From d489393ff8acdc9bf28cc75a7d33d9f5009603e8 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Wed, 4 Feb 2015 19:31:11 +0100
Subject: [PATCH 001/331] set "Adjust Lights" base position to camera position

---
 src/utils/debug.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 72e869954..8e03f0cce 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -153,24 +153,14 @@ void addAttachment(Attachment::AttachmentType type)
  * nitro emitters) */
 LightNode* findNearestLight()
 {
-    World* world = World::getWorld();
-    if (!world) return NULL;
 
-    AbstractKart* player_kart = NULL;
-    for (unsigned int i = 0; i < world->getNumKarts(); i++)
-    {
-        AbstractKart *kart = world->getKart(i);
-        if (kart->getController()->isPlayerController())
-            player_kart = kart;
-    }
-
-    if (!player_kart)
-    {
-        Log::error("Debug", "No player kart found.");
+    Camera* camera = Camera::getActiveCamera();
+    if (camera == NULL) {
+        Log::error("[Debug Menu]", "No camera found.");
         return NULL;
     }
 
-    core::vector3df kart_pos = player_kart->getNode()->getAbsolutePosition();
+    core::vector3df cam_pos = camera->getCameraSceneNode()->getAbsolutePosition();
     LightNode* nearest = 0;
     float nearest_dist = 1000000.0; // big enough
     for (unsigned int i = 0; i < irr_driver->getLights().size(); i++)
@@ -182,10 +172,10 @@ LightNode* findNearestLight()
             continue;
 
         core::vector3df light_pos = light->getAbsolutePosition();
-        if ( kart_pos.getDistanceFrom(light_pos) < nearest_dist)
+        if ( cam_pos.getDistanceFrom(light_pos) < nearest_dist)
         {
             nearest      = irr_driver->getLights()[i];
-            nearest_dist = kart_pos.getDistanceFrom(light_pos);
+            nearest_dist = cam_pos.getDistanceFrom(light_pos);
         }
     }
 

From 6805ead6e6767067bc2e8a14f992b9ada0200e23 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Tue, 24 Feb 2015 23:23:35 +0100
Subject: [PATCH 002/331] Add tooltip to explain usage of per-player handicaps

---
 src/guiengine/skin.cpp                   | 6 ++++++
 src/states_screens/options_screen_ui.cpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index ad77c23b8..c917eddf3 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1609,6 +1609,12 @@ void Skin::drawCheckBox(const core::recti &rect, Widget* widget, bool focused)
                                              0 /* no clipping */, 0,
                                              true /* alpha */);
     }
+
+    if (focused && widget->hasTooltip())
+    {
+        m_tooltip_at_mouse.push_back(true);
+        m_tooltips.push_back(widget);
+    }
 }   // drawCheckBox
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options_screen_ui.cpp
index f1c2e8728..7789226d1 100644
--- a/src/states_screens/options_screen_ui.cpp
+++ b/src/states_screens/options_screen_ui.cpp
@@ -151,6 +151,7 @@ void OptionsScreenUI::init()
     CheckBoxWidget* difficulty = getWidget<CheckBoxWidget>("perPlayerDifficulty");
     assert( difficulty != NULL );
     difficulty->setState( UserConfigParams::m_per_player_difficulty );
+    difficulty->setTooltip(_("Handicap stronger players in the kart selection"));
 
     CheckBoxWidget* show_login = getWidget<CheckBoxWidget>("show-login");
     assert( show_login!= NULL );

From f9919c462f6ef32da062f08466a4ff9d289302cd Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 1 Mar 2015 22:30:33 +0100
Subject: [PATCH 003/331] Improve tooltip text and center tooltips

---
 src/guiengine/skin.cpp                   | 2 +-
 src/states_screens/options_screen_ui.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index c917eddf3..4e4583c44 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1849,7 +1849,7 @@ void Skin::drawTooltip(Widget* widget, bool atMouse)
     if (atMouse)
     {
         pos = irr_driver->getDevice()->getCursorControl()->getPosition()
-            + core::position2di(15, 15);
+            + core::position2di(10 - size.Width / 2, 20);
     }
 
     core::recti r(pos, size);
diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options_screen_ui.cpp
index 7789226d1..f885987b7 100644
--- a/src/states_screens/options_screen_ui.cpp
+++ b/src/states_screens/options_screen_ui.cpp
@@ -151,7 +151,7 @@ void OptionsScreenUI::init()
     CheckBoxWidget* difficulty = getWidget<CheckBoxWidget>("perPlayerDifficulty");
     assert( difficulty != NULL );
     difficulty->setState( UserConfigParams::m_per_player_difficulty );
-    difficulty->setTooltip(_("Handicap stronger players in the kart selection"));
+    difficulty->setTooltip(_("Players can select handicapped (more difficult) profiles on the kart selection screen"));
 
     CheckBoxWidget* show_login = getWidget<CheckBoxWidget>("show-login");
     assert( show_login!= NULL );

From 1ddc4afc14d371fe6fa7e1147b0f40ca9fd9d12d Mon Sep 17 00:00:00 2001
From: Kacper <ZyperPL>
Date: Sat, 7 Mar 2015 20:56:44 +0100
Subject: [PATCH 004/331] Sliders react to mouse

---
 src/guiengine/skin.cpp                   | 14 +++++++++
 src/guiengine/widgets/spinner_widget.cpp | 40 ++++++++++++++++++++++++
 src/guiengine/widgets/spinner_widget.hpp |  8 +++++
 3 files changed, 62 insertions(+)

diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index f948ea28d..7834f6b46 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1378,6 +1378,20 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
                                             0 /* no clipping */, 0,
                                             true /* alpha */);
 
+        // ---- Set value by mouse position
+        const float max_value = (float)(w->getMax() - w->getMin()) /
+                                       (w->getMax() - w->getMin());
+
+        const core::recti mouse_area(rect.UpperLeftCorner.X + handle_size,
+                                    rect.UpperLeftCorner.Y,
+                                    rect.UpperLeftCorner.X + handle_size +
+                                           (int)((widget->m_w
+                                                  - 2*handle_size)*max_value),
+                                    rect.UpperLeftCorner.Y + widget->m_h);
+
+        const core::position2di mouse_position
+            = irr_driver->getDevice()->getCursorControl()->getPosition();
+        q->setValuesByMouse(mouse_position, mouse_area);
     }
 
     if (focused && widget->hasTooltip())
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 1a740830f..bbb21522d 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -46,6 +46,7 @@ SpinnerWidget::SpinnerWidget(const bool gauge) : Widget(WTYPE_SPINNER)
     m_supports_multiplayer = true;
     m_value = -1;
     m_use_background_color=false;
+    m_allow_mouse_change = false;
     m_spinner_widget_player_id=-1;
     m_min = 0;
     m_max = 999;
@@ -432,3 +433,42 @@ void SpinnerWidget::setCustomText(const core::stringw& text)
     }
 }
 
+// -----------------------------------------------------------------------------
+
+void SpinnerWidget::setValuesByMouse(const core::position2di & mouse_position,
+                                     const core::recti & body_rect)
+{
+    if(body_rect.isPointInside(mouse_position))
+    {
+        if (m_allow_mouse_change)
+        {
+            float exact_hover = (float)((mouse_position.X -
+                body_rect.UpperLeftCorner.X) /
+                (float)body_rect.getWidth()) * (m_max-m_min) + 0.5f;
+
+            int new_value = ((exact_hover * (m_max-m_min)) / 
+                              (m_max-m_min))+m_min;
+            //Log::info("SpinnerWidget", "mouse_value: %d (%f)", 
+            //            mouse_value, exact_hover);
+
+            if (new_value > m_max) new_value = m_max;
+            if (new_value < m_min) new_value = m_min;
+
+            setValue(new_value);
+            EventHandler::get()->processGUIAction(
+                          PlayerAction::PA_MENU_SELECT,
+                          1, Input::MAX_VALUE,
+                          Input::IT_MOUSEBUTTON, false); //process the changes
+            m_allow_mouse_change = false;
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void SpinnerWidget::onClick()
+{
+    m_allow_mouse_change = true;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 02a908788..12bd61bae 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -59,6 +59,7 @@ namespace GUIEngine
         
         int m_spinner_widget_player_id;
         bool m_use_background_color;
+        bool m_allow_mouse_change;
         
         /** If each value the spinner can take has an associated text, this vector will be non-empty */
         std::vector<irr::core::stringw> m_labels;
@@ -91,6 +92,9 @@ namespace GUIEngine
         
         /** \brief implementing method from base class Widget */
         virtual EventPropagation leftPressed(const int playerID);
+
+        /** \brief implementing method from base class Widget */
+        virtual void onClick();
         
         /** When inferring widget size from its label length, this method will be called to
          * if/how much space must be added to the raw label's size for the widget to be large enough */
@@ -197,6 +201,10 @@ namespace GUIEngine
 
         /** Display custom text in spinner */
         void setCustomText(const core::stringw& text);
+
+        /** Set m_value based on mouse position */
+        void setValuesByMouse(const core::position2di & mouse_position,
+                              const core::recti & body_rect);
     };
 
 }

From 2aef2468970e84bd959d39a8ddeff42c05f2a517 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 18 Jan 2015 14:40:29 +0100
Subject: [PATCH 005/331] Fix #1824 - Hardware stats sends duplicate data

---
 src/config/hardware_stats.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/config/hardware_stats.cpp b/src/config/hardware_stats.cpp
index 6780fa5ad..900733b64 100644
--- a/src/config/hardware_stats.cpp
+++ b/src/config/hardware_stats.cpp
@@ -313,9 +313,6 @@ void reportHardwareStats()
 
     std::string vendor, renderer, full_version;
     irr_driver->getOpenGLData(&vendor, &renderer, &full_version);
-    json.add("GL_VENDOR",   vendor          );
-    json.add("GL_RENDERER", renderer        );
-    json.add("GL_VERSION",  full_version    );
     json.add("gfx_drv_ver", "OpenGL "+vendor);
 
     std::string card_name = vendor;

From ded59ac81e41a084851386f91766780169cf299d Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 18 Jan 2015 23:40:56 +0100
Subject: [PATCH 006/331] Fix #1822 - Addons xml file contains wrong xmlns path

---
 src/addons/addons_manager.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/addons/addons_manager.cpp b/src/addons/addons_manager.cpp
index 3fe7ff51f..f5f7e8d5f 100644
--- a/src/addons/addons_manager.cpp
+++ b/src/addons/addons_manager.cpp
@@ -583,13 +583,19 @@ bool AddonsManager::uninstall(const Addon &addon)
  */
 void AddonsManager::saveInstalled()
 {
-    //Put the addons in the xml file
-    //Manually because the irrlicht xml writer doesn't seem finished, FIXME ?
+    // Put the addons in the xml file
+    // Manually because the irrlicht xml writer doesn't seem finished, FIXME ?
     std::ofstream xml_installed(m_file_installed.c_str());
 
-    //write the header of the xml file
+    // Write the header of the xml file
     xml_installed << "<?xml version=\"1.0\"?>" << std::endl;
-    xml_installed << "<addons  xmlns='http://stkaddons.net/'>"
+
+    // Get server address from config
+    std::string server = UserConfigParams::m_server_addons;
+    // Find the third slash (end of the domain)
+    std::string::size_type index = server.find('/');
+    index = server.find('/', index + 2) + 1; // Omit one slash
+    xml_installed << "<addons  xmlns='" << server.substr(0, index) << "'>"
                     << std::endl;
 
     for(unsigned int i = 0; i < m_addons_list.getData().size(); i++)

From b21f6f4782286164e316e64fd24d75457a334e44 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 8 Mar 2015 15:14:31 +0100
Subject: [PATCH 007/331] Improve handling of mouse movement for the first
 person camera, especially at low framerates

---
 src/graphics/camera.cpp     |  1 +
 src/input/input_manager.cpp | 10 ++++------
 src/input/input_manager.hpp |  4 ----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 465950bc1..388ad47eb 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -489,6 +489,7 @@ void Camera::update(float dt)
         // - the kart should not be visible, but it works)
         m_camera->setNearValue(27.0);
     }
+    // Update the first person camera
     else if (UserConfigParams::m_camera_debug == 3)
     {
         core::vector3df direction(m_camera->getTarget() - m_camera->getPosition());
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index c4beeafb5..e2f233904 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -67,8 +67,7 @@ using GUIEngine::EVENT_BLOCK;
 /** Initialise input
  */
 InputManager::InputManager() : m_mode(BOOTSTRAP),
-                               m_mouse_val_x(-1), m_mouse_val_y(-1),
-                               m_mouse_reset(0)
+                               m_mouse_val_x(-1), m_mouse_val_y(-1)
 {
     m_device_manager = new DeviceManager();
     m_device_manager->initialize();
@@ -977,11 +976,13 @@ EventPropagation InputManager::input(const SEvent& event)
                     UserConfigParams::m_fpscam_direction_speed;
                 float mouse_y = ((float) diff_y) *
                     -UserConfigParams::m_fpscam_direction_speed;
+
                 // No movement the first time it's used
                 // At the moment there's also a hard limit because the mouse
                 // gets reset to the middle of the screen and sometimes there
                 // are more events fired than expected.
-                if (m_mouse_val_x != -1 && m_mouse_reset <= 0)
+                if (m_mouse_val_x != -1 &&
+                   (diff_x + diff_y) < 100 && (diff_x + diff_y) > -100)
                 {
                     // Rotate camera
                     core::vector3df up(cam->getUpVector());
@@ -1016,8 +1017,6 @@ EventPropagation InputManager::input(const SEvent& event)
                         irr_driver->getDevice()->getCursorControl()->setPosition(mid_x, mid_y);
                         m_mouse_val_x = mid_x;
                         m_mouse_val_y = mid_y;
-                        // Ignore the next 2 movements
-                        m_mouse_reset = 2;
                     }
                     else
                     {
@@ -1029,7 +1028,6 @@ EventPropagation InputManager::input(const SEvent& event)
                 {
                     m_mouse_val_x = event.MouseInput.X;
                     m_mouse_val_y = event.MouseInput.Y;
-                    --m_mouse_reset;
                 }
                 return EVENT_BLOCK;
             }
diff --git a/src/input/input_manager.hpp b/src/input/input_manager.hpp
index 3be9879c7..e931c68c5 100644
--- a/src/input/input_manager.hpp
+++ b/src/input/input_manager.hpp
@@ -67,10 +67,6 @@ private:
     * makes the mouse behave like an analog axis on a gamepad/joystick.
     */
     int m_mouse_val_x, m_mouse_val_y;
-    /** To detect mouse events that are not caused by the user but by resetting
-        the mouse position to the center of the screen.
-        If it's not 0, the movement is ignored and the value is decreased. */
-    int m_mouse_reset;
 
     void   dispatchInput(Input::InputType, int deviceID, int btnID,
                          Input::AxisDirection direction, int value);

From 5b8834b48fea4bf5081de360d6ec729420a6c2ce Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 8 Mar 2015 17:15:50 +0100
Subject: [PATCH 008/331] Add possibility to attach the fps camera to the kart

---
 src/graphics/camera.cpp     | 77 ++++++++++++++++++++++++++++++++++++-
 src/graphics/camera.hpp     | 25 ++++++++++++
 src/input/input_manager.cpp | 22 +----------
 src/utils/debug.cpp         |  7 ++++
 4 files changed, 109 insertions(+), 22 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 388ad47eb..0416badbc 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -50,6 +50,7 @@ Camera* Camera::s_active_camera = NULL;
 Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
 {
     m_smooth        = false;
+    m_attached      = false;
     m_mode          = CM_NORMAL;
     m_index         = camera_index;
     m_original_kart = kart;
@@ -91,6 +92,11 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
     m_target_direction = core::vector3df(0, 0, 1);
     m_target_up_vector = core::vector3df(0, 1, 0);
     m_direction_velocity = core::vector3df(0, 0, 0);
+
+    m_local_position = core::vector3df(0, 0, 0);
+    m_local_direction = core::vector3df(0, 0, 1);
+    m_local_up = core::vector3df(0, 1, 0);
+
     m_angular_velocity = 0;
     m_target_angular_velocity = 0;
     m_max_velocity = 15;
@@ -108,6 +114,42 @@ Camera::~Camera()
         s_active_camera = NULL;
 }   // ~Camera
 
+//-----------------------------------------------------------------------------
+/** Applies mouse movement to the first person camera.
+ *  \param x The horizontal difference of the mouse position.
+ *  \param y The vertical difference of the mouse position.
+ */
+void Camera::applyMouseMovement (float x, float y)
+{
+    core::vector3df direction(m_target_direction);
+    core::vector3df up(m_camera->getUpVector());
+
+    // Set local values if the camera is attached to the kart
+    if (m_attached)
+        up = m_local_up;
+
+    core::vector3df side(direction.crossProduct(up));
+
+    direction.normalize();
+    up.normalize();
+    core::quaternion quat;
+    quat.fromAngleAxis(x, up);
+
+    core::quaternion quat_y;
+    quat_y.fromAngleAxis(y, side);
+    quat *= quat_y;
+
+    direction = quat * direction;
+    m_target_direction = direction;
+
+    // Don't do that because it looks ugly and is bad to handle ;)
+    /*side = direction.crossProduct(up);
+    // Compute new up vector
+    up = side.crossProduct(direction);
+    up.normalize();
+    cam->setUpVector(up);*/
+}
+
 //-----------------------------------------------------------------------------
 /** Changes the owner of this camera to the new kart.
  *  \param new_kart The new kart to use this camera.
@@ -495,6 +537,15 @@ void Camera::update(float dt)
         core::vector3df direction(m_camera->getTarget() - m_camera->getPosition());
         core::vector3df up(m_camera->getUpVector());
         core::vector3df side(direction.crossProduct(up));
+        core::vector3df pos = m_camera->getPosition();
+
+        // Set local values if the camera is attached to the kart
+        if (m_attached)
+        {
+            direction = m_local_direction;
+            up = m_local_up;
+            pos = m_local_position;
+        }
 
         // Update smooth movement
         if (m_smooth)
@@ -567,9 +618,33 @@ void Camera::update(float dt)
         // Move camera
         core::vector3df movement(direction * m_lin_velocity.Z +
             up * m_lin_velocity.Y + side * m_lin_velocity.X);
-        core::vector3df pos = m_camera->getPosition();
         pos = pos + movement * dt;
 
+        if (m_attached)
+        {
+            // Save current values
+            m_local_position = pos;
+            m_local_direction = direction;
+            m_local_up = up;
+
+            // Move the camera with the kart
+            btTransform t = m_kart->getTrans();
+            if (stk_config->m_camera_follow_skid &&
+                m_kart->getSkidding()->getVisualSkidRotation() != 0)
+            {
+                // If the camera should follow the graphical skid, add the
+                // visual rotation to the relative vector:
+                btQuaternion q(m_kart->getSkidding()->getVisualSkidRotation(), 0, 0);
+                t.setBasis(t.getBasis() * btMatrix3x3(q));
+            }
+            pos = Vec3(t(Vec3(pos))).toIrrVector();
+
+            btQuaternion q = t.getRotation();
+            btMatrix3x3 mat(q);
+            direction = Vec3(mat * Vec3(direction)).toIrrVector();
+            up = Vec3(mat * Vec3(up)).toIrrVector();
+        }
+
         // Set camera attributes
         m_camera->setPosition(pos);
         m_camera->setTarget(pos + direction);
diff --git a/src/graphics/camera.hpp b/src/graphics/camera.hpp
index 071e8db91..deca13935 100644
--- a/src/graphics/camera.hpp
+++ b/src/graphics/camera.hpp
@@ -113,6 +113,10 @@ private:
     /** Smooth acceleration with the first person camera. */
     bool m_smooth;
 
+    /** Attache the first person camera to a kart.
+        That means moving the kart also moves the camera. */
+    bool m_attached;
+
     /** The speed at which the up-vector rotates, only used for the first person camera. */
     float m_angular_velocity;
 
@@ -138,6 +142,15 @@ private:
     /** The up vector the camera should have, only used for the first person camera. */
     core::vector3df m_target_up_vector;
 
+    /** Save the local position if the first person camera is attached to the kart. */
+    core::vector3df m_local_position;
+
+    /** Save the local direction if the first person camera is attached to the kart. */
+    core::vector3df m_local_direction;
+
+    /** Save the local up vector if the first person camera is attached to the kart. */
+    core::vector3df m_local_up;
+
     /** List of all cameras. */
     static std::vector<Camera*> m_all_cameras;
 
@@ -269,6 +282,10 @@ public:
     /** Returns the kart to which this camera is attached. */
     AbstractKart* getKart() { return m_kart; }
 
+    // ------------------------------------------------------------------------
+    /** Applies mouse movement to the first person camera. */
+    void applyMouseMovement (float x, float y);
+
     // ------------------------------------------------------------------------
     /** Sets if the first person camera should be moved smooth. */
     void setSmoothMovement (bool value) { m_smooth = value; }
@@ -277,6 +294,14 @@ public:
     /** If the first person camera should be moved smooth. */
     bool getSmoothMovement () { return m_smooth; }
 
+    // ------------------------------------------------------------------------
+    /** Sets if the first person camera should be moved with the kart. */
+    void setAttachedFpsCam (bool value) { m_attached = value; }
+
+    // ------------------------------------------------------------------------
+    /** If the first person camera should be moved with the kart. */
+    bool getAttachedFpsCam () { return m_attached; }
+
     // ------------------------------------------------------------------------
     /** Sets the angular velocity for this camera. */
     void setMaximumVelocity (float vel) { m_max_velocity = vel; }
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index e2f233904..a9e5b95b4 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -985,27 +985,7 @@ EventPropagation InputManager::input(const SEvent& event)
                    (diff_x + diff_y) < 100 && (diff_x + diff_y) > -100)
                 {
                     // Rotate camera
-                    core::vector3df up(cam->getUpVector());
-                    core::vector3df direction(cam->getDirection());
-                    core::vector3df side(direction.crossProduct(up));
-                    direction.normalize();
-                    up.normalize();
-                    core::quaternion quat;
-                    quat.fromAngleAxis(mouse_x, up);
-
-                    core::quaternion quat_y;
-                    quat_y.fromAngleAxis(mouse_y, side);
-                    quat *= quat_y;
-
-                    direction = quat * direction;
-                    cam->setDirection(direction);
-                    side = direction.crossProduct(up);
-
-                    // Compute new up vector
-                    /*up = side.crossProduct(direction);
-                    up.normalize();
-                    // Don't do that because it looks ugly and is bad to handle ;)
-                    cam->setUpVector(up);*/
+                    cam->applyMouseMovement(mouse_x, mouse_y);
 
                     // Reset mouse position to the middle of the screen when
                     // the mouse is far away
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 72e869954..eab8c828a 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -97,6 +97,7 @@ enum DebugMenuCommand
     DEBUG_GUI_CAM_WHEEL,
     DEBUG_GUI_CAM_NORMAL,
     DEBUG_GUI_CAM_SMOOTH,
+    DEBUG_GUI_CAM_ATTACH,
     DEBUG_HIDE_KARTS,
     DEBUG_THROTTLE_FPS,
     DEBUG_VISUAL_VALUES,
@@ -260,6 +261,7 @@ bool onEvent(const SEvent &event)
             sub->addItem(L"First person view", DEBUG_GUI_CAM_FREE);
             sub->addItem(L"Normal view", DEBUG_GUI_CAM_NORMAL);
             sub->addItem(L"Toggle smooth camera", DEBUG_GUI_CAM_SMOOTH);
+            sub->addItem(L"Attach fps camera to kart", DEBUG_GUI_CAM_ATTACH);
 
             mnu->addItem(L"Adjust values", DEBUG_VISUAL_VALUES);
 
@@ -539,6 +541,11 @@ bool onEvent(const SEvent &event)
                     Camera *cam = Camera::getActiveCamera();
                     cam->setSmoothMovement(!cam->getSmoothMovement());
                 }
+                else if (cmdID == DEBUG_GUI_CAM_ATTACH)
+                {
+                    Camera *cam = Camera::getActiveCamera();
+                    cam->setAttachedFpsCam(!cam->getAttachedFpsCam());
+                }
                 else if (cmdID == DEBUG_PRINT_START_POS)
                 {
                     if(!world) return false;

From 0a7234df84b9d38889fc54ab117d6c7d59ff0784 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 9 Mar 2015 18:44:10 +0100
Subject: [PATCH 009/331] Allow to use shift + tab to switch to previous field.

Thanks to xXFlorianXx.
---
 src/input/input_manager.cpp | 20 ++++++++++++++++----
 src/input/input_manager.hpp |  3 ++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index a9e5b95b4..4b88fb744 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -544,7 +544,8 @@ int InputManager::getPlayerKeyboardID() const
  */
 void InputManager::dispatchInput(Input::InputType type, int deviceID,
                                  int button,
-                                 Input::AxisDirection axisDirection, int value)
+                                 Input::AxisDirection axisDirection, int value,
+                                 bool shift_mask)
 {
     // Act different in input sensing mode.
     if (m_mode == INPUT_SENSE_KEYBOARD ||
@@ -597,7 +598,17 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
         else if (button == KEY_RIGHT)  action = PA_MENU_RIGHT;
         else if (button == KEY_SPACE)  action = PA_MENU_SELECT;
         else if (button == KEY_RETURN) action = PA_MENU_SELECT;
-        else if (button == KEY_TAB)    action = PA_MENU_DOWN;
+        else if (button == KEY_TAB)    
+        {
+            if (shift_mask)
+            {
+                action = PA_MENU_UP;
+            }
+            else
+            {
+                action = PA_MENU_DOWN;
+            }
+        }
 
         if (button == KEY_RETURN && GUIEngine::ModalDialog::isADialogActive())
         {
@@ -922,7 +933,8 @@ EventPropagation InputManager::input(const SEvent& event)
             const bool wasInTextBox = GUIEngine::isWithinATextBox();
 
             dispatchInput(Input::IT_KEYBOARD, event.KeyInput.Char, key,
-                          Input::AD_POSITIVE, Input::MAX_VALUE);
+                          Input::AD_POSITIVE, Input::MAX_VALUE,
+                          event.KeyInput.Shift);
 
             // if this action took us into a text box, don't let event continue
             // (FIXME not the cleanest solution)
@@ -951,7 +963,7 @@ EventPropagation InputManager::input(const SEvent& event)
             }
 
             dispatchInput(Input::IT_KEYBOARD, event.KeyInput.Char, key,
-                          Input::AD_POSITIVE, 0);
+                          Input::AD_POSITIVE, 0, event.KeyInput.Shift);
             return EVENT_BLOCK; // Don't propagate key up events
         }
     }
diff --git a/src/input/input_manager.hpp b/src/input/input_manager.hpp
index e931c68c5..3c3518a09 100644
--- a/src/input/input_manager.hpp
+++ b/src/input/input_manager.hpp
@@ -69,7 +69,8 @@ private:
     int m_mouse_val_x, m_mouse_val_y;
 
     void   dispatchInput(Input::InputType, int deviceID, int btnID,
-                         Input::AxisDirection direction, int value);
+                         Input::AxisDirection direction, int value,
+                         bool shift_mask = false);
     void   handleStaticAction(int id0, int value);
     void   inputSensing(Input::InputType type, int deviceID, int btnID,
                         Input::AxisDirection axisDirection,  int value);

From acd1628528e2d080221bef60ace1af59f0d1568f Mon Sep 17 00:00:00 2001
From: Kacper <ZyperPL>
Date: Mon, 9 Mar 2015 19:22:10 +0100
Subject: [PATCH 010/331] Moved slider's code to onClick()

---
 src/guiengine/skin.cpp                   | 14 ------
 src/guiengine/widgets/spinner_widget.cpp | 61 +++++++++++++-----------
 src/guiengine/widgets/spinner_widget.hpp |  5 --
 3 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 7834f6b46..f948ea28d 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1378,20 +1378,6 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
                                             0 /* no clipping */, 0,
                                             true /* alpha */);
 
-        // ---- Set value by mouse position
-        const float max_value = (float)(w->getMax() - w->getMin()) /
-                                       (w->getMax() - w->getMin());
-
-        const core::recti mouse_area(rect.UpperLeftCorner.X + handle_size,
-                                    rect.UpperLeftCorner.Y,
-                                    rect.UpperLeftCorner.X + handle_size +
-                                           (int)((widget->m_w
-                                                  - 2*handle_size)*max_value),
-                                    rect.UpperLeftCorner.Y + widget->m_h);
-
-        const core::position2di mouse_position
-            = irr_driver->getDevice()->getCursorControl()->getPosition();
-        q->setValuesByMouse(mouse_position, mouse_area);
     }
 
     if (focused && widget->hasTooltip())
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index bbb21522d..9b9670d18 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -46,7 +46,6 @@ SpinnerWidget::SpinnerWidget(const bool gauge) : Widget(WTYPE_SPINNER)
     m_supports_multiplayer = true;
     m_value = -1;
     m_use_background_color=false;
-    m_allow_mouse_change = false;
     m_spinner_widget_player_id=-1;
     m_min = 0;
     m_max = 999;
@@ -435,40 +434,46 @@ void SpinnerWidget::setCustomText(const core::stringw& text)
 
 // -----------------------------------------------------------------------------
 
-void SpinnerWidget::setValuesByMouse(const core::position2di & mouse_position,
-                                     const core::recti & body_rect)
+void SpinnerWidget::onClick()
 {
+    int x = m_x;
+    int y = m_y;
+
+    if (m_parent != NULL)
+    {
+        x += m_parent->getAbsolutePosition().UpperLeftCorner.X;
+        y += m_parent->getAbsolutePosition().UpperLeftCorner.Y;
+    }
+
+    if (m_children[1].m_deactivated) return;
+
+    if (m_children[1].m_properties[PROP_ID] != "spinnerbody" 
+        || !isGauge()) { return; }
+
+    const core::position2di mouse_position
+        = irr_driver->getDevice()->getCursorControl()->getPosition();
+
+    const int handle_size = m_h*110/128; //need params->m_left_border and params->getImage()->getSize().Height
+
+    rect<s32> body_rect = rect<s32>(x+handle_size, 
+                                    y, 
+                                    x+handle_size + (m_w-2*handle_size), 
+                                    y+handle_size);
+
     if(body_rect.isPointInside(mouse_position))
     {
-        if (m_allow_mouse_change)
-        {
-            float exact_hover = (float)((mouse_position.X -
-                body_rect.UpperLeftCorner.X) /
-                (float)body_rect.getWidth()) * (m_max-m_min) + 0.5f;
+        float exact_hover = (float)((mouse_position.X -
+            body_rect.UpperLeftCorner.X) /
+            (float)body_rect.getWidth()) * (m_max-m_min) + 0.5f;
 
-            int new_value = ((exact_hover * (m_max-m_min)) / 
-                              (m_max-m_min))+m_min;
-            //Log::info("SpinnerWidget", "mouse_value: %d (%f)", 
-            //            mouse_value, exact_hover);
+        int new_value = ((exact_hover * (m_max-m_min)) / 
+                          (m_max-m_min))+m_min;
 
-            if (new_value > m_max) new_value = m_max;
-            if (new_value < m_min) new_value = m_min;
+        if (new_value > m_max) new_value = m_max;
+        if (new_value < m_min) new_value = m_min;
 
-            setValue(new_value);
-            EventHandler::get()->processGUIAction(
-                          PlayerAction::PA_MENU_SELECT,
-                          1, Input::MAX_VALUE,
-                          Input::IT_MOUSEBUTTON, false); //process the changes
-            m_allow_mouse_change = false;
-        }
+        setValue(new_value);
     }
 }
 
 // -----------------------------------------------------------------------------
-
-void SpinnerWidget::onClick()
-{
-    m_allow_mouse_change = true;
-}
-
-// -----------------------------------------------------------------------------
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 12bd61bae..2347ab3d0 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -59,7 +59,6 @@ namespace GUIEngine
         
         int m_spinner_widget_player_id;
         bool m_use_background_color;
-        bool m_allow_mouse_change;
         
         /** If each value the spinner can take has an associated text, this vector will be non-empty */
         std::vector<irr::core::stringw> m_labels;
@@ -201,10 +200,6 @@ namespace GUIEngine
 
         /** Display custom text in spinner */
         void setCustomText(const core::stringw& text);
-
-        /** Set m_value based on mouse position */
-        void setValuesByMouse(const core::position2di & mouse_position,
-                              const core::recti & body_rect);
     };
 
 }

From 17f7f84597eb887408f7a5abb64a04c9ee5cb6c2 Mon Sep 17 00:00:00 2001
From: Kacper <ZyperPL>
Date: Tue, 10 Mar 2015 16:52:07 +0100
Subject: [PATCH 011/331] Replaced hardcoded values

---
 src/guiengine/widgets/spinner_widget.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 9b9670d18..6423df23f 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -445,20 +445,18 @@ void SpinnerWidget::onClick()
         y += m_parent->getAbsolutePosition().UpperLeftCorner.Y;
     }
 
-    if (m_children[1].m_deactivated) return;
-
-    if (m_children[1].m_properties[PROP_ID] != "spinnerbody" 
-        || !isGauge()) { return; }
+    if (m_children[1].m_deactivated || 
+        m_children[1].m_properties[PROP_ID] != "spinnerbody"  || 
+        !isGauge()) 
+    { 
+        return; 
+    }
 
     const core::position2di mouse_position
         = irr_driver->getDevice()->getCursorControl()->getPosition();
 
-    const int handle_size = m_h*110/128; //need params->m_left_border and params->getImage()->getSize().Height
-
-    rect<s32> body_rect = rect<s32>(x+handle_size, 
-                                    y, 
-                                    x+handle_size + (m_w-2*handle_size), 
-                                    y+handle_size);
+    core::recti body_rect 
+        = m_children[1].getIrrlichtElement()->getAbsolutePosition();
 
     if(body_rect.isPointInside(mouse_position))
     {

From 886c0e3e9f72c34f7c67d04a0ac09cf5fcef0add Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 11 Mar 2015 08:04:35 +1100
Subject: [PATCH 012/331] Make sure there is always enough push back from
 kart-terrain collisions to avoid karts getting stuck into the wall.

---
 src/karts/kart.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index b4a396570..4877cc7d8 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1825,8 +1825,11 @@ void Kart::crashed(const Material *m, const Vec3 &normal)
             impulse.normalize();
         else
             impulse = Vec3(0, 0, -1); // Arbitrary
-        // impulse depends of kart speed - and speed can be negative
-        impulse *= sqrt(fabsf(getSpeed()))
+        // Impulse depends of kart speed - and speed can be negative
+        // If the speed is too low, karts can still get stuck into a wall
+        // so make sure there is always enough impulse to avoid this
+        float abs_speed = fabsf(getSpeed());
+        impulse *= ( abs_speed<10 ? 10.0f : sqrt(abs_speed) )
                  * m_kart_properties->getCollisionTerrainImpulse();
         m_bounce_back_time = 0.2f;
         m_vehicle->setTimedCentralImpulse(0.1f, impulse);

From a3105509047a7ec202e9128fe5a16f0707e5e5fe Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 10 Mar 2015 19:42:56 -0400
Subject: [PATCH 013/331] Small tweaks to pull request, remove unused code, use
 roundf instead of adding +0.5

---
 src/guiengine/widgets/spinner_widget.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 6423df23f..568bd5958 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -436,15 +436,6 @@ void SpinnerWidget::setCustomText(const core::stringw& text)
 
 void SpinnerWidget::onClick()
 {
-    int x = m_x;
-    int y = m_y;
-
-    if (m_parent != NULL)
-    {
-        x += m_parent->getAbsolutePosition().UpperLeftCorner.X;
-        y += m_parent->getAbsolutePosition().UpperLeftCorner.Y;
-    }
-
     if (m_children[1].m_deactivated || 
         m_children[1].m_properties[PROP_ID] != "spinnerbody"  || 
         !isGauge()) 
@@ -458,14 +449,15 @@ void SpinnerWidget::onClick()
     core::recti body_rect 
         = m_children[1].getIrrlichtElement()->getAbsolutePosition();
 
-    if(body_rect.isPointInside(mouse_position))
+    if (body_rect.isPointInside(mouse_position))
     {
         float exact_hover = (float)((mouse_position.X -
             body_rect.UpperLeftCorner.X) /
-            (float)body_rect.getWidth()) * (m_max-m_min) + 0.5f;
+            (float)body_rect.getWidth()) * (m_max-m_min);
 
-        int new_value = ((exact_hover * (m_max-m_min)) / 
-                          (m_max-m_min))+m_min;
+        float new_value_f = ((exact_hover * (m_max - m_min)) /
+            (m_max - m_min)) + m_min;
+        int new_value = (int)roundf(new_value_f);
 
         if (new_value > m_max) new_value = m_max;
         if (new_value < m_min) new_value = m_min;

From ce9ba74f57dc063c83934357b82fa38351a52afa Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 10 Mar 2015 19:56:10 -0400
Subject: [PATCH 014/331] Tweak tooltip to only display if the mouse is
 actually over the checkbox

---
 src/guiengine/skin.cpp | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 91e8bf7fc..71a99f5a5 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1374,9 +1374,9 @@ void Skin::drawSpinnerBody(const core::recti &rect, Widget* widget,
         const core::recti source_area(0, 0, texture_w, texture_h);
 
         draw2DImage(texture,
-                                            dest_area, source_area,
-                                            0 /* no clipping */, 0,
-                                            true /* alpha */);
+                    dest_area, source_area,
+                    0 /* no clipping */, 0,
+                    true /* alpha */);
 
     }
 
@@ -1598,21 +1598,28 @@ void Skin::drawCheckBox(const core::recti &rect, Widget* widget, bool focused)
                              SColor(100,255,255,255),
                              SColor(100,255,255,255),
                              SColor(100,255,255,255) };
-        draw2DImage( texture, rect, source_area,
-                                            0 /* no clipping */, colors,
-                                            true /* alpha */);
+        draw2DImage(texture, rect, source_area,
+                    0 /* no clipping */, colors,
+                    true /* alpha */);
     }
     else
     {
-        draw2DImage( texture, rect, source_area,
-                                             0 /* no clipping */, 0,
-                                             true /* alpha */);
+        draw2DImage(texture, rect, source_area,
+                    0 /* no clipping */, 0,
+                    true /* alpha */);
     }
 
+
     if (focused && widget->hasTooltip())
     {
-        m_tooltip_at_mouse.push_back(true);
-        m_tooltips.push_back(widget);
+        const core::position2di mouse_position =
+            irr_driver->getDevice()->getCursorControl()->getPosition();
+
+        if (rect.isPointInside(mouse_position))
+        {
+            m_tooltip_at_mouse.push_back(true);
+            m_tooltips.push_back(widget);
+        }
     }
 }   // drawCheckBox
 

From 55934bd8f14888d4c658ab55a3c35dfd0e95c961 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 11 Mar 2015 14:45:25 +1100
Subject: [PATCH 015/331] Fixed cmake on VS (before cmake create would fail,
 but redoing the configure and then generating the project would still work,
 so with an existing project this error was not detected).

---
 lib/libpng/CMakeLists.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/libpng/CMakeLists.txt b/lib/libpng/CMakeLists.txt
index 1450173c0..2165db6a2 100644
--- a/lib/libpng/CMakeLists.txt
+++ b/lib/libpng/CMakeLists.txt
@@ -43,9 +43,14 @@ if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks")
 endif()
 
-# needed packages
-find_package(ZLIB REQUIRED)
-include_directories(${ZLIB_INCLUDE_DIR})
+# Needed packages. Since WIN32 (except mingw) uses the included zlib
+# version, find_package would fail with an error message. Since
+# all variables are already set in this case, the find package
+# is actually not necessary in this case, so just ignore it
+if(NOT WIN32 OR MINGW)
+    find_package(ZLIB REQUIRED)
+    include_directories(${ZLIB_INCLUDE_DIR})
+endif()
 
 if(NOT WIN32)
   find_library(M_LIBRARY

From 98671b620d79018056b29212fa0bacd59297052f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 11 Mar 2015 16:45:20 +1100
Subject: [PATCH 016/331] Added some support to enable a legacy (2.1) opengl
 context. Many things don't work with that atm (rtt, some transparent
 textures). Needs to be manually set in the user's config file.

---
 lib/irrlicht/include/SIrrCreationParameters.h |   7 +
 .../source/Irrlicht/COpenGLDriver.cpp         | 155 +++++++++---------
 src/config/user_config.hpp                    |   4 +
 src/graphics/central_settings.cpp             |   3 +-
 src/graphics/irr_driver.cpp                   |   1 +
 5 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/lib/irrlicht/include/SIrrCreationParameters.h b/lib/irrlicht/include/SIrrCreationParameters.h
index a0bc65277..ec36a5ad4 100644
--- a/lib/irrlicht/include/SIrrCreationParameters.h
+++ b/lib/irrlicht/include/SIrrCreationParameters.h
@@ -47,6 +47,7 @@ namespace irr
 			DisplayAdapter(0),
 			DriverMultithreaded(false),
 			UsePerformanceTimer(true),
+            ForceLegacyDevice(false),
 			SDK_version_do_not_use(IRRLICHT_SDK_VERSION)
 		{
 		}
@@ -79,6 +80,7 @@ namespace irr
 			DriverMultithreaded = other.DriverMultithreaded;
 			DisplayAdapter = other.DisplayAdapter;
 			UsePerformanceTimer = other.UsePerformanceTimer;
+            ForceLegacyDevice = other.ForceLegacyDevice;
 			return *this;
 		}
 
@@ -289,6 +291,11 @@ namespace irr
 		*/
 		bool UsePerformanceTimer;
 
+        //! For opengl: forces a opengl 2.1 context, even if an 
+        /** opengl 3 context is available.
+        */
+        bool ForceLegacyDevice;
+
 		//! Don't use or change this parameter.
 		/** Always set it to IRRLICHT_SDK_VERSION, which is done by default.
 		This is needed for sdk version checks. */
diff --git a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp b/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
index 79dd45682..f2f527ec1 100644
--- a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
+++ b/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
@@ -83,93 +83,96 @@ bool COpenGLDriver::changeRenderContext(const SExposedVideoData& videoData, CIrr
 
 static PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs_ARB;
 
-static HGLRC getMeAGLContext(HDC HDc)
+static HGLRC getMeAGLContext(HDC HDc, bool force_legacy_context)
 {
-    useCoreContext = true;
-    HGLRC hrc = 0;
-    int ctx44debug[] =
+    if (!force_legacy_context)
     {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        useCoreContext = true;
+        HGLRC hrc = 0;
+        int ctx44debug[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
+            WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    int ctx44[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx44[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx44debug : ctx44);
-    if (hrc)
-        return hrc;
+        hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx44debug : ctx44);
+        if (hrc)
+            return hrc;
 
-    int ctx40debug[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 0,
-        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx40debug[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 0,
+            WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    int ctx40[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 0,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx40[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 0,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx40debug : ctx40);
-    if (hrc)
-        return hrc;
+        hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx40debug : ctx40);
+        if (hrc)
+            return hrc;
 
-    int ctx33debug[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx33debug[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
+            WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    int ctx33[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx33[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 3,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx33debug : ctx33);
-    if (hrc)
-        return hrc;
+        hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx33debug : ctx33);
+        if (hrc)
+            return hrc;
 
-    int ctx31debug[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
-        WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx31debug[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+            WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    int ctx31[] =
-    {
-        WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-        WGL_CONTEXT_MINOR_VERSION_ARB, 1,
-        WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-        0
-    };
+        int ctx31[] =
+        {
+            WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+            WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+            0
+        };
 
-    hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx31debug : ctx31);
-    if (hrc)
-        return hrc;
+        hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx31debug : ctx31);
+        if (hrc)
+            return hrc;
+    }   // if (!force_legacy_context)
 
     useCoreContext = false;
     int legacyctx[] =
@@ -178,7 +181,7 @@ static HGLRC getMeAGLContext(HDC HDc)
         WGL_CONTEXT_MINOR_VERSION_ARB, 1,
         0
     };
-    hrc = wglCreateContextAttribs_ARB(HDc, 0, legacyctx);
+    HGLRC hrc = wglCreateContextAttribs_ARB(HDc, 0, legacyctx);
     if (hrc)
         return hrc;
 
@@ -510,7 +513,7 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
 #ifdef WGL_ARB_create_context
 	if (wglCreateContextAttribs_ARB)
 	{
-        hrc = getMeAGLContext(HDc);
+        hrc = getMeAGLContext(HDc, Params.ForceLegacyDevice);
     }
 	else
 #endif
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 9ef1df30f..4b75e1e23 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -440,6 +440,10 @@ namespace UserConfigParams
     PARAM_PREFIX IntUserConfigParam         m_max_fps
             PARAM_DEFAULT(  IntUserConfigParam(120, "max_fps",
                        &m_video_group, "Maximum fps, should be at least 60") );
+    PARAM_PREFIX BoolUserConfigParam        m_force_legacy_device
+        PARAM_DEFAULT(BoolUserConfigParam(false, "force_legacy_device",
+        &m_video_group, "Force OpenGL 2 context, even if OpenGL 3 is available."));
+
     PARAM_PREFIX BoolUserConfigParam        m_texture_compression
         PARAM_DEFAULT(BoolUserConfigParam(true, "enable_texture_compression",
         &m_video_group, "Enable Texture Compression"));
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index 3b793a3f0..b4b7bc888 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -46,7 +46,8 @@ void CentralVideoSettings::init()
         Log::info("IrrDriver", "OpenGL renderer: %s", glGetString(GL_RENDERER));
         Log::info("IrrDriver", "OpenGL version string: %s", glGetString(GL_VERSION));
     }
-    m_glsl = (m_gl_major_version > 3 || (m_gl_major_version == 3 && m_gl_minor_version >= 1));
+    m_glsl = (m_gl_major_version > 3 || (m_gl_major_version == 3 && m_gl_minor_version >= 1))
+           && !UserConfigParams::m_force_legacy_device;
     if (!ProfileWorld::isNoGraphics())
         initGL();
 
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index c2995d097..3db7aebb3 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -397,6 +397,7 @@ void IrrDriver::initDevice()
         m_device  = NULL;
 
         SIrrlichtCreationParameters params;
+        params.ForceLegacyDevice = UserConfigParams::m_force_legacy_device;
 
         // Try 32 and, upon failure, 24 then 16 bit per pixels
         for (int bits=32; bits>15; bits -=8)

From 41a67d425063fa3d290e2f9332f58d2400d68a40 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 12 Mar 2015 10:33:42 +1100
Subject: [PATCH 017/331] Added privacy notice to 'enable internet' dialog;
 used redirecting URLs for privacy and terms&conditions.

---
 src/main.cpp                                       | 4 ++--
 src/states_screens/dialogs/registration_dialog.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index d9557221b..8e4a8685f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -395,7 +395,6 @@ void handleXmasMode()
  */
 bool isEasterMode(int day, int month, int year, int before_after_days)
 {
-    bool ears = false;
     switch (UserConfigParams::m_easter_ear_mode)
     {
     case 0:
@@ -1201,6 +1200,7 @@ void askForInternetPermission()
     new MessageDialog(_("SuperTuxKart may connect to a server "
         "to download add-ons and notify you of updates. We also collect "
         "anonymous hardware statistics to help with the development of STK. "
+        "Please read our privacy policy at http://privacy.supertuxkart.net. "
         "Would you like this feature to be enabled? (To change this setting "
         "at a later time, go to options, select tab "
         "'User Interface', and edit \"Connect to the "
@@ -1651,4 +1651,4 @@ void runUnitTests()
     assert( isEasterMode(22, 3, 2016, 5));
     assert(!isEasterMode(21, 3, 2016, 5));
     UserConfigParams::m_easter_ear_mode = saved_easter_mode;
-}   // unitTesting
\ No newline at end of file
+}   // unitTesting
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 83b39567f..c876fc910 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -46,7 +46,7 @@ RegistrationDialog::RegistrationDialog() :
         L"these terms. If you have any questions or comments regarding these "
         L"terms, one of the members of the development team would gladly "
         L"assist you.",
-        L"http://supertuxkart.net/terms");
+        L"http://terms.supertuxkart.net");
     terms_widget->setText(terms, false);
 
    // showRegistrationTerms();

From ad68d9a866bf28ccfa7367104f139048a27642ff Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 11 Mar 2015 20:28:35 -0400
Subject: [PATCH 018/331] Warn if OpenGL is too old

---
 src/main.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index d9557221b..9208ab611 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -152,6 +152,7 @@
 #include "config/player_profile.hpp"
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/graphics_restrictions.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
@@ -1368,6 +1369,14 @@ int main(int argc, char *argv[] )
                 /*from queue*/ true);
             GUIEngine::DialogQueue::get()->pushDialog(dialog);
         }
+        else if (!CVS->isGLSL())
+        {
+            MessageDialog *dialog =
+                new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
+                "if an update for your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."),
+                /*from queue*/ true);
+            GUIEngine::DialogQueue::get()->pushDialog(dialog);
+        }
 
         // Note that on the very first run of STK internet status is set to
         // "not asked", so the report will only be sent in the next run.

From 443d57019699cbd6363894499e1257cc50efd757 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 12 Mar 2015 11:47:38 +1100
Subject: [PATCH 019/331] Make legacy somewhat working on linux (just in case).

---
 .../source/Irrlicht/CIrrDeviceLinux.cpp       | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index 6846e7912..361f38311 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -498,7 +498,7 @@ void IrrPrintXGrabError(int grabResult, const c8 * grabCommand )
 }
 #endif
 
-static GLXContext getMeAGLContext(Display *display, GLXFBConfig glxFBConfig)
+static GLXContext getMeAGLContext(Display *display, GLXFBConfig glxFBConfig, bool force_legacy_context)
 {
 	GLXContext Context;
 	irr::video::useCoreContext = true;
@@ -557,25 +557,29 @@ static GLXContext getMeAGLContext(Display *display, GLXFBConfig glxFBConfig)
 	glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
 						glXGetProcAddressARB( (const GLubyte *) "glXCreateContextAttribsARB" );
   
-	// create core 4.3 context
-	os::Printer::log("Creating OpenGL 4.3 context...", ELL_INFORMATION);
-	Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core43ctxdebug : core43ctx);
-	if (!XErrorSignaled)
-		return Context;
+    if(!force_legacy_context)
+    {
+        // create core 4.3 context
+        os::Printer::log("Creating OpenGL 4.3 context...", ELL_INFORMATION);
+        Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core43ctxdebug : core43ctx);
+        if (!XErrorSignaled)
+            return Context;
+        
+        XErrorSignaled = false;
+        // create core 3.3 context
+        os::Printer::log("Creating OpenGL 3.3 context...", ELL_INFORMATION);
+        Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core33ctxdebug : core33ctx);
+        if (!XErrorSignaled)
+            return Context;
 
-	XErrorSignaled = false;
-	// create core 3.3 context
-	os::Printer::log("Creating OpenGL 3.3 context...", ELL_INFORMATION);
-	Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core33ctxdebug : core33ctx);
-	if (!XErrorSignaled)
-		return Context;
+        XErrorSignaled = false;
+        // create core 3.1 context (for older mesa)
+        os::Printer::log("Creating OpenGL 3.1 context...", ELL_INFORMATION);
+        Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core31ctxdebug : core31ctx);
+        if (!XErrorSignaled)
+            return Context;
 
-	XErrorSignaled = false;
-	// create core 3.1 context (for older mesa)
-	os::Printer::log("Creating OpenGL 3.1 context...", ELL_INFORMATION);
-	Context = glXCreateContextAttribsARB(display, glxFBConfig, 0, True, GLContextDebugBit ? core31ctxdebug : core31ctx);
-	if (!XErrorSignaled)
-		return Context;
+    }   // if(force_legacy_context)
 
 	XErrorSignaled = false;
 	irr::video::useCoreContext = false;
@@ -999,7 +1003,7 @@ bool CIrrDeviceLinux::createWindow()
 		glxWin=glXCreateWindow(display,glxFBConfig,window,NULL);
 		if (glxWin)
 		{
-			Context = getMeAGLContext(display, glxFBConfig);
+			Context = getMeAGLContext(display, glxFBConfig, CreationParams.ForceLegacyDevice);
 			if (Context)
 			{
 				if (!glXMakeContextCurrent(display, glxWin, glxWin, Context))

From 06ca68275eda6991faeca833592e7234780c8a5b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 13 Mar 2015 10:12:43 +1100
Subject: [PATCH 020/331] Fixed typo.

---
 src/race/race_manager.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 01078df8f..050e043ee 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -120,7 +120,7 @@ public:
 
     // ------------------------------------------------------------------------
     /** True if the AI should have additional abbilities, e.g.
-     *  nolik will get special bubble gums in the final challenge. */
+     *  nolok will get special bubble gums in the final challenge. */
     enum AISuperPower
     {
         SUPERPOWER_NONE       = 0,

From 7e635660879e75ed326b0abdf3e68739d30ff737 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 12 Mar 2015 19:50:09 -0400
Subject: [PATCH 021/331] Upgrade minimum track version requirement

---
 data/stk_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/stk_config.xml b/data/stk_config.xml
index 80b558770..7f1674394 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -7,7 +7,7 @@
 
   <!-- Minimum and maxium track versions that be be read by this binary.
        Older versions will be ignored. -->
-  <track-version min="3" max="6"/>
+  <track-version min="6" max="6"/>
 
   <!-- Maximum number of karts to be used at the same time. This limit
        can easily be increased, but some tracks might not have valid start

From 8203d6b0e4139d4398eac438d51fe97020a39139 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 13 Mar 2015 11:02:59 +1100
Subject: [PATCH 022/331] Fix #1786 (needs r16106 on the assets to work!!!!!).

---
 data/challenges/islandtrack.challenge        | 2 +-
 data/challenges/jungle.challenge             | 2 +-
 data/challenges/startrack.challenge          | 2 +-
 data/grandprix/2_offthebeatentrack.grandprix | 2 +-
 data/grandprix/3_tothemoonandback.grandprix  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/challenges/islandtrack.challenge b/data/challenges/islandtrack.challenge
index 3b04e9e3a..7fcda6fbc 100644
--- a/data/challenges/islandtrack.challenge
+++ b/data/challenges/islandtrack.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="20_island" laps="3"/>
+    <track id="island" laps="3"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="95"/>
     
diff --git a/data/challenges/jungle.challenge b/data/challenges/jungle.challenge
index 3c7fbb76e..bb713f5f7 100644
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="30_chocolate" laps="3"/>
+    <track id="chocolate" laps="3"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="15"/>
     
diff --git a/data/challenges/startrack.challenge b/data/challenges/startrack.challenge
index 59f905063..80f317d86 100644
--- a/data/challenges/startrack.challenge
+++ b/data/challenges/startrack.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="startrack" laps="3"/>
+    <track id="stk_enterprise" laps="3"/>
     <mode major="single" minor="followtheleader"/>
     <requirements trophies="110"/>
     
diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix
index abb51915f..0fc65f211 100644
--- a/data/grandprix/2_offthebeatentrack.grandprix
+++ b/data/grandprix/2_offthebeatentrack.grandprix
@@ -1,7 +1,7 @@
 
 <supertuxkart_grand_prix name="Off the beaten track">
 
-    <track id="30_chocolate" laps="3" reverse="false" />
+    <track id="chocolate"    laps="3" reverse="false" />
     <track id="snowmountain" laps="3" reverse="false" />
     <track id="hacienda"     laps="3" reverse="false" />
     <track id="zengarden"    laps="4" reverse="false" />
diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix
index 9fd8315ab..3626d2dc7 100644
--- a/data/grandprix/3_tothemoonandback.grandprix
+++ b/data/grandprix/3_tothemoonandback.grandprix
@@ -1,10 +1,10 @@
 
 <supertuxkart_grand_prix name="To the moon and back">
 
-    <track id="20_island"      laps="3" reverse="false" />
+    <track id="island"         laps="3" reverse="false" />
     <track id="greenvalley"    laps="2" reverse="false" />
     <track id="mansion"        laps="3" reverse="false" />
-    <track id="startrack"      laps="3" reverse="false" />
+    <track id="stk_enterprise" laps="3" reverse="false" />
     <track id="city"           laps="2" reverse="false" />
     
 </supertuxkart_grand_prix>

From ad7ea60d6cc324a03e17119e39fef87f667519fc Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 13 Mar 2015 16:09:02 +1100
Subject: [PATCH 023/331] Updated comment.

---
 src/karts/kart_gfx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 19bf92bf0..160cfd381 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -162,8 +162,8 @@ void KartGFX::reset()
 
 // ----------------------------------------------------------------------------
 /** Selects the correct skidding particle type depending on skid bonus level.
- *  \param type Must be either KGFX_SKID1 or KGFX_SKID2 - the particle type
- *         to use corresponding to the bonus level.
+ *  \param level Must be 1 (accumulated enough for level 1 bonus) or 2 
+ *         (accumulated enough for level 2 bonus).
  */
 void KartGFX::setSkidLevel(const unsigned int level)
 {

From dcc8cfac12813dcf58db5c4a477a9ef4a84561fb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 13 Mar 2015 16:09:28 +1100
Subject: [PATCH 024/331] Minor style changes.

---
 src/karts/kart.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 4877cc7d8..03ef993f1 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2758,10 +2758,11 @@ void Kart::setOnScreenText(const wchar_t *text)
     // when the parent is deleted.
 }   // setOnScreenText
 
+// ----------------------------------------------------------------------------
 void Kart::activateSkidLight(unsigned int level)
 {
     m_skidding_light_1->setVisible(level == 1);
     m_skidding_light_2->setVisible(level > 1);
-}
+}   // activateSkidLight
 
 /* EOF */

From 5c4f1f796c14f8ff2a9ce074cb84ff8ad62780f8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 13 Mar 2015 23:44:02 +1100
Subject: [PATCH 025/331] Updated challenges and gp for assets r16110 (renamed
 chocolate and island).

---
 data/challenges/islandtrack.challenge        |  2 +-
 data/challenges/jungle.challenge             |  2 +-
 data/grandprix/2_offthebeatentrack.grandprix |  2 +-
 data/grandprix/3_tothemoonandback.grandprix  | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/challenges/islandtrack.challenge b/data/challenges/islandtrack.challenge
index 7fcda6fbc..6f1394301 100644
--- a/data/challenges/islandtrack.challenge
+++ b/data/challenges/islandtrack.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="island" laps="3"/>
+    <track id="gran_paradiso_island" laps="3"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="95"/>
     
diff --git a/data/challenges/jungle.challenge b/data/challenges/jungle.challenge
index bb713f5f7..b6345dbb5 100644
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <challenge version="2">
-    <track id="chocolate" laps="3"/>
+    <track id="cocoa_temple" laps="3"/>
     <mode major="single" minor="quickrace"/>
     <requirements trophies="15"/>
     
diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix
index 0fc65f211..a53170f6b 100644
--- a/data/grandprix/2_offthebeatentrack.grandprix
+++ b/data/grandprix/2_offthebeatentrack.grandprix
@@ -1,7 +1,7 @@
 
 <supertuxkart_grand_prix name="Off the beaten track">
 
-    <track id="chocolate"    laps="3" reverse="false" />
+    <track id="cocoa_temple" laps="3" reverse="false" />
     <track id="snowmountain" laps="3" reverse="false" />
     <track id="hacienda"     laps="3" reverse="false" />
     <track id="zengarden"    laps="4" reverse="false" />
diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix
index 3626d2dc7..2d0f4b104 100644
--- a/data/grandprix/3_tothemoonandback.grandprix
+++ b/data/grandprix/3_tothemoonandback.grandprix
@@ -1,11 +1,11 @@
 
 <supertuxkart_grand_prix name="To the moon and back">
 
-    <track id="island"         laps="3" reverse="false" />
-    <track id="greenvalley"    laps="2" reverse="false" />
-    <track id="mansion"        laps="3" reverse="false" />
-    <track id="stk_enterprise" laps="3" reverse="false" />
-    <track id="city"           laps="2" reverse="false" />
+    <track id="gran_paradiso_island" laps="3" reverse="false" />
+    <track id="greenvalley"          laps="2" reverse="false" />
+    <track id="mansion"              laps="3" reverse="false" />
+    <track id="stk_enterprise"       laps="3" reverse="false" />
+    <track id="city"                 laps="2" reverse="false" />
     
 </supertuxkart_grand_prix>
 

From 6b2d35a86a5169187f71052a9ede6af0f4384d64 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 14 Mar 2015 00:14:21 +1100
Subject: [PATCH 026/331] Updated 'all tracks' achievement to actually include
 all tracks :)

---
 data/achievements.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/data/achievements.xml b/data/achievements.xml
index f2c94caa8..064255c71 100644
--- a/data/achievements.xml
+++ b/data/achievements.xml
@@ -2,16 +2,26 @@
 <achievements>
   <achievement id="1" check-type="all-at-least" reset-type="never"
                name="Christoffel Columbus" description="Play every official track at least once." >
+      <city goal="1"/>
+      <cocoa_temple goal="1"/>
       <farm goal="1"/>
-      <scotland goal="1"/>
-      <lighthouse goal="1"/>
-      <sandtrack goal="1"/>
-      <olivermath goal="1"/>
-      <subsea goal="1"/>
-      <mansion goal="1"/>
-      <minigolf goal="1"/>
+      <fortmagma goal="1"/>
+      <gran_paradiso_island goal="1"/>
+      <greenvalley goal="1"/>
       <hacienda goal="1"/>
-      <jungle goal="1"/>      
+      <lighthouse goal="1"/>
+      <mansion goal="1"/>
+      <mines goal="1"/>
+      <minigolf goal="1"/>
+      <olivermath goal="1"/>
+      <sandtrack goal="1"/>
+      <scotland goal="1"/>
+      <snowmountain goal="1"/>
+      <snowtuxpeak goal="1"/>
+      <stk_enterprise goal="1"/>
+      <subsea goal="1"/>
+      <xr591 goal="1"/>
+      <zengarden goal="1"/>      
   </achievement>
   <achievement id="2" check-type="all-at-least" reset-type="never"
                name="Strike!" description="Hit 10 karts with a bowling-ball.">

From fa9a58cbe17c58dcd7f2f007349cb875b49bea46 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 14 Mar 2015 09:48:17 +1100
Subject: [PATCH 027/331] Updated strings for translations.

---
 data/po/supertuxkart.pot | 530 +++++++++++++++++++++------------------
 1 file changed, 282 insertions(+), 248 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index dd24398ed..7e8750971 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-08 18:14-0500\n"
+"POT-Creation-Date: 2015-03-14 09:46+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,14 +33,16 @@ msgid ""
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -56,7 +58,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -74,12 +76,12 @@ msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -94,12 +96,12 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1148
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
@@ -150,8 +152,8 @@ msgstr ""
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: ./data/gui/online/profile_friends.stkgui
 msgid "..."
 msgstr ""
 
@@ -208,7 +210,7 @@ msgstr ""
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
@@ -222,14 +224,14 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
@@ -254,10 +256,10 @@ msgstr ""
 msgid "Account Settings"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
 #: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
@@ -303,18 +305,18 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#. I18N: track group name
-#. I18N: kart group name
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:155
-#: src/states_screens/grand_prix_editor_screen.cpp:336
-#: src/states_screens/kart_selection.cpp:286
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/grand_prix_editor_screen.cpp:336
+#: src/states_screens/tracks_screen.cpp:155
+#: src/states_screens/kart_selection.cpp:286
 #: src/states_screens/easter_egg_screen.cpp:145
 msgid "Add-Ons"
 msgstr ""
@@ -328,7 +330,7 @@ msgstr ""
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
@@ -337,25 +339,24 @@ msgstr ""
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
 #. I18N: name of the tab that will show arenas from all groups
 #. I18N: name of the tab that will show tracks from all groups
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:411
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/tracks_screen.cpp:145
 #: src/states_screens/addons_screen.cpp:49
 #: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
-#: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
 #: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/options_screen_video.cpp:434
 msgid "All"
 msgstr ""
 
@@ -375,13 +376,17 @@ msgstr ""
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:441
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -400,7 +405,7 @@ msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:427
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
@@ -414,7 +419,7 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:421
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
@@ -445,7 +450,7 @@ msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:438
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
@@ -468,16 +473,16 @@ msgstr ""
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
-#: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
+#: src/states_screens/edit_gp_screen.cpp:123
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
@@ -501,17 +506,17 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:642
 #: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:135
 #: src/states_screens/options_screen_input.cpp:139
 #: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/user_screen.cpp:647
+#: src/states_screens/options_screen_video.cpp:163
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -551,7 +556,7 @@ msgstr ""
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
@@ -565,7 +570,7 @@ msgstr ""
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
@@ -583,10 +588,6 @@ msgstr ""
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
 msgid "Beastie"
 msgstr ""
@@ -615,12 +616,12 @@ msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:450
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:958
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
@@ -655,36 +656,36 @@ msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:112
-#: src/states_screens/dialogs/addons_loading.cpp:227
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
+#: src/states_screens/dialogs/addons_loading.cpp:227
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -718,10 +719,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. I18N: ./data/gui/karts.stkgui
-#. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts.stkgui
+#. I18N: In the kart selection (player setup) screen
 msgid "Choose a Kart"
 msgstr ""
 
@@ -733,22 +734,22 @@ msgstr ""
 msgid "Click here to play the tutorial"
 msgstr ""
 
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
@@ -761,13 +762,13 @@ msgstr ""
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -783,7 +784,7 @@ msgid ""
 "bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -792,10 +793,10 @@ msgstr ""
 msgid "Completed achievement \"%s\"."
 msgstr ""
 
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
 msgid "Confirm"
 msgstr ""
 
@@ -820,14 +821,14 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
+#. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+#: src/states_screens/race_result_gui.cpp:186
 #: src/states_screens/dialogs/gp_info_dialog.cpp:212
 msgid "Continue"
 msgstr ""
@@ -838,7 +839,7 @@ msgstr ""
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
@@ -846,10 +847,10 @@ msgstr ""
 #. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:644
-#: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_audio.cpp:67
+#: src/states_screens/user_screen.cpp:649
+#: src/states_screens/options_screen_video.cpp:166
 msgid "Controls"
 msgstr ""
 
@@ -858,13 +859,13 @@ msgstr ""
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:216
-#: src/states_screens/register_screen.cpp:223
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
@@ -906,7 +907,7 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:388
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
@@ -963,7 +964,7 @@ msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:462
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -978,7 +979,7 @@ msgstr ""
 #. indicates a graphical feature is disabled
 #: src/states_screens/dialogs/custom_video_settings.cpp:62
 #: src/states_screens/dialogs/custom_video_settings.cpp:86
-#: src/states_screens/options_screen_video.cpp:409
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
@@ -987,12 +988,12 @@ msgstr ""
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:578
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1001,8 +1002,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1017,7 +1018,7 @@ msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:432
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
@@ -1053,27 +1054,27 @@ msgstr ""
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:822
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:291
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:297
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:275
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
@@ -1089,14 +1090,14 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is enabled
-#: src/states_screens/options_screen_video.cpp:406
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
@@ -1151,12 +1152,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1791
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1800
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1232,10 +1233,12 @@ msgstr ""
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1278,11 +1281,11 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
@@ -1306,11 +1309,11 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
@@ -1328,7 +1331,7 @@ msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:466
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
@@ -1339,7 +1342,7 @@ msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:454
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
@@ -1357,7 +1360,7 @@ msgstr ""
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
@@ -1377,7 +1380,7 @@ msgstr ""
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1203
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
@@ -1388,11 +1391,11 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:641
 #: src/states_screens/options_screen_input2.cpp:85
-#: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
 #: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
@@ -1424,12 +1427,12 @@ msgstr ""
 msgid "Hacienda"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
 msgid "Help"
 msgstr ""
 
@@ -1437,7 +1440,7 @@ msgstr ""
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1241
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
@@ -1477,11 +1480,16 @@ msgid ""
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:719
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
 msgid "Install"
@@ -1494,12 +1502,12 @@ msgstr ""
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:324
-#: src/states_screens/register_screen.cpp:400
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:963
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
@@ -1615,12 +1623,12 @@ msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:458
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
@@ -1634,18 +1642,23 @@ msgstr ""
 msgid "Lobby Settings"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Local Name"
+msgstr ""
+
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
+#: src/states_screens/tracks_screen.cpp:283
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/race_setup_screen.cpp:214
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1672,7 +1685,7 @@ msgstr ""
 msgid "Logging in"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:489
+#: src/states_screens/user_screen.cpp:494
 #, c-format
 msgid "Logging in '%s'"
 msgstr ""
@@ -1689,13 +1702,13 @@ msgstr ""
 msgid "Logging out"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:488
+#: src/states_screens/user_screen.cpp:493
 #, c-format
 msgid "Logging out '%s'"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
 #: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
@@ -1736,7 +1749,7 @@ msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:413
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1759,7 +1772,7 @@ msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:435
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
@@ -1791,11 +1804,11 @@ msgstr ""
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
@@ -1807,14 +1820,12 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1837,6 +1848,10 @@ msgstr ""
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "New"
@@ -1904,8 +1919,8 @@ msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:415
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -1918,7 +1933,7 @@ msgstr ""
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
@@ -1957,16 +1972,16 @@ msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/message_dialog.cpp:122
 #: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
@@ -1998,15 +2013,15 @@ msgstr ""
 msgid "Oliver's Math Class"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
 #: src/states_screens/main_menu_screen.cpp:170
 #: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
@@ -2020,29 +2035,29 @@ msgstr ""
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:279
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:283
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:749
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
 msgid "Options"
 msgstr ""
 
@@ -2061,10 +2076,10 @@ msgstr ""
 
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
 msgid "Password"
 msgstr ""
 
@@ -2078,7 +2093,7 @@ msgstr ""
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:287
+#: src/states_screens/register_screen.cpp:288
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
@@ -2087,7 +2102,7 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:271
+#: src/states_screens/register_screen.cpp:272
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
 msgid "Passwords don't match!"
 msgstr ""
@@ -2097,13 +2112,13 @@ msgstr ""
 msgid "Pause Game"
 msgstr ""
 
-#. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: ./data/gui/overworld_dialog.stkgui
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2136,14 +2151,20 @@ msgstr ""
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
 #: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
-#: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:137
 #: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/server_selection.cpp:92
 #: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_video.cpp:165
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 msgid "Please enter the name of the grand prix"
@@ -2154,6 +2175,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2172,7 +2197,7 @@ msgstr ""
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
 "Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
@@ -2255,13 +2280,13 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2305,7 +2330,7 @@ msgstr ""
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:954
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
@@ -2349,10 +2374,10 @@ msgstr ""
 
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2381,7 +2406,7 @@ msgstr ""
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
@@ -2453,11 +2478,11 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the wizard"
 msgstr ""
 
@@ -2466,22 +2491,18 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-msgid "Scotland"
-msgstr ""
-
 #. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2542,7 +2563,7 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
@@ -2551,12 +2572,12 @@ msgstr ""
 msgid "Shadows"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:447
+#: src/states_screens/options_screen_video.cpp:470
 #, c-format
 msgid "Shadows: %i"
 msgstr ""
 
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
@@ -2627,8 +2648,8 @@ msgid ""
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
 "Sorry, an error occurred while contacting the add-ons website. Make sure you "
 "are connected to the Internet and that SuperTuxKart is not blocked by a "
@@ -2644,10 +2665,10 @@ msgstr ""
 msgid "Sound Effects"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
 msgid "Standard"
 msgstr ""
@@ -2661,10 +2682,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2691,10 +2712,10 @@ msgstr ""
 msgid "Strike!"
 msgstr ""
 
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
 msgid "Submit"
 msgstr ""
 
@@ -2711,20 +2732,20 @@ msgstr ""
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: ./data/gui/help1.stkgui
 #. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
 #. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_players.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
@@ -2736,13 +2757,14 @@ msgstr ""
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1138
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at http://privacy."
+"supertuxkart.net. Would you like this feature to be enabled? (To change this "
+"setting at a later time, go to options, select tab 'User Interface', and "
+"edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
@@ -2760,7 +2782,7 @@ msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
 #. I18N: in the language choice, to select the same language as the OS
-#: src/states_screens/options_screen_ui.cpp:185
+#: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr ""
 
@@ -2770,6 +2792,10 @@ msgid ""
 "them in a race."
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
 msgid "Terms and Agreement"
@@ -2854,7 +2880,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1119
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -2911,7 +2937,7 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
 "Unable to connect to the server. Check your internet connection or try again "
 "later."
@@ -2958,7 +2984,7 @@ msgstr ""
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
@@ -2970,11 +2996,11 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:643
 #: src/states_screens/options_screen_input2.cpp:87
-#: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/user_screen.cpp:648
+#: src/states_screens/options_screen_video.cpp:164
 msgid "User Interface"
 msgstr ""
 
@@ -2988,10 +3014,10 @@ msgstr ""
 
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
 #: src/states_screens/online_user_search.cpp:74
 #: src/states_screens/online_profile_friends.cpp:67
 msgid "Username"
@@ -3005,7 +3031,7 @@ msgstr ""
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:352
+#: src/states_screens/register_screen.cpp:353
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
 msgid "Validating info"
@@ -3021,10 +3047,10 @@ msgstr ""
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
@@ -3057,11 +3083,11 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help4.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
@@ -3074,7 +3100,7 @@ msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:424
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
@@ -3116,7 +3142,7 @@ msgstr ""
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
@@ -3126,7 +3152,7 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
@@ -3160,12 +3186,12 @@ msgid ""
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
 #: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
@@ -3190,20 +3216,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:857
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1145
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3213,7 +3241,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1900
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3221,7 +3249,7 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:467
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
@@ -3240,16 +3268,22 @@ msgid ""
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:360
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:857 src/karts/kart.cpp:876
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3262,7 +3296,7 @@ msgid ""
 "created."
 msgstr ""
 
-#: src/main.cpp:1302
+#: src/main.cpp:1367
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
 msgstr ""
@@ -3312,17 +3346,17 @@ msgstr ""
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "sara the racer"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/tracks_screen.cpp:153
 #: src/states_screens/kart_selection.cpp:284
-#: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
 msgid "standard"
 msgstr ""

From 036a6f986a37525752805d98fb239979f7196de8 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 13 Mar 2015 21:43:09 -0400
Subject: [PATCH 028/331] Update POT file

---
 data/po/supertuxkart.pot | 324 +++++++++++++++++++--------------------
 1 file changed, 162 insertions(+), 162 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 7e8750971..a53e8355f 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-14 09:46+1100\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -149,11 +149,11 @@ msgid ""
 "join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -236,17 +236,17 @@ msgstr ""
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
@@ -256,10 +256,10 @@ msgstr ""
 msgid "Account Settings"
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#. I18N: Section in the profile screen
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
@@ -298,26 +298,26 @@ msgstr ""
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: ./data/gui/easter_egg.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
 #. I18N: arena group name
 #. I18N: track group name
 #. I18N: kart group name
 #. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/grand_prix_editor_screen.cpp:336
-#: src/states_screens/tracks_screen.cpp:155
-#: src/states_screens/kart_selection.cpp:286
 #: src/states_screens/easter_egg_screen.cpp:145
+#: src/states_screens/grand_prix_editor_screen.cpp:336
+#: src/states_screens/kart_selection.cpp:286
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -339,31 +339,31 @@ msgstr ""
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: ./data/gui/easter_egg.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: Time filters for add-ons
 #. I18N: name of the tab that will show arenas from all groups
 #. I18N: name of the tab that will show tracks from all groups
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: if all kart animations are enabled
-#: src/states_screens/arenas_screen.cpp:75
-#: src/states_screens/grand_prix_editor_screen.cpp:333
-#: src/states_screens/tracks_screen.cpp:145
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76
 #: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
 #: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -473,8 +473,8 @@ msgstr ""
 msgid "Are you sure you want to permanently delete this configuration?"
 msgstr ""
 
-#: src/states_screens/grand_prix_editor_screen.cpp:109
 #: src/states_screens/edit_gp_screen.cpp:123
+#: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
@@ -506,11 +506,11 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:86
 #: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_input2.cpp:86
 #: src/states_screens/options_screen_ui.cpp:118
-#: src/states_screens/user_screen.cpp:647
 #: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
@@ -541,8 +541,8 @@ msgstr ""
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
 #. I18N: name of buttons on gamepads
-#: src/states_screens/dialogs/addons_loading.cpp:284
 #: src/input/gamepad_config.cpp:216
+#: src/states_screens/dialogs/addons_loading.cpp:284
 msgid "Back"
 msgstr ""
 
@@ -660,31 +660,31 @@ msgstr ""
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/dialogs/add_device_dialog.cpp:128
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
+#: src/states_screens/dialogs/add_device_dialog.cpp:128
 #: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
@@ -719,10 +719,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#. I18N: ./data/gui/karts_online.stkgui
-#. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts_online.stkgui
+#. I18N: In the kart selection (player setup) screen
 msgid "Choose a Kart"
 msgstr ""
 
@@ -734,18 +734,18 @@ msgstr ""
 msgid "Click here to play the tutorial"
 msgstr ""
 
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
-#. I18N: ./data/gui/online/notification_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#. I18N: ./data/gui/online/recovery_info.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
@@ -793,10 +793,10 @@ msgstr ""
 msgid "Completed achievement \"%s\"."
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
 msgid "Confirm"
 msgstr ""
 
@@ -822,14 +822,14 @@ msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/tutorial_message_dialog.stkgui
-#. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: src/states_screens/race_result_gui.cpp:186
+#. I18N: ./data/gui/tutorial_message_dialog.stkgui
+#. I18N: Button in tutorial
 #: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
@@ -843,14 +843,14 @@ msgstr ""
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_ui.cpp:120
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/user_screen.cpp:649
+#: src/states_screens/options_screen_ui.cpp:120
 #: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
@@ -945,10 +945,10 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
@@ -1023,10 +1023,10 @@ msgstr ""
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
@@ -1059,10 +1059,10 @@ msgstr ""
 msgid "Eliminated"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
 msgid "Email"
 msgstr ""
 
@@ -1141,10 +1141,10 @@ msgstr ""
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1281,14 +1281,14 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
@@ -1309,14 +1309,14 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
@@ -1391,10 +1391,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:85
-#: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:117
 #: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
 #: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
@@ -1427,12 +1427,12 @@ msgstr ""
 msgid "Hacienda"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
 msgid "Help"
 msgstr ""
 
@@ -1495,10 +1495,10 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
@@ -1653,12 +1653,12 @@ msgstr ""
 
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1804,14 +1804,14 @@ msgstr ""
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
@@ -1909,8 +1909,8 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
-#: src/states_screens/edit_gp_screen.cpp:253
 #: src/states_screens/dialogs/message_dialog.cpp:128
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "No"
 msgstr ""
 
@@ -1939,10 +1939,10 @@ msgid ""
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -1972,16 +1972,16 @@ msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/message_dialog.cpp:122
 #: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
@@ -2013,12 +2013,12 @@ msgstr ""
 msgid "Oliver's Math Class"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
 #: src/states_screens/main_menu_screen.cpp:185
 #: src/states_screens/online_profile_friends.cpp:149
@@ -2052,12 +2052,12 @@ msgstr ""
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
 msgid "Options"
 msgstr ""
 
@@ -2074,12 +2074,12 @@ msgstr ""
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the registration dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the registration dialog
 msgid "Password"
 msgstr ""
 
@@ -2093,8 +2093,8 @@ msgstr ""
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:288
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2102,8 +2102,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:272
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2112,8 +2112,8 @@ msgstr ""
 msgid "Pause Game"
 msgstr ""
 
-#. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: ./data/gui/race_paused_dialog.stkgui
 msgid "Paused"
 msgstr ""
 
@@ -2146,16 +2146,16 @@ msgstr ""
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/server_selection.cpp:92
-#: src/states_screens/options_screen_ui.cpp:119
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
 #: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
@@ -2284,8 +2284,8 @@ msgstr ""
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
@@ -2307,8 +2307,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2351,10 +2351,10 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
@@ -2363,21 +2363,21 @@ msgstr ""
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2482,8 +2482,12 @@ msgstr ""
 msgid "STK Enterprise"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
-msgid "Sara the wizard"
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
@@ -2491,13 +2495,13 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
@@ -2665,10 +2669,10 @@ msgstr ""
 msgid "Sound Effects"
 msgstr ""
 
-#. I18N: ./data/gui/easter_egg.stkgui
-#. I18N: track group
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
 msgid "Standard"
 msgstr ""
@@ -2712,10 +2716,10 @@ msgstr ""
 msgid "Strike!"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Submit"
 msgstr ""
 
@@ -2732,20 +2736,20 @@ msgstr ""
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: ./data/gui/options_video.stkgui
 #. I18N: ./data/gui/options_device.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_input.stkgui
 #. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
@@ -2897,10 +2901,10 @@ msgstr ""
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
@@ -2996,11 +3000,11 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:87
-#: src/states_screens/options_screen_input.cpp:140
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/user_screen.cpp:648
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3012,14 +3016,14 @@ msgstr ""
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_user_search.cpp:74
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/online_profile_friends.cpp:67
+#: src/states_screens/online_user_search.cpp:74
 msgid "Username"
 msgstr ""
 
@@ -3031,9 +3035,9 @@ msgstr ""
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:353
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3083,14 +3087,14 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
@@ -3346,18 +3350,14 @@ msgstr ""
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
-msgid "sara the racer"
-msgstr ""
-
 #. I18N: arena group name
 #. I18N: track group name
 #. I18N: kart group name
 #. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 

From d9405aab3a99af6d52b75844daa3353443ed0e18 Mon Sep 17 00:00:00 2001
From: ZyperPL <zyperpl@gmail.com>
Date: Sat, 14 Mar 2015 16:16:41 +0100
Subject: [PATCH 029/331] Fixed highscores update

---
 src/states_screens/track_info_screen.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 4d1d10d21..21bf33586 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -194,6 +194,7 @@ void TrackInfoScreen::init()
     RibbonWidget* bt_start = getWidget<GUIEngine::RibbonWidget>("buttons");
     bt_start->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
 
+    updateHighScores();
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -322,6 +323,7 @@ void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
         const int num_ai = m_ai_kart_spinner->getValue();
         race_manager->setNumKarts( race_manager->getNumLocalPlayers() + num_ai );
         UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers() + num_ai;
+        updateHighScores();
     }
 }   // eventCallback
 

From d9375c9a437bb8139eb10f6b6c07694c1d680d89 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 16 Mar 2015 08:37:59 +1100
Subject: [PATCH 030/331] Revert 65cb55add42d53060df7dfe8a98582dbe45c6dfd (Make
 bloom less pixelated using Intel doc) since it causes crashes on hd3000.

---
 data/shaders/Lightspaceboundingbox.comp |  2 +-
 data/shaders/bilateralH.comp            |  7 ++--
 data/shaders/bilateralV.comp            |  7 ++--
 data/shaders/bloom.frag                 |  2 +-
 data/shaders/gaussian6h.comp            |  7 ++--
 data/shaders/gaussian6v.comp            |  7 ++--
 src/graphics/irr_driver.hpp             |  2 --
 src/graphics/post_processing.cpp        | 45 +++++--------------------
 src/graphics/rtts.cpp                   |  4 ---
 9 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/data/shaders/Lightspaceboundingbox.comp b/data/shaders/Lightspaceboundingbox.comp
index 933517e71..e55e69c68 100644
--- a/data/shaders/Lightspaceboundingbox.comp
+++ b/data/shaders/Lightspaceboundingbox.comp
@@ -49,7 +49,7 @@ void main()
     ivec3 lmax3 = ivec3(-1000);
     ivec3 lmin3 = ivec3(1000);
 
-    vec2 start_xy = gl_LocalInvocationID.xy + gl_WorkGroupID.xy * gl_WorkGroupSize.xy * 8 + vec2(0.5);
+    vec2 start_xy = gl_LocalInvocationID.xy + gl_WorkGroupID.xy * gl_WorkGroupSize.xy * 8;
     for (int i = 0; i < 8; i++) {
         for (int j = 0; j < 8; j++) {
 
diff --git a/data/shaders/bilateralH.comp b/data/shaders/bilateralH.comp
index 76da31d9d..5ecad97c9 100644
--- a/data/shaders/bilateralH.comp
+++ b/data/shaders/bilateralH.comp
@@ -15,10 +15,9 @@ void main()
 {
     int x = int(gl_LocalInvocationID.x), y = int(gl_LocalInvocationID.y);
     ivec2 iuv = ivec2(gl_GlobalInvocationID.x, gl_GlobalInvocationID.y);
-    vec2 guv = gl_GlobalInvocationID.xy + vec2(0.5);
-    vec2 uv_m = (guv - vec2(8, 0)) * pixel;
-    vec2 uv = guv * pixel;
-    vec2 uv_p = (guv + vec2(8, 0)) * pixel;
+    vec2 uv_m = (iuv - ivec2(8, 0)) * pixel;
+    vec2 uv = iuv * pixel;
+    vec2 uv_p = (iuv + ivec2(8, 0)) * pixel;
 
     local_src[x][y] = texture(source, uv_m).x;
     local_depth[x][y] = texture(depth, uv_m).x;
diff --git a/data/shaders/bilateralV.comp b/data/shaders/bilateralV.comp
index af2d7c3db..720566821 100644
--- a/data/shaders/bilateralV.comp
+++ b/data/shaders/bilateralV.comp
@@ -15,10 +15,9 @@ void main()
 {
     int x = int(gl_LocalInvocationID.x), y = int(gl_LocalInvocationID.y);
     ivec2 iuv = ivec2(gl_GlobalInvocationID.x, gl_GlobalInvocationID.y);
-    vec2 guv = gl_GlobalInvocationID.xy + vec2(0.5);
-    vec2 uv_m = (guv - vec2(0, 8)) * pixel;
-    vec2 uv = guv * pixel;
-    vec2 uv_p = (guv + vec2(0, 8)) * pixel;
+    vec2 uv_m = (iuv - ivec2(0, 8)) * pixel;
+    vec2 uv = iuv * pixel;
+    vec2 uv_p = (iuv + ivec2(0, 8)) * pixel;
 
     local_src[x][y] = texture(source, uv_m).x;
     local_depth[x][y] = texture(depth, uv_m).x;
diff --git a/data/shaders/bloom.frag b/data/shaders/bloom.frag
index 90fc1eac4..099922bab 100644
--- a/data/shaders/bloom.frag
+++ b/data/shaders/bloom.frag
@@ -7,7 +7,7 @@ vec3 getRGBFromCIEXxy(vec3 YxyColor);
 
 void main()
 {
-    vec2 uv = gl_FragCoord.xy / 1024;
+    vec2 uv = gl_FragCoord.xy / 512;
     vec3 col = texture(tex, uv).xyz;
     vec3 Yxy = getCIEYxy(col);
     vec3 WhiteYxy = getCIEYxy(vec3(1.));
diff --git a/data/shaders/gaussian6h.comp b/data/shaders/gaussian6h.comp
index 62f54f821..f2df38fe0 100644
--- a/data/shaders/gaussian6h.comp
+++ b/data/shaders/gaussian6h.comp
@@ -13,10 +13,9 @@ void main()
 {
     int x = int(gl_LocalInvocationID.x), y = int(gl_LocalInvocationID.y);
     ivec2 iuv = ivec2(gl_GlobalInvocationID.x, gl_GlobalInvocationID.y);
-    vec2 guv = gl_GlobalInvocationID.xy + vec2(0.5);
-    vec2 uv_m = (guv - vec2(6, 0)) * pixel;
-    vec2 uv = guv * pixel;
-    vec2 uv_p = (guv + vec2(6, 0)) * pixel;
+    vec2 uv_m = (iuv - ivec2(6, 0)) * pixel;
+    vec2 uv = iuv * pixel;
+    vec2 uv_p = (iuv + ivec2(6, 0)) * pixel;
 
     local_src[x][y] = texture(source, uv_m);
     local_src[x + 6][y] = texture(source, uv);
diff --git a/data/shaders/gaussian6v.comp b/data/shaders/gaussian6v.comp
index 0878e0822..7c3a0979a 100644
--- a/data/shaders/gaussian6v.comp
+++ b/data/shaders/gaussian6v.comp
@@ -13,10 +13,9 @@ void main()
 {
     int x = int(gl_LocalInvocationID.x), y = int(gl_LocalInvocationID.y);
     ivec2 iuv = ivec2(gl_GlobalInvocationID.x, gl_GlobalInvocationID.y);
-    vec2 guv = gl_GlobalInvocationID.xy + vec2(0.5);
-    vec2 uv_m = (guv - vec2(0, 6)) * pixel;
-    vec2 uv = guv * pixel;
-    vec2 uv_p = (guv + vec2(0, 6)) * pixel;
+    vec2 uv_m = (iuv - ivec2(0, 6)) * pixel;
+    vec2 uv = iuv * pixel;
+    vec2 uv_p = (iuv + ivec2(0, 6)) * pixel;
 
     local_src[x][y] = texture(source, uv_m);
     local_src[x][y + 6] = texture(source, uv);
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 5b8245773..b04b380bc 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -100,7 +100,6 @@ enum TypeFBO
     FBO_DISPLACE,
     FBO_BLOOM_1024,
     FBO_SCALAR_1024,
-    FBO_TMP_1024,
     FBO_BLOOM_512,
     FBO_TMP_512,
     FBO_LENS_512,
@@ -163,7 +162,6 @@ enum TypeRTT
 
     RTT_BLOOM_1024,
     RTT_SCALAR_1024,
-    RTT_TMP_1024,
     RTT_BLOOM_512,
     RTT_TMP_512,
     RTT_LENS_512,
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 80266a818..49f6b4617 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -722,13 +722,12 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glClear(GL_STENCIL_BUFFER_BIT);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 
-            FrameBuffer::Blit(*in_fbo, irr_driver->getFBO(FBO_TMP_1024), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            FrameBuffer::Blit(*in_fbo, irr_driver->getFBO(FBO_BLOOM_1024), GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
-            irr_driver->getFBO(FBO_BLOOM_1024).Bind();
-            renderBloom(irr_driver->getRenderTargetTexture(RTT_TMP_1024));
+            irr_driver->getFBO(FBO_BLOOM_512).Bind();
+            renderBloom(irr_driver->getRenderTargetTexture(RTT_BLOOM_1024));
 
             // Downsample
-            FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_1024), irr_driver->getFBO(FBO_BLOOM_512), GL_COLOR_BUFFER_BIT, GL_LINEAR);
             FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_BLOOM_256), GL_COLOR_BUFFER_BIT, GL_LINEAR);
             FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_BLOOM_128), GL_COLOR_BUFFER_BIT, GL_LINEAR);
 			
@@ -739,44 +738,18 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
 			
 
             // Blur
-
-            // The fbo sum chain is from https://software.intel.com/en-us/articles/compute-shader-hdr-and-bloom
-            glBlendFunc(GL_ONE, GL_ONE);
-            glBlendEquation(GL_FUNC_ADD);
-			
-			renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_512), irr_driver->getFBO(FBO_TMP_512));
-            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_256), irr_driver->getFBO(FBO_TMP_256));
-            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_128), irr_driver->getFBO(FBO_TMP_128));
-
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_TMP_128), 2., 2.);
-            glEnable(GL_BLEND);
-            irr_driver->getFBO(FBO_BLOOM_256).Bind();
-            renderPassThrough(irr_driver->getFBO(FBO_BLOOM_128).getRTT()[0], 256, 256);
-            glDisable(GL_BLEND);
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_TMP_256), 2., 2.);
-            glEnable(GL_BLEND);
-            irr_driver->getFBO(FBO_BLOOM_512).Bind();
-            renderPassThrough(irr_driver->getFBO(FBO_BLOOM_256).getRTT()[0], 512, 512);
-            glDisable(GL_BLEND);
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_TMP_512), 2., 2.);
-            glEnable(GL_BLEND);
-            irr_driver->getFBO(FBO_BLOOM_1024).Bind();
-            renderPassThrough(irr_driver->getFBO(FBO_BLOOM_512).getRTT()[0], 1024, 1024);
-            glDisable(GL_BLEND);
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_1024), irr_driver->getFBO(FBO_TMP_1024), 2., 2.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_TMP_512), 1., 1.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_TMP_256), 1., 1.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_TMP_128), 1., 1.);
 
             // Additively blend
             in_fbo->Bind();
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
-            renderPassThrough(irr_driver->getRenderTargetTexture(RTT_BLOOM_1024), in_fbo->getWidth(), in_fbo->getHeight());
-
-
-			FullScreenShader::LensBlendShader::getInstance()->SetTextureUnits(
-                irr_driver->getRenderTargetTexture(RTT_LENS_128), irr_driver->getRenderTargetTexture(RTT_LENS_256), irr_driver->getRenderTargetTexture(RTT_LENS_512));
-            DrawFullScreenEffect<FullScreenShader::LensBlendShader>();
-
+            FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(
+                irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
+            DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
             glDisable(GL_BLEND);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         } // end if bloom
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 25e237b40..4af6d1d3c 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -105,7 +105,6 @@ RTT::RTT(size_t width, size_t height)
     RenderTargetTextures[RTT_BLOOM_1024] = generateRTT(shadowsize0, GL_RGBA16F, GL_BGR, GL_FLOAT);
     RenderTargetTextures[RTT_SCALAR_1024] = generateRTT(shadowsize0, GL_R32F, GL_RED, GL_FLOAT);
     RenderTargetTextures[RTT_BLOOM_512] = generateRTT(shadowsize1, GL_RGBA16F, GL_BGR, GL_FLOAT);
-    RenderTargetTextures[RTT_TMP_1024] = generateRTT(shadowsize0, GL_RGBA16F, GL_BGR, GL_FLOAT);
     RenderTargetTextures[RTT_TMP_512] = generateRTT(shadowsize1, GL_RGBA16F, GL_BGR, GL_FLOAT);
 	RenderTargetTextures[RTT_LENS_512] = generateRTT(shadowsize1, GL_RGBA16F, GL_BGR, GL_FLOAT);
 	
@@ -193,9 +192,6 @@ RTT::RTT(size_t width, size_t height)
     somevector.push_back(RenderTargetTextures[RTT_SCALAR_1024]);
     FrameBuffers.push_back(new FrameBuffer(somevector, 1024, 1024));
     somevector.clear();
-    somevector.push_back(RenderTargetTextures[RTT_TMP_1024]);
-    FrameBuffers.push_back(new FrameBuffer(somevector, 1024, 1024));
-    somevector.clear();
     somevector.push_back(RenderTargetTextures[RTT_BLOOM_512]);
     FrameBuffers.push_back(new FrameBuffer(somevector, 512, 512));
     somevector.clear();

From d09f6d3c7ab73abd209bc7a5ae1dddbd1a94fe86 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 16 Mar 2015 08:49:36 +1100
Subject: [PATCH 031/331] Revert "Clean bloomblending since it's not used
 anymore"

This reverts commit 2206f8ad5c89bae00a54703d91d7e16215b58bb8.

Conflicts:

	src/graphics/post_processing.cpp
---
 data/shaders/bloomblend.frag     | 14 ++++++++++++++
 src/graphics/post_processing.cpp |  2 +-
 src/graphics/shaders.cpp         | 10 ++++++++++
 src/graphics/shaders.hpp         |  6 ++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 data/shaders/bloomblend.frag

diff --git a/data/shaders/bloomblend.frag b/data/shaders/bloomblend.frag
new file mode 100644
index 000000000..503c9dcb9
--- /dev/null
+++ b/data/shaders/bloomblend.frag
@@ -0,0 +1,14 @@
+uniform sampler2D tex_128;
+uniform sampler2D tex_256;
+uniform sampler2D tex_512;
+
+out vec4 FragColor;
+
+void main()
+{
+    vec2 uv = gl_FragCoord.xy / screen;
+    vec4 col = .125 * texture(tex_128, uv);
+    col += .25 * texture(tex_256, uv);
+    col += .5 * texture(tex_512, uv);
+    FragColor = vec4(col.xyz, 1.);
+}
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 49f6b4617..11c9ab0f9 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -742,7 +742,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_TMP_256), 1., 1.);
             renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_TMP_128), 1., 1.);
 
-            // Additively blend
+            // Additively blend on top of tmp1
             in_fbo->Bind();
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 532708a67..c3e50ef32 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1570,6 +1570,16 @@ namespace FullScreenShader
 
         AssignSamplerNames(Program, 0, "tex");
     }
+
+    BloomBlendShader::BloomBlendShader()
+    {
+        Program = LoadProgram(OBJECT,
+            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
+            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bloomblend.frag").c_str());
+        AssignUniforms();
+
+        AssignSamplerNames(Program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+    }
 	
 	LensBlendShader::LensBlendShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 50a48a759..9661278b1 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -388,6 +388,12 @@ public:
     BloomShader();
 };
 
+class BloomBlendShader : public ShaderHelperSingleton<BloomBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+{
+public:
+    BloomBlendShader();
+};
+
 class LensBlendShader : public ShaderHelperSingleton<LensBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:

From ba773b8452e31c8bc96bbd18fb39758f2efcab0b Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 15 Mar 2015 19:26:15 -0400
Subject: [PATCH 032/331] Support per-track library objects

---
 src/tracks/track_object_presentation.cpp | 27 +++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 8e324cba9..7995e31a0 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -40,6 +40,7 @@
 #include "states_screens/dialogs/tutorial_message_dialog.hpp"
 #include "tracks/model_definition_loader.hpp"
 #include "tracks/track.hpp"
+#include "tracks/track_manager.hpp"
 #include "tracks/track_object_manager.hpp"
 
 #include <IBillboardSceneNode.h>
@@ -168,12 +169,36 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
     XMLNode* libroot;
     std::string lib_path =
         file_manager->getAsset(FileManager::LIBRARY, name) + "/";
+
     bool create_lod_definitions = true;
 
     if (!model_def_loader.containsLibraryNode(name))
     {
+        World* world = World::getWorld();
+        Track* track = NULL;
+        if (world != NULL)
+            track = world->getTrack();
+        std::string local_lib_node_path;
+        if (track != NULL)
+            local_lib_node_path = track->getTrackFile(name + "/node.xml");
         std::string lib_node_path = lib_path + "node.xml";
-        libroot = file_manager->createXMLTree(lib_node_path);
+
+        if (local_lib_node_path.size() > 0 && file_manager->fileExists(local_lib_node_path))
+        {
+            lib_path = track->getTrackFile(name);
+            libroot = file_manager->createXMLTree(local_lib_node_path);
+        }
+        else if (file_manager->fileExists(lib_node_path))
+        {
+            libroot = file_manager->createXMLTree(lib_node_path);
+        }
+        else
+        {
+            Log::error("TrackObjectPresentationLibraryNode",
+                "Cannot find library '%s'", lib_node_path.c_str());
+            return;
+        }
+
         if (libroot == NULL)
         {
             Log::error("TrackObjectPresentationLibraryNode",

From 321786c28783a6371e13f9c3b080ce4cdca76ce5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 17 Mar 2015 10:47:49 +1100
Subject: [PATCH 033/331] Removed warning in case of missing wheels (that
 warning is now part of the exporter, and e.g. Sara's kart has always one
 wheel missing).

---
 src/karts/kart_model.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 7637c1b92..c047376d9 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -629,19 +629,9 @@ void KartModel::loadWheelInfo(const XMLNode &node,
                               const std::string &wheel_name, int index)
 {
     const XMLNode *wheel_node = node.getNode(wheel_name);
-    if(!wheel_node)
-    {
-        // Only print the warning if a model filename is given. Otherwise the
-        // stk_config file is read (which has no model information).
-        if(m_model_filename!="")
-        {
-            Log::error("Kart_Model", "Missing wheel information '%s' for model "
-                       "'%s'.", wheel_name.c_str(), m_model_filename.c_str());
-            Log::error("Kart_Model", "This can be ignored, but the wheels will "
-                       "not rotate.");
-        }
-        return;
-    }
+    // Ignore in case of karts with missing wheels (e.g. Sara)
+    if(!wheel_node) return;
+
     wheel_node->get("model",            &m_wheel_filename[index]         );
     wheel_node->get("position",         &m_wheel_graphics_position[index]);
     wheel_node->get("min-suspension",   &m_min_suspension[index]         );

From 184f48b931976997e1524e028a16b375f4e7448f Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 17 Mar 2015 20:36:43 -0400
Subject: [PATCH 034/331] Fix movable LOD objects vs scale

---
 src/tracks/track_object.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 44b93e4ef..f499c1559 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -183,7 +183,21 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
                 new TrackObjectPresentationLOD(xml_node, parent, model_def_loader);
             m_presentation = lod_node;
 
-            glownode = ((LODNode*)lod_node->getNode())->getAllNodes()[0];
+            LODNode* node = (LODNode*)lod_node->getNode();
+            if (type == "movable" && parent != NULL)
+            {
+                // HACK: unparent movables from their parent library object if any,
+                // because bullet provides absolute transforms, not transforms relative
+                // to the parent object
+                node->updateAbsolutePosition();
+                core::matrix4 absTransform = node->getAbsoluteTransformation();
+                node->setParent(irr_driver->getSceneManager()->getRootSceneNode());
+                node->setPosition(absTransform.getTranslation());
+                node->setRotation(absTransform.getRotationDegrees());
+                node->setScale(absTransform.getScale());
+            }
+
+            glownode = node->getAllNodes()[0];
         }
         else
         {

From e596c48f42c4ea4ffc179d732101605a1188388a Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 17 Mar 2015 20:44:14 -0400
Subject: [PATCH 035/331] Tweak per-track library objects to be grouped in a
 subdirectory

---
 src/tracks/track_object_presentation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 7995e31a0..1a6d5b17a 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -180,12 +180,12 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
             track = world->getTrack();
         std::string local_lib_node_path;
         if (track != NULL)
-            local_lib_node_path = track->getTrackFile(name + "/node.xml");
+            local_lib_node_path = track->getTrackFile("library/" + name + "/node.xml");
         std::string lib_node_path = lib_path + "node.xml";
 
         if (local_lib_node_path.size() > 0 && file_manager->fileExists(local_lib_node_path))
         {
-            lib_path = track->getTrackFile(name);
+            lib_path = track->getTrackFile("library/" + name);
             libroot = file_manager->createXMLTree(local_lib_node_path);
         }
         else if (file_manager->fileExists(lib_node_path))

From 5e34ac3a44678d8a9e6305d5ae5292308854e029 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 18 Mar 2015 21:48:22 -0400
Subject: [PATCH 036/331] Fix bug #2037 (objects in library objects with curve
 animations not working)

---
 src/animations/three_d_animation.cpp     |  2 +-
 src/physics/physical_object.cpp          |  2 +-
 src/scriptengine/script_track.cpp        |  2 +-
 src/states_screens/grand_prix_lose.cpp   |  2 +-
 src/states_screens/grand_prix_win.cpp    | 10 +++++-----
 src/tracks/track_object.cpp              |  7 +++++--
 src/tracks/track_object.hpp              |  3 ++-
 src/tracks/track_object_presentation.cpp |  8 +++++---
 src/tracks/track_object_presentation.hpp |  6 +++---
 9 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/animations/three_d_animation.cpp b/src/animations/three_d_animation.cpp
index 26f490425..324b392d5 100644
--- a/src/animations/three_d_animation.cpp
+++ b/src/animations/three_d_animation.cpp
@@ -108,7 +108,7 @@ void ThreeDAnimation::update(float dt)
 
         if (m_object)
         {
-            m_object->move(xyz.toIrrVector(), hpr, scale.toIrrVector(), true);
+            m_object->move(xyz.toIrrVector(), hpr, scale.toIrrVector(), true, false);
         }
     }
 }   // update
diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 4e8ec6418..cfa014e32 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -508,7 +508,7 @@ void PhysicalObject::update(float dt)
     //m_node->setRotation(hpr.toIrrHPR());
 
     m_object->move(xyz.toIrrVector(), hpr.toIrrVector()*RAD_TO_DEGREE,
-                   m_init_scale, false);
+                   m_init_scale, false, true /* isAbsoluteCoord */);
 }   // update
 
 // ----------------------------------------------------------------------------
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index d40f99fde..7b66c31f3 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -86,7 +86,7 @@ namespace Scripting
             core::vector3df xyz = new_pos->toIrrVector();
             core::vector3df hpr = core::vector3df(0, 0, 0);
             core::vector3df scale = core::vector3df(1, 1, 1);
-            ((TrackObjectPresentation*)(memory))->move(xyz, hpr, scale);
+            ((TrackObjectPresentation*)(memory))->move(xyz, hpr, scale, false);
         }
         //stop a sound
         void stop(void *memory)
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index 4b63c630f..9a3db63c0 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -145,7 +145,7 @@ void GrandPrixLose::onUpdate(float dt)
                 core::vector3df kart_pos(m_kart_x + n*DISTANCE_BETWEEN_KARTS,
                     m_kart_y,
                     m_kart_z);
-                m_kart_node[n]->move(kart_pos, kart_rot, kart_scale, false);
+                m_kart_node[n]->move(kart_pos, kart_rot, kart_scale, false, true);
             }
         }
     }
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index b48626b88..36ccc122c 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -204,7 +204,7 @@ void GrandPrixWin::onUpdate(float dt)
                 core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
                 core::vector3df kart_rot(0, m_kart_rotation[k], 0);
                 core::vector3df kart_scale(1.0f, 1.0f, 1.0f);
-                m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
+                m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false, true);
             }
         } // end for
 
@@ -227,11 +227,11 @@ void GrandPrixWin::onUpdate(float dt)
                     core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
                     core::vector3df kart_rot(0, m_kart_rotation[k], 0);
                     core::vector3df kart_scale(1.0f, 1.0f, 1.0f);
-                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
+                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false, true);
 
                     core::vector3df podium_pos = m_podium_steps[k]->getInitXYZ();
                     core::vector3df podium_rot(0, m_kart_rotation[k], 0);
-                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false);
+                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false, true);
 
                     karts_not_yet_done++;
                 }
@@ -256,13 +256,13 @@ void GrandPrixWin::onUpdate(float dt)
                     core::vector3df kart_pos(m_kart_x[k], m_kart_y[k], m_kart_z[k]);
                     core::vector3df kart_rot(0, m_kart_rotation[k], 0);
                     core::vector3df kart_scale(1.0f, 1.0f, 1.0f);
-                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false);
+                    m_kart_node[k]->move(kart_pos, kart_rot, kart_scale, false, true);
 
 
                     core::vector3df podium_pos = m_podium_steps[k]->getInitXYZ();
                     core::vector3df podium_rot(0, m_kart_rotation[k], 0);
                     podium_pos.Y = INITIAL_PODIUM_Y - (INITIAL_Y - m_kart_y[k]) - KARTS_DELTA_Y;
-                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false);
+                    m_podium_steps[k]->move(podium_pos, podium_rot, core::vector3df(1.0f, 1.0f, 1.0f), false, true);
                 }
             }
         } // end for
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index f499c1559..a322df919 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -339,9 +339,12 @@ bool TrackObject::castRay(const btVector3 &from,
 // ----------------------------------------------------------------------------
 
 void TrackObject::move(const core::vector3df& xyz, const core::vector3df& hpr,
-                       const core::vector3df& scale, bool update_rigid_body)
+                       const core::vector3df& scale, bool update_rigid_body,
+                       bool isAbsoluteCoord)
 {
-    if (m_presentation != NULL) m_presentation->move(xyz, hpr, scale);
+    if (m_presentation != NULL)
+        m_presentation->move(xyz, hpr, scale, isAbsoluteCoord);
+
     if (update_rigid_body && m_physical_object != NULL)
     {
         // If we set a bullet position from an irrlicht position, we need to
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 14f785556..fcdcdffba 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -105,7 +105,8 @@ public:
     virtual      ~TrackObject();
     virtual void update(float dt);
     void move(const core::vector3df& xyz, const core::vector3df& hpr,
-              const core::vector3df& scale, bool updateRigidBody);
+              const core::vector3df& scale, bool updateRigidBody,
+              bool isAbsoluteCoord);
 
     virtual void reset();
     void setEnable(bool mode);
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 1a6d5b17a..55a20c61e 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -100,11 +100,12 @@ const core::vector3df& TrackObjectPresentationSceneNode::getScale() const
 // ----------------------------------------------------------------------------
 void TrackObjectPresentationSceneNode::move(const core::vector3df& xyz,
                                             const core::vector3df& hpr,
-                                            const core::vector3df& scale)
+                                            const core::vector3df& scale,
+                                            bool isAbsoluteCoord)
 {
     if (m_node == NULL) return;
 
-    if (m_node->getParent() != NULL)
+    if (m_node->getParent() != NULL && isAbsoluteCoord)
     {
         scene::ISceneNode* parent = m_node->getParent();
         m_node->setPosition((xyz - parent->getAbsolutePosition())
@@ -640,7 +641,8 @@ TrackObjectPresentationSound::~TrackObjectPresentationSound()
 // ----------------------------------------------------------------------------
 void TrackObjectPresentationSound::move(const core::vector3df& xyz, 
                                         const core::vector3df& hpr,
-                                        const core::vector3df& scale)
+                                        const core::vector3df& scale,
+                                        bool isAbsoluteCoord)
 {
     m_xyz = xyz;
     if (m_sound != NULL) m_sound->setPosition(xyz);
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index d717082f7..46f66d183 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -82,7 +82,7 @@ public:
     virtual void setEnable(bool enabled) {}
     virtual void update(float dt) {}
     virtual void move(const core::vector3df& xyz, const core::vector3df& hpr,
-                      const core::vector3df& scale) {}
+        const core::vector3df& scale, bool isAbsoluteCoord) {}
 
     // ------------------------------------------------------------------------
     /** Returns the position of this TrackObjectPresentation. */
@@ -139,7 +139,7 @@ public:
     virtual const core::vector3df& getRotation() const OVERRIDE;
     virtual const core::vector3df& getScale() const OVERRIDE;
     virtual void move(const core::vector3df& xyz, const core::vector3df& hpr,
-                      const core::vector3df& scale) OVERRIDE;
+        const core::vector3df& scale, bool isAbsoluteCoord) OVERRIDE;
     virtual void setEnable(bool enabled) OVERRIDE;
     virtual void reset() OVERRIDE;
 
@@ -264,7 +264,7 @@ public:
     virtual void onTriggerItemApproached(Item* who) OVERRIDE;
     virtual void update(float dt) OVERRIDE;
     virtual void move(const core::vector3df& xyz, const core::vector3df& hpr,
-                      const core::vector3df& scale) OVERRIDE;
+        const core::vector3df& scale, bool isAbsoluteCoord) OVERRIDE;
     void triggerSound(bool loop);
     void stopSound();
 

From c422b61464bdb93ee8b100aefafcd0e0dba6f3dc Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 19 Mar 2015 19:01:35 -0400
Subject: [PATCH 037/331] Fix lens flare

---
 src/graphics/post_processing.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 11c9ab0f9..21c93ffd0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -750,6 +750,12 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
             DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
+
+            FullScreenShader::LensBlendShader::getInstance()->SetTextureUnits(
+                irr_driver->getRenderTargetTexture(RTT_LENS_128), irr_driver->getRenderTargetTexture(RTT_LENS_256), irr_driver->getRenderTargetTexture(RTT_LENS_512));
+            DrawFullScreenEffect<FullScreenShader::LensBlendShader>();
+
+
             glDisable(GL_BLEND);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         } // end if bloom

From 5a9ce9826983a2ab97a7978800363bc9ef4d3b49 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 19 Mar 2015 20:18:21 -0400
Subject: [PATCH 038/331] Properly fix lens flare

---
 src/graphics/post_processing.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 21c93ffd0..a04c69aa0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -742,11 +742,17 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_TMP_256), 1., 1.);
             renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_TMP_128), 1., 1.);
 
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_512), irr_driver->getFBO(FBO_TMP_512));
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_256), irr_driver->getFBO(FBO_TMP_256));
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_128), irr_driver->getFBO(FBO_TMP_128));
+            
+
             // Additively blend on top of tmp1
             in_fbo->Bind();
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
+            
             FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
             DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();

From 633f6c5e30aeb4e60e2bb7d238dd0d451b352449 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 22 Mar 2015 20:41:13 -0400
Subject: [PATCH 039/331] Update credits

---
 data/CREDITS | Bin 13598 -> 13580 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index e27fbb5408a3ff7f136289646d5778f3cef42e7b..656a28d86e046b32aa6a87000cd744fd72c52b88 100644
GIT binary patch
delta 254
zcmbQ2)swYBjZs{eL4m=Mp%@5L8A^bp0z)E05ku<4uZphDAO?_I!jQ>O24pEPI5Xrk
z<N{$nLmpIV9zzOHJRhhg1E``1$j$+(P6o0;DpDDWH!CwHvocyv?q)k_4zkM)s34Ic
z8z_|oRLI2u67z-{2(l;-DwYejID^4}!F+NcyW?aD4i90F+t4hWY|Ep(iE|EzBtp&|
hsHzO;lzgBwfR36xTTq#s3up((UqByj-YuA{3;=xcG|>P6

delta 164
zcmeClnwPafjdAlb#spSY3kE#~qsi>-Cns}p*iGhRZ=3AF;lZdgIi6X3vIo0FrVfJw
zLncEW5SIXPB0~<4Uk+qtGL$kDGo*rLa~TSN;;9U|K%56umk3sy4`hRM7X#IUL`s0N
jML>QsLq0<aSf?70mkZ_PY~IhYm}7E{pwi|wf(gn1P+TQQ


From fab1698d69f4bae365ab99197028870ab9017c81 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 22 Mar 2015 21:03:06 -0400
Subject: [PATCH 040/331] Update translations

---
 data/po/ar.po    | 1312 +++++++-----------
 data/po/bg.po    | 1250 +++++++----------
 data/po/bn.po    | 1336 +++++++-----------
 data/po/br.po    | 1848 ++++++++++---------------
 data/po/bs.po    | 1251 +++++++----------
 data/po/ca.po    | 1514 ++++++++-------------
 data/po/cs.po    | 1345 +++++++-----------
 data/po/da.po    | 1498 ++++++++-------------
 data/po/da_DK.po | 3369 ++++++++++++++++++++++++++++++++++++++++++++++
 data/po/de.po    | 1898 +++++++++++---------------
 data/po/el.po    | 1971 +++++++++++----------------
 data/po/en_AU.po | 1253 +++++++----------
 data/po/en_GB.po | 1282 +++++++-----------
 data/po/eo.po    | 1249 +++++++----------
 data/po/es.po    | 1536 ++++++++-------------
 data/po/eu.po    | 1414 +++++++------------
 data/po/fa.po    | 1246 +++++++----------
 data/po/fi.po    | 1789 ++++++++++--------------
 data/po/fr.po    | 1949 +++++++++++----------------
 data/po/fr_CA.po | 1255 +++++++----------
 data/po/ga.po    | 1308 +++++++-----------
 data/po/gd.po    | 1635 +++++++++-------------
 data/po/gl.po    | 1431 ++++++++------------
 data/po/he.po    | 1433 ++++++++------------
 data/po/hi.po    | 1265 +++++++----------
 data/po/hr.po    | 1329 +++++++-----------
 data/po/hu.po    | 1363 +++++++------------
 data/po/hy.po    | 1247 +++++++----------
 data/po/id.po    | 1407 +++++++------------
 data/po/is.po    | 1249 +++++++----------
 data/po/it.po    | 1425 +++++++-------------
 data/po/ja.po    | 1294 +++++++-----------
 data/po/jbo.po   | 1345 ++++++++----------
 data/po/ko.po    | 1259 +++++++----------
 data/po/kw.po    | 2446 +++++++++++++++------------------
 data/po/ky.po    | 1255 +++++++----------
 data/po/lt.po    | 1357 +++++++------------
 data/po/nb.po    | 1330 +++++++-----------
 data/po/nl.po    | 1499 ++++++++-------------
 data/po/nn.po    | 1347 +++++++-----------
 data/po/os.po    | 1248 +++++++----------
 data/po/pl.po    | 1455 ++++++++------------
 data/po/pt.po    | 1911 +++++++++++---------------
 data/po/pt_BR.po | 1583 ++++++++--------------
 data/po/ro.po    | 1305 +++++++-----------
 data/po/ru.po    | 1724 +++++++++---------------
 data/po/sco.po   | 1247 +++++++----------
 data/po/sk.po    | 1328 +++++++-----------
 data/po/sl.po    | 1500 ++++++++-------------
 data/po/sq.po    | 1269 +++++++----------
 data/po/sr.po    | 1440 ++++++++------------
 data/po/sv.po    | 1342 +++++++-----------
 data/po/tr.po    | 1420 +++++++------------
 data/po/tt.po    | 1244 +++++++----------
 data/po/uk.po    | 1856 +++++++++++--------------
 data/po/uz.po    | 1244 +++++++----------
 data/po/vi.po    | 1368 +++++++------------
 data/po/zh_CN.po | 1278 +++++++-----------
 data/po/zh_TW.po | 1793 ++++++++++--------------
 59 files changed, 35781 insertions(+), 51563 deletions(-)
 create mode 100644 data/po/da_DK.po

diff --git a/data/po/ar.po b/data/po/ar.po
index 441054cf4..db5518617 100644
--- a/data/po/ar.po
+++ b/data/po/ar.po
@@ -1,24 +1,22 @@
-# Arabic translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 13:54+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Arabic <ar@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/supertuxkart/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
-"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -29,21 +27,26 @@ msgstr "   Y"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -59,7 +62,7 @@ msgstr "%s كيلو بايت"
 msgid "%s MB"
 msgstr "%s م.بايت"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -71,19 +74,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s من طر� %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s من طر� %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s مستعد"
@@ -98,25 +100,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s قد است�بعد"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(�ارغ)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(اللعب على الشبكة غير متو�ر بعد)"
 
@@ -130,44 +130,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* يمكن مشاهدة إعدادات التحكم الحالية أو تغييرها من قائمة الخيارات"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* يمكن لعب معظم هذه الأساليب �ي سباق الجائزة الكبرى ، حيث تلعب سباقات كثيرة "
-"متتالية بدلًا من واحد. كلما كانت رتبتك أ�ضل كلما زادت نقاطك، وي�وز اللاعب "
-"الأكثر نقاطًا بالكأس."
+msgstr "* يمكن لعب معظم هذه الأساليب �ي سباق الجائزة الكبرى ، حيث تلعب سباقات كثيرة متتالية بدلًا من واحد. كلما كانت رتبتك أ�ضل كلما زادت نقاطك، وي�وز اللاعب الأكثر نقاطًا بالكأس."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -198,7 +188,6 @@ msgstr "قتال بثلاث ضربات"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -217,23 +206,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= أعلى النتائج ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "الخروج من سباق الجائزة الكبرى"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "معلومات عن اللعبة"
 
@@ -242,37 +228,35 @@ msgstr "معلومات عن اللعبة"
 msgid "Accelerate"
 msgstr "الاند�اع"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -280,8 +264,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -291,13 +274,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -308,7 +289,6 @@ msgstr "أض� ضبط لوحة م�اتيح"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "أض� لاعبًا"
 
@@ -319,32 +299,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "أض� جهازًا"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "الاضا�ات"
 
@@ -354,49 +331,43 @@ msgstr "اسم الإضا�ة"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "الإضا�ات"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "آدي�مي"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "الكل"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "كل المسارات"
 
@@ -406,18 +377,20 @@ msgstr "مسموح استخدام كل الضربات، �التقط الأسل
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -427,25 +400,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "المرساة - تبطئ إلى حد كبير سرعة العربة الأولى"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "شخصيات متحركة"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "الشخصيات متحركة: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "مشهد متحرك"
 
@@ -453,24 +423,24 @@ msgstr "مشهد متحرك"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "المناظر متحركة: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -480,29 +450,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "طبّ�ق الميز الجديد"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -517,49 +483,44 @@ msgstr "هل أنت متأكد من أنك تود حذ� هذه الإعدادا
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "حلبات"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "اجعله زر الخروج"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "نهاية العالم"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "الصوت"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "تجنب الموز!"
 
@@ -581,79 +542,66 @@ msgstr "المحور %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "العودة"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "العودة الى السباق"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "العودة إلى السباق"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "العودة إلى قائمة الأجهزة"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "العودة إلى القائمة"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "العودة إلى القائمة"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "جزيرة القتال"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "بيغل"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "بيستي"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "حظًا أو�ر �ي المرة القادمة!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -663,36 +611,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "قصر التل الأسود"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "حوش الأبقار"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "كرة البولنج - ترتد عن الجدران. إن كنت تنظر خل�ك �ست�رمى للخل�."
 
 #. I18N: Key binding name
@@ -701,7 +645,6 @@ msgid "Brake"
 msgstr "المكبح"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -709,53 +652,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr "لكنني مخلوق عادل، لذلك سأعقد ص�قة معك."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"كعكة - تلقى على أقرب المنا�سين، مثالية على المدى القصير وعلى الطرق المستقيمة"
+msgstr "كعكة - تلقى على أقرب المنا�سين، مثالية على المدى القصير وعلى الطرق المستقيمة"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "يتعذر الولوج لخادم الإضا�ات..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -769,26 +704,23 @@ msgid "Cancel/Back"
 msgstr "إلغاء/عودة"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "الكه� إكس"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "أ�نجز التحدي"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "�شل التحدي"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "التحديات : غر�ة الجائزة"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -796,61 +728,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "إختر عربة"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "إضغط هنا لتعلّ�م كي�ية اللعب"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "إجمع العلب الزرقاء : سو� تعطيك أسلحة و قوى أخرى"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "إجمع قنينات النيترو (سنستعملهم بعد المنعط�)"
 
@@ -860,17 +783,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"جمع النيترو يتيح لك الحصول على تعزيز السرعة كلما رغبت عن طريق الضغط على "
-"الم�تاح المناسب. يمكنك أن ترى مستواك الحالي من النيترو �ي شريط على يمين "
-"الشاشة."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "جمع النيترو يتيح لك الحصول على تعزيز السرعة كلما رغبت عن طريق الضغط على الم�تاح المناسب. يمكنك أن ترى مستواك الحالي من النيترو �ي شريط على يمين الشاشة."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -883,11 +802,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -895,7 +814,6 @@ msgstr "تأكيد دقة الشاشة خلال %i ثانية"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -907,100 +825,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"لا يحتوي على أسلحة أو قوى أخرى، �قط مهاراتك �ي القيادة  هي التي تحدث ال�رق !"
+msgstr "لا يحتوي على أسلحة أو قوى أخرى، �قط مهاراتك �ي القيادة  هي التي تحدث ال�رق !"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "تابع"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "عناصر التحكم"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "المساهمون �ي العمل"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1013,13 +913,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "إعدادات مخصصة..."
 
@@ -1045,7 +944,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1053,28 +951,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "حذ� الإعدادات"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1087,24 +983,23 @@ msgstr "إبطال الجهاز"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "غير م��عّل"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "عرض FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "هل تريد حقا إلغاء سباق الجائزة الكبرى؟"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "هل تريد حقا حذ� اللاعب '%s' ؟"
@@ -1113,8 +1008,8 @@ msgstr "هل تريد حقا حذ� اللاعب '%s' ؟"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "لا تضغط على أي زر قبل إشارة الانطلاق"
 
@@ -1125,27 +1020,24 @@ msgstr "أس�ل"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1156,7 +1048,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1166,12 +1057,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "إ�ل��نْت"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "أقصي"
 
@@ -1179,24 +1069,22 @@ msgstr "أقصي"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "إ�مول"
 
@@ -1208,27 +1096,24 @@ msgstr "ت�عيل الجهاز"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "م��عّل"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "أدخل إسم اللاعب الجديد"
 
@@ -1241,31 +1126,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "جميع اللاعبين :\nاض�ط 'اختيار' للانضمام للعبة!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"جميع اللاعبين :\n"
-"اض�ط 'اختيار' للانضمام للعبة!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "الخروج من السباق"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "ماهر"
 
@@ -1273,12 +1158,12 @@ msgstr "ماهر"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1303,19 +1188,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "الل�ة الأخيرة !"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1326,20 +1209,14 @@ msgstr "نار"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"أولا، ستحتاج لعدة أجهزة إدخال (وجود لوحة لعب متعددة أو عصا تحكم أ�ضل وسيلة "
-"للعب مع عدة اشخاص). اذهب لشاشة الإعدادات ثم قم بإعداد لوحة اللعب. من الممكن "
-"أيضا للعب باستخدام لوحة الم�اتيح، سيكون لكل لاعب مجموعة مختل�ة من الم�اتيح، "
-"وضع �ي لاعتبار أن معظم لوحات الم�اتيح ليست مناسبة للعب الجماعي لأنها لا تدعم "
-"الضغط المتعدد على الم�اتيح."
+msgstr "أولا، ستحتاج لعدة أجهزة إدخال (وجود لوحة لعب متعددة أو عصا تحكم أ�ضل وسيلة للعب مع عدة اشخاص). اذهب لشاشة الإعدادات ثم قم بإعداد لوحة اللعب. من الممكن أيضا للعب باستخدام لوحة الم�اتيح، سيكون لكل لاعب مجموعة مختل�ة من الم�اتيح، وضع �ي لاعتبار أن معظم لوحات الم�اتيح ليست مناسبة للعب الجماعي لأنها لا تدعم الضغط المتعدد على الم�اتيح."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1352,7 +1229,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1360,14 +1236,19 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "حصن الصهارة"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1391,13 +1272,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "كامل الشاشة"
 
@@ -1411,22 +1291,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "م�اتيح اللعبة"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "أسلوب اللعب"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1442,51 +1319,45 @@ msgstr "زر لوحة اللعب %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "معلومات عامة"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "الانسحاب من السباق"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "جنو"
 
@@ -1496,61 +1367,53 @@ msgid "Go!"
 msgstr "إنطلق"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "سباق الجائزة الكبرى"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "تقدم الجائزة الكبرى:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "مستوى التأثيرات الرسومية"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "الرسوميات"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "إعدادات الرسوميات"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "الوادي الأخضر"
 
@@ -1567,12 +1430,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "المزرعة"
 
@@ -1582,22 +1443,18 @@ msgstr "المزرعة"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "المساعدة"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "هيكْسلي"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "النتائج العليا"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1605,76 +1462,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"إضرب اللاعبين الآخرين بالأسلحة حتى يخسروا كامل نقاطهم. (�قط �ي أسلوب متعدد "
-"اللاعبين)"
+msgstr "إضرب اللاعبين الآخرين بالأسلحة حتى يخسروا كامل نقاطهم. (�قط �ي أسلوب متعدد اللاعبين)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "إن إستطعت هز يمتي �ي السباق، سأطلق سراح العجوز غريب الأطوار."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "إذا كنت ترى زر ق�ل مثل هذا، تحتاج لإكمال التحدي ل�تحه."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "تجاه�ل '%s'، أنت �ي حاجة للانضمام �ي وقت سابق للعب!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "تثبيت"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "متوسط"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1684,13 +1536,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "عربات"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "الح�اظ على هذه الدقة"
 
@@ -1709,7 +1560,6 @@ msgid "Keyboard %i"
 msgstr "لوحة الم�اتيح %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "كونكي"
 
@@ -1718,7 +1568,7 @@ msgstr "كونكي"
 msgid "Lap"
 msgstr "ل�ة"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "الل�ة %i"
@@ -1780,50 +1630,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "تحميل"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "م�ق�ل"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "م�ق�ل : أكمل التحديات المتبقية لتحصل على المزيد !"
 
@@ -1831,11 +1677,51 @@ msgstr "م�ق�ل : أكمل التحديات المتبقية لتحصل عل
 msgid "Locked!"
 msgstr "م�ق�ل"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1846,27 +1732,18 @@ msgstr "النظر للوراء"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1874,18 +1751,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "أنا �قط"
 
@@ -1895,29 +1770,33 @@ msgid "Menu Keys"
 msgstr "م�اتيح القائمة"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "محور ال�أرة %d% s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1925,48 +1804,41 @@ msgstr "زر ال�أرة %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "متعدد اللاعبين"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "متعدد اللاعبين"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "الموسيقى"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1986,13 +1858,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2001,9 +1875,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "سباق الجائزة الكبرى '%s ' متو�ر الآن"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2016,7 +1894,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "الصعوبة الجديدة '%s' متو�رة الآن"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "أ�ضل وقت"
 
@@ -2044,19 +1922,18 @@ msgstr "نيترو"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "نولوك"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "لاشيء"
 
@@ -2066,21 +1943,19 @@ msgid "Normal Race"
 msgstr "سباق عادي"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "المنتجع الشمالي"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "مبتدئ"
 
@@ -2091,46 +1966,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "عدد المنا�سين"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "موا�ق"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2138,60 +2008,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "المنجم القديم"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "حجرة الرياضيات"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "يمكن لمالك اللعبة �قط التصر� �ي هذه المرحلة!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2202,14 +2071,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "الخيارات"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2218,35 +2084,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "المظلة - تبطئ جميع العربات المتقدمة"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2254,8 +2115,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2266,12 +2127,11 @@ msgstr "إيقا� اللعبة مؤقتا"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "متوقّ� مؤقتا"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "وقت الجزاء"
 
@@ -2280,7 +2140,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "حديقة العاب البطريق"
 
@@ -2289,37 +2148,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "ب�دْج�ن"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "العب الكل"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "اللاعبون"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2328,6 +2188,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "الرجاء إعادة تعري� ارتباط الم�اتيح."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "المرجو انتظار تحديث الإضا�ات"
@@ -2337,46 +2201,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "المرجو انتظار تحميل الإضا�ات"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"الش�اط - اقذ�ه إلى الأمام لسحب الخصم إلى الوراء، أو اقذ�ه عندما تنظر إلى "
-"الوراء لحجب رؤية المنا�س اللذي يتبعك"
+msgstr "الش�اط - اقذ�ه إلى الأمام لسحب الخصم إلى الوراء، أو اقذ�ه عندما تنظر إلى الوراء لحجب رؤية المنا�س اللذي يتبعك"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "اضغط ESC لإلغاء"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "إضغط أي م�تاح"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "إضغط ENTER أو أنقر مرتين على الجهاز لضبطه"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "إضغط ENTER أو أنقر مرتين على اللاعب لتغيير معلوماته أو حذ�ه"
 
@@ -2410,7 +2266,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2419,7 +2274,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "بَ�ي"
 
@@ -2431,25 +2285,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "أ�خرج"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "إعدادات السباق"
 
@@ -2470,8 +2320,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "عربة عشوائية"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "مسار عشوائي"
 
@@ -2480,82 +2330,68 @@ msgid "Rank"
 msgstr "الرتبة"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "جاهز !"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "حذ�"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "إعادة التسمية"
 
@@ -2581,29 +2417,25 @@ msgstr "إنقاذ"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "دقة الشاشة"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "إعادة التشغيل"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "إعادة السباق"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2660,41 +2492,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "أسكتلندا"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2704,12 +2530,10 @@ msgid "Select"
 msgstr "إختر"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "إختر أسلوب اللعب"
 
@@ -2719,36 +2543,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2763,91 +2581,49 @@ msgstr "اجهز"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "إعداد سباق جديد"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "الرمال المتحركة"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "الضواحي المشرقة"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2857,7 +2633,6 @@ msgid "Size: %s"
 msgstr "حجم %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2868,12 +2643,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "الكسوة"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "قمة الجبل"
 
@@ -2883,27 +2656,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"عذرا، حدث خطأ أثناء الاتصال بموقع الإضا�ات. تأكد أنك متصل بالإنترنت و أنه لا "
-"يتم حظراللعبة من طر� جدار حماية"
+msgstr "عذرا، حدث خطأ أثناء الاتصال بموقع الإضا�ات. تأكد أنك متصل بالإنترنت و أنه لا يتم حظراللعبة من طر� جدار حماية"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2911,7 +2680,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "المؤثرات الصوتية"
 
@@ -2920,7 +2688,6 @@ msgstr "المؤثرات الصوتية"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "قياسي"
 
@@ -2933,11 +2700,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "إبدأ سباق الجائزة الكبرى"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "إبدأ السباق"
 
@@ -2957,12 +2723,10 @@ msgstr "توجيه إلى اليمين"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2970,82 +2734,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "تحت البحار"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "إضا�ات سوبرتَكس كارت"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "المساعدة"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "خيارات سوبرتَكس كارت"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "يمكن لعب سوبرتَكس كارت  بأسلوب متعدد اللاعبين على ن�س الحاسوب"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "تضم سوبرتَكس كارت  عدة أساليب لعب"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "سوزان"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "المقايض - يتم تحويل علب الهدايا إلى الموز، ل�ترة قصيرة والعكس صحيح."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "منشة الحشرات - تدعس العربات القريبة منك لت�بط�ئهم"
 
@@ -3054,32 +2805,37 @@ msgstr "منشة الحشرات - تدعس العربات القريبة منك
 msgid "System Language"
 msgstr "إختيار اللغة"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "الملعب"
 
@@ -3091,9 +2847,7 @@ msgstr "وحدة الإضا�ات غير م�علة حاليا �ي خيارات
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"مل� النتائج العالية كان قديما جدا،\n"
-"جميع النتائج تم مسحها"
+msgstr "مل� النتائج العالية كان قديما جدا،\nجميع النتائج تم مسحها"
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3106,32 +2860,22 @@ msgstr "ضد الوقت"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"ضد الوقت : لا يحتوي على أسلحة أو قوى أخرى، �قط مهاراتك �ي القيادة هي التي "
-"تحدث ال�رق !"
+msgstr "ضد الوقت : لا يحتوي على أسلحة أو قوى أخرى، �قط مهاراتك �ي القيادة هي التي تحدث ال�رق !"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "لمساعدتك على ال�وز، هنالك مجموعة من القوى يمكن لك جمعها :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3150,7 +2894,7 @@ msgstr "أ�ضل %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3164,19 +2908,17 @@ msgstr "مسار من طر� %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "المسارات"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3187,24 +2929,21 @@ msgstr "أع�د المحاولة"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "البرنامج التعليمي: غر�ة التحديد"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "تَكس"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3212,20 +2951,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "إزالة التثبيت"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3239,8 +2976,8 @@ msgid "Update"
 msgstr "تحديث"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3249,40 +2986,36 @@ msgid "Updated date"
 msgstr "تاريخ التحديث"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "واجهة المستخدم"
 
@@ -3291,19 +3024,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3312,13 +3043,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3329,27 +3059,23 @@ msgstr "الإصدار : %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertical Sync (يتطلب إعادة تشغيل)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "حجم الصوت"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3361,7 +3087,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "الاتجاه خاطئ !"
 
@@ -3372,45 +3098,40 @@ msgid ""
 "working."
 msgstr "تحذير، الم�تاح 'Shift' ليس موصى به المرجو إختيار م�تاح أخر."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "الأسلحة"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "المؤثرات الجوية : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3421,42 +3142,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "و�لبر"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "إكس أر ٥٩١"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "نعم"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3466,37 +3181,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "لقد أنهيت سباق الجائزة الكبرى!"
 
@@ -3517,20 +3231,26 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "لقد أنهيت السباق!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "لقد تم إقصاؤك!"
 
@@ -3540,7 +3260,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3548,36 +3268,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "لقد �زت بالسباق!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3590,6 +3315,11 @@ msgid ""
 "created."
 msgstr "يبدو أن مل� الإعداد قديم جدا، لذلك تم حذ�ه وسيتم إنشاء إعداد جديد"
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3600,7 +3330,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "الحديقة الهادئة"
 
@@ -3611,7 +3340,6 @@ msgstr "[لاشيء]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3620,7 +3348,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "من طر�"
@@ -3629,50 +3358,25 @@ msgstr "من طر�"
 msgid "featured"
 msgstr "مختارة"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "قياسي"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Benjamin Kerensa https://launchpad.net/~bkerensa\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Hichem Razgallah https://launchpad.net/~hichemraz\n"
-"  Majid Al-Dharrab https://launchpad.net/~majid\n"
-"  SAKOUM Yassine https://launchpad.net/~karaytanto\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  abdXelrhman https://launchpad.net/~popo49-abdo\n"
-"  ص�ا ال�ليج https://launchpad.net/~safaalfulaij\n"
-"  محمدالحرقان https://launchpad.net/~imksa"
+msgstr "Launchpad Contributions:\n  Benjamin Kerensa https://launchpad.net/~bkerensa\n  Dawid Gan https://launchpad.net/~deveee\n  Hichem Razgallah https://launchpad.net/~hichemraz\n  Majid Al-Dharrab https://launchpad.net/~majid\n  SAKOUM Yassine https://launchpad.net/~karaytanto\n  STK-team https://launchpad.net/~stk\n  abdXelrhman https://launchpad.net/~popo49-abdo\n  ص�ا ال�ليج https://launchpad.net/~safaalfulaij\n  محمدالحرقان https://launchpad.net/~imksa"
diff --git a/data/po/bg.po b/data/po/bg.po
index 93dde5fde..84191e8bc 100644
--- a/data/po/bg.po
+++ b/data/po/bg.po
@@ -1,23 +1,22 @@
-# Bulgarian translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 11:57+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/supertuxkart/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -58,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -70,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s на %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s на %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s е готов"
@@ -97,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' бе елиминиран."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Празно)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(мрежовата игра в�е още не е налична)"
 
@@ -129,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -145,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -194,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -213,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Редокри ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Отно�но Гран При"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Отно�но"
 
@@ -238,37 +224,35 @@ msgstr "Отно�но"
 msgid "Accelerate"
 msgstr "У�кор�ване"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -276,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -287,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -304,7 +285,6 @@ msgstr "Добав�не на клавиатурна конфигураци�"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Добав�не на играч"
 
@@ -315,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Добав�не на у�трой�тво"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Добавки"
 
@@ -350,49 +327,43 @@ msgstr "Име на добавката"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Добавки"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "В�ички"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "В�ички пи�ти"
 
@@ -402,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -423,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "�нимирани герои : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -449,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "�нимиран пейзаж : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -476,37 +446,32 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Прилагане на новата разделителна �по�обно�т"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
-"Сигурни ли �те, че желаете безвъзвратно да изтриете тази конфигураци�?"
+msgstr "Сигурни ли �те, че желаете безвъзвратно да изтриете тази конфигураци�?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
@@ -514,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�рени"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "�а кра� на �вета"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Звук"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Изб�гвайте бананите!"
 
@@ -578,79 +538,66 @@ msgstr "О� %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "�азад"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Към �ъ�тезанието"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Връщане към �пи�ъка � у�трой�тва"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Връщане към менюто"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Повече къ�мет �ледващи�т път!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -660,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -698,7 +641,6 @@ msgid "Brake"
 msgstr "Спирачка"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -706,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -765,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Отказване/�азад"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -792,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Изберете количка"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -856,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -876,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -888,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -902,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "�апред"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Контроли"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "За�луги"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1005,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1037,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1045,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Изтриване на конфигураци�та"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1079,24 +979,23 @@ msgstr "Забран�ване на у�трой�тво"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Изключено"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Показване на кадри за �екунда"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "�аи�тина ли желаете да изтриете играча '%s' ?"
@@ -1105,8 +1004,8 @@ msgstr "�аи�тина ли желаете да изтриете играча
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1117,27 +1016,24 @@ msgstr "�адолу"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1148,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1158,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Слон"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1171,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1200,27 +1092,24 @@ msgstr "Разрешаване на у�трой�тво"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Включено"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Въвете името на нови� играч"
 
@@ -1235,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Изход от �ъ�тезанието"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Трудно"
 
@@ -1263,12 +1154,12 @@ msgstr "Трудно"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1293,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "По�ледна обиколка"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1316,13 +1205,12 @@ msgstr "Стрелба"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1337,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1345,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1376,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "�а ц�л екран"
 
@@ -1396,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Клавиши за игра"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Режими на игра"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1427,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Общи"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Гну"
 
@@ -1481,61 +1359,53 @@ msgid "Go!"
 msgstr "Давай!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Графика"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1552,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1567,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Помощ"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Кла�иране"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1593,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Ин�талиране"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1667,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Колички"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Запазване на тази разделителна �по�обно�т"
 
@@ -1692,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Клавиатура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Конки"
 
@@ -1701,7 +1560,7 @@ msgstr "Конки"
 msgid "Lap"
 msgstr "Обиколка"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Обиколка %i"
@@ -1763,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Зареждане"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1814,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1829,27 +1724,18 @@ msgstr "Поглеждане назад"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1857,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Само аз"
 
@@ -1878,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1908,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Музика"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1969,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1984,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1999,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�ова най-бърза обиколка"
 
@@ -2027,19 +1914,18 @@ msgstr "�итро"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2049,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2074,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Добре"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2121,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2185,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "�а�тройки"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2201,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2237,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2249,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "�а пауза"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2263,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2272,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Играчи"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2311,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2320,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2391,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2400,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2412,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2451,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2461,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2562,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2641,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2685,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2700,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2744,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2838,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2849,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2864,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2890,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2899,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2912,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2936,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2949,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3033,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3083,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3125,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3139,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3162,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3187,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3214,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3224,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3266,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3287,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3304,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3336,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3347,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3396,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3441,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3492,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3515,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3523,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3565,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3575,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3586,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3595,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3604,43 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Svetoslav Stefanov https://launchpad.net/~svetlisashkov"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Svetoslav Stefanov https://launchpad.net/~svetlisashkov"
diff --git a/data/po/bn.po b/data/po/bn.po
index f33013bb8..ac0ba3dde 100644
--- a/data/po/bn.po
+++ b/data/po/bn.po
@@ -1,23 +1,22 @@
-# Bengali translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# Mahay Alam Khan <mak@ankur.org.bd>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Mahay Alam Khan <mak@ankur.org.bd>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 11:56+0000\n"
-"Last-Translator: Mahay Alam Khan <mahayalamkhan@gmail.com>\n"
-"Language-Team: Bengali <bn@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/supertuxkart/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -58,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -70,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s দ�বারা %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s দ�বারা %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s তৈরি"
@@ -97,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' বাদ গিয়েছে।"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(খালি)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "নেটওয়ার�ক খেলা �খনও বিদ�যমান না"
 
@@ -129,45 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* সাম�প�রতিক কী বাইন�ডিং দেখা যায়/মেন� অপশনে পরিবর�তিত"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* �ই গেমটির অধিকাংশ মোড গ�র�যান�ড প�রিক�স ফ�যাশনে খেলা যাবে: �কক রেস খেলার "
-"পরিবর�তে, ত�মি �ক সারিতে অনেক খেলা খেলতে পারবে। যত ভাল অবস�থানে ত�মি যাবে তত "
-"বেশি পয়েন�ট ত�মি পাবে। সব শেষে ,যে খেলোয়াড়ের সবচাইতে বেশি পয়েন�ট আছে সে-ই "
-"চাপ জয় করবে।"
+msgstr "* �ই গেমটির অধিকাংশ মোড গ�র�যান�ড প�রিক�স ফ�যাশনে খেলা যাবে: �কক রেস খেলার পরিবর�তে, ত�মি �ক সারিতে অনেক খেলা খেলতে পারবে। যত ভাল অবস�থানে ত�মি যাবে তত বেশি পয়েন�ট ত�মি পাবে। সব শেষে ,যে খেলোয়াড়ের সবচাইতে বেশি পয়েন�ট আছে সে-ই চাপ জয় করবে।"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -198,7 +184,6 @@ msgstr "৩টি স�ট�রাইক য�দ�ধ"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -217,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= সর�বোচ�চ নম�বর ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "গ�র�যান�ড প�রিক�স বাতিল কর"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "সম�পর�কিত"
 
@@ -242,37 +224,35 @@ msgstr "সম�পর�কিত"
 msgid "Accelerate"
 msgstr "গতি বৃদ�ধি কর"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -280,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -291,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -308,7 +285,6 @@ msgstr "কীবোর�ড বিন�যস�তকরণ যোগ কর
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "খেলোায়াড় যোগ কর"
 
@@ -319,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "ডিভাইস যোগ কর"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "অ�যাড-অন"
 
@@ -354,71 +327,66 @@ msgstr "নাম অ�যাড-অন কর"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "অ�যাডঅন"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "অ�যাডামি"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "সকল"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "সকল ট�র�যাক"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"সব ধরনের লড়াই অন�মোদিত, তাই অস�ত�র ধর �বং চালাকির সাথে তাদের ব�যবহার কর!"
+msgstr "সব ধরনের লড়াই অন�মোদিত, তাই অস�ত�র ধর �বং চালাকির সাথে তাদের ব�যবহার কর!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -428,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "নোঙর- কার�টকে ধীর গতিতে বিশেষভাবে প�রথম স�থানে নিয়ে আসে"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "অ�যানিমেটেড চরিত�র :%s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -454,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "�নিমেটেড দৃশ�য : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -481,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "নত�ন রেজল�য�শন প�রয়োগ কর"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -518,49 +479,44 @@ msgstr "ত�মি কি নিশ�চিত যে ত�মি �ই ক
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�রিনাস"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "ESC কী নির�ধারণ কর"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "পৃথিবীর শেষে"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "অডিও"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "কলা �ড়িয়ে চল!"
 
@@ -582,79 +538,66 @@ msgstr "অক�ষ %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "পেছনে যাও"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "রেসে ফিরে যাও"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "ডিভাইস তালিকায় ফিরে যাও"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "মেন�তে ফিরে যাও"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "য�দ�ধ দ�বীপ"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "গ�প�তচর"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "পরবর�তী সময়ের জন�য সৌভাগ�য কামনা করছি!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -664,39 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "গবাদিপশ�র খামারবাড়ির উঠান"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"বোলিং বল - ওয়ালে বাউন�স নিষ�ক�রিয়। যদি ত�মি পেছনে তাকাও,তাহলে �টা পেছন দিকে "
-"ছ�ড়ে ফেলা হবে।"
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "বোলিং বল - ওয়ালে বাউন�স নিষ�ক�রিয়। যদি ত�মি পেছনে তাকাও,তাহলে �টা পেছন দিকে ছ�ড়ে ফেলা হবে।"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -704,7 +641,6 @@ msgid "Brake"
 msgstr "গতিরোধ কর"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -712,53 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"কেক - নিকটতম প�রতিদ�বন�দ�বীর দিকে নিক�ষেপ করে,কাছের বা সোজা দূরের দূরত�ব।"
+msgstr "কেক - নিকটতম প�রতিদ�বন�দ�বীর দিকে নিক�ষেপ করে,কাছের বা সোজা দূরের দূরত�ব।"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "stkaddons সার�ভারে প�রবেশ করতে পারেনা..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "বাতিল"
 
@@ -772,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "বাতিল/পিছনে ফিরে যাও"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "X গ�হা"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "চ�যালেঞ�জ : ট�রফি র�ম"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -799,62 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "কার�ট নির�বাচন কর"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"নীল বাক�স সংগ�রহ কর : �টা তোমাকে নত�ন অস�ত�র বা অন�যান�য শক�তি প�রদান করবে"
+msgstr "নীল বাক�স সংগ�রহ কর : �টা তোমাকে নত�ন অস�ত�র বা অন�যান�য শক�তি প�রদান করবে"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -864,17 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"নিট�র  সংগ�রহ তোমাকে অন�মতি দেয় ব�স�ট গতি পেতে যখনই ত�মি সঠিক কী চেপে তা "
-"পেতে চাও। গেম পর�দার ডান দিকের বারে ত�মি তোমার নিট�রর সাম�প�রতিক লেভেল দেখতে "
-"পাবে।"
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "নিট�র  সংগ�রহ তোমাকে অন�মতি দেয় ব�স�ট গতি পেতে যখনই ত�মি সঠিক কী চেপে তা পেতে চাও। গেম পর�দার ডান দিকের বারে ত�মি তোমার নিট�রর সাম�প�রতিক লেভেল দেখতে পাবে।"
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -887,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -899,7 +810,6 @@ msgstr "%i সেকেন�ডের মধ�যে রেজল�য�শ
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -911,100 +821,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"কোনো পাওয়ারআপস নেই,কেবলমাত�র তোমার চালানোর দক�ষতাই �খানে প�রধান বিষয়!"
+msgstr "কোনো পাওয়ারআপস নেই,কেবলমাত�র তোমার চালানোর দক�ষতাই �খানে প�রধান বিষয়!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "চালিয়ে যাও"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "নিয়ন�ত�রণ"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "ক�রেডিট"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1017,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1049,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1057,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "কনফিগারেশন ম�ছে ফেল"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1091,24 +979,23 @@ msgstr "নিষ�ক�রিয় ডিভাইস"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "নিষ�ক�রিয়"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "FPS প�রদর�শন কর"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "ত�মি কি সত�যি খেলোয়াড় '%s' কে ম�ছে ফেলতে চাও?"
@@ -1117,8 +1004,8 @@ msgstr "ত�মি কি সত�যি খেলোয়াড় '%s' কে 
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "অভিযানের আগে গতিবৃদ�ধি করোনা"
 
@@ -1129,27 +1016,24 @@ msgstr "নিচে"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1160,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1170,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "হাতি"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1183,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "ইম�ল"
 
@@ -1212,27 +1092,24 @@ msgstr "ডিভাইস সক�রিয় কর"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "সক�রিয়"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "নত�ন খেলোয়াড়ের নাম লিখ"
 
@@ -1247,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "রেস থেকে প�রস�থান"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "দক�ষ"
 
@@ -1275,12 +1154,12 @@ msgstr "দক�ষ"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1305,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "চূড়ান�ত ল�যাপ"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1328,21 +1205,14 @@ msgstr "আগ�ন"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"প�রথমে,তোমার প�রয়োজন হবে বিভিন�ন ইনপ�ট ডিভাইস(কয়েক জনের সাথে খেলার ভাল উপায় "
-"যদি �কাধিক গেমপ�যাড অথবা জয়স�টিক থাকে)। ইনপ�ট কনফিগারেশন পর�দায় যাও �বং "
-"গেমপ�যাড স�থাপন কর। �টা কীবোর�ডের দিয়েও খেলা যায়,তবে প�রতিটি খেলোয়াড়ের "
-"বিভিন�ন সেট কী'র  প�রয়োজন হবে,মনে রাখা গ�র�ত�বপূর�ণ যে বেশিরভাগ কীবোর�ড "
-"মাল�টিপ�লেয়ার গেমপ�লের জন�য উপয�ক�ত নয় কারণ তারা বেশি সংখ�যক keypresses  "
-"সমর�থন করে না।"
+msgstr "প�রথমে,তোমার প�রয়োজন হবে বিভিন�ন ইনপ�ট ডিভাইস(কয়েক জনের সাথে খেলার ভাল উপায় যদি �কাধিক গেমপ�যাড অথবা জয়স�টিক থাকে)। ইনপ�ট কনফিগারেশন পর�দায় যাও �বং গেমপ�যাড স�থাপন কর। �টা কীবোর�ডের দিয়েও খেলা যায়,তবে প�রতিটি খেলোয়াড়ের বিভিন�ন সেট কী'র  প�রয়োজন হবে,মনে রাখা গ�র�ত�বপূর�ণ যে বেশিরভাগ কীবোর�ড মাল�টিপ�লেয়ার গেমপ�লের জন�য উপয�ক�ত নয় কারণ তারা বেশি সংখ�যক keypresses  সমর�থন করে না।"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1355,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1363,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "ম�যাগমা ফোর�ট"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1394,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "সম�পূর�ণ পর�দা জ�ড়ে প�রদর�শন"
 
@@ -1414,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "গেম কী"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "গেম মোড"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1445,51 +1311,45 @@ msgstr "গেনপ�যাড বোতাম %d"
 msgid "Gamepad hat %d"
 msgstr "গেমপ�যাড ট�পি %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "সাধারণ"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1499,61 +1359,53 @@ msgid "Go!"
 msgstr "যাও!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "গ�র�যান�ড প�রিক�স"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "গ�রাফিকাল প�রভাবের মাত�রা"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "গ�রাফিক"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1570,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "বসতবাড়ি - সংবলিত বৃহৎ ভূসম�পত�তি"
 
@@ -1585,22 +1435,18 @@ msgstr "বসতবাড়ি - সংবলিত বৃহৎ ভূসম
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "সাহায�য"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "হেক�সলে"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "উচ�চসংখ�যা"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1608,78 +1454,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"অস�ত�র দ�বারা অন�যদের আঘাত করতে থাক যতক�ষন না পর�যন�ত তারা তাদের জীবন হারায়। "
-"(কেকলমাত�র মাল�টিপ�লেয়ার গেমের জন�য প�রযোজ�য)"
+msgstr "অস�ত�র দ�বারা অন�যদের আঘাত করতে থাক যতক�ষন না পর�যন�ত তারা তাদের জীবন হারায়। (কেকলমাত�র মাল�টিপ�লেয়ার গেমের জন�য প�রযোজ�য)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"ত�মি যদি �ই ধরনের কোনো লক বাটন দেখ,তাহলে তোমাকে �ই চ�যালেন�জটি সম�পন�ন করে "
-"তাকে আনলক করতে হবে।"
+msgstr "ত�মি যদি �ই ধরনের কোনো লক বাটন দেখ,তাহলে তোমাকে �ই চ�যালেন�জটি সম�পন�ন করে তাকে আনলক করতে হবে।"
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s' অগ�রাহ�য কর, তোমার আগে খেলায় যোগদান প�রয়োজন!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "ইনস�টল"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "মধ�যম"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1689,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "কার�ট"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "�ই রেজল�য�শন রাখ"
 
@@ -1714,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "কীবোর�ড %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1723,7 +1560,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "ল�যাপ"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "ল�যাপ %i"
@@ -1785,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "লোড হচ�ছে"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "আবদ�ধ"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "আবদ�ধ: আরও বেশি প�রবেশাধিকার পেতে চ�যালেঞ�জ সমাধান কর!"
 
@@ -1836,11 +1669,51 @@ msgstr "আবদ�ধ: আরও বেশি প�রবেশাধিক
 msgid "Locked!"
 msgstr "আবদ�ধ!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1851,27 +1724,18 @@ msgstr "পেছনে তাকাও"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1879,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "কেবলমাত�র আমি"
 
@@ -1900,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "মেন� কী"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "মাউস অক�ষ %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1930,48 +1796,41 @@ msgstr "মাউস বোতাম %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "�কাধিক খেলোয়াড়"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "�কাধিক খেলোয়াড়"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "সঙ�গীত"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1991,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2006,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "নত�ন গ�র�যান�ড প�রিক�স  '%s �খন সহজলভ�য"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2021,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "নত�ন সমস�যা  '%s' �খন দেখা দিয়েছে"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "নত�ন দ�র�ততর ল�যাপ"
 
@@ -2049,19 +1914,18 @@ msgstr "নিট�রো"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "নোলোক"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "�কটিও না"
 
@@ -2071,21 +1935,19 @@ msgid "Normal Race"
 msgstr "সাধারণ রেস"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "উত�তর রিসোর�ট"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "শিক�ষানবীশ"
 
@@ -2096,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "সকল কার�টের সংখ�যা"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "ঠিক আছে"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2143,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "প�রনো মাইন"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "অলিভারের গণিত শ�রেণি"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "কেবলমাত�র গেম মাষ�টার �ই পর�যায়ে কাজ করতে পারে!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2207,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "অপশন"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2223,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "প�যারাস�য�ট- ধীর গতিতে সকল কার�টকে ভাল অবস�থানে নামাবে।"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2259,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2271,12 +2119,11 @@ msgstr "খেলা স�থগিত কর"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "স�থগিত"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "শাস�তির সময়!!"
 
@@ -2285,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "পেঙ�গ�ইন খেলারস�থান"
 
@@ -2294,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "পিজিন"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "সব খেল�ন"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "খেলোয়াড়"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2333,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "অন�গ�রহ করে তোমার কী বাইন�ডিং প�নরায় কনফিগার কর।"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "অ�যাডঅন হালনাগাদ করার সময় অন�গ�রহ করে অপেক�ষা কর"
@@ -2342,49 +2193,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "অ�যাড-অন লোড হওয়ার সময় অন�গ�রহ করে অপেক�ষা কর"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"প�লাংগার - সামনের দিকে ছ�ড়ে মারো প�রতিপক�ষকে টেনে পেছনে ফেলার জন�য,অথবা যখন "
-"ফিরে তাকায় তখন ছ�ড়ে মারো যাতে দেখতে না পায়।"
+msgstr "প�লাংগার - সামনের দিকে ছ�ড়ে মারো প�রতিপক�ষকে টেনে পেছনে ফেলার জন�য,অথবা যখন ফিরে তাকায় তখন ছ�ড়ে মারো যাতে দেখতে না পায়।"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "বাতিল করতে ESC চাপ�ন"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "কী চাপ�ন"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "কনফিগার করতে ডিভাইসে �ন�টার চাপ�ন বা ডাবল ক�লিক কর"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"খেলোয়াড় নিজের কিছ� সম�পাদনা করতে �ন�টার চাপতে হবে বা ডাবল ক�লিক করতে হবে"
+msgstr "খেলোয়াড় নিজের কিছ� সম�পাদনা করতে �ন�টার চাপতে হবে বা ডাবল ক�লিক করতে হবে"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2416,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2425,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "পাফী"
 
@@ -2437,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "বেড়িয়ে যাও"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "রেস স�থাপন"
 
@@ -2476,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "�লোমেলো কার�ট"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "�লোমেলো ট�র�যাক"
 
@@ -2486,82 +2322,68 @@ msgid "Rank"
 msgstr "সারি"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "তৈরি!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "সরিয়ে ফেল"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "প�নরায় নামকরণ কর"
 
@@ -2587,29 +2409,25 @@ msgstr "উদ�ধার কর"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "রেজল�য�শন"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "প�নরায় শ�র� কর"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "প�নরায় রেস শ�র� কর"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2666,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "স�কটল�যান�ড"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2710,12 +2522,10 @@ msgid "Select"
 msgstr "নির�বাচন কর"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "গেম মোড নির�বাচন কর"
 
@@ -2725,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2769,91 +2573,49 @@ msgstr "নির�ধারণ কর!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "নত�ন রেস নির�ধারণ কর"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "বালির সরানো"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "উজ�জ�বল শহরতলি"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2863,7 +2625,6 @@ msgid "Size: %s"
 msgstr "আকার: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2874,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "স�কিন"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "বরফের চূড়া"
 
@@ -2889,28 +2648,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"দ�ঃখিত,অ�যাড-অন ওয়েবসাইটে য�ক�ত  হওয়ার সময় ত�র�টি য�ক�ত হয়েছে। নিশ�চিত কর�ন "
-"যে আপনি ইন�টারনেটের সাথে সংয�ক�ত �বং যে SuperTuxKart �কটি ফায়ারওয়ালের "
-"দ�বারা অবর�দ�ধ না"
+msgstr "দ�ঃখিত,অ�যাড-অন ওয়েবসাইটে য�ক�ত  হওয়ার সময় ত�র�টি য�ক�ত হয়েছে। নিশ�চিত কর�ন যে আপনি ইন�টারনেটের সাথে সংয�ক�ত �বং যে SuperTuxKart �কটি ফায়ারওয়ালের দ�বারা অবর�দ�ধ না"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2918,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "শব�দের প�রভাব"
 
@@ -2927,7 +2680,6 @@ msgstr "শব�দের প�রভাব"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "আদর�শ"
 
@@ -2940,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "গ�র�যান�ড"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "রেস শ�র� কর"
 
@@ -2964,12 +2715,10 @@ msgstr "ডান স�টিয়ার"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2977,84 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Subsea"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart অ�যাডঅন"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart সাহায�য"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart অপশন"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "�কই কম�পিউটারে SuperTuxKart মাল�টিপ�লেয়ার মোডে খেলা যায়"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart ফচার গেমের বিভিন�ন মোড"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"পরিবর�তনকারী - উপহারের বাক�স কলায় রূপান�তরিত হয়ে যায় �বং স�বল�প সময়ের জন�য "
-"উলটভাবে হয়।"
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "পরিবর�তনকারী - উপহারের বাক�স কলায় রূপান�তরিত হয়ে যায় �বং স�বল�প সময়ের জন�য উলটভাবে হয়।"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "আঠা - কার�টকে টেনে তার গতি কমিয়ে দেয়।"
 
@@ -3063,32 +2797,37 @@ msgstr "আঠা - কার�টকে টেনে তার গতি ক
 msgid "System Language"
 msgstr "ভাষা বিষয়ক পদ�ধতি"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "স�টেডিয়াম"
 
@@ -3100,9 +2839,7 @@ msgstr "অপশন পর�দায় অ�যাড-অন মডিউল 
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"সর�বোচ�চ সংখ�যার ফাইলটি খ�ব প�রনো,\n"
-"সকল সর�বোচ�চ সংখ�যার ফাইল ম�ছে ফেলা হয়েছে।"
+msgstr "সর�বোচ�চ সংখ�যার ফাইলটি খ�ব প�রনো,\nসকল সর�বোচ�চ সংখ�যার ফাইল ম�ছে ফেলা হয়েছে।"
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3115,37 +2852,22 @@ msgstr "অন�শীলনের সময়"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"অন�শীলনের সময়: কোনো পাওয়ারআপস নেই, তাই কেবলমাত�র তোমার চালানোর দক�ষতাই �খানে "
-"প�রধঅন বিষয়!"
+msgstr "অন�শীলনের সময়: কোনো পাওয়ারআপস নেই, তাই কেবলমাত�র তোমার চালানোর দক�ষতাই �খানে প�রধঅন বিষয়!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"নত�ন গেমপ�যাড/জয়স�টিক যোগ করতে,শ�ধ� SuperTuxKart সাথে সংযোগ দিয়ে শ�র� কর �বং "
-"�টি তালিকায় প�রদর�শিত হবে।\n"
-"\n"
-"কীবোর�ড কনফিগ যোগ করতে, ত�মি নিচের বাটন ব�যবহার করতে পার,"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "নত�ন গেমপ�যাড/জয়স�টিক যোগ করতে,শ�ধ� SuperTuxKart সাথে সংযোগ দিয়ে শ�র� কর �বং �টি তালিকায় প�রদর�শিত হবে।\n\nকীবোর�ড কনফিগ যোগ করতে, ত�মি নিচের বাটন ব�যবহার করতে পার,"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"জয়লাভে সাহায�য করতে,�খানে কিছ� পাওয়ারআপস দেয়া আছে যা ত�মি সংগ�রহ করতে পার :"
+msgstr "জয়লাভে সাহায�য করতে,�খানে কিছ� পাওয়ারআপস দেয়া আছে যা ত�মি সংগ�রহ করতে পার :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3164,7 +2886,7 @@ msgstr "শীর�ষ %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3178,19 +2900,17 @@ msgstr "ট�র�যাক দ�বারা %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "ট�র�যাক"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3201,24 +2921,21 @@ msgstr "প�নরায় চেষ�টা কর"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "টিউটোরিয়াল : নির�বাচন কক�ষ"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "টাক�স"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3226,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "আনইনস�টল"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3253,8 +2968,8 @@ msgid "Update"
 msgstr "হালনাগাদ কর"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3263,40 +2978,36 @@ msgid "Updated date"
 msgstr "তারিখ হালনাগাদ করা হয়েছে"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "ব�যবহারকারী ইন�টারফেস"
 
@@ -3305,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3326,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3343,27 +3051,23 @@ msgstr "সংস�করণ: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "উলম�ব সিঙ�ক (প�নরায় শ�র� করা প�রয়োজন)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "ভলিউম"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3375,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ভ�ল পথ!"
 
@@ -3386,54 +3090,43 @@ msgid ""
 "working."
 msgstr "সতর�কবানী,'শিফ�ট' প�রস�তাবিত কী না : যখন শিফট কী চাপা হবে,"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "অস�ত�র"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "আবহাওয়ার প�রভাব: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"যখন ইনপ�ট ডিভাইস কনফিগার করা হয়, তখন ত�মি খেলতে প�রস�ত�ত। প�রধান মেন�তে "
-"'মাল�টিপ�লেয়ার রেস' নির�বাচন কর। যখন কার�ট নির�বাচন করার সময় হবে, প�রত�যেক "
-"খেলোয়াড় তাদের গেম প�যাডের বা কীবোর�ডের 'ফায়ার' কী তে চাপ দিবে।প�রত�যেক "
-"খেলোয়াড় তাদের কার�ট নির�বাচন করতে ইনপ�ট ডিভাইস নির�বাচন করতে পারবে। গেম চলবে "
-"তখনি যখন প�রত�যেকে তাদের কার�ট নির�বাচন করবে। উল�লেখ�য যে �ই অপারেশন মাউস "
-"ব�যবহার করা যাবে না।"
+msgstr "যখন ইনপ�ট ডিভাইস কনফিগার করা হয়, তখন ত�মি খেলতে প�রস�ত�ত। প�রধান মেন�তে 'মাল�টিপ�লেয়ার রেস' নির�বাচন কর। যখন কার�ট নির�বাচন করার সময় হবে, প�রত�যেক খেলোয়াড় তাদের গেম প�যাডের বা কীবোর�ডের 'ফায়ার' কী তে চাপ দিবে।প�রত�যেক খেলোয়াড় তাদের কার�ট নির�বাচন করতে ইনপ�ট ডিভাইস নির�বাচন করতে পারবে। গেম চলবে তখনি যখন প�রত�যেকে তাদের কার�ট নির�বাচন করবে। উল�লেখ�য যে �ই অপারেশন মাউস ব�যবহার করা যাবে না।"
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3441,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "উইলবার"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "হ�যা�"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3486,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "ত�মি গ�র�যান�ড প�রিক�স সম�পন�ন করেছো!"
 
@@ -3537,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "ত�মি রেস সমাপ�ত করেছ!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "ত�মি বাদ গিয়েছো!"
 
@@ -3560,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3568,51 +3256,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "ত�মি রেসে জয় লাভ করেছো!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"তোমার কনফিগ ফাইল অসংগঠিত ছিল,তাই �কে ম�ছে ফেলা হয়েছে �বং নত�ন �কটি তৈরি করা "
-"হয়েছে।"
+msgstr "তোমার কনফিগ ফাইল অসংগঠিত ছিল,তাই �কে ম�ছে ফেলা হয়েছে �বং নত�ন �কটি তৈরি করা হয়েছে।"
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "তোমার কনফিগ ফাইল খ�ব প�রানো ছিল,তাই তা ম�ছে ফেলা হয়েছে �বং নত�ন �কটা তৈরি করা হয়েছে।"
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"তোমার কনফিগ ফাইল খ�ব প�রানো ছিল,তাই তা ম�ছে ফেলা হয়েছে �বং নত�ন �কটা তৈরি "
-"করা হয়েছে।"
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3624,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "জেন বাগান"
 
@@ -3635,7 +3328,6 @@ msgstr "[none]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3644,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "দ�বারা"
@@ -3653,42 +3346,25 @@ msgstr "দ�বারা"
 msgid "featured"
 msgstr "বৈশিষ�ট�য"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "আদর�শ"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Mahay Alam Khan https://launchpad.net/~mahayalamkhan"
+msgstr "Launchpad Contributions:\n  Mahay Alam Khan https://launchpad.net/~mahayalamkhan"
diff --git a/data/po/br.po b/data/po/br.po
index ac45b7f04..9dd8c88b5 100644
--- a/data/po/br.po
+++ b/data/po/br.po
@@ -1,23 +1,23 @@
-# Breton translation for stk
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alan Monfort <alan.monfort@free.fr>, 2015
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-18 20:37+0000\n"
-"Last-Translator: Alan <Unknown>\n"
-"Language-Team: Breton <br@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-22 10:15+0000\n"
+"Last-Translator: Alan Monfort <alan.monfort@free.fr>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/supertuxkart/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,26 +28,25 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" C'hwi, avat, paourkaezh penn skañv ne viot ket barrek d' a'm zrec'hiñ - "
-"Roue ar C'hartoù ac'hanon !"
+msgstr " C'hwi, avat, paourkaezh penn skañv ne viot ket barrek d' a'm zrec'hiñ - Roue ar C'hartoù ac'hanon !"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] "Bremañ ez eus %d c'heneil enlinenn."
 msgstr[1] "Bremañ ez eus %d a geneiled enlinenn."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (nammet)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -60,7 +59,7 @@ msgstr "%s Ke"
 msgid "%s MB"
 msgstr "%s Me"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "Enlinenn eo %s ha %s bremañ."
@@ -72,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s gant %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s gant %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "Enlinenn eo %s bremañ."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "Prest eo %s"
@@ -99,25 +97,23 @@ msgstr "Aelad %s"
 msgid "%s's server"
 msgstr "Dafariad %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "Enlinenn eo %s, %s ha %s bremañ."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "Dilamet eo bet '%s'"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Goullo)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(N'eo ket hegerz ar rouedad c'hoari c'hoazh)"
 
@@ -131,45 +127,34 @@ msgstr "* Un elfenn ruz a dalv d'ur c'henniñv er c'hefluniadur bremanel"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Kemmet/gwelet e vez ar berradennoù klavier el lañser Dibarzhioù"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* C'hoariet e vez an darn vuiañ eus ar modoù c'hoari dre vod ur Grand Prix : "
-"e-lec'h c'hoari ur redadeg eeun e vez c'hoariet meur a hini diouzh renk. "
-"Gwell eo da renk, muioc'h a boentoù a dapi. Gant an hini a dapo ar muiañ a "
-"boentoù ez ay ar maout."
+msgstr "* C'hoariet e vez an darn vuiañ eus ar modoù c'hoari dre vod ur Grand Prix : e-lec'h c'hoari ur redadeg eeun e vez c'hoariet meur a hini diouzh renk. Gwell eo da renk, muioc'h a boentoù a dapi. Gant an hini a dapo ar muiañ a boentoù ez ay ar maout."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Adloc'hañ STK da seveniñ an arventennoù nevez"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Ar c'hefluniadur da arverañ a vo despizet hervez ar stokell 'Diuzañ' pouezet warni da vont d'ar c'hoari."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -200,13 +185,10 @@ msgstr "Kad dre 3 lod"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Kad dre 3 lod : c'hoari liesc'hoarier nemetken. Sko ar re all gant armoù "
-"betek ma kollint o buhezioù holl."
+msgstr "Kad dre 3 lod : c'hoari liesc'hoarier nemetken. Sko ar re all gant armoù betek ma kollint o buhezioù holl."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -221,23 +203,20 @@ msgid "9 months"
 msgstr "9 miz"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Eriñvoù uhelañ ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Kartoù Al"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Dilezel Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Diwar-benn"
 
@@ -246,39 +225,35 @@ msgstr "Diwar-benn"
 msgid "Accelerate"
 msgstr "Herrekaat"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Herreka ha pouez war ar stokell <%s> en ur dreiñ da ziflipañ. Aesoc'h e vo "
-"deoc'h treiñ buanoc'h dre ziflipañ un tammig da gemer kammdroioù lemm."
+msgstr "Herreka ha pouez war ar stokell <%s> en ur dreiñ da ziflipañ. Aesoc'h e vo deoc'h treiñ buanoc'h dre ziflipañ un tammig da gemer kammdroioù lemm."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Herreka gant  <%s> ha stur gant <%s> ha <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Asañtiñ"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Atoradur ar gont"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Arventennoù ar gont"
 
@@ -286,10 +261,9 @@ msgstr "Arventennoù ar gont"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Redadegoù echu"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
@@ -297,15 +271,13 @@ msgstr "Gwered"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Ouzhpennañ"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Ouzhpennañ ur c'heneil"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -314,7 +286,6 @@ msgstr "Ouzhpennañ kefluniadur ur c'havier"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Ouzhpennañ ur c'hoarier"
 
@@ -325,32 +296,29 @@ msgstr "Ouzhpennañ ur Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Ouzhpennañ un drobarzhell"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Ouzhpennañ un arveriad"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Askouezhioù"
 
@@ -360,99 +328,91 @@ msgstr "Anv an askouezh"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Askouezhioù"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumi"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Eoulsan kempleshoc'h (gouleier, h.a.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "An holl anezho"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "An holl loabroù"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Aotreet eo an holl walldaolioù, neuze tap armoù ha bez speredek ganto !"
+msgstr "Aotreet eo an holl walldaolioù, neuze tap armoù ha bez speredek ganto !"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
+msgstr "Diskouez bepred ar skramm kennaskañ"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "C'hoarvezet ez eus bet ur fazi e-pad ma oa oc'h enrollañ ar grand prix."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Eor - gorrekaat a ra kreñv ar c'hart el lec'hiadur kentañ."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Tudennoù blivet"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Tudennoù blivet : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Gweledva blivet"
 
@@ -460,56 +420,52 @@ msgstr "Gweledva blivet"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Gweledva blivet : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Annebahelek x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Annebahelek x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Annebahelek x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Annebahelek x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Ur grand prix all ez eus endeo gant an hevelep anv."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Lufrañ"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Lufrañ : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Seveniñ"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Seveniñ an diarunusted nevez"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -522,51 +478,46 @@ msgstr "Ha sur out e fell dit dilemel ar c'hefluniadur-mañ da vat ?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Ha fellout a ra deoc'h dilemel '%s' ?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenaoù"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Tro dro d'an tour tan"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Dezverkañ netra"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Deverkañ d'ar stokell ACAP"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "E debenn ar bed"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Aodio"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Tremen e-bioù ar bananez !"
 
@@ -588,123 +539,102 @@ msgstr "Ahel %d %s"
 msgid "Axis %d inverted"
 msgstr "Ahel %d tuginet"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Distro"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Distreiñ d'ar c'hoari"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Distreiñ d'ar redadeg"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Distreiñ da ziuzad an daeoù"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Distreiñ d'ar roll trobarzhelloù"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Distreiñ d'al lañser"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Distreiñ d'al lañser"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Karour Bananez"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basket Ball - dazlammat a ra war-lerc'h ar penn, ha marteze e flastro kartoù "
-"ha kartoù all vo daleet war an hent."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basket Ball - dazlammat a ra war-lerc'h ar penn, ha marteze e flastro kartoù ha kartoù all vo daleet war an hent."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Enezenn ar gad"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Gwell e vo ar wech a zeu !"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Uelinennek"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Du"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Annez an drogenn du"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Ar maout gant ar skipailh glas"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Porzh-saout"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Boul vowling - dazlammat a ra ouzh ar mogerioù. Mar kilselli e vo bannet war-"
-"gil."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Boul vowling - dazlammat a ra ouzh ar mogerioù. Mar kilselli e vo bannet war-gil."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -712,70 +642,58 @@ msgid "Brake"
 msgstr "Starderez"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Gom chaokat - en em warez gant ur skoed pe gra gantañ en ur gilsellout da "
-"leuskel ur boullenn roz ha pegus war da lerc'h."
+msgstr "Gom chaokat - en em warez gant ur skoed pe gra gantañ en ur gilsellout da leuskel ur boullenn roz ha pegus war da lerc'h."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Ur c'hrouadur a-feson ez on-me, neuze e kinnigan ur marc'had dit."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Gwastell - bannet ouzh ar c'hart tostañ, efedusoc'h a-dost gant un hentoù "
-"eeun."
+msgstr "Gwastell - bannet ouzh ar c'hart tostañ, efedusoc'h a-dost gant un hentoù eeun."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "N'haller ket tizhout dafariad stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Dilezel"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Nullañ ar goulenn"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -783,90 +701,76 @@ msgid "Cancel/Back"
 msgstr "Dilezel/Distreiñ"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Echuet eo bet an dae"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "C'hwitet eo bet an dae"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Daeoù : Sal ar c'hiboù"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Kemmañ"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Dibab ur c'hart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Kristobal Kolombus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klik amañ da lenn ar c'helennskrid"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Serriñ"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Templ Kokoa"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Dastumit 5 bananezenn da vihanañ e-pad ur redadeg."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Dastum boestadoù glas : ganto e teuy armoù ha galloudoù dit"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Dastum boestadoù profoù ha gra gant an arm gant <%s> da zistrujañ ar "
-"boestadoù-mañ !"
+msgstr "Dastum boestadoù profoù ha gra gant an arm gant <%s> da zistrujañ ar boestadoù-mañ !"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Dastum boutailhadoù nitro (ganto e vo graet goude ar gammdro)"
 
@@ -876,19 +780,15 @@ msgstr "Dastum nitro !"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Dastum nitro a ro tro dit da gaout dreist-tizh pa 'z po c'hoant en ur "
-"bouezañ war ar stokell dereat. Diskouezet  eo da live nitro war ur varrenn a "
-"zo war tu dehou skramm ar c'hoari."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Dastum nitro a ro tro dit da gaout dreist-tizh pa 'z po c'hoant en ur bouezañ war ar stokell dereat. Diskouezet  eo da live nitro war ur varrenn a zo war tu dehou skramm ar c'hoari."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Echuit an holl zaelioù da zibrennañ an nor vras !"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
@@ -899,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Kadarnaat"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -911,190 +811,166 @@ msgstr "Kadarnaat an diarunusted a-benn %i eilenn"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Kennaskañ ouzh Internet"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Kennask da wiimote ouzh ardoer ar Bluetooth ha klik war Mat eo. Titouroù "
-"ouzhpenn e supertuxkart.net/Wiimote"
+msgstr "Kennask da wiimote ouzh ardoer ar Bluetooth ha klik war Mat eo. Titouroù ouzhpenn e supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "N'eus galloud ebet, pouezus eo da varregezh vleinañ hepken"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Kenderc'hel"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Kenderc'hel"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Reolerezhioù"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Eilañ"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "N'haller ket krouiñ ar c'hoarier '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "N'haller ket dinoiñ ur wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Krouiñ"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Krouiñ un dafariad"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Krouiñ un arveriad"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Krouadur un dafariad"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Trugarez da"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Ger-tremen bremanel"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Didalvoud eo ar ger-tremen bremanel"
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "N'eo ket kennasket bremañ"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personelaet"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Arventennoù personelaet..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "Afell groaz diskenn"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "Afell groaz kleiz"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "Afell groaz dehou"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "Afell groaz sevel"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Nac'hañ"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Dre ziouer"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Dilemel"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Diverkañ ar c'hefluniadur"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Donder an noñv"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Donder an noñv : %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1104,34 +980,33 @@ msgstr "Diweredekaat an drobarzhell"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Diweredekaet"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Skrammañ FPS (Skeudennoù Dre Eilenn)"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Ha fellout a ra deoc'h dilezel ar Grand Prix da vat ?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ha fellout a ra deoc'h dilemel ar c'hoarier '%s' ?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Ha fellout a ra deoc'h enrollañ ho kemmoù ?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Arabat herrekaat kent Kae"
 
@@ -1142,29 +1017,26 @@ msgstr "Diskenn"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Bleinañ dre an tu gin"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Gouleier dialuskel : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Embann"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Embann ar Grand Prix"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1173,7 +1045,6 @@ msgstr "Kerc'hat vioù"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Kerc'hat vioù  : Ergerzh dre loabroù da gavout vioù kuzh."
 
@@ -1183,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Vioù : %d /%d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Olifphpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Dilamet"
 
@@ -1196,24 +1066,22 @@ msgstr "Dilamet"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Postel"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Hirder ur postel a rank bezañ etre 4 ha 50 arouezenn !"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Didalvoud eo ar postel"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Ne glot ket ar posteloù !"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1225,65 +1093,61 @@ msgstr "Gweredekaat an drobarzhell"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Gweredekaet"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Gweredekaet evit an holl anezho"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Enankañ anv ar c'hoarier nevez"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Fazi e-pad ma oa o pellgargañ ar c'heleier : '%s'"
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Pep hini ac'hanoc'h :\n"
-"Pouezit war 'Diuzañ' bremañ\n"
-"da gemer perzh er c'hoari !"
+msgstr "Pep hini ac'hanoc'h :\nPouezit war 'Diuzañ' bremañ\nda gemer perzh er c'hoari !"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Kont enlinenn ez eus anezhi"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Kuitaat"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Kuitaat ar redadeg"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Kuitaat ar c'hoari"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Mailh"
 
@@ -1291,12 +1155,12 @@ msgstr "Mailh"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Ergerzh dre loabroù da gavout an holl vioù kuzh."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1309,33 +1173,31 @@ msgstr ""
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "O kerc'hat keneiled"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "O kerc'hat ar mouezhiañ diwezhañ"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "O kerc'hat dafariadoù"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Leugnit an anv arveriad hag ar postel hoc'h eus roet e-pad ar marilhañ da vezañ gouest da adderaouekaat ho ker-tremen."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Tro diwezhañ !"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Kavout un dafariad"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1344,21 +1206,14 @@ msgstr "Tan"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Da gentañ e vo ret deoc'h kaout meur a zornell c'hoari (an doare gwellañ eo "
-"da c'hoari gant meur a zen). Kae betek skramm ar c'hefluniañ hag arventenn "
-"an dornelloù. C'hoariet e vez gant ar c'hlavier ivez. Ezhomm a vo strolladoù "
-"stokelloù disheñvel gant pep c'hoarier. Koulskoude ne vez ket ar c'hlavieroù "
-"an trobarzhelloù dereatañ evit c'hoari gant meur a zen rak ne c'houzañvont "
-"ket un niver re vras a bouezadennoù war ar stokelloù."
+msgstr "Da gentañ e vo ret deoc'h kaout meur a zornell c'hoari (an doare gwellañ eo da c'hoari gant meur a zen). Kae betek skramm ar c'hefluniañ hag arventenn an dornelloù. C'hoariet e vez gant ar c'hlavier ivez. Ezhomm a vo strolladoù stokelloù disheñvel gant pep c'hoarier. Koulskoude ne vez ket ar c'hlavieroù an trobarzhelloù dereatañ evit c'hoari gant meur a zen rak ne c'houzañvont ket un niver re vras a bouezadennoù war ar stokelloù."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1371,55 +1226,51 @@ msgstr "Heuilh ar Penn !"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Heuilh ar penn : klask chom war an eil renk. Dilamet e vo ar c'hart diwezhañ "
-"ha lakaet da vann e vo ar gonterez. Taol evezh : mard i dreist ar penn e vi "
-"dilamet ivez !"
+msgstr "Heuilh ar penn : klask chom war an eil renk. Dilamet e vo ar c'hart diwezhañ ha lakaet da vann e vo ar gonterez. Taol evezh : mard i dreist ar penn e vi dilamet ivez !"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Kreñvlec'h Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Kavet ez eus bet %d wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Kavet ez eus bet %d wiimote"
+msgstr[1] "Kavet ez eus bet %d wiimote"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Dilamet eo bet ar c'heneil !"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Asantet eo bet goulenn ar c'heneil !"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Dilezet eo bet goulenn ar c'heneil !"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Nac'het eo bet goulenn ar c'heneil !"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Kaset eo bet goulenn ur c'heneil !"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Keneiled"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Skrammad a-bezh"
 
@@ -1433,24 +1284,21 @@ msgstr "PAL !"
 msgid "Game Keys"
 msgstr "Stokelloù ar c'hoari"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modoù c'hoari"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Rizh ar c'hoari (bevenn ar palioù / bevenn an amzer)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1464,51 +1312,45 @@ msgstr "Afell %d an dornell c'hoari"
 msgid "Gamepad hat %d"
 msgstr "Dornell c'hoari %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Hollek"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Dilezel ar redadeg"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Goulaouder hollek"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Goulaouder hollek : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Skleur (trolinennoù)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Skleur (trolinennoù) : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1518,61 +1360,53 @@ msgid "Go!"
 msgstr "Kit !"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Bleiner alaouret "
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Enezenn Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Embanner Grand Prix"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Embanner Grand Prix"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Araokadur ar Grand Prix :"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Live an efedoù kevregat"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Kevregadoù"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Arventennoù ar c'hevregadoù"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Traonienn c'hlas"
 
@@ -1585,16 +1419,14 @@ msgstr "Kouviad"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Ostiz %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1604,117 +1436,105 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Skoazell"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Heksley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Eriñvoù uhelañ"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Stekiñ 10 kart gant ur voul vowling."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Sko ar re all gant armoù betek ma vo kollet o buhezioù holl ganto (Gant ar "
-"c'hoari gant meur a c'hoarier nemetken)"
+msgstr "Sko ar re all gant armoù betek ma vo kollet o buhezioù holl ganto (Gant ar c'hoari gant meur a c'hoarier nemetken)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Stokit an hevelep kart 5 gwech da vihanañ e-pad ur redadeg."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "C'hoarion dud nemetken"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "A-du on gant ar termenoù amañ a-us ha 13 bloaz tremenet ez on."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Mar bez trec'h warnon e-pad ar redadeg e laoskin an den kozh."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Mar gweli un afell gant ur c'hadranas evel hennezh e vo ret dit echuiñ an "
-"dae d'e zilemel."
+msgstr "Mar gweli un afell gant ur c'hadranas evel hennezh e vo ret dit echuiñ an dae d'e zilemel."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Siwazh '%s', erruet out re ziwezhat da gemer perzh er c'hoari !"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Staliañ"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Etre"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Diweredekaet eo haeziñ ouzh Internet, gweredekait an haeziñ en dibarzhioù, mar plij"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Un dresadenn eo"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Ur c'hevrin eo"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Kevreañ"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "An dafariad kevreañ"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kartoù"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Mirout an diarunusted"
 
@@ -1725,7 +1545,7 @@ msgstr "Chom tost ouzh ar penn, arabat mont dreistañ, avat !"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Berradennoù klavier"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1733,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Klavier %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konki"
 
@@ -1742,14 +1561,14 @@ msgstr "Konki"
 msgid "Lap"
 msgstr "Tro"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Tro %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Troioù"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1769,85 +1588,81 @@ msgstr "Kleiz"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Distokell gleiz"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Afell biz meud kleiz"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Diskenn biz meud kleiz"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Kleiz biz meud kleiz"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Dehou biz meud kleiz"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Sevel biz meud kleiz"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Draen kleiz"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "O kargañ"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Rakkambr"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Arventennoù ar rakkambr"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "Anv lec'hel"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Prennet"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Prennet :"
 
@@ -1855,13 +1670,53 @@ msgstr "Prennet :"
 msgid "Locked!"
 msgstr "Prennet !"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Kennaskañ"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Digennaskañ"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Kennasket evel : %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "O kennaskañ"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "O kennaskañ '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Mard oc'h kennasket evel un den pedet ho po an aotre da gemer perzh er redadegoù enlinenn. N'ho po ket ar gwir  da vouezhiañ evit an askouezhioù, avat pe zastum taolioù berzh ar redadegoù echu e-pad ma viot enlinenn."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "O tikennaskañ"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "O tikennaskañ '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Kennaskañ"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1870,46 +1725,35 @@ msgstr "Kilsellout"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Klask keneiled all :"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Ober 5 rikladur e korf un dro hepken."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Ober ur redadeg gant 5 tro pe muioc'h."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratonour"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Niver uc'hek a c'hoarierion"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Amzer uc'hek (mun.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Me nemetken"
 
@@ -1919,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Stokelloù evit al lañser"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Golf bihan"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Chaseour pikerezed"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Ruzed dre fiñval"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Ruzed dre fiñval : %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Ahel al logodenn %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1949,98 +1797,97 @@ msgstr "Afell al logodenn %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Diskenn"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Sevel"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Liesc'hoarier"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Liesc'hoarier"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Sonerezh"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Anv"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Etre 4 ha 30 arouezenn e rank bezañ hirder un anv !"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Goullo eo an anv."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Re hir eo an anv."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
-msgstr ""
+msgstr "Anv an dafariad"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Poull Nessie"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Nevez"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "Hegerz eo ar Grand Prix nevez '%s' bremañ"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Kont enlinenn nevez"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Ger-tremen nevez"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Goulenn nevez"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "Hegerz eo an diaester nevez '%s' bremañ"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Tro herrekañ nevez"
 
@@ -2068,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Dae an Nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Ket"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Tra ebet"
 
@@ -2090,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Redadeg reizh"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Bod ar C'hreiznoz"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Mard deui a-benn da ziflipañ e-pad un toulladig eilennoù e vi garedoned gant "
-"da dizh kreskaet !"
+msgstr "Mard deui a-benn da ziflipañ e-pad un toulladig eilennoù e vi garedoned gant da dizh kreskaet !"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Deraouad"
 
@@ -2117,107 +1959,101 @@ msgstr "Kartoù bleinet gant an urzhiataer : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Kartoù bleinet gant an urzhiataer"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Niver a balioù evit gounit"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Niver a droioù"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Niver a droioù :"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Mat eo"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Er-maez eus an hentoù fraeet"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Ezlinenn"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Kont ezlinenn"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "O ya, sell, em c'hastell emañ bremañ ha debret e vo da goan..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Mengleuz kozh"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Klas jedoniezh Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Enlinenn"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Liesc'hoarierion enlinenn"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Anv arveriad enlinenn"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Etre 3 ha 30 arouezenn e rank bezañ gant an anvioù arveriaded enlinenn !"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Un anv arveriad enlinenn n'hall ket kregiñ gant ur sifr !"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Mestr ar c'hoari hepken zo gouest d'ober un dra bennak bremañ !"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Hopala ! Mar teuy kudennoù ouzhit, pouez war  <%s> da vezañ sikouret"
@@ -2228,62 +2064,54 @@ msgstr "Hopala ! Mar teuy kudennoù ouzhit, pouez war  <%s> da vezañ sikouret"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Dibarzhioù"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Alberz"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Harz-lamm - gorrekaat a ra an holl gartoù dirazout."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Ger-tremen"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Ger-tremen :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Kemm ar ger-tremen"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Etre 8 ha 30 arouezenn e rank bezañ gant ar gerioù-tremen !"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Kemmet eo bet ar ger-tremen gant berzh."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Ne glot ket ar gerioù-tremen !"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2292,68 +2120,71 @@ msgstr "Ehanañ ar c'hoari"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Ehanet"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Kastiz amzer !!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "War c'hortoz"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Tachenn c'hoari ar mank"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "O vouezhiañ"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "C'hoari an holl anezho"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "C'hoari gant pep loabr kefridiel ur wech da vihanañ."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "C'hoarierion"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Un aelad nammet (diaesoc'h) a vez diuzet gant ar c'hoarierion diwar skramm diuzañ ar c'hartoù"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Mar plij, biziatait anv ar grand prix"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Mar plij, adkeflugn da vlokadoù stokelloù"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Mar plij, lenn an termenoù hag an amplegadoù"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Gortoz, mar plij, e-pad m'emañ an askouezhioù o vezañ hizivaet"
@@ -2363,46 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Gortoz, mar plij, e-pad m'emañ an askouezhioù o vezañ karget"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Mandoz - bannañ war-eeun da sachañ un enebour war-gil pe vannañ en ur "
-"gilsellout da zallañ an enebour."
+msgstr "Mandoz - bannañ war-eeun da sachañ un enebour war-gil pe vannañ en ur gilsellout da zallañ an enebour."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Pouez war <%s> da gilsellout. Tenn gant an arm gant <%s> ha pouez war <%s> diouzh an dro da gildennañ !"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pouez war ACHAP da zilezel"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Pouezañ war ur stokell"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Pouez war Enankañ pe zaouglik war un drobarzhell d'he c'hefluniañ"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Pouez war Enankañ pe zaouglik war ur c'hoarier d'e zaskemmañ"
 
@@ -2418,9 +2241,7 @@ msgstr "Pouez war Tan da loc'hañ an dae"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Pouez war an afell 1 + 2 a-gevred war da wiimote d'he lakaat e mod an "
-"dizoleiñ, neuze klik war OK. Titouroù ouzhpenn e supertuxkart.net/Wiimote"
+msgstr "Pouez war an afell 1 + 2 a-gevred war da wiimote d'he lakaat e mod an dizoleiñ, neuze klik war OK. Titouroù ouzhpenn e supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2438,16 +2259,14 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Aelad"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Araokadur"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffi"
 
@@ -2455,37 +2274,31 @@ msgstr "Puffi"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Bount ar vell e-barzh kaoued ar skipailh all da verkañ palioù (c'hoarioù "
-"liesc'hoarier nemetken)"
+msgstr "Bount ar vell e-barzh kaoued ar skipailh all da verkañ palioù (c'hoarioù liesc'hoarier nemetken)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "C'hoari prim"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Kuitaat an darafiad."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Arventennañ ar redadeg"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Dargouezhek"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2493,15 +2306,15 @@ msgstr "Arena dargouezhek"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Grand Prix dargouezhek"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Kart dargouezhek"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Loabr dargouezhek"
 
@@ -2510,84 +2323,68 @@ msgid "Rank"
 msgstr "Renk"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Priziadur >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Prientit !"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Ar maout gant ar skipailh ruz"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Marilhañ"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Redadeg voutin : aotreet eo an holl walldaolioù, neuze tap armoù ha bez "
-"speredek ganto !"
+msgstr "Redadeg voutin : aotreet eo an holl walldaolioù, neuze tap armoù ha bez speredek ganto !"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Adkargañ"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Derc'hel soñj er ger-tremen"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Derc'hel soñj e lec'hiadur ar prenestr"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Dilemel"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Adenvel"
 
@@ -2613,35 +2410,31 @@ msgstr "Sikour"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Diarunusted"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Adloc'hañ"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Adloc'hañ ar redadeg"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Tuginañ"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Tuginañ :"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Tuginet"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2651,18 +2444,18 @@ msgstr "Dehoù"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Distokell dehou"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Afell biz meud dehou"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Biz meud dehou da ziskenn"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
@@ -2686,49 +2479,43 @@ msgstr ""
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Draen dehou"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "TIZH"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "Embregerezh STK"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara ar rederez"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Sara ar strobinellerez"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Enrollañ"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Enrollañ ar Grand Prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Bro Skoz"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Klask"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "O klask"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2736,57 +2523,49 @@ msgid "Select"
 msgstr "Diuzañ"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Diuzañ un diaester"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Diuzañ ur mod c'hoari"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Diuzañ ul loabr"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Diuzañ ur c'hart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Kas stadegoù dizanv a-fet periant"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Krouiñ un dafariad"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Titouroù diwar-benn an dafariad"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Diuzad an dafariad"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Anv an dafariad :"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Krouet eo bet an dafariad gant berzh. Bremañ e c'hallit mont di."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2795,93 +2574,51 @@ msgstr "Evezh !"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Arventennañ ur redadeg nevez"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Skeudoù"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Skeudoù : %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Skeudoù : %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Bouktraezh"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Banlevioù lugernus"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Emezellañ"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Emezellañ evel ostiz"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Abaoe"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "C'hoarier en e unan"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2889,9 +2626,8 @@ msgid "Size: %s"
 msgstr "Ment: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Goueled"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2900,12 +2636,10 @@ msgstr "Diflipañ"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Neuz"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Menez gant erc'h"
 
@@ -2915,30 +2649,23 @@ msgid "Soccer"
 msgstr "Mell droad"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Tachenn vell droad"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Mell droad : C'hoarioù liesc'hoarier nemetken. Gra gant da gart da voutañ ar "
-"vell e-barzh ar pal."
+msgstr "Mell droad : C'hoarioù liesc'hoarier nemetken. Gra gant da gart da voutañ ar vell e-barzh ar pal."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Digarez,, degouezhet ez eus ur fazi e-pad ma oa o kehentiñ gant lec'hienn an "
-"askouezhioù. Bez sur ez out kennasket ouzh internet ha n'eo ket gannet "
-"SuperTuxKart gant un danvoger"
+msgstr "Digarez,, degouezhet ez eus ur fazi e-pad ma oa o kehentiñ gant lec'hienn an askouezhioù. Bez sur ez out kennasket ouzh internet ha n'eo ket gannet SuperTuxKart gant un danvoger"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2946,7 +2673,6 @@ msgstr "diflip war an tu Digarez, c'hwitadenn war pellgargañ an askouezhioù"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efedoù son"
 
@@ -2955,30 +2681,28 @@ msgstr "Efedoù son"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Skoueriek"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Loc'hañ"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Loc'hañ ar Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Loc'hañ ar redadeg"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Stad"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2992,98 +2716,80 @@ msgstr "Diflip war an tu dehou"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Mod an istor"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Strike !"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Kas"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Dindan ar mor"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTuks"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Askouezhioù evit SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Skoazell SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Dibarzhioù SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"C'hoariet e vez SuperTuxKart er mod liesc'hoarier gant an hevelep urzhiataer"
+msgstr "C'hoariet e vez SuperTuxKart er mod liesc'hoarier gant an hevelep urzhiataer"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart a ginnig meur a vod c'hoari"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "Gouest eo SuperTuxKart d'en em gennaskañ ouzh un dafariad da bellgargañ askouezhioù ha kas kemennoù deoc'h a-fet rebuzadurioù. Stadegoù dizanv a-zivout ar periant a zastumomp ivez da reiñ skoazell da ziorrenn STK. Lennit hor reolennoù a-fet buhez prevez, mar plij e http://privacy.supertuxkart.net. Ha fellout a ra deoc'h gweredekaat ar c'heweriuster-mañ ? (Da gemmañ an dibarzh-mañ, kit d'an dibarzhioù, diuzit an ivinell 'Ketal an arveriad' ha kemmit \"Kennaskañ ouzh an Internet\" ha \"Kas stadegoù dizanv a-fet periant\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanna"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Kevamsavell - boestadoù profoù a ya da vananezennoù hag ar c'hontrefed e-pad "
-"ur predig."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Kevamsavell - boestadoù profoù a ya da vananezennoù hag ar c'hontrefed e-pad ur predig."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Kelienouer - flastra a ray ar c'hartoù o tostañ d'o c'horrekaat."
 
@@ -3092,34 +2798,37 @@ msgstr "Kelienouer - flastra a ray ar c'hartoù o tostañ d'o c'horrekaat."
 msgid "System Language"
 msgstr "Yezh ar reizhiad"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Gwel da enebouion evel ma vije pikerezed ! Flastr 5 anezho da vihanañ gant al lopell."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Templ"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Termenoù hag Aotreoù"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Koazhadur ar wiadezh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Silañ gwiadezhioù"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Ar stokell 'Diflipañ' a ro tro dit da ziflipañ e kammdroioù lemm ha da "
-"wellat da dizh."
+msgstr "Ar stokell 'Diflipañ' a ro tro dit da ziflipañ e kammdroioù lemm ha da wellat da dizh."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Ar Stadiom"
 
@@ -3131,13 +2840,11 @@ msgstr "Gweredekaet eo bet mollad an askouezhioù war skrammad an dibarzhioù"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Re gozh e oa an eriñvoù uhelañ,\n"
-"diverket int bet holl."
+msgstr "Re gozh e oa an eriñvoù uhelañ,\ndiverket int bet holl."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "An niver uc'hek a c'hoarierion a rank bezañ etre 2 ha 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3146,47 +2853,29 @@ msgstr "A-enep an amzer"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"A-enep an amzer : N'eus galloud ebet, pouezus eo da varregezh vleinañ hepken "
-"!"
+msgstr "A-enep an amzer : N'eus galloud ebet, pouezus eo da varregezh vleinañ hepken !"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Evit ouzhpennañ dornelloù c'hoari nevez, loc'h SuperTuxKart gant da "
-"zornelloù kennasket ha war ar roll ez aint war-wel.\n"
-"\n"
-"Evit ouzhpennañ ur c'hefluniadur evit ar c'hlavier, gra gant an afell amañ "
-"dindan. KOULSKOUDE, arabat disoñjal ne vez ket gouzañvet kalz "
-"kenbouezadurioù ha ur c'hlavier n'eo ket a pep dereatañ evit ar mod "
-"liesc'hoarier. Meur a glavier a c'hall bezañ kennasket koulskoude. Blokadoù "
-"stokelloù disheñvel a vo ezhomm gant pep hini anezho)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Evit ouzhpennañ dornelloù c'hoari nevez, loc'h SuperTuxKart gant da zornelloù kennasket ha war ar roll ez aint war-wel.\n\nEvit ouzhpennañ ur c'hefluniadur evit ar c'hlavier, gra gant an afell amañ dindan. KOULSKOUDE, arabat disoñjal ne vez ket gouzañvet kalz kenbouezadurioù ha ur c'hlavier n'eo ket a pep dereatañ evit ar mod liesc'hoarier. Meur a glavier a c'hall bezañ kennasket koulskoude. Blokadoù stokelloù disheñvel a vo ezhomm gant pep hini anezho)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Dastum galloudoù, aesoc'h e vo dit gounit :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Betek al loar ha distreiñ"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Hiziv"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3196,12 +2885,12 @@ msgstr "Top %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Loabr"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Loabr %i%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3212,19 +2901,17 @@ msgstr "Loabr gant %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Strollad loabroù"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Loabroù"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinennek"
 
@@ -3235,47 +2922,42 @@ msgstr "Klask en-dro"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Kelennskrid"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Kelennskrid : Sal diuzañ"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tuks"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Rizh :"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Rizh : Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "N'haller ket kennaskañ ouzh an dafariad. Gwiriit ho kennask ouzh Internet pe glaskit diwezhatoc'h."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Distaliañ"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Anarsavadus"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3287,8 +2969,8 @@ msgid "Update"
 msgstr "Hizivaat"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Hizivaet"
 
@@ -3297,78 +2979,71 @@ msgid "Updated date"
 msgstr "Deiziad hizivaet"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Gra gant 10 pe vuioc'h a c'halloudoù en ur redadeg."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Arverañ gwiadezhioù uhel o diarunusted"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Gra gant kleiz/dehou da zibab da skipailh ha leuskel tan"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Arver an nitro bet tapet ganit dre bouezañ <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Titouroù an arveriad"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Ketal an arveriad"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Despizet eo bet an arveriad"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Klask an arveriad"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Anv arveriad"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Didalvoudek eo an anv arveriad pe/hag ar chomlec'h."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "a-enep"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Talvoudekadur an titouroù"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3377,39 +3052,35 @@ msgstr "Handelv : %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Goubredañ a-serzh (ret e vo adloc'hañ)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Gwelout"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Tregern"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Mouezhiañ"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Mouezhiaet gant berzh ! Serriñ ar prenestr a c'hallit bremañ."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "POUEZ"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "HENT FALL !"
 
@@ -3418,140 +3089,121 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Evezh, 'Pennlizherenn' n'eo ket ur stokell erbedet : mar bez pouezet warni "
-"ned ay ket en-dro ar stokelloù gant un arouezenn disheñvel warno."
+msgstr "Evezh, 'Pennlizherenn' n'eo ket ur stokell erbedet : mar bez pouezet warni ned ay ket en-dro ar stokelloù gant un arouezenn disheñvel warno."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armoù"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efedoù hin"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efedoù hin : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Petra zo fall ganit, hipied kaezh ? Ho penn gnu a vankfe ?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Ur wech kefluniet an dornelloù ez out prest da c'hoari. Diuz ar 'redadeg "
-"liesc'hoarier' diwar al lañser pennañ. Ur wech dibabet e gart e pouez pep "
-"c'hoarier war ar stokell 'Tan' eus e zornell da vont d'ar c'hoari. Graet e "
-"vez gant e zornell da ziuzañ e gart. Ne vez ket graet gant al logodenn evit "
-"ober an dra-se."
+msgstr "Ur wech kefluniet an dornelloù ez out prest da c'hoari. Diuz ar 'redadeg liesc'hoarier' diwar al lañser pennañ. Ur wech dibabet e gart e pouez pep c'hoarier war ar stokell 'Tan' eus e zornell da vont d'ar c'hoari. Graet e vez gant e zornell da ziuzañ e gart. Ne vez ket graet gant al logodenn evit ober an dra-se."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Gwenn"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Gounit 5 redadeg eeun diouzh renk."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Gounez en holl vodoù gant ur c'hoarier eeun a-enep 3 enebour da vihanañ."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Ksue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ya"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Prest out da gemer perzh er redadeg bremañ. Chañs vat !"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Emaoc'h o c'hoari evel"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Daskemm ar feur lakaet a-raok en ur glikañ war ar steredennoù amañ dindan."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "N'hallez ket pellgargañ askouezhioù hep ur c'hennask ouzh internet. Mar fell dit pellgargañ askouezhioù, kae d'an dibarzhioù, diuz an ivinell 'Ketal an arveriad' ha kemm \"Kennaskañ ouzh internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "N'hallez ket c'hoari enlinenn hep ur c'hennask ouzh internet. Mar fell dit c'hoari enlinenn, kae d'an dibarzhioù, diuz an ivinell 'Ketal an arveriad' ha kemm \"Kennaskañ ouzh internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Gallout a rez c'hoari hep krouiñ ur gont enlinenn en ur ziuzañ ur gont ezlinenn. Koulskoude, n'hallez ket kennaskañ ouzh keneiled, mouezhiañ evit askouezhioù, h.a. Mar plij, lenn hon diskleriadenn war http://privacy.supertuxkart.net "
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Echuet ec'h eus un dae !"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Echuet ec'h eus daeoù !"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Echuet ec'h eus ar Grand Prix !"
 
@@ -3559,33 +3211,35 @@ msgstr "Echuet ec'h eus ar Grand Prix !"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Echuet ec'h eus an dael diaes ! Poentoù gounezet gant al live-mañ : %i%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Echuet ec'h eus an dael aes ! Poentoù gounezet gant al live-mañ : %i%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Echuet ec'h eus an dael etre ! Poentoù gounezet gant al live-mañ : %i%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Echuet ec'h eus ar redadeg !"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "%d goulenn a-berzh ur c'heneil nevez hoc'h eus !"
+msgstr[1] "%d a c'houlennoù a-berzh keneiled nevez hoc'h eus !"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Ur goulenn hoc'h eus a-berzh ur c'heneil !"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Dilamet out bet !"
 
@@ -3593,75 +3247,78 @@ msgstr "Dilamet out bet !"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "N'hoc'h eus ket mouezhiet evit an enlugellad-mañ c'hoazh. Diuzit ar feur a fell deoc'h en ur glikañ war ar steredennoù amañ dindan"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Muioc'h a boentoù hoc'h eus ezhomm\nda vont d'an dael-mañ !\nTaolit ur sell ouzh ar gartenn vihan\nda gavout daeloù hegerz."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Ret eo deoc'h biziata ur ger-tremen."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Dibrennet ec'h eus ar Grand Prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Dibrennet ec'h eus al loabr %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ur postel a zegeremot gant titouroù ouzhpenn evit gouzout penaos adderaouekaat ho ker-tremen. Gortozit un tamm ha taolit ur sell ouzh ar pod lastez."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ur postel a zegeremot gant titouroù ouzhpenn evit gouzout penaos deraouekaat ho kont. Gortozit un tamm ha taolit ur sell ouzh ar pod lastez."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Aet eo ar maout ganit !"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Re gozh e hañval bezañ handelv hoc'h OpenGL. Klaskit kavout un hizivadenn evit ho stur video. OpenGL 3.1 pe nevesoc'h ho po ezhomm gant SuperTuxKart."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Kempennet fall e oa da gefluniadur neuze eo bet diverket ha krouet e vo unan "
-"nevez."
+msgstr "Kempennet fall e oa da gefluniadur neuze eo bet diverket ha krouet e vo unan nevez."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Re gozh e oa da restr kefluniañ neuze eo bet diverket ha krouet e vo unan "
-"nevez."
+msgstr "Re gozh e oa da restr kefluniañ neuze eo bet diverket ha krouet e vo unan nevez."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Re gozh eo handelv ho stur. Stalhit ar sturioù video nevesañ, mar plij."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"N'eo ket keverlec'h da restr kefluniañ an enankadoù gant an handelv-mañ eus "
-"STK."
+msgstr "N'eo ket keverlec'h da restr kefluniañ an enankadoù gant an handelv-mañ eus STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Hoc'h aelad"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Liorzh Zen"
 
@@ -3672,7 +3329,6 @@ msgstr "[hini ebet]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3681,7 +3337,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "gant"
@@ -3690,44 +3347,25 @@ msgstr "gant"
 msgid "featured"
 msgstr "kinniget"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "uhel"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "izel"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "skoueriek"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Alan https://launchpad.net/~alan-m.\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Alan https://launchpad.net/~alan-m.\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/bs.po b/data/po/bs.po
index faa6f9731..8aa02fdd1 100644
--- a/data/po/bs.po
+++ b/data/po/bs.po
@@ -1,23 +1,22 @@
-# Bosnian translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2012-10-31 03:19+0000\n"
-"Last-Translator: Kenan Dervišević <kenan@dkenan.com>\n"
-"Language-Team: Bosnian <bs@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/supertuxkart/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -58,7 +59,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -70,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -97,25 +97,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -129,13 +127,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -145,25 +141,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -194,7 +185,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -213,23 +203,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -238,37 +225,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -276,8 +261,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -287,13 +271,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -304,7 +286,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -315,32 +296,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -350,49 +328,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -402,18 +374,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -423,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -449,24 +420,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -476,29 +447,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -513,49 +480,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -577,79 +539,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -659,36 +608,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -697,7 +642,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -705,52 +649,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -764,26 +701,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -791,61 +725,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -855,14 +780,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -875,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -887,7 +811,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -901,97 +824,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1004,13 +910,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1036,7 +941,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1044,28 +948,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1078,24 +980,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1104,8 +1005,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1116,27 +1017,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1147,7 +1045,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1157,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1170,24 +1066,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1199,27 +1093,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1234,27 +1125,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1262,12 +1155,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1292,19 +1185,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1315,13 +1206,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1336,7 +1226,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1344,14 +1233,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1375,13 +1266,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1395,22 +1285,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1426,51 +1313,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1480,61 +1361,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1551,12 +1424,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1566,22 +1437,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1592,71 +1459,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1666,13 +1530,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1691,7 +1554,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1700,7 +1562,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1762,50 +1624,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1813,11 +1671,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1828,27 +1726,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1856,18 +1745,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1877,29 +1764,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1907,48 +1798,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1968,13 +1852,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1983,9 +1869,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1998,7 +1888,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2026,19 +1916,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2048,21 +1937,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2073,46 +1960,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2120,60 +2002,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2184,14 +2065,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2200,35 +2078,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2236,8 +2109,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2248,12 +2121,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2262,7 +2134,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2271,37 +2142,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2310,6 +2182,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2319,44 +2195,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2390,7 +2260,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2399,7 +2268,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2411,25 +2279,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2450,8 +2314,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2460,82 +2324,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2561,29 +2411,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2640,41 +2486,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2684,12 +2524,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2699,36 +2537,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2743,91 +2575,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2837,7 +2627,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2848,12 +2637,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2863,23 +2650,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2889,7 +2674,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2898,7 +2682,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2911,11 +2694,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2935,12 +2717,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2948,82 +2728,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3032,32 +2799,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3082,30 +2854,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3124,7 +2888,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3138,19 +2902,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3161,24 +2923,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3186,20 +2945,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3213,8 +2970,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3223,40 +2980,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3265,19 +3018,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3286,13 +3037,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3303,27 +3053,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3335,7 +3081,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3346,45 +3092,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3395,42 +3136,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3440,37 +3175,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3491,20 +3225,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3514,7 +3251,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3522,36 +3259,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3564,6 +3306,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3574,7 +3321,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3585,7 +3331,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3594,7 +3339,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3603,42 +3349,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Kenan Dervišević https://launchpad.net/~kenan3008"
+msgstr "Launchpad Contributions:\n  Kenan Dervišević https://launchpad.net/~kenan3008"
diff --git a/data/po/ca.po b/data/po/ca.po
index f74bd2240..432e39d92 100644
--- a/data/po/ca.po
+++ b/data/po/ca.po
@@ -1,20 +1,23 @@
-# Marc Coll Carrillo, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Marc Coll Carrillo, 2012
+# Marc Coll Carrillo <marc.coll.carrillo@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTukKart 0.6\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-04 18:28+0000\n"
-"Last-Translator: Marc Coll Carrillo <Unknown>\n"
-"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 20:39+0000\n"
+"Last-Translator: Marc Coll Carrillo <marc.coll.carrillo@gmail.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/supertuxkart/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: ca\n"
-"X-Poedit-Language: Catalan\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,23 +28,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Però vosaltres, patètics gamarussos, mai sereu capaços de guanyar-me a mi, "
-"el rei dels karts!"
+msgstr " Però vosaltres, patètics gamarussos, mai sereu capaços de guanyar-me a mi, el rei dels karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] "%d amic en línia."
 msgstr[1] "%d amics en línia."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (limitat)"
@@ -57,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s i %s estan en línia."
@@ -69,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s per %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s per %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s està en línia."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s està llest"
@@ -96,25 +97,23 @@ msgstr "Perfil de %s"
 msgid "%s's server"
 msgstr "Servidor de %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s i %s estan en línia."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' ha estat eliminat"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Buit)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(les partides en xarxa encara no estan disponibles)"
 
@@ -128,47 +127,34 @@ msgstr "Un element vermell indica un conflicte a la configuració actual"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"Les assignacions de tecles actuals es poden veure/modificar al menú d'opcions"
+msgstr "Les assignacions de tecles actuals es poden veure/modificar al menú d'opcions"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"La majoria dels modes de joc també es poden jugar com un campionat: en "
-"comptes de jugar una sola cursa, s'en juguen diverses seguides. A millor "
-"posició, més punts. Al final, el jugador amb més punts guanya la copa."
+msgstr "La majoria dels modes de joc també es poden jugar com un campionat: en comptes de jugar una sola cursa, s'en juguen diverses seguides. A millor posició, més punts. Al final, el jugador amb més punts guanya la copa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "Cal reiniciar el STK per aplicar la nova configuració"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* La configuració a emprar dependrà de quina tecla 'Seleccionar' es premi "
-"per unir-se a la partida."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* La configuració a emprar dependrà de quina tecla 'Seleccionar' es premi per unir-se a la partida."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -199,13 +185,10 @@ msgstr "Batalla a 3 cops"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Batalla a 3 cops: Només en partides multijugador. Ataca als altres amb armes "
-"fins que es quedin sense vides."
+msgstr "Batalla a 3 cops: Només en partides multijugador. Ataca als altres amb armes fins que es quedin sense vides."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +203,20 @@ msgid "9 months"
 msgstr "9 mesos"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Millors temps ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Karts controlats per l'ordinador"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Avorta el campionat"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Quant a"
 
@@ -245,39 +225,35 @@ msgstr "Quant a"
 msgid "Accelerate"
 msgstr "Accelera"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Accelera i prem la tecla <%s> mentre gires per derrapar. Derrapar una mica "
-"pot ajudar-te a girar més ràpid per agafar corbes tancades."
+msgstr "Accelera i prem la tecla <%s> mentre gires per derrapar. Derrapar una mica pot ajudar-te a girar més ràpid per agafar corbes tancades."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Accelera amb <%s> i gira amb <%s> i <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Accepta"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Recuperació del compte"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Paràmetres del compte"
 
@@ -285,8 +261,7 @@ msgstr "Paràmetres del compte"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Assoliments"
 
@@ -296,13 +271,11 @@ msgstr "Acció"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Afegeix"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Afegeix amic"
 
@@ -313,7 +286,6 @@ msgstr "Afegeix configuració de teclat"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Afegeix jugador"
 
@@ -324,32 +296,29 @@ msgstr "Afegeix un Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Afegeix un dispositiu"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Afegeix usuari"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Complements"
 
@@ -359,71 +328,66 @@ msgstr "Nom del complement"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Complements"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Efectes avançats (llums, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Tots"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Tots els circuits"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Totes els cops estan permesos, o sigui que agafa armes i fes-ne un bon ús!"
+msgstr "Totes els cops estan permesos, o sigui que agafa armes i fes-ne un bon ús!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Mostra sempre la pantalla d'inici de sessió"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Oclusió ambiental"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Oclusió ambiental: %s"
@@ -433,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "S'ha produït un error mentre s'intentava desar el teu campionat."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Àncora - frena molt el kart que va en primera posició."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personatges animats"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personatges animats: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Escenaris animats"
 
@@ -459,24 +420,24 @@ msgstr "Escenaris animats"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Escenaris animats: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotròpic x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotròpic x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotròpic x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotròpic x8"
 
@@ -486,29 +447,25 @@ msgstr "Ja existeix un altre campionat amb aquest nom."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Antialiàsing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Antialiàsing: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Aplica-ho"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplica la nova resolució"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Arxienemic"
 
@@ -523,49 +480,44 @@ msgstr "Estàs segur que vols esborrar permanentment aquesta configuració?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Estàs segur que vols eliminar '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenes"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Al voltant del far"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "No assignis res"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Assignar a la tecla ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "A la fi del món"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "So"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evita els plàtans!"
 
@@ -587,81 +539,66 @@ msgstr "Eix %d %s"
 msgid "Axis %d inverted"
 msgstr "Eix %d invertit"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Tornar"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Tornar a la partida"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Tornar a la cursa"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Tornar a la selecció de reptes"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Tornar a la llista de dispositius"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Tornar al menú"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Tornar al menú"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Amant dels plàtans"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Pilota de bàsquet - rebota empaitant el líder, i pot esclafar i frenar karts "
-"pel camí."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Pilota de bàsquet - rebota empaitant el líder, i pot esclafar i frenar karts pel camí."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Illa de batalla"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Més sort la propera vegada!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineal"
 
@@ -671,39 +608,33 @@ msgid "Black"
 msgstr "Botó negre"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mansió Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Lluïssor"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Lluïssor: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "L'equip blau guanya"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Granja bovina"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bola de bitlles - rebota a les parets. Si mires darrere teu, serà llençada "
-"cap enrere."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bola de bitlles - rebota a les parets. Si mires darrere teu, serà llençada cap enrere."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -711,64 +642,52 @@ msgid "Brake"
 msgstr "Frena"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Xiclet - protegeix-te amb un escut, o fes-lo servir mentre mires enrere per "
-"deixar una taca rosa enganxosa darrera teu."
+msgstr "Xiclet - protegeix-te amb un escut, o fes-lo servir mentre mires enrere per deixar una taca rosa enganxosa darrera teu."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr "Però sóc una criatura justa, així que us oferiré un tracte."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Pastís - llençat contra el rival més proper, millor a poca distància i en "
-"rectes llargues."
+msgstr "Pastís - llençat contra el rival més proper, millor a poca distància i en rectes llargues."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "No s'ha pogut accedir al servidor de complements..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -782,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Cancel·lar/Tornar"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cova X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Repte completat"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Repte no superat"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Reptes: sala de trofeus"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Canvia-ho"
 
@@ -809,63 +725,52 @@ msgstr "Canvia-ho"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Tria un kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Cristòfol Colom"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Fes clic aquí per jugar el tutorial"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Tancar"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr "Temple del cacau"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Recull un mínim 5 plàtans en una cursa."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Recull les caixes blaves: et donaran armes o altres millores."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Recull caixes de regal, i dispara l'arma amb <%s> per fer explotar aquestes "
-"capses!"
+msgstr "Recull caixes de regal, i dispara l'arma amb <%s> per fer explotar aquestes capses!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Recull ampolles de nitro (les farem servir després de la corba)"
 
@@ -875,17 +780,13 @@ msgstr "Recull nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Recollir nitro et permet obtenir augments de velocitat en qualsevol moment "
-"prement la tecla corresponent. Pots veure el teu nivell actual de nitro a la "
-"barra que hi ha a la dreta de la pantalla del joc."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Recollir nitro et permet obtenir augments de velocitat en qualsevol moment prement la tecla corresponent. Pots veure el teu nivell actual de nitro a la barra que hi ha a la dreta de la pantalla del joc."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Completa tots els reptes per obrir la porta gran!"
 
@@ -898,11 +799,11 @@ msgstr "Has completat l'assoliment '%s'."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Confirma"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -910,7 +811,6 @@ msgstr "Confirma la resolució abans de %i segons"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Connectat a Internet"
 
@@ -918,106 +818,86 @@ msgstr "Connectat a Internet"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Connecta el teu Wiimote al gestor de Bluetooth, i després fes clic al botó "
-"\"D'acord\". Instruccions detallades a supertuxkart.net/Wiimote"
+msgstr "Connecta el teu Wiimote al gestor de Bluetooth, i després fes clic al botó \"D'acord\". Instruccions detallades a supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"No conté armes, o sigui que només importa la teva habilitat al volant!"
+msgstr "No conté armes, o sigui que només importa la teva habilitat al volant!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continua"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Continua un campionat desat"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Continua."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controls"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Copia"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "No s'ha pogut crear el jugador '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "No s'ha pogut detectar cap Wiimote"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Crea"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Crea un servidor"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Crea un usuari"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Crea un compte en línia"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "S'està creant el servidor"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Crèdits"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Contrasenya actual"
 
@@ -1030,13 +910,12 @@ msgid "Currently not signed in"
 msgstr "Actualment no estàs connectat"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "A mida"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Configuració a mida..."
 
@@ -1062,7 +941,6 @@ msgstr "D-Pad amunt"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Rebutjar"
 
@@ -1070,28 +948,26 @@ msgstr "Rebutjar"
 msgid "Default"
 msgstr "Predeterminat"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Esborra"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Esborra la configuració"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Profunditat de camp"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Profunditat de camp: %s"
@@ -1104,24 +980,23 @@ msgstr "Deshabilita el dispositiu"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Deshabilitat"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Mostrar FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Realment vols avortar el campionat?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Realment vols eliminar el jugador '%s'?"
@@ -1130,8 +1005,8 @@ msgstr "Realment vols eliminar el jugador '%s'?"
 msgid "Do you want to save your changes?"
 msgstr "Vols desar els canvis?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "No acceleris abans de la sortida"
 
@@ -1142,27 +1017,24 @@ msgstr "Avall"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Condueix a l'inrevés"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Llums dinàmiques: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Edita"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Edita el campionat"
 
@@ -1173,11 +1045,8 @@ msgstr "A la recerca dels ous perduts"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"A la recerca dels ous perduts: explora circuits per trobar tots els ous "
-"amagats"
+msgstr "A la recerca dels ous perduts: explora circuits per trobar tots els ous amagats"
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1185,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Ous: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminat"
 
@@ -1198,24 +1066,22 @@ msgstr "Eliminat"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "El correu electrònic ha de tenir entre 4 i 50 caràcters!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "El correu electrònic no és vàlid!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Els correus electrònics no coincideixen!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1227,27 +1093,24 @@ msgstr "Habilita el dispositiu"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr "Habilita els usuaris limitats"
+msgid "Enable per-player handicaps"
+msgstr "Habilita les limitacions per jugador"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Habilitat"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Habilitat per a tots"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Introdueix el nom del nou jugador"
 
@@ -1260,31 +1123,31 @@ msgstr "Error descarregant notícies: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Tothom:\n"
-"Premeu 'Seleccionar' ara per unir-vos a la partida!"
+msgstr "Tothom:\nPremeu 'Seleccionar' ara per unir-vos a la partida!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Compte en línia existent"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Sortir"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Sortir de la cursa"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Surt del joc"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1292,12 +1155,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explora circuits per trobar tots els ous amagats"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1322,21 +1185,17 @@ msgid "Fetching servers"
 msgstr "Obtenint servidors"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Introdueix el nom d'usuari i l'adreça de correu electrònic que vas "
-"proporcionar al registrar-te per poder restablir la teva contrasenya."
+msgstr "Introdueix el nom d'usuari i l'adreça de correu electrònic que vas proporcionar al registrar-te per poder restablir la teva contrasenya."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Última volta!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Troba un servidor"
 
@@ -1347,22 +1206,14 @@ msgstr "Foc"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Primer, necessitareu diferents dispositius d'entrada (tenir més d'un "
-"comandament o joystick és la millor manera de jugar amb vàries persones). "
-"Aneu a la pantalla de configuració de dispositius d'entrada i configureu els "
-"comandaments. També és possible jugar amb un o més teclats, però cada "
-"jugador necessitarà un joc de tecles diferent, i cal tenir en compte que la "
-"majoria de teclats no són adequats per al mode multijugador perquè no "
-"permeten gaires tecles pitjades alhora."
+msgstr "Primer, necessitareu diferents dispositius d'entrada (tenir més d'un comandament o joystick és la millor manera de jugar amb vàries persones). Aneu a la pantalla de configuració de dispositius d'entrada i configureu els comandaments. També és possible jugar amb un o més teclats, però cada jugador necessitarà un joc de tecles diferent, i cal tenir en compte que la majoria de teclats no són adequats per al mode multijugador perquè no permeten gaires tecles pitjades alhora."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1375,25 +1226,22 @@ msgstr "Segueix al líder!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Segueix el líder: Corre per quedar segon, doncs el darrer kart serà "
-"desqualificat cada vegada que el comptador arribi a zero. Compte: anar per "
-"davant del líder també t'eliminarà!"
+msgstr "Segueix el líder: Corre per quedar segon, doncs el darrer kart serà desqualificat cada vegada que el comptador arribi a zero. Compte: anar per davant del líder també t'eliminarà!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "S'ha trobat %d Wiimote(s)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "S'ha trobat %d wiimote"
+msgstr[1] "S'han trobat %d wiimotes"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1417,13 +1265,12 @@ msgstr "La petició d'amistat s'ha enviat!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Amics"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
@@ -1437,22 +1284,19 @@ msgstr "GOL!"
 msgid "Game Keys"
 msgstr "Tecles del joc"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modes de joc"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Tipus de joc (límit de gols / límit de temps)"
 
@@ -1468,51 +1312,45 @@ msgstr "Botó %d del comandament"
 msgid "Gamepad hat %d"
 msgstr "Botó 'punt de vista' del comandament %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "General"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Abandonar la cursa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Il·luminació global"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Il·luminació global: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Resplendor (contorns)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Resplendor (contorns): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1522,61 +1360,53 @@ msgid "Go!"
 msgstr "Ja!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "Conductor d'or"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr "Illa Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Campionats"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Editor de campionats"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Editor de campionats"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progrés del campionat:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivell d'efectes gràfics"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Gràfics"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Configuració gràfica"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Vall verda"
 
@@ -1593,12 +1423,10 @@ msgstr "Convidat %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr "Entrar com a convidat"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1608,22 +1436,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Ajuda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Millors temps"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Encerta 10 karts amb una bola de bitlles."
 
@@ -1631,78 +1455,71 @@ msgstr "Encerta 10 karts amb una bola de bitlles."
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Ataca als altres amb armes fins que perdin totes les seves vides. (Només en "
-"mode multijugador)"
+msgstr "Ataca als altres amb armes fins que perdin totes les seves vides. (Només en mode multijugador)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Encerta el mateix kart un mínim de 5 vegades en una cursa."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Només jugadors humans"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Accepto els termes i tinc 13 anys o més. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Si podeu guanyar-me en una cursa, deixaré anar al vell xaruc."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Si veus un botó amb un cadenat com aquest, cal que completis un repte per "
-"desbloquejar-lo."
+msgstr "Si veus un botó amb un cadenat com aquest, cal que completis un repte per desbloquejar-lo."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "S'ignora a '%s', hauries d'haver entrat abans per poder  jugar!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Il'luminació basada en imatges"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instal·lar"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermedi"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "L'accés a Internet es troba deshabilitat, activa'l a les opcions"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Empatats"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr "És secret"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Unir-se"
 
@@ -1712,13 +1529,12 @@ msgstr "Unint-se al servidor"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Mantingues aquesta resolució"
 
@@ -1737,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Teclat %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1746,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Volta"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Volta %i"
@@ -1808,50 +1623,46 @@ msgstr "Gallet esquerre"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Rajos crepusculars"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Rajos crepusculars: %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Carregant"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Llista de jugadors"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Paràmetres de la llista de jugadors"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Nom d'usuari local"
+msgid "Local Name"
+msgstr "Nom local"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloquejat: resol els reptes actius per accedir a més!"
 
@@ -1859,11 +1670,51 @@ msgstr "Bloquejat: resol els reptes actius per accedir a més!"
 msgid "Locked!"
 msgstr "Bloquejat!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Inici de sessió"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Surt de la sessió"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Connectat com: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "S'està connectant"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "S'està connectant '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Entrar com a convidat et permet participar en curses en línia, però no et permet votar complements, ni aconseguir cap assoliment mentre estàs en línia."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "S'està desconnectant"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "S'està desconnectant '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Inicia una sessió"
 
@@ -1874,27 +1725,18 @@ msgstr "Mirar enrere"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Busca més amics:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr "Luna"
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Derrapa 5 vegades en una mateixa volta."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Fes una cursa de 5 voltes o més."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Corredor de maratons"
 
@@ -1902,18 +1744,16 @@ msgstr "Corredor de maratons"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Nombre màxim de jugadors"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Màxim de temps (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Només jo"
 
@@ -1923,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Tecles del menú"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr "Minigolf"
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Caçador de mosquits"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Difuminació de moviment"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Difuminació de moviment: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Eix %d %s del ratolí"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1953,48 +1797,41 @@ msgstr "Botó %d del ratolí"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Mou cap avall"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Mou cap amunt"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multijugador"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multijugador"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Música"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Nom"
 
@@ -2014,13 +1851,15 @@ msgstr "El nom és massa llarg."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Nom del servidor"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "L'estany de Nessie"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Nou"
 
@@ -2029,9 +1868,13 @@ msgstr "Nou"
 msgid "New Grand Prix '%s' now available"
 msgstr "Nou campionat '%s'  ja disponible"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nou compte en línia"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nova contrasenya"
 
@@ -2044,7 +1887,7 @@ msgstr "Nova petició"
 msgid "New difficulty '%s' now available"
 msgstr "Nou nivell de dificultat '%s' ja disponible"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nova volta ràpida"
 
@@ -2072,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Repte de nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "No"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Cap"
 
@@ -2094,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Cursa normal"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Resort nòrdic"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Tingues en compte que si aconsegueixes derrapar durant varis segons, rebràs "
-"un increment de velocitat com a recompensa!"
+msgstr "Tingues en compte que si aconsegueixes derrapar durant varis segons, rebràs un increment de velocitat com a recompensa!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Novell"
 
@@ -2121,46 +1959,41 @@ msgstr "Karts controlats per l'ordinador: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Karts controlats per l'ordinador"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Nombre de gols per guanyar"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Nombre de voltes"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Nombre de voltes:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "D'acord"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Fora del circuit habitual"
 
@@ -2168,62 +2001,59 @@ msgstr "Fora del circuit habitual"
 msgid "Offline"
 msgstr "Fora de línia"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Compte fora de línia"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Oh, sí! Veuràs, ara mateix es troba al meu castell, i serà servit com a "
-"sopar..."
+msgstr "Oh, sí! Veuràs, ara mateix es troba al meu castell, i serà servit com a sopar..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "La vella mina"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Classe de mates de l'Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "En línia"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Multijugador en línia"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Nom d'usuari en línia"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "El nom d'usuari en línia ha de tenir entre 3 i 30 caràcters!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "El nom d'usuari en línia no pot començar per un número!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Només el creador de la partida pot actuar en aquest punt!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ups! Quan tinguis problemes, prem <%s> per ser rescatat"
@@ -2234,14 +2064,11 @@ msgstr "Ups! Quan tinguis problemes, prem <%s> per ser rescatat"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opcions"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Vista general"
 
@@ -2250,35 +2077,30 @@ msgid "POWER"
 msgstr "POTÈNCIA"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paracaigudes - frena tots els karts millor posicionats."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Contrasenya"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Contrasenya:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "La contrasenya ha de tenir entre 8 i 30 caràcters!"
 
@@ -2286,8 +2108,8 @@ msgstr "La contrasenya ha de tenir entre 8 i 30 caràcters!"
 msgid "Password successfully changed."
 msgstr "La contrasenya s'ha canviat correctament."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Les contrasenyes no coïncideixen!"
 
@@ -2298,12 +2120,11 @@ msgstr "Pausa"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "En pausa"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Temps de penalització!!"
 
@@ -2312,7 +2133,6 @@ msgid "Pending"
 msgstr "Pendent"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pati del pingüí"
 
@@ -2321,37 +2141,38 @@ msgid "Performing vote"
 msgstr "S'està realitzant la votació"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Juga a tots"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr "Juga a tots els circuits oficials com a mínim una vegada."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jugadors"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Els jugadors poden seleccionar perfils limitats (més difícils) a la pantalla de selecció de karts"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Introdueix el nom del campionat"
 
@@ -2360,6 +2181,10 @@ msgstr "Introdueix el nom del campionat"
 msgid "Please re-configure your key bindings."
 msgstr "Reconfigura les teves tecles."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Si us plau, llegeix els termes i condicions"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Espera mentre s'actualitzen els complements"
@@ -2369,48 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Espera mentre es carreguen els complements"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Desembussador - llença'l cap endavant per estirar un oponent pel darrera, o "
-"llença'l mentre mires cap enrere per fer que un d'ells perdi visió."
+msgstr "Desembussador - llença'l cap endavant per estirar un oponent pel darrera, o llença'l mentre mires cap enrere per fer que un d'ells perdi visió."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr "Amant de les millores"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Prem <%s> per mirar darrera teu, i dispara l'arma amb <%s> mentre prems <%s> "
-"per disparar cap enrere!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Prem <%s> per mirar darrera teu, i dispara l'arma amb <%s> mentre prems <%s> per disparar cap enrere!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Prem ESC per cancel·lar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Prem una tecla"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Prem intro o fes doble clic sobre un dispositiu per configurar-lo"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Prem intro o fes doble clic sobre un jugador per editar-lo"
 
@@ -2426,10 +2241,7 @@ msgstr "Prem 'Foc' per començar el repte"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Prem els botons 1 + 2 alhora en el teu Wiimote per posar-lo en mode "
-"descobriment, i després fes clic a \"D'acord\". Instruccions detallades a "
-"supertuxkart.net/Wiimote"
+msgstr "Prem els botons 1 + 2 alhora en el teu Wiimote per posar-lo en mode descobriment, i després fes clic a \"D'acord\". Instruccions detallades a supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2447,7 +2259,6 @@ msgstr "S'està processant"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Perfil"
 
@@ -2456,7 +2267,6 @@ msgid "Progress"
 msgstr "Progrés"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2464,31 +2274,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Empeny la pilota cap a la porteria contrària per marcar gols. (Només en mode "
-"multijugador)"
+msgstr "Empeny la pilota cap a la porteria contrària per marcar gols. (Només en mode multijugador)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Partida ràpida"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Sortir"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Abandonar el servidor"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Configuració de la cursa"
 
@@ -2509,8 +2313,8 @@ msgstr "Campionat aleatori"
 msgid "Random Kart"
 msgstr "Kart aleatori"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Circuit aleatori"
 
@@ -2519,84 +2323,68 @@ msgid "Rank"
 msgstr "Classificació"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Puntuació >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr "Mansió Ravenbridge"
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Preparats!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr "De debò... un secret."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "L'equip vermell guanya"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Registra't"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Cursa normal: Tots els cops estan permesos, o sigui que agafa armes i fes-ne "
-"un bon ús!"
+msgstr "Cursa normal: Tots els cops estan permesos, o sigui que agafa armes i fes-ne un bon ús!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Torna a carregar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Recorda la contrasenya"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Recorda la posició de la finestra"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Elimina"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Canvia el nom"
 
@@ -2622,29 +2410,25 @@ msgstr "Rescat"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolució"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reiniciar"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Reiniciar la cursa"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "A l'inrevés"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "A l'inrevés:"
 
@@ -2701,41 +2485,35 @@ msgstr "Gallet dret"
 msgid "SPEED"
 msgstr "VELOCITAT"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr "Sara la bruixa"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara la corredora"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Sara la fetillera"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Desa"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Desa el campionat"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Escòcia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Cercar"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "S'està cercant"
 
@@ -2745,12 +2523,10 @@ msgid "Select"
 msgstr "Selecciona"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Selecciona un nivell de dificultat"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Selecciona un mode de joc"
 
@@ -2760,36 +2536,30 @@ msgstr "Selecciona un circuit"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Selecciona un kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Envia estadístiques anònimes del maquinari"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Creació del servidor"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Informació del servidor"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Selecció del servidor"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Nom del servidor"
 
@@ -2804,93 +2574,49 @@ msgstr "Llestos!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Configurar una nova cursa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Ombres"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Ombres: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Ombres: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Arenes movedisses"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Suburbis lluents"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Inici de sessió"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Entra com a convidat"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Finalitza la sessió"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Estàs connectat com a: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "S'està connectant"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "S'està connectant '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Entrar com a convidat et permet participar en curses en línia, però no et "
-"permet votar complements, ni aconseguir cap assoliment mentre estàs en línia."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Desconnectant"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "S'està desconnectant '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Des de"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Un jugador"
 
@@ -2900,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Mida: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr "Derrapatge compulsiu"
 
@@ -2911,12 +2636,10 @@ msgstr "Derrapar"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Aparença"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Pic nevat"
 
@@ -2926,30 +2649,23 @@ msgid "Soccer"
 msgstr "Futbol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Camp de futbol"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Futbol: Només en partides multijugador. Fes servir el teu kart per ficar la "
-"pilota la porteria."
+msgstr "Futbol: Només en partides multijugador. Fes servir el teu kart per ficar la pilota la porteria."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"S'ha produït un error mentre es contactava amb el servidor de complements. "
-"Assegura't que estàs connectat a Internet i que el Supertuxkart no està "
-"bloquejat per un tallafocs"
+msgstr "S'ha produït un error mentre es contactava amb el servidor de complements. Assegura't que estàs connectat a Internet i que el Supertuxkart no està bloquejat per un tallafocs"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2957,7 +2673,6 @@ msgstr "No s'ha pogut descarregar el complement"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efectes de so"
 
@@ -2966,7 +2681,6 @@ msgstr "Efectes de so"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Estàndard"
 
@@ -2979,11 +2693,10 @@ msgstr "Botó 'Start'"
 msgid "Start Grand Prix"
 msgstr "Comença el campionat"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Comença la cursa"
 
@@ -3003,12 +2716,10 @@ msgstr "Gira a la dreta"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Història"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr "Diana!"
 
@@ -3016,92 +2727,69 @@ msgstr "Diana!"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Envia"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Sota el mar"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Complements del SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Ajuda del SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opcions del SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart es pot jugar en mode multijugador dins del mateix ordinador"
+msgstr "SuperTuxKart es pot jugar en mode multijugador dins del mateix ordinador"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart té diferents modes de joc"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
-"El SuperTuxKart pot connectar-se a un servidor per descarregar complements i "
-"notificar-te actualitzacions. També recollim estadístiques anònimes de "
-"maquinari per ajudar en el desenvolupament del STK. T'agradaria habilitar "
-"aquesta característica? (Per canviar aquest paràmetre més endavant, vés a "
-"les opcions, selecciona la pestanya \"Interfície d'usuari\", i edita els "
-"paràmetres \"Connectat a Internet\" i \"Envia estadístiques anònimes del "
-"maquinari\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "El SuperTuxKart pot connectar-se a un servidor per descarregar complements i \nnotificar-te actualitzacions. També recollim estadístiques anònimes de \nmaquinari per ajudar en el desenvolupament del STK. Llegeix la nostra política de privacitat a http://privacy.supertuxkart.net. T'agradaria habilitar \naquesta característica? (Per canviar aquest paràmetre més endavant, vés a \nles opcions, selecciona la pestanya \"Interfície d'usuari\", i edita els \nparàmetres \"Connectat a Internet\" i \"Envia estadístiques anònimes del \nmaquinari\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Intercanviador - les caixes es transformen en plàtans i viceversa durant un "
-"curt període de temps."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Intercanviador - les caixes es transformen en plàtans i viceversa durant un curt període de temps."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Matamosques - esclafarà els karts al teu voltant, frenant-los."
 
@@ -3110,50 +2798,49 @@ msgstr "Matamosques - esclafarà els karts al teu voltant, frenant-los."
 msgid "System Language"
 msgstr "Idioma del sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Pren als teus oponents per mosquits! Amb el matamosques, esclafa'n al menys 5 en una cursa."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Temple"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Termes i acord"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Compressió de textures"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtratge de textures"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"La tecla 'Derrapar' et permet derrapar en corbes tancades i obtenir un plus "
-"de velocitat."
+msgstr "La tecla 'Derrapar' et permet derrapar en corbes tancades i obtenir un plus de velocitat."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "L'estadi"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"El mòdul de complements actualment es troba deshabilitat a la finestra "
-"d'opcions"
+msgstr "El mòdul de complements actualment es troba deshabilitat a la finestra d'opcions"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"El fitxer de puntuacions era massa antic,\n"
-"totes les puntuacions han estat esborrades."
+msgstr "El fitxer de puntuacions era massa antic,\ntotes les puntuacions han estat esborrades."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3166,41 +2853,22 @@ msgstr "Contra rellotge"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Contra rellotge: no conté armes, o sigui que només compten les teves "
-"habilitats al volant!"
+msgstr "Contra rellotge: no conté armes, o sigui que només compten les teves habilitats al volant!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Per afegir un nou comandament/joystick, simplement engega el SuperTuxKart "
-"amb el dispositiu connectat i apareixerà a la llista.\n"
-"\n"
-"Per afegir una configuració de teclat pots fer servir el botó inferior, PERÒ "
-"tingues en compte que la majoria de teclats només permeten una limitada "
-"quantitat de tecles pitjades simultàniament, i per tant no són apropiats per "
-"als modes multijugador. (Tanmateix, pots connectar diferents teclats a "
-"l'ordinador. Recorda que tot i així tothom necessitarà un joc de tecles "
-"diferent)."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Per afegir un nou comandament/joystick, simplement engega el SuperTuxKart amb el dispositiu connectat i apareixerà a la llista.\n\nPer afegir una configuració de teclat pots fer servir el botó inferior, PERÒ tingues en compte que la majoria de teclats només permeten una limitada quantitat de tecles pitjades simultàniament, i per tant no són apropiats per als modes multijugador. (Tanmateix, pots connectar diferents teclats a l'ordinador. Recorda que tot i així tothom necessitarà un joc de tecles diferent)."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Per ajudar-te a guanyar, hi ha alguns elements que pots recollir:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Fins a la lluna i tornar"
 
@@ -3219,7 +2887,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr "Circuit"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Circuit %i/%i"
@@ -3233,19 +2901,17 @@ msgstr "Circuit creat per %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Conjunt de circuits"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Circuits"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineal"
 
@@ -3256,24 +2922,21 @@ msgstr "Tornar-ho a provar"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial: lloc de selecció"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipus:"
 
@@ -3281,22 +2944,18 @@ msgstr "Tipus:"
 msgid "Type: Grand Prix"
 msgstr "Tipus: campionat"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"No s'ha pogut connectar al servidor. Comprova la teva connexió a Internet o "
-"torna-ho a provar més tard."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "No s'ha pogut connectar al servidor. Comprova la teva connexió a Internet o torna-ho a provar més tard."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Desinstal·lar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr "Imparable"
 
@@ -3310,8 +2969,8 @@ msgid "Update"
 msgstr "Actualitza"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Actualitzat"
 
@@ -3320,40 +2979,36 @@ msgid "Updated date"
 msgstr "Data d'actualització"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr "Fes servir 10 millores o més en una cursa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Textures d'alta definició"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr "Fes servir esquerra/dreta per triar el teu equip i prem 'Foc'"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Fes servir el nitro que has recollit prement <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Informació de l'usuari"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interfície d'usuari"
 
@@ -3362,19 +3017,17 @@ msgid "User defined"
 msgstr "Definits per l'usuari"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Cerca usuaris"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Nom d'usuari"
 
@@ -3383,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr "El nom d'usuari i/o el correu electrònic no són vàlids."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "S'està validant la informació"
 
@@ -3400,27 +3052,23 @@ msgstr "Versió: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronització vertical (cal reiniciar)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Vista"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volum"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Vota"
 
@@ -3432,7 +3080,7 @@ msgstr "El vot s'ha enviat correctament! Ja pots tancar la finestra."
 msgid "WEIGHT"
 msgstr "PES"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "DIRECCIÓ CONTRÀRIA!"
 
@@ -3441,60 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Atenció, la tecla 'Majúscules' no es recomana: quan es premi aquesta tecla, "
-"totes les tecles que continguin un caràcter diferent en majúscules deixaran "
-"de funcionar."
+msgstr "Atenció, la tecla 'Majúscules' no es recomana: quan es premi aquesta tecla, totes les tecles que continguin un caràcter diferent en majúscules deixaran de funcionar."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armes"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efectes climàtics"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efectes climàtics: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Què passa, petits hippys? El vostre gran líder Gnu ha desaparegut?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Un cop configurats els dispositius d'entrada, ja estàs a punt per jugar. "
-"Selecciona la icona 'Multijugador' al menú principal. Quan sigui el moment "
-"de triar un kart, cada jugador pot prémer la tecla 'Foc' del seu  "
-"comandament o teclat per unir-se a la partida. Cada jugador pot fer servir "
-"el seu dispositiu per triar el seu kart. El joc continua quan tothom ha "
-"seleccionat el seu kart. Cal tenir en compte que el ratolí no es pot fer "
-"servir en aquesta operació."
+msgstr "Un cop configurats els dispositius d'entrada, ja estàs a punt per jugar. Selecciona la icona 'Multijugador' al menú principal. Quan sigui el moment de triar un kart, cada jugador pot prémer la tecla 'Foc' del seu  comandament o teclat per unir-se a la partida. Cada jugador pot fer servir el seu dispositiu per triar el seu kart. El joc continua quan tothom ha seleccionat el seu kart. Cal tenir en compte que el ratolí no es pot fer servir en aquesta operació."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3502,95 +3135,75 @@ msgid "White"
 msgstr "Botó blanc"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr "Guanya 5 curses individuals seguides."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
-"Guanya en tots els modes d'un jugador, contra un mínim de 3 oponents."
+msgstr "Guanya en tots els modes d'un jugador, contra un mínim de 3 oponents."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Sí"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Ja estàs preparat per competir.  Bona sort!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Estàs jugant com a"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
-"Pots canviar la teva qualificació anterior fent clic a les estrelles d'aquí "
-"sota."
+msgstr "Pots canviar la teva qualificació anterior fent clic a les estrelles d'aquí sota."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
-"No pots descarregar complements sense accés a Internet. Si vols descarregar "
-"complements, vés a les opcions, selecciona la pestanya \"Interfície "
-"d'usuari\", i edita el paràmetre \"Connectat a Internet\"."
+msgstr "No pots descarregar complements sense accés a Internet. Si vols descarregar complements, vés a les opcions, selecciona la pestanya \"Interfície d'usuari\", i edita el paràmetre \"Connectat a Internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
-"No pots jugar en línia sense accés a Internet. Si vols jugar en línia, vés a "
-"les opcions, selecciona la pestanya \"Interfície d'usuari\", i edita el "
-"paràmetre \"Connectat a Internet\"."
+msgstr "No pots jugar en línia sense accés a Internet. Si vols jugar en línia, vés a les opcions, selecciona la pestanya \"Interfície d'usuari\", i edita el paràmetre \"Connectat a Internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
-"Pots jugar sense crear un compte en línia desmarcant la casella "
-"corresponent, tot i que aleshores no podràs connectar-te amb amics, votar "
-"complements, etc. Llegeix la nostra declaració de privacitat a "
-"http://privacy.supertuxkart.net"
+msgstr "Pots jugar sense crear un compte en línia seleccionant un compte fora de línia. Però aleshores no podràs connectar-te amb amics, votar complements, etc. Llegeix la nostra declaració de privacitat a http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Has completat un repte!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Has completat reptes!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Has completat el campionat!"
 
@@ -3598,39 +3211,35 @@ msgstr "Has completat el campionat!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Has completat el repte de nivell difícil! Punts guanyats en aquest nivell: "
-"%i/%i"
+msgstr "Has completat el repte de nivell difícil! Punts guanyats en aquest nivell: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Has completat el repte de nivell fàcil! Punts guanyats en aquest nivell: "
-"%i/%i"
+msgstr "Has completat el repte de nivell fàcil! Punts guanyats en aquest nivell: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Has completat el repte de nivell intermedi! Punts guanyats en aquest nivell: "
-"%i/%i"
+msgstr "Has completat el repte de nivell intermedi! Punts guanyats en aquest nivell: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Has acabat la cursa!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Tens %d noves peticions d'amistat!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Tens %d petició d'amistat!"
+msgstr[1] "Tens %d peticions d'amistat!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Tens una nova petició d'amistat!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Estàs eliminat!"
 
@@ -3638,79 +3247,71 @@ msgstr "Estàs eliminat!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Encara no has votat per aquest complement. Selecciona la qualificació que "
-"desitgis fent clic a les estrelles inferiors"
+msgstr "Encara no has votat per aquest complement. Selecciona la qualificació que desitgis fent clic a les estrelles inferiors"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Necessites més punts\n"
-"per entrar en aquest repte!\n"
-"Busca els reptes disponibles\n"
-"al mapa en miniatura."
+msgstr "Necessites més punts\nper entrar en aquest repte!\nBusca els reptes disponibles\nal mapa en miniatura."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Cal que introdueixis una contrasenya."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Has desbloquejat el campionat %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Has desbloquejat el circuit %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Rebràs un correu electrònic amb més instruccions sobre com reiniciar la teva "
-"contrasenya. Sigues pacient i assegura't de comprovar la teva carpeta de "
-"correu brossa."
+msgstr "Rebràs un correu electrònic amb més instruccions sobre com reiniciar la teva contrasenya. Sigues pacient i assegura't de comprovar la teva carpeta de correu brossa."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Rebràs un correu electrònic amb més instruccions sobre l'activació del "
-"compte. Sigues pacient i assegura't de comprovar la teva carpeta de correu "
-"brossa."
+msgstr "Rebràs un correu electrònic amb més instruccions sobre l'activació del compte. Sigues pacient i assegura't de comprovar la teva carpeta de correu brossa."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Has guanyat la cursa!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "La teva versió d'OpenGL sembla que és massa antiga. Comprova si hi ha una actualització del teu controlador gràfic. SuperTuxKart necessita OpenGL 3.1 o superior."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"El teu fitxer de configuració tenia un format incorrecte, així que s'ha "
-"esborrat i s'en crearà un de nou."
+msgstr "El teu fitxer de configuració tenia un format incorrecte, així que s'ha esborrat i s'en crearà un de nou."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"El teu fitxer de configuració era massa antic, així que s'ha esborrat i s'en "
-"crearà un de nou."
+msgstr "El teu fitxer de configuració era massa antic, així que s'ha esborrat i s'en crearà un de nou."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "La versió del teu controlador és massa antiga. Si us plau, instal·la la darrera versió."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"El teu fitxer de configuració de dispositius d'entrada no és compatible amb "
-"aquesta versió de STK."
+msgstr "El teu fitxer de configuració de dispositius d'entrada no és compatible amb aquesta versió de STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3718,7 +3319,6 @@ msgid "Your profile"
 msgstr "El teu perfil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Jardí zen"
 
@@ -3729,7 +3329,6 @@ msgstr "[cap]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "accions"
 
@@ -3738,7 +3337,8 @@ msgstr "accions"
 msgid "all"
 msgstr "Tots"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "per"
@@ -3747,47 +3347,25 @@ msgstr "per"
 msgid "featured"
 msgstr "Destacats"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr "Collita"
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "altes"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "baixes"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "Newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr "Sara la corredora"
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Estàndard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Aljullu https://launchpad.net/~aljullu\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Tae-Wong SEO https://launchpad.net/~seotaewong40\n"
-"  VPablo https://launchpad.net/~villumar"
+msgstr "Launchpad Contributions:\n  Aljullu https://launchpad.net/~aljullu\n  Dawid Gan https://launchpad.net/~deveee\n  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  VPablo https://launchpad.net/~villumar"
diff --git a/data/po/cs.po b/data/po/cs.po
index a101e0427..0f8c3a637 100644
--- a/data/po/cs.po
+++ b/data/po/cs.po
@@ -1,18 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.5\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/supertuxkart/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -23,22 +26,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Takoví spratci jako vy,  mě nikdy nemůžou porazit - krále všech motokár!"
+msgstr " Takoví spratci jako vy,  mě nikdy nemůžou porazit - krále všech motokár!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -54,7 +58,7 @@ msgstr "%s kB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -66,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s od %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s od %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s je připraven"
@@ -93,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' byl vyřazen."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Prázdné)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(síťová hra zatím není dostupná)"
 
@@ -125,44 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "Nastavení kláves lze zobrazit/nastavit v menu Možnosti"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"Většinu těchto hracích módů lze hrát v režimu Velké Ceny: místo jednoho "
-"závodu jich pojedete několik. Čím lépe se umístíte, tím více bodů získáte. "
-"Kdo má na konci nejvíc bodů vyhrává Velkou Cenu."
+msgstr "Většinu těchto hracích módů lze hrát v režimu Velké Ceny: místo jednoho závodu jich pojedete několik. Čím lépe se umístíte, tím více bodů získáte. Kdo má na konci nejvíc bodů vyhrává Velkou Cenu."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr "Bitva na 3 zásahy"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Nejvyšší skóre ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Ukon�it Velkou Cenu"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "O programu"
 
@@ -237,37 +224,35 @@ msgstr "O programu"
 msgid "Accelerate"
 msgstr "Zrychlení"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr "Přidat nastavení klávesnice"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Přidat hrá�e"
 
@@ -314,32 +295,29 @@ msgstr "Přidat Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Přidat vstupní zařízení"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Zásuvné moduly"
 
@@ -349,49 +327,43 @@ msgstr "Jméno doplňku"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Zásuvné moduly"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "VÅ¡echny"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "VÅ¡echny tratÄ›"
 
@@ -401,18 +373,20 @@ msgstr "Všechny údery povoleny, tak sbírejte zbraně a moudře je využijte!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Kotva - zpomalí hrá�e na první pozici"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animace postavi�ek"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animované postavy: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animace scenérie"
 
@@ -448,24 +419,24 @@ msgstr "Animace scenérie"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animovaná krajina: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Povolit nové rozlišení"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr "Opravdu chcete trvale smazat toto nastavení?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arény"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Přiřadit ke klávese ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Na konci světa"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Zvuk"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Vyhněte se banánům!"
 
@@ -576,79 +538,66 @@ msgstr "Osa %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Zpět"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Návrat do hry"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Vrátit se do závodu"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Zpět k seznamu zařízení"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Návrat do menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Zpět do menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Bitevní ostrov"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Příště více štěstí!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,38 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Temný zámek"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Hovězí farma"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingová koule - odráží se od zdí. Při pohledu zpět bude poslána dozadu."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingová koule - odráží se od zdí. Při pohledu zpět bude poslána dozadu."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -697,7 +641,6 @@ msgid "Brake"
 msgstr "Brzda"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -705,54 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Dort - házej na nejbližšího soupeře, nejlépe na krátkou vzdálenost na "
-"dlouhých rovinkách."
+msgstr "Dort - házej na nejbližšího soupeře, nejlépe na krátkou vzdálenost na dlouhých rovinkách."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Server s doplňky je nedostupný"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -766,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Zrušit/Zpět"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "JeskynÄ› X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Výzva dokon�ena"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Výzva selhala"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Úkoly: Trofeje"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -793,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Vyberte si motokáru"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Zavřít"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Sbírejte modré krabice: přidají vám zbraně nebo další bonusy"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -857,16 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Sbíráním nitra získáte zrychlení, které vyvoláte stiskem patři�né klávesy. "
-"Aktuální úroveň nitra je znázorněna v pruhu v pravé �ásti obrazovky."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Sbíráním nitra získáte zrychlení, které vyvoláte stiskem patři�né klávesy. Aktuální úroveň nitra je znázorněna v pruhu v pravé �ásti obrazovky."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -879,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -891,7 +810,6 @@ msgstr "Potvr�te rozlišení během %i sekund"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -905,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Neobsahuje žádné bonusy, takže rozhodují vaše řidi�ské schopnosti!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Pokra�ovat"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Ovládání"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Nemohu nalézt žádný wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Poděkování"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1008,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Vlastní"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Vlastní nastavení"
 
@@ -1040,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1048,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Smazat nastavení"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1082,24 +979,23 @@ msgstr "Zakázat zařízení"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Zakázáno"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Zobraz FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Opravdu chcete smazat hrá�e jménem '%s' ?"
@@ -1108,8 +1004,8 @@ msgstr "Opravdu chcete smazat hrá�e jménem '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Nerozjíždějte se před startem"
 
@@ -1120,27 +1016,24 @@ msgstr "Dolů"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1151,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1161,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Slon"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminován"
 
@@ -1174,24 +1065,22 @@ msgstr "Eliminován"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1203,27 +1092,24 @@ msgstr "Povolit zařízení"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Povoleno"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Povoleny pro všechny"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Zadejte jméno nového hrá�e"
 
@@ -1236,31 +1122,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Všichni:\nZmá�kněte klávesu 'Vybrat' pro připojení se do hry!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"VÅ¡ichni:\n"
-"Zmá�kněte klávesu 'Vybrat' pro připojení se do hry!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Odejít ze závodu"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1268,12 +1154,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1298,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Poslední kolo!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1321,21 +1205,14 @@ msgstr "Střelba"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Nejprve potřebujete několik vstupních zařízení (pro hru více hrá�ů je dobré "
-"mít více gamepadů nebo joysticků). Jděte do Nastavení a nakonfigurujte "
-"gamepady. Je také možné hrát na klávesnici (klávesnicích), ovšem každý hrá� "
-"bude potřebovat jinou sadu kláves a je třeba si uvědomit, že většina "
-"klávesnic není vhodná pro hru více hrá�ů, protože nepodporují sou�asný stisk "
-"několika kláves."
+msgstr "Nejprve potřebujete několik vstupních zařízení (pro hru více hrá�ů je dobré mít více gamepadů nebo joysticků). Jděte do Nastavení a nakonfigurujte gamepady. Je také možné hrát na klávesnici (klávesnicích), ovšem každý hrá� bude potřebovat jinou sadu kláves a je třeba si uvědomit, že většina klávesnic není vhodná pro hru více hrá�ů, protože nepodporují sou�asný stisk několika kláves."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1348,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1356,14 +1232,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Pevnost Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Nalezeno %d ovlada�ů wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1387,13 +1265,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1407,22 +1284,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Herní klávesy"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Herní režimy"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1438,51 +1312,45 @@ msgstr "Tla�ítko gamepadu %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad má %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Obecné"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Vzdát závod"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1492,61 +1360,53 @@ msgid "Go!"
 msgstr "Start!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Velká Cena"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Průběh Grand Prix"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Úroveň grafických efektů"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Nastavení grafiky"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Zelené údolí"
 
@@ -1563,12 +1423,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1578,22 +1436,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Nápověda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Nejvyšší skóre"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1601,77 +1455,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Střílej po ostatních zbraněmi dokud neztratí všechny životy. (Jen pro hru "
-"více hrá�ů)"
+msgstr "Střílej po ostatních zbraněmi dokud neztratí všechny životy. (Jen pro hru více hrá�ů)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Pouze autí�ka ovládaná lidmi"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Když mě porazíš na trati, tak toho starce pustím."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Vidíte-li tla�ítko se zámkem jako je toto, musíte pro odem�ení splnit výzvu."
+msgstr "Vidíte-li tla�ítko se zámkem jako je toto, musíte pro odem�ení splnit výzvu."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignoruji '%s', musíte se do hry připojit dříve!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Nainstalovat"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Pokro�ilý"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1681,13 +1529,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Motokáry"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Zachovat toto rozlišení"
 
@@ -1706,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Klávesnice %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1715,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Kolo"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Kolo %i"
@@ -1777,50 +1623,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Na�ítání"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Zam�eno"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Zam�eno: splň aktivní výzvy k získání přístupu!"
 
@@ -1828,11 +1670,51 @@ msgstr "Zam�eno: splň aktivní výzvy k získání přístupu!"
 msgid "Locked!"
 msgstr "Zam�eno!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1843,27 +1725,18 @@ msgstr "Podívat se za sebe"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1871,18 +1744,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Pouze já"
 
@@ -1892,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Klávesy menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Osa myši %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1922,48 +1797,41 @@ msgstr "Tla�ítko myši %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Hra více hrá�ů"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Hra více hrá�ů"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Hudba"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1983,13 +1851,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1998,9 +1868,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Nová Velká Cena '%s' nyní k dispozici"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2013,7 +1887,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Nová obtížnost '%s' nyní k dispozici"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nové nejrychlejší kolo"
 
@@ -2041,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Žádný"
 
@@ -2063,21 +1936,19 @@ msgid "Normal Race"
 msgstr "Normální závod"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Severní letovisko"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nová�ek"
 
@@ -2088,46 +1959,41 @@ msgstr "Po�et autí�ek ovládaných po�íta�em: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Po�et po�íta�em ovládaných motokár"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Budiž"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Vyjeté koleje"
 
@@ -2135,60 +2001,59 @@ msgstr "Vyjeté koleje"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Jasně, koukni, je v mém zámku a bude podáván k ve�eři..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Starý důl"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Hodina matiky"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Nastavení může provádět pouze hrá� zakládající hru."
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2199,14 +2064,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Možnosti"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2215,35 +2077,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Padák - zpomalí všechny hrá�e před tebou."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2251,8 +2108,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2263,12 +2120,11 @@ msgstr "Pozastavit Hru"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pozastaveno"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Trestný �as!!"
 
@@ -2277,7 +2133,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Hřiště tu�ňáků"
 
@@ -2286,37 +2141,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Hrát vše"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Hrá�i"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2325,6 +2181,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Prosím přenastavte své nastavení kláves."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Chvíli strpení, aktualizují se doplňky."
@@ -2334,50 +2194,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Chvíli strpení, na�ítají se doplňky."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Zvon - tref protivníkova záda a přitáhne tě, nebo ho� zvon dozadu a "
-"protihrá�, kterého trefíš, přijde o výhled"
+msgstr "Zvon - tref protivníkova záda a přitáhne tě, nebo ho� zvon dozadu a protihrá�, kterého trefíš, přijde o výhled"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pro zrušení stiskněte ESC"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Stiskněte klávesu"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Stiskněte enter nebo dvojitě klikněte na zařízení, které chcete nastavit"
+msgstr "Stiskněte enter nebo dvojitě klikněte na zařízení, které chcete nastavit"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Stiskněte enter nebo dvojitě klikněte na hrá�e, kterého chcete upravit"
+msgstr "Stiskněte enter nebo dvojitě klikněte na hrá�e, kterého chcete upravit"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2409,7 +2259,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2418,7 +2267,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2430,25 +2278,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Konec"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Nastavení závodu"
 
@@ -2469,8 +2313,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Náhodná motokára"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Náhodná trať"
 
@@ -2479,82 +2323,68 @@ msgid "Rank"
 msgstr "Pořadí"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Připravit!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Zapamatovat si umístění okna"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Odstranit"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -2580,29 +2410,25 @@ msgstr "Záchrana"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Restart"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Restartovat závod"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Opa�ný směr"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2659,41 +2485,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skotsko"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2703,12 +2523,10 @@ msgid "Select"
 msgstr "Vybrat"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Vybrat herní mód"
 
@@ -2718,36 +2536,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Výběr autí�ka"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2762,91 +2574,49 @@ msgstr "Pozor!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nastavit nový závod"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Tekuté písky"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Třpytivé předměstí"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2856,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Velikost: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2867,12 +2636,10 @@ msgstr "Smyk"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Motiv"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Sněžný vrchol"
 
@@ -2882,27 +2649,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Omluváme se, během připojování k webu doplňků se vyskytla chyba. Ujistěte se "
-"že jste připojeni k internetu a že SuperTuxKart není blokován firewallem"
+msgstr "Omluváme se, během připojování k webu doplňků se vyskytla chyba. Ujistěte se že jste připojeni k internetu a že SuperTuxKart není blokován firewallem"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2910,7 +2673,6 @@ msgstr "Omlouváme se, ale stahování přídavku selhalo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Zvukové efekty"
 
@@ -2919,7 +2681,6 @@ msgstr "Zvukové efekty"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standardní"
 
@@ -2932,11 +2693,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Start Velké Ceny"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Start závodu"
 
@@ -2956,12 +2716,10 @@ msgstr "Doprava"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Režim příběhu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2969,82 +2727,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Pod mořem"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart moduly"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Nápověda k SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Možnosti SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart umožňuje hru více hrá�ů na jednom po�íta�i"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart má několik hracích módů"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "Prohazova�ka - dárky se na krátkou chvíli mění na banány a naopak."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Pláca�ka - rozplácne soupeře nablízku a tím ho zpomalí"
 
@@ -3053,32 +2798,37 @@ msgstr "Pláca�ka - rozplácne soupeře nablízku a tím ho zpomalí"
 msgid "System Language"
 msgstr "Systémový jazyk"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtrování textur"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "Klávesa 'smyk' ti umožní ostře zato�it a nabrat rychlost."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3090,9 +2840,7 @@ msgstr "Doplněk je momentálně zakázný v menu \"Možnosti\"."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Soubor s nejvyšším skóre byl příliš starý,\n"
-"všechna nejvyšší skóre byla smazána."
+msgstr "Soubor s nejvyšším skóre byl příliš starý,\nvšechna nejvyšší skóre byla smazána."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3105,40 +2853,22 @@ msgstr "Závod na �as"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Závod na �as: Neobsahuje žádná vylepšení, záleží pouze na vašich řidi�ských "
-"schopnostech!"
+msgstr "Závod na �as: Neobsahuje žádná vylepšení, záleží pouze na vašich řidi�ských schopnostech!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Pro přidání gamepadu/joysticku spusťte SuperTuxKart s připojeným zařízením, "
-"které se poté objeví v seznamu.\n"
-"\n"
-"Pro přidání nastavení klávesnice můžete použít tla�ítko dole, OVŠEM uvědomte "
-"si, že většina klávesnic podporuje pouze omezené množství sou�asně "
-"stisknutých kláves a jsou proto nevhodné pro hru více hrá�ů. (Ovšem můžete "
-"připojit více klávesnic k po�íta�i. Pamatujte, že každý hrá� potřebuje jiné "
-"nastavení kláves.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Pro přidání gamepadu/joysticku spusťte SuperTuxKart s připojeným zařízením, které se poté objeví v seznamu.\n\nPro přidání nastavení klávesnice můžete použít tla�ítko dole, OVŠEM uvědomte si, že většina klávesnic podporuje pouze omezené množství sou�asně stisknutých kláves a jsou proto nevhodné pro hru více hrá�ů. (Ovšem můžete připojit více klávesnic k po�íta�i. Pamatujte, že každý hrá� potřebuje jiné nastavení kláves.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Abyste si usnadnili cestu k výhře, můžete sbírat následující bonusy:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Na měsíc a zpět"
 
@@ -3157,7 +2887,7 @@ msgstr "Prvních %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3171,19 +2901,17 @@ msgstr "Autor tratÄ› %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "TratÄ›"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3194,24 +2922,21 @@ msgstr "Zkuste znovu"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Výuka: Výběr"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Typ :"
 
@@ -3219,20 +2944,18 @@ msgstr "Typ :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Odinstalovat"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3246,8 +2969,8 @@ msgid "Update"
 msgstr "Aktualizovat"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3256,40 +2979,36 @@ msgid "Updated date"
 msgstr "Datum aktualizace"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Uživatelské rozhraní"
 
@@ -3298,19 +3017,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3319,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3336,27 +3052,23 @@ msgstr "Verze: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertikální synchronizace (vyžaduje restart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Hlasitost"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3368,7 +3080,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ŠPATN� SMĚR!"
 
@@ -3377,58 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Varování, 'Shift' není doporu�ená klávesa : přestanou fungovat všechny "
-"klávesy, které mají jiné znaky při stisknuté klávese 'Shift'."
+msgstr "Varování, 'Shift' není doporu�ená klávesa : přestanou fungovat všechny klávesy, které mají jiné znaky při stisknuté klávese 'Shift'."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "ZbranÄ›"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efekty po�así"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efekty po�así: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Co se děje, prckové? Snad vám nechybí váš šéf pakůň?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Až nastavíte vstupní zařízení, budete připraveni hrát. Vyberte ikonu 'Hra "
-"více hrá�ů' v hlavním menu. Až bude možno vybírat autí�ka, každý hrá� může "
-"stisknout tla�ítko 'Střílet' na gamepadu nebo klávesnici pro připojení se do "
-"závodu. Každý hrá� může použít vlastní zařízení pro vybrání autí�ka. Hra "
-"pokra�uje tehdy, až si všichni vyberou svá autí�ka. Pro tuto operaci není "
-"možné použít myš."
+msgstr "Až nastavíte vstupní zařízení, budete připraveni hrát. Vyberte ikonu 'Hra více hrá�ů' v hlavním menu. Až bude možno vybírat autí�ka, každý hrá� může stisknout tla�ítko 'Střílet' na gamepadu nebo klávesnici pro připojení se do závodu. Každý hrá� může použít vlastní zařízení pro vybrání autí�ka. Hra pokra�uje tehdy, až si všichni vyberou svá autí�ka. Pro tuto operaci není možné použít myš."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3436,42 +3135,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ano"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Hrajete jako"
 
@@ -3481,37 +3174,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Dokon�ili jste výzvu!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Dokon�ili jste výzvy!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Velká Cena dokon�ena!"
 
@@ -3532,20 +3224,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Dokon�ili jste závod!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Byl(a) jsi vyřazen(a)!"
 
@@ -3555,7 +3250,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3563,54 +3258,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Odemkli jse grand prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Odemkli jste trať %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Vyhráli jste závod!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Soubor nastavení byl poškozen, proto byl smazán a bude vytvořen nový."
+msgstr "Soubor nastavení byl poškozen, proto byl smazán a bude vytvořen nový."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Soubor nastavení byl zastaralý, proto byl smazán a bude vytvořen nový."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Soubor nastavení byl zastaralý, proto byl smazán a bude vytvořen nový."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Vstupní soubor nastavení není kompatibilní s touto verzí SuperTuxKart."
+msgstr "Vstupní soubor nastavení není kompatibilní s touto verzí SuperTuxKart."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3618,7 +3320,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Japonská zahrada"
 
@@ -3629,7 +3330,6 @@ msgstr "[nezadáno]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3638,7 +3338,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "od"
@@ -3647,59 +3348,25 @@ msgstr "od"
 msgid "featured"
 msgstr "oblíbené"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standardní"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Ari Green https://launchpad.net/~ariyoyah\n"
-"  David Kolibá� https://launchpad.net/~david-kolibac\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  František Zatloukal https://launchpad.net/~zatloukal-frantisek\n"
-"  H0ff1 https://launchpad.net/~stefhoff\n"
-"  Jakub Talich https://launchpad.net/~jakub.talich-deactivatedaccount\n"
-"  Jan Srb https://launchpad.net/~j-srb\n"
-"  Jirka Folta https://launchpad.net/~pholta-cz\n"
-"  Lukáš Machyán https://launchpad.net/~phobulos\n"
-"  Michal Kundrát https://launchpad.net/~dreit\n"
-"  MightyPork https://launchpad.net/~mighty-pork\n"
-"  Ondřej Holý https://launchpad.net/~ondrej-holy\n"
-"  Petr Wudi https://launchpad.net/~petr-wudi\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Tadeáš Pařík https://launchpad.net/~pariktadeas\n"
-"  Tomáš Velecký https://launchpad.net/~elektron112\n"
-"  donny https://launchpad.net/~michal-donat\n"
-"  dtfjgk https://launchpad.net/~dtfjgk-deactivatedaccount"
+msgstr "Launchpad Contributions:\n  Ari Green https://launchpad.net/~ariyoyah\n  David Kolibá� https://launchpad.net/~david-kolibac\n  Dawid Gan https://launchpad.net/~deveee\n  František Zatloukal https://launchpad.net/~zatloukal-frantisek\n  H0ff1 https://launchpad.net/~stefhoff\n  Jakub Talich https://launchpad.net/~jakub.talich-deactivatedaccount\n  Jan Srb https://launchpad.net/~j-srb\n  Jirka Folta https://launchpad.net/~pholta-cz\n  Lukáš Machyán https://launchpad.net/~phobulos\n  Michal Kundrát https://launchpad.net/~dreit\n  MightyPork https://launchpad.net/~mighty-pork\n  Ondřej Holý https://launchpad.net/~ondrej-holy\n  Petr Wudi https://launchpad.net/~petr-wudi\n  STK-team https://launchpad.net/~stk\n  Tadeáš Pařík https://launchpad.net/~pariktadeas\n  Tomáš Velecký https://launchpad.net/~elektron112\n  donny https://launchpad.net/~michal-donat\n  dtfjgk https://launchpad.net/~dtfjgk-deactivatedaccount"
diff --git a/data/po/da.po b/data/po/da.po
index 9a99588ec..dff7f3bbd 100644
--- a/data/po/da.po
+++ b/data/po/da.po
@@ -1,22 +1,23 @@
-# Danish translation Supertuxkart.
-# Copyright (C) 2009 Joe Hansen.
-# This file is distributed under the same license as the Supertuxkart package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Joe Hansen <joedalton2@yahoo.dk>, 2009,2015
+# Søren Dyhr <siadyhr@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Branch irrlicht\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-04 16:23+0000\n"
-"Last-Translator: 1001sd <siadyhr@gmail.com>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-16 06:53+0000\n"
+"Last-Translator: Søren Dyhr <siadyhr@gmail.com>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/supertuxkart/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,23 +28,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Men I patetiske, små skvatmikler vil aldrig være i stand til at slå mig - "
-"go-kartenes konge!"
+msgstr " Men I patetiske, små skvatmikler vil aldrig være i stand til at slå mig - go-kartenes konge!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] "Vennen %d er nu online"
 msgstr[1] "Vennerne %d er nu online"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (handikappet)"
@@ -59,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s og %s er nu online."
@@ -71,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s af %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s af %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s er nu online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s er klar"
@@ -98,25 +97,23 @@ msgstr "%ss profil"
 msgid "%s's server"
 msgstr "%ss server"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s og %s er nu online."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
-msgstr "'%s' er blevet elimineret!"
+msgstr "»%s« er blevet elimineret!"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tom)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(netværksspil er endnu ikke tilgængeligt)"
 
@@ -130,46 +127,34 @@ msgstr "* Et rødt element viser en konflikt med en anden konfiguration"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Aktuelle nøglebindinger kan ses/ændres i indstillingsmenuen"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"De fleste af disse spil-typer kan også spilles som Grand Prix: i stedet for "
-"at spille et enkelt løb, spiller du mange i række. Jo højere du rangerer, jo "
-"flere point får du. Spilleren med flest point sammenlagt vinder turnering."
+msgstr "De fleste af disse spiltyper kan også spilles som Grand Prix: i stedet for at spille et enkelt løb, spiller du mange i række. Jo højere du rangerer, jo flere point får du. Spilleren med flest point sammenlagt vinder turneringen."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr "* Genstart STK for at tage de ny indstillinger i brug"
+msgstr "* Genstart STK for at tage de nye indstillinger i brug"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Hvilken tastaturindstilling der vil blive benyttet, vil blive bestemt ud "
-"fra hvilken 'Select'-tast, der bliver trykket for at deltage i spillet."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Hvilken tastaturindstilling der vil blive benyttet, vil blive bestemt ud fra hvilken »Select«-tast, der bliver trykket for at deltage i spillet."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -200,13 +185,10 @@ msgstr "3-strike-kamp"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"3-strike-kamp: Kun i flerspillerspil. Ram andre spillere med våben, indtil "
-"de har mistet alle deres liv."
+msgstr "3-strike-kamp: Kun i flerspillerspil. Ram andre spillere med våben, indtil de har mistet alle deres liv."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -221,23 +203,20 @@ msgid "9 months"
 msgstr "9 måneder"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= De bedste tider ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Computerstyrede biler"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Afbryd Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Om"
 
@@ -246,39 +225,35 @@ msgstr "Om"
 msgid "Accelerate"
 msgstr "Accelerér"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Accelerer og tryk <%s>-tasten imens du drejer for at drifte. At drifte i et "
-"kort stykke tid kan hjælpe med at dreje skarpere og gennemføre skarpe sving."
+msgstr "Accelerer og tryk <%s>-tasten imens du drejer for at drifte. At drifte i et kort stykke tid kan hjælpe med at dreje skarpere og gennemføre skarpe sving."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Accelerer med <%s> og drej med <%s> og <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Godkend"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Kontogenskabelse"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Kontoindstillinger"
 
@@ -286,8 +261,7 @@ msgstr "Kontoindstillinger"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Præstationer"
 
@@ -297,13 +271,11 @@ msgstr "Handling"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Tilføj"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Tilføj ven"
 
@@ -314,7 +286,6 @@ msgstr "Tilføj tastaturindstilling"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Tilføj spiller"
 
@@ -325,32 +296,29 @@ msgstr "Tilføj wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Tilføj en enhed"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Udvidelser"
 
@@ -360,70 +328,66 @@ msgstr "Udvidelsesnavn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Udvidelser"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Avanceret grafik"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alle"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alle baner"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr "Alt er tilladt, so grib nogle våben og brug dem klogt!"
+msgstr "Alt er tilladt, så grib nogle våben og brug dem klogt!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
-msgstr "Vis altid loginskærm"
+msgstr "Vis altid logindskærm"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Ambient occlusion"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Ambient occlusion: %s"
@@ -433,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Der er opstået en fejl i forsøget på at gemme dit grand prix."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Anker - bremser den forreste bil"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animerede karakterer"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animerede karakterer: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animeret sceneri"
 
@@ -459,24 +420,24 @@ msgstr "Animeret sceneri"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animeret scenery: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotopisk x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropisk x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Aniso"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropisk x8"
 
@@ -486,86 +447,77 @@ msgstr "Der findes allerede et grand prix med samme navn."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Antialias"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Antialias: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Anvend"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Anvend ny opløsning"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Ærkefjende"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr "Er du sikker på at du permanent vil slette denne indstilling?"
+msgstr "Er du sikker på, at du permanent vil slette denne indstilling?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr "Er du sikker på at du vil fjerne »%s«?"
+msgstr "Er du sikker på, at du vil fjerne »%s«?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenaer"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Rundt om fyrtårnet"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Fjern tildelt tast"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Indstil til ESC-tasten"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ved verdens ende"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Lyd"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Undgå bananskræller!"
 
@@ -587,81 +539,66 @@ msgstr "Akse %d %s"
 msgid "Axis %d inverted"
 msgstr "Akse %d omvendt"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Tilbage"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Tilbage til spillet"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Tilbage til løbet"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Tilbage til udfordringssektionen"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Tilbage til enhedslisten"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Tilbage til menuen"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Tilbage til menuen"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Bananelsker"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basketbold - hopper efter den førende spiller, og kan også smaske andre "
-"spiller undervejs ned"
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basketbold - hopper efter den førende spiller, og kan også smaske andre spiller undervejs ned"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Kamp-ø"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Bedre held næste gang!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineær"
 
@@ -671,39 +608,33 @@ msgid "Black"
 msgstr "Sort"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Sortbakkepalæet"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Bloom"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Bloom: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Blåt hold har vundet"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Bondegård"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingkugle - rikochetterer på vægge. Hvis du kigger bagud, vil den blive "
-"kastet baglæns."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingkugle - rikochetterer på vægge. Hvis du kigger bagud, vil den blive kastet baglæns."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -711,65 +642,52 @@ msgid "Brake"
 msgstr "Bremse"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Tyggegummi - beskyt dig selv med et skjold, eller efterlad en klistrende "
-"klat bag dig hvis du bruger den når du kigger bagud."
+msgstr "Tyggegummi - beskyt dig selv med et skjold, eller efterlad en klistrende klat bag dig hvis du bruger den når du kigger bagud."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
-"Men jeg er en retfærdig skabning, så jeg vil slå en handel af med jer."
+msgstr "Men jeg er en retfærdig skabning, så jeg vil slå en handel af med jer."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kage - flyver automatisk mod nærmeste fjende. Bedst til korte distancer "
-"eller længere lige."
+msgstr "Kage - flyver automatisk mod nærmeste fjende. Bedst til korte distancer eller længere lige."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
-msgstr "Kan ikke tilgå STKaddons server…"
+msgstr "Kan ikke tilgå STKaddons server …"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Annuller"
 
@@ -783,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Annuler/tilbage"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "X-grotten"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Udfordring gennemført"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Udfordring mislykket"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Udfordringer: Trofærum"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Ændr"
 
@@ -810,62 +725,52 @@ msgstr "Ændr"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Vælg en bil"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Kartoffel Kolumbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klik her for at køre træningen"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Luk"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr "Kakaotempel"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Kør ind i minds 5 bananer i det samme løb."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Saml blå bokse : De vil give dig våben og andre forbedringer"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Saml gaveæsker og affyr våbenet med <%s> for at få flyttet de her kasser!"
+msgstr "Saml gaveæsker og affyr våbenet med <%s> for at få flyttet de her kasser!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Indsaml nitroflasker (vi vil bruge dem efter svinget)"
 
@@ -875,17 +780,13 @@ msgstr "Indsaml nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Indsamling af nitro gør, at du får hastighedsforbedringer når du ønsker det, "
-"ved at trykke på den behørige tast. Du kan se din aktuelle nitrobeholdning i "
-"bjælken til højre for spilområdet."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Indsamling af nitro gør, at du får hastighedsforbedringer når du ønsker det, ved at trykke på den behørige tast. Du kan se din aktuelle nitrobeholdning i bjælken til højre for spilområdet."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Gennemfør alle udfordringerne for at låse den store dør op!"
 
@@ -898,11 +799,11 @@ msgstr "Gennemført præstation »%s«"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Bekræft"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -910,7 +811,6 @@ msgstr "Bekræft skærmopløsningen inden der er gået %i sekunder"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Forbind til internettet"
 
@@ -918,107 +818,86 @@ msgstr "Forbind til internettet"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Forbind din wiimote til bluetooth-håndteringsværktøjet, og tryk derefter på "
-"OK. Detaljerede instruktioner kan findes på supertuxkart.net/Wiimote"
+msgstr "Forbind din wiimote til bluetooth-håndteringsværktøjet, og tryk derefter på OK. Detaljerede instruktioner kan findes på supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Har ingen power-ups, så det er kun ens kørefærdigheder der betyder noget."
+msgstr "Har ingen power-ups, så det er kun ens kørefærdigheder der betyder noget."
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Fortsæt"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Fortsæt et gemt grand prix"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Fortsæt"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Styring"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Kopiér"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Kunne ikke oprette spilleren »%s«"
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Kunne ikke detektere nogen wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Opret"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Opret server"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Opret bruger"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Opret onlinebruger"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Opretter server"
 
-# Kredittekster (fortekster, eftertekster)
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Rulletekster"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Nuværende kodeord"
 
@@ -1031,13 +910,12 @@ msgid "Currently not signed in"
 msgstr "Ikke logget ind i øjeblikket"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Brugertilpasset"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Brugertilpassede indstillinger"
 
@@ -1063,7 +941,6 @@ msgstr "DPad op"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Afvis"
 
@@ -1071,28 +948,26 @@ msgstr "Afvis"
 msgid "Default"
 msgstr "Standard"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Slet"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Fjern indstilling"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Depth of field"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Depth of field: %s"
@@ -1105,24 +980,23 @@ msgstr "Deaktiver enhed"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Deaktiveret"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Vis FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
-msgstr "Vil du virkelig gerne annullere grand prix-et?"
+msgstr "Vil du virkelig gerne annullere grand prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ønsker du virkelig at slette spiller »%s« ?"
@@ -1131,8 +1005,8 @@ msgstr "Ønsker du virkelig at slette spiller »%s« ?"
 msgid "Do you want to save your changes?"
 msgstr "Ønsker du at gemme dine ændringer?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Lad være med at accellerere før »kør«"
 
@@ -1143,27 +1017,24 @@ msgstr "Ned"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Kør omvendt"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Dynamisk belysning: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Rediger"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Rediger grand prix"
 
@@ -1174,7 +1045,6 @@ msgstr "Æggejagt"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Æggejagt: Udforsk baner for at finde alle de gemte æg."
 
@@ -1184,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Æg: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Elemineret"
 
@@ -1197,24 +1066,22 @@ msgstr "Elemineret"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "E-mail"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "E-mail skal være imellem 4 og 50 tegn lang!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "E-mail er ugyldig!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "E-mails passer ikke sammen!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1226,64 +1093,61 @@ msgstr "Aktiver enhed"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr "Slå brugere med handikap til"
+msgid "Enable per-player handicaps"
+msgstr "Slå brugerspecifikke handikap til."
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Slået til"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Aktiveret for alle"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Indtast den nye spillers navn"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr "Mislykkedes i at downloade nyheder: »%s«"
+msgstr "Mislykkedes i at hente nyheder: »%s«"
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Alle:\n"
-"Tryk »Vælg« nu for at deltage i spillet!"
+msgstr "Alle:\nTryk »Vælg« nu for at deltage i spillet!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Eksisterende netkonto"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Afslut"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Forlad løb"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Forlad spil"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ekspert"
 
@@ -1291,12 +1155,12 @@ msgstr "Ekspert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Udforsk baner for at finde alle de gemte æg"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d - PolyCount: %d Solid, %d Shadows - LightDist: %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d K Tris"
@@ -1321,21 +1185,17 @@ msgid "Fetching servers"
 msgstr "FÃ¥r fat i servere"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Indtast brugernavnet og emailadressen du oplyste ved registreringen for at "
-"nulstille dit kodeord."
+msgstr "Indtast brugernavnet og emailadressen du oplyste ved registreringen for at nulstille dit kodeord."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Sidste runde!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Find server"
 
@@ -1346,21 +1206,14 @@ msgstr "Ild"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Først skal du bruge flere input-enheder (flere controllere eller joysticks "
-"er den bedste måde at spille med mange mennesker). Gå ind i input-"
-"indstillingerne og indstil controllerne. Man kan også spille på "
-"tastatur(er), men så skal hver bruger bruge unikke taster, og husk på, at de "
-"fleste tastaturer ikke er velegnede til flerspillerspil, da de ikke "
-"understøtter en stor mængde tastetryk samtidig."
+msgstr "Først skal du bruge flere input-enheder (flere controllere eller joysticks er den bedste måde at spille med mange mennesker). Gå ind i input-indstillingerne og indstil controllerne. Man kan også spille på tastatur(er), men så skal hver bruger bruge unikke taster, og husk på, at de fleste tastaturer ikke er velegnede til flerspillerspil, da de ikke understøtter en stor mængde tastetryk samtidig."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1373,25 +1226,22 @@ msgstr "Følg efter lederen!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Følg lederen: Lig på en andenplads, da den bagerste bil vil blive "
-"diskvalificeret hver gang tælleren når 0. Men pas på: Hvis du kører foran "
-"leder vil du også blive elimineret!"
+msgstr "Følg lederen: Lig på en andenplads, da den bagerste bil vil blive diskvalificeret hver gang tælleren når 0. Men pas på: Hvis du kører foran leder vil du også blive elimineret!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Har fundet %d wiimote(r)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Fandt %d wiimote"
+msgstr[1] "Fandt %d wiimoter"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1415,13 +1265,12 @@ msgstr "Venneandmodning afsendt!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Venner"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
@@ -1435,22 +1284,19 @@ msgstr "MÃ…L!"
 msgid "Game Keys"
 msgstr "Spiltaster"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spiltilstande"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Spiltype (Målbegrænsning/Tidsbegrænsning)"
 
@@ -1466,51 +1312,45 @@ msgstr "Gamepadknap %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepadhat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Generelt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Giv op"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Global oplysning"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Global oplysning: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Glødende kanter"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Glødende kanter: %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1520,61 +1360,53 @@ msgid "Go!"
 msgstr "Kør!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "Guldbilleist"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr "Gran Paradiso Ø"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grandprix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr "Grand prix redigeringsværktøj"
+msgstr "Grand prix-redigeringsværktøj"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr "Grand prix redigeringsværktøj"
+msgstr "Grand prix-redigeringsværktøj"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Grand prix-fremskridt"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafikeffektniveau"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafik"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikindstillinger"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Grønnedal"
 
@@ -1591,12 +1423,10 @@ msgstr "Gæst %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Gæstelogin"
+msgid "Guest Log in"
+msgstr "Gæstlogind"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1606,22 +1436,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hjælp"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Topscoreliste"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Ram 10 biler med en bowlingkugle"
 
@@ -1629,79 +1455,71 @@ msgstr "Ram 10 biler med en bowlingkugle"
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Ram andre med våben indtil de ikke har flere liv. (Kun i flerspillerspil)"
+msgstr "Ram andre med våben indtil de ikke har flere liv. (Kun i flerspillerspil)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Ram den samme bil mindst 5 gange i det samme løb."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Kun menneskekontrollerede biler."
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
-"Jeg accepterer de ovenstående betingelser samt at jeg er mindst 13 år eller "
-"derover. "
+msgstr "Jeg accepterer de ovenstående betingelser samt at jeg er mindst 13 år eller derover. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Hvis du kan slå mig i racerløb, vil jeg befri den gamle knark."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Hvis du ser en knap med en lås som denne, så skal du gennemføre en "
-"udfordring for at låse den op."
+msgstr "Hvis du ser en knap med en lås som denne, så skal du gennemføre en udfordring for at låse den op."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorerer »%s«: Du skulle have deltaget tidligere for at spille."
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Billedbaseret belysning"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installér"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Mellem"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "Internetadgang er slået fra. Du kan slå det til i indstillingerne."
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Det står lige."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr "Det er en hemmelighed."
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Deltag"
 
@@ -1711,13 +1529,12 @@ msgstr "Deltager i server"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Biler"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Behold denne opløsning"
 
@@ -1736,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Tastatur %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1745,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Omgang"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Runde %i"
@@ -1807,50 +1623,46 @@ msgstr "Venstre knap (LT)"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Crepuscularstråler (tusmørkestråler)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Crepuscularstråler (tusmørkestråler): %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Indlæser"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Lobby"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Lobbyindstillinger"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Lokalt brugernavn"
+msgid "Local Name"
+msgstr "Lokalt navn"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "LÃ¥st"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Låst: løs aktive udfordringer for at få adgang til mere!"
 
@@ -1858,11 +1670,51 @@ msgstr "Låst: løs aktive udfordringer for at få adgang til mere!"
 msgid "Locked!"
 msgstr "LÃ¥st!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Log ind"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Log ud"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Logget ind som: %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Logger ind"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Logger ind som »%s«"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Ved at logge ind som en gæst kan du deltage i internetløb, men du kan ikke stemme for udvidelser, eller opnå resultater mens du er på."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Logger ud"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Logger »%s« ud"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Log ind"
 
@@ -1873,27 +1725,18 @@ msgstr "Se tilbage"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Søg efter flere venner:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr "Luna"
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Drift 5 gange i samme runde."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Kør et ræs med mindst 5 runder."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Maratonkører"
 
@@ -1901,18 +1744,16 @@ msgstr "Maratonkører"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Maksimalt antal spillere"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Maksimal tid (minutter)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Kun mig"
 
@@ -1922,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Menutaster."
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr "Minigolf"
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Myggejager"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Bevægelsessløring"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Bevægelsessløring: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Museakse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1952,48 +1797,41 @@ msgstr "Museknap %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Flyt ned"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Flyt op"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Flerspiller"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Flerspiller"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musik"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Navn"
 
@@ -2013,13 +1851,15 @@ msgstr "Navnet er for langt."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Servernavn"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Nessies dam"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Ny"
 
@@ -2028,9 +1868,13 @@ msgstr "Ny"
 msgid "New Grand Prix '%s' now available"
 msgstr "Nyt grand prix »%s« er nu tilgængeligt"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Ny netkonto"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nyt kodeord"
 
@@ -2043,7 +1887,7 @@ msgstr "Ny forespørgsel"
 msgid "New difficulty '%s' now available"
 msgstr "Ny sværhedsgrad »%s« er nu tilgængelig"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Ny hurtigste omgang"
 
@@ -2071,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Nitroudfordring"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "Nej"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ingen"
 
@@ -2093,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Normalt ræs"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Skiferie"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Hvis du kan drifte i et par sekunder, vil du få en hastighedsbonus som "
-"belønning!"
+msgstr "Hvis du kan drifte i et par sekunder, vil du få en hastighedsbonus som belønning!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Novice"
 
@@ -2120,46 +1959,41 @@ msgstr "Antal computerstyrede biler: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Antal AI-vogne"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Antal mål for at vinde"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Antal runder"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Antal runder"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Ud at køre offroad"
 
@@ -2167,65 +2001,62 @@ msgstr "Ud at køre offroad"
 msgid "Offline"
 msgstr "Offline"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Frakoblet konto"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Åh ja, se, han er i min borg nu og vil blive serveret til middagsmad…"
+msgstr "Åh ja, se, han er i min borg nu og vil blive serveret til middagsmad…"
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Den gamle mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Olivers matematiktime"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Online"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Online flerspiller"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Online-brugernavn"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "Online-brugernavn skal være mellem 3 og 30 karaktere langt!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Online-brugernavn må ikke starte med et tal!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Kun spilmesteren kan agere ved dette punkt"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
-msgstr ""
-"Hovsa! Når du er i problemer, kan du trykke på »%s« for at blive reddet"
+msgstr "Hovsa! Når du er i problemer, kan du trykke på »%s« for at blive reddet"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2233,14 +2064,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Indstillinger"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Oversigt"
 
@@ -2249,35 +2077,30 @@ msgid "POWER"
 msgstr "KRAFT"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Faldskærm -  bremser alle biler foran dig"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Kodeord"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Kodeord"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Kodeordsændring"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Kodeordet skal være imellem 8 og 30 karakterer langt!"
 
@@ -2285,8 +2108,8 @@ msgstr "Kodeordet skal være imellem 8 og 30 karakterer langt!"
 msgid "Password successfully changed."
 msgstr "Kodeordet er blevet ændret."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Kodeordene er ikke ens!"
 
@@ -2297,12 +2120,11 @@ msgstr "Paus spillet"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pauset"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Straftid!!"
 
@@ -2311,7 +2133,6 @@ msgid "Pending"
 msgstr "Afventer"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinlegeplads"
 
@@ -2320,37 +2141,38 @@ msgid "Performing vote"
 msgstr "Udfører stemme"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Spil alle"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr "Spil alle de officielle baner mindst en gang"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spillere"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Spillere kan vælge handikappede profiler (som er sværere at spille), på bilvalgs-skærmen."
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Indtast navnet på grand prixet."
 
@@ -2359,6 +2181,10 @@ msgstr "Indtast navnet på grand prixet."
 msgid "Please re-configure your key bindings."
 msgstr "Genindstil dine tastaturindstillinger."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Læs venligst vilkår og betingelser"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Vent mens udvidelser bliver opdateret."
@@ -2368,48 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Vent mens udvdelserne indlæses."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Svupper - kast fremad for at trække an modstander tilbage, eller kast den "
-"baglæns for at få en modspiller til at miste synet."
+msgstr "Svupper - kast fremad for at trække an modstander tilbage, eller kast den baglæns for at få en modspiller til at miste synet."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr "Powerup-kærlighed"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Tryk <%s> for at kigge baglæns, og affyr våbnet med <%s> imens du holder "
-"<%s> nede for at skyde baglæns!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Tryk <%s> for at kigge baglæns, og affyr våbnet med <%s> imens du holder <%s> nede for at skyde baglæns!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Tryk ESC for at afbryde"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Tryk på en tast"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Tryk <enter> eller dobbeltklik på en enhed for at indstille den"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Tryk retur eller dobbeltklik på en spiller for at redigere ham/hende"
 
@@ -2425,10 +2241,7 @@ msgstr "Tryk skyd for at starte udfordringen"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Tryk på knapperne 1 og 2 samtidig på din wiimote for at sætte den i "
-"\"discovery mode\", og klik derefter på OK. Detaljerede instruktioner er på "
-"supertuxkart.net/Wiimote"
+msgstr "Tryk på knapperne 1 og 2 samtidig på din wiimote for at sætte den i \"discovery mode\", og klik derefter på OK. Detaljerede instruktioner er på supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2446,7 +2259,6 @@ msgstr "Arbejder"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Profil"
 
@@ -2455,7 +2267,6 @@ msgid "Progress"
 msgstr "Fremskridt"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2463,30 +2274,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Skub bolden ned i det modsatte mål for at score mål. (Kun i flerspillerspil)."
+msgstr "Skub bolden ned i det modsatte mål for at score mål. (Kun i flerspillerspil)."
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Hurtigt spil"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Slut serveren"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Løbsopsætning"
 
@@ -2507,8 +2313,8 @@ msgstr "Tilfældigt grand prix"
 msgid "Random Kart"
 msgstr "Tilfældig vogn"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Tilfældigt løb"
 
@@ -2517,82 +2323,68 @@ msgid "Rank"
 msgstr "Placering"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Vurdering >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr "Ravnebro palæ"
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Klar!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr "Ja… En hemmelighed."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Rødt hold har vundet."
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Registrer"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr "Normalt ræs: Alt er tilladt, så skaf nogle våben og brug dem klogt!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Genindlæs"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Husk vinduesplacering"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Fjern"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Omdøb"
 
@@ -2618,29 +2410,25 @@ msgstr "Red"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Genstart"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Genstart løb"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Baglæns"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Baglæns:"
 
@@ -2697,41 +2485,35 @@ msgstr "Højre tast (R2)"
 msgid "SPEED"
 msgstr "HASTIGHED"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Racerkøreren Sara"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr "Troldkvinden Sara"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Gem"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Gem grand prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Søg"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Søger"
 
@@ -2741,12 +2523,10 @@ msgid "Select"
 msgstr "Vælg"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Vælg en sværhedsgrad"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Vælg en spilstilstand"
 
@@ -2756,36 +2536,30 @@ msgstr "Vælg en bane"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Vælg bil"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Send anonyme hardware statistikker"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Serveroprettelse"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Serverinformation"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Servervalg"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Servernavn:"
 
@@ -2800,93 +2574,49 @@ msgstr "Klar!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Kør et løb"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Skygger"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Skygger: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Skygger: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Skiftende sande"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Skinnende forstader"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Log ind"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Log ind som gæst"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Log af"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Logget ind som »%s«"
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Logger ind"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Logger ind som »%s«"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Hvis du logger ind som gæst kan du deltage i online løb, men du kan ikke "
-"stemme på udvidelser eller opnå præstationer."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Logger ud"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Logger »%s« ud"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Siden"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Enspiller"
 
@@ -2896,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Størrelse: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr "Driftkongen"
 
@@ -2907,12 +2636,10 @@ msgstr "Drift"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snetop"
 
@@ -2922,29 +2649,23 @@ msgid "Soccer"
 msgstr "Fodbold"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Fodboldbane"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Fodbold: Kun i flerspillerspil. Brug din bil til at skubbe bolden i mål."
+msgstr "Fodbold: Kun i flerspillerspil. Brug din bil til at skubbe bolden i mål."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"En fejl opstod i forsøget på at kontakte udvidelelsessiden. Kontroller at du "
-"er forbundet til internnet og at SuperTuxKart ikke er blokeret af en "
-"firewall."
+msgstr "En fejl opstod i forsøget på at kontakte udvidelelsessiden. Kontroller at du er forbundet til internnet og at SuperTuxKart ikke er blokeret af en firewall."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2952,7 +2673,6 @@ msgstr "Forsøget på at downloade udvidelsen mislykkedes."
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Lydeffekter"
 
@@ -2961,7 +2681,6 @@ msgstr "Lydeffekter"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
@@ -2974,11 +2693,10 @@ msgstr "Start"
 msgid "Start Grand Prix"
 msgstr "Start grand prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Start løb"
 
@@ -2998,12 +2716,10 @@ msgstr "Drej til højre"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Historie"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr "Strike!"
 
@@ -3011,90 +2727,69 @@ msgstr "Strike!"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Indsend"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Underr vandet"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart-udvidelser"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Hjælp til SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Indstillinger i SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart kan blive spillet som et flerspillerspil på den samme computer"
+msgstr "SuperTuxKart kan blive spillet som et flerspillerspil på den samme computer"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart har flere forskellige spiltyper"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
-"SuperTuxKart kan forbinde til en server for at downloade udvidelser og "
-"fortælle dig om opdateringer. Vi indsamler også anonyme hardwarestatistikker "
-"for at hjælpe udviklingen af STK. Vil du slå det til? (For at ændre denne "
-"indstilling senere, kan du gå til fanen »Brugergrænseflade« og redigere "
-"»Forbind til internettet« samt »Send anonyme hardwarestatistikker«"
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart kan forbinde til en server for at downloade udvidelser og fortælle dig om opdateringer. Vi indsamler også anonyme hardwarestatistikker for at hjælpe udviklingen af STK. Vil du slå det til? (For at ændre denne indstilling senere, kan du gå til fanen »Brugergrænseflade« og redigere »Forbind til internettet« samt »Send anonyme hardwarestatistikker«"
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Ombytter - gavekasser bliver lavet om til bananer og omvend i et kort stykke "
-"tid"
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Ombytter - gavekasser bliver lavet om til bananer og omvend i et kort stykke tid"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Fluesmækker - vil smaske biler tæt på ned, så de kører langsommere."
 
@@ -3103,32 +2798,37 @@ msgstr "Fluesmækker - vil smaske biler tæt på ned, så de kører langsommere.
 msgid "System Language"
 msgstr "Systemsprog"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Opfat dine modstandere som myg! Med fluesmækkeren skal du knuse mindst 5 i et løb."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Tempel"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Betingelser"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Billedkomprimering"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Billedfiltrering"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "Drifte-tasten lader dig dreje skarpt i sving of få et boost."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadiet."
 
@@ -3140,9 +2840,7 @@ msgstr "Udvidelsesmodulet er slået fra i indstillingsvinduet."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Filen over de bedste resultater var for gammel,\n"
-"alle de bedste resultater er blevet slettet."
+msgstr "Filen over de bedste resultater var for gammel,\nalle de bedste resultater er blevet slettet."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3155,40 +2853,22 @@ msgstr "Tidsprøve"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tidsprøve: Indeholder ingen forbedringer, så kun dine køreegenskaber tæller!"
+msgstr "Tidsprøve: Indeholder ingen forbedringer, så kun dine køreegenskaber tæller!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"For at tilføje en ny controller/joystick, skal du bare starte SuperTuxKart "
-"mens det er tilsluttet, og den vil vise sig i listen.\n"
-"\n"
-"Fot at tilføje en tastaturindstilling, kan du bruge nedenstående knap, men "
-"vær opmærksom på at mange tastaturer kun understøtter et begrænset antal "
-"samtidige tryk, og er derfor upassende til flerspillerspil. (Du kan dog "
-"forbinde flere tastaturer til samme computer. Husk at alle spillere stadig "
-"har brug for unikke tastaturindstillinger)."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "For at tilføje en ny controller/joystick, skal du bare starte SuperTuxKart mens det er tilsluttet, og den vil vise sig i listen.\n\nFot at tilføje en tastaturindstilling, kan du bruge nedenstående knap, men vær opmærksom på at mange tastaturer kun understøtter et begrænset antal samtidige tryk, og er derfor upassende til flerspillerspil. (Du kan dog forbinde flere tastaturer til samme computer. Husk at alle spillere stadig har brug for unikke tastaturindstillinger)."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Til at hjælpe dig med at vinde, er der nogle forbedringer du kan indsamle :"
+msgstr "Til at hjælpe dig med at vinde, er der nogle forbedringer du kan indsamle :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Til månen og tilbage"
 
@@ -3207,7 +2887,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr "Bane"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Bane %i/%i"
@@ -3221,19 +2901,17 @@ msgstr "Bane kreeret af %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Bane-gruppe"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Bane"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineær"
 
@@ -3244,24 +2922,21 @@ msgstr "Prøv igen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Øvelse"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Øvelse: Valgrum"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Type:"
 
@@ -3269,22 +2944,18 @@ msgstr "Type:"
 msgid "Type: Grand Prix"
 msgstr "Type: Grand prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"Kan ikke forbinde til serveren. Kontroller din internetforbindelser eller "
-"prøv igen senere."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Kan ikke forbinde til serveren. Kontroller din internetforbindelser eller prøv igen senere."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Afinstallér"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr "Ustoppelig"
 
@@ -3298,8 +2969,8 @@ msgid "Update"
 msgstr "Opdatér"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Opdateret"
 
@@ -3308,40 +2979,36 @@ msgid "Updated date"
 msgstr "Opdateret"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr "Brug 10 eller flere powerups i ét ræs."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Brug højopløsningsgrafik."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr "Brug venstre/højre til at vælge dit hold og tryk skyd."
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Brug den nitro du har indsamlet ved at trykke på <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Brugerinformation"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Brugergrænseflade"
 
@@ -3350,19 +3017,17 @@ msgid "User defined"
 msgstr "Brugerdefineret"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Brugersøgning"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Brugernavn"
 
@@ -3371,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr "Brugernavn og/eller email-adresse er ugyldig."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Validerer information"
 
@@ -3388,27 +3052,23 @@ msgstr "Version: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "VSync (kræver genstart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Visning"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Lydstyrke"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Stem"
 
@@ -3420,7 +3080,7 @@ msgstr "Stemme lykkedes. Du kan nu lukke vinduet."
 msgid "WEIGHT"
 msgstr "VÆGT"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "FORKERT VEJ!"
 
@@ -3429,59 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Advarsel: Det er ikke anbefalet at bruge<shift>: NÃ¥r man trykker den, vil "
-"alle taster der indeholder et andet symbol stoppe med at virke (for eksempel "
-"1→!)."
+msgstr "Advarsel: Det er ikke anbefalet at bruge<shift>: Når man trykker den, vil alle taster der indeholder et andet symbol stoppe med at virke (for eksempel 1→!)."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "VÃ¥ben"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Vejreffekter"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Vejreffekter: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Hvad er der galt små hippier? Er jer store gnu-leder blevet væk?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Når inputenhederne er indstillet er du klar til at spille. Vælg "
-"»flerspiller«-ikonet i hovedmenuen. Når det bliver tid til at vælge bil, kan "
-"hver spiller trykke på »skyd«-tasten på deres joystick/controller/tastatur "
-"for at deltage. Hver spiller bruger sin inputenhed for at vælge bil. Spillet "
-"fortsætter når alle har valgt deres bil. Læg mærke til at musen ikke kan "
-"benyttes til dette."
+msgstr "Når inputenhederne er indstillet er du klar til at spille. Vælg »flerspiller«-ikonet i hovedmenuen. Når det bliver tid til at vælge bil, kan hver spiller trykke på »skyd«-tasten på deres joystick/controller/tastatur for at deltage. Hver spiller bruger sin inputenhed for at vælge bil. Spillet fortsætter når alle har valgt deres bil. Læg mærke til at musen ikke kan benyttes til dette."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3489,42 +3135,36 @@ msgid "White"
 msgstr "Hvid"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr "Vind 5 ræs i træk."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr "Vind alle enspiller-spiltyper mod mindst 3 modstandere."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Du er nu klar til at køre. Held og lykke!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Du spiller som"
 
@@ -3534,46 +3174,36 @@ msgstr "Du kan ændre din tidligere bedømmelse ved at trykke på stjernerne."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
-"Du kan ikke downloade udvidelser uden internetadgang. Hvis du vil downloade "
-"udvidelser, skal du gå til indstillinger, vælge fanen »Brugergrænseflade« og "
-"ændre »Forbind til internettet«."
+msgstr "Du kan ikke downloade udvidelser uden internetadgang. Hvis du vil downloade udvidelser, skal du gå til indstillinger, vælge fanen »Brugergrænseflade« og ændre »Forbind til internettet«."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
-"Du kan ikke spille online uden internetadgang. Hvis du vil spille online, "
-"skal du gå til indstillinger, vælge fanen »Brugergrænseflade« og ændre "
-"»Forbind til internettet«."
+msgstr "Du kan ikke spille online uden internetadgang. Hvis du vil spille online, skal du gå til indstillinger, vælge fanen »Brugergrænseflade« og ændre »Forbind til internettet«."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
-"Du kan spille uden at oprette en bruger ved at fjerne afkrydsningen i "
-"»online«-feltet. Du kan dog ikke forbinde med venner, stemme på udvidelser "
-"o.s.v. Læs også vores privatlivsregler på http://privacy.supertuxkart.net"
+msgstr "Du kan spille uden at oprette en internetkonto ved at vælge frakoblet konto. Du er dog så ikke forbundet til venner, kan ikke stemme på udvidelser etc. Læs venligst vores privatlivserklæring på http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Du gennemførte en udfordring!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Du gennemførte udfordringer!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Du gennemførte grand prixet!"
 
@@ -3592,23 +3222,24 @@ msgstr "Du klarede den nemme udfordring! Point fået på dette niveau: %i/%i"
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Du klarede den intermediære udfordring! Point fået på dette niveau: %i/%i"
+msgstr "Du klarede den intermediære udfordring! Point fået på dette niveau: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Du afsluttede løbet!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Du har %d nye venneanmodninger!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Du har %d ny venneanmodning!"
+msgstr[1] "Du har %d nye venneanmodninger!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Du har en ny venneanmodning!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Du er blevet elimineret!"
 
@@ -3616,71 +3247,67 @@ msgstr "Du er blevet elimineret!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Du har endnu ikke stemt på denne udvidelse. Vælg den ønskede bedømmelse ved "
-"at trykke på de nedenstående stjerner."
+msgstr "Du har endnu ikke stemt på denne udvidelse. Vælg den ønskede bedømmelse ved at trykke på de nedenstående stjerner."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Du har brug for flere point \n"
-"for at spille denne udfordring.\n"
-"Se på minimappet efter \n"
-"tilgængelige udfordringer."
+msgstr "Du har brug for flere point \nfor at spille denne udfordring.\nSe på minimappet efter \ntilgængelige udfordringer."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Du skal indtaste et kodeord."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Du har låst op for grand prixet %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Du har låst op for banen %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Du vil få en email med videre instruktionerne til hvordan du nulstiller dit "
-"kodeord. Vær tålmodig, og huske at kontrollere din spam/reklamemail-mappe."
+msgstr "Du vil få en email med videre instruktionerne til hvordan du nulstiller dit kodeord. Vær tålmodig, og huske at kontrollere din spam/reklamemail-mappe."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Du vil få en email med videre instruktionerne til konto-aktivering. Vær "
-"tålmodig, og huske at kontrollere din spam/reklamemail-mappe."
+msgstr "Du vil få en email med videre instruktionerne til konto-aktivering. Vær tålmodig, og huske at kontrollere din spam/reklamemail-mappe."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Du vandt løbet!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Din OpenGL-version ser ud til at være for gammel. Kontroller venligst, om der er en opdatering tilgængelig til dine grafikdrivere. SuperTuxKart kræver OpenGL 3.1 eller bedre."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Din indstillingsfil var gået i stykket, så den er blevet slettet og en ny "
-"oprettet."
+msgstr "Din indstillingsfil var gået i stykket, så den er blevet slettet og en ny oprettet."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Din indstillingsfil var for gammel, så den er blevet slettet og en ny "
-"oprettet."
+msgstr "Din indstillingsfil var for gammel, så den er blevet slettet og en ny oprettet."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Din driverversion er for gammel. Installer venligst de seneste videodrivere."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3692,7 +3319,6 @@ msgid "Your profile"
 msgstr "Din profil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zenhave"
 
@@ -3703,7 +3329,6 @@ msgstr "[ingen]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "handlinger"
 
@@ -3712,7 +3337,8 @@ msgstr "handlinger"
 msgid "all"
 msgstr "alle"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "af"
@@ -3721,47 +3347,25 @@ msgstr "af"
 msgid "featured"
 msgstr "fremhævet"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr "Høsttid"
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "høj"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "lav"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr "Racerkøreren Sara"
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  1001sd https://launchpad.net/~siadyhr\n"
-"  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  J https://launchpad.net/~rumbukken\n"
-"  Marcus Møller https://launchpad.net/~marcusmoller\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  1001sd https://launchpad.net/~siadyhr\n  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n  Auria https://launchpad.net/~auria-mg\n  J https://launchpad.net/~rumbukken\n  Marcus Møller https://launchpad.net/~marcusmoller\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/da_DK.po b/data/po/da_DK.po
new file mode 100644
index 000000000..b2f69c5f4
--- /dev/null
+++ b/data/po/da_DK.po
@@ -0,0 +1,3369 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/projects/p/supertuxkart/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. I18N: Do NOT literally translate this string!! Please enter Y as the
+#. translation if your language is a RTL (right-to-left) language,
+#. N (or nothing) otherwise
+#: src/utils/translation.cpp:262
+msgid "   Is this a RTL language?"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid ""
+" But you pathetic little twerps will never be able to beat me - King of the "
+"Karts!"
+msgstr ""
+
+#. I18N: Only used for count > 3
+#: src/online/online_player_profile.cpp:429
+#, c-format
+msgid "%d friend is now online."
+msgid_plural "%d friends are now online."
+msgstr[0] ""
+msgstr[1] ""
+
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
+#, c-format
+msgid "%s (handicapped)"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:172
+#: src/states_screens/dialogs/addons_loading.cpp:176
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:165
+#, c-format
+msgid "%s MB"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:418
+#, c-format
+msgid "%s and %s are now online."
+msgstr ""
+
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/states_screens/addons_screen.cpp:306
+#, c-format
+msgctxt "addons"
+msgid "%s by %s"
+msgstr ""
+
+#: src/modes/linear_world.cpp:358
+#, c-format
+msgctxt "fastest_lap"
+msgid "%s by %s"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:414
+#, c-format
+msgid "%s is now online."
+msgstr ""
+
+#: src/guiengine/widgets/player_kart_widget.cpp:420
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:108
+#, c-format
+msgid "%s's profile"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:60
+#, c-format
+msgid "%s's server"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:423
+#, c-format
+msgid "%s, %s and %s are now online."
+msgstr ""
+
+#: src/modes/world.cpp:1147
+#, c-format
+msgid "'%s' has been eliminated."
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
+msgid "(Empty)"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "(network play is not yet available)"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:372
+msgid "* A blue item means a conflict with another configuration"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:377
+msgid "* A red item means a conflict in the current configuration"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help screen
+msgid "* Current key bindings can be seen/changed in menu Options"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"* Most of these game modes can also be played in a Grand Prix fashion: "
+"instead of playing a single race, you play many in a row. The better you "
+"rank, the more points you get. In the end, the player with the most points "
+"wins the cup."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "* Restart STK to apply new settings"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+msgid ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_achievements.stkgui
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "..."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:52
+msgid "1 month"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:50
+msgid "1 week"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:56
+msgid "1 year"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:51
+msgid "2 weeks"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:57
+msgid "2 years"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:182
+msgid "3 Strikes Battle"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
+"they lose all their lives."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:53
+msgid "3 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:54
+msgid "6 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:55
+msgid "9 months"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+msgid "= Highscores ="
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "AI karts"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:189
+msgid "Abort Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "About"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:236
+msgid "Accelerate"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:975
+#, c-format
+msgid ""
+"Accelerate and press the <%s> key while turning to skid. Skidding for a "
+"short while can help you turn faster to take sharp turns."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:897
+#, c-format
+msgid "Accelerate with <%s> and steer with <%s> and <%s>"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Accept"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Account Recovery"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:101
+msgid "Account Settings"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:100
+msgid "Achievements"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:71
+msgid "Action"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Add"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Add Friend"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:111
+msgid "Add Keyboard Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Add Player"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:90
+msgid "Add Wiimote"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Add a device"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Add user"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
+#: src/states_screens/grand_prix_editor_screen.cpp:336
+#: src/states_screens/kart_selection.cpp:286
+#: src/states_screens/tracks_screen.cpp:155
+msgid "Add-Ons"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:110
+msgid "Add-on name"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Addons"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
+msgid "Adiumy"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Advanced pipeline (lights, etc.)"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
+#: src/states_screens/addons_screen.cpp:49
+#: src/states_screens/arenas_screen.cpp:75
+#: src/states_screens/easter_egg_screen.cpp:137
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
+msgid "All"
+msgstr ""
+
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: Section in easter egg tracks selection screen
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+msgid "All Tracks"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:202
+msgid "All blows allowed, so catch weapons and make clever use of them!"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Always show login screen"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Ambient Occlusion"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:464
+#, c-format
+msgid "Ambient occlusion : %s"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:323
+msgid "An error occurred while trying to save your grand prix."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Anchor - slows down greatly the kart in the first position."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Characters"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:450
+#, c-format
+msgid "Animated Characters : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Scenery"
+msgstr ""
+
+#. I18N: in graphical options
+#. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
+#. UserConfigParams::m_pixel_shaders ? enabled : disabled);
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:444
+#, c-format
+msgid "Animated Scenery : %s"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
+msgid "Anisotropic x16"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
+msgid "Anisotropic x2"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
+msgid "Anisotropic x8"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
+msgid "Another grand prix with this name already exists."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Anti-aliasing"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:461
+#, c-format
+msgid "Anti-aliasing : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Apply"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Apply new resolution"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Arch Enemy"
+msgstr ""
+
+#. I18N: shown before deleting an input configuration
+#: src/states_screens/options_screen_input2.cpp:575
+msgid "Are you sure you want to permanently delete this configuration?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:123
+#: src/states_screens/grand_prix_editor_screen.cpp:109
+#, c-format
+msgid "Are you sure you want to remove '%s'?"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
+msgid "Arenas"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/lighthouse/track.xml
+msgid "Around the lighthouse"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign nothing"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign to ESC key"
+msgstr ""
+
+#. I18N: ./data/grandprix/4_atworldsend.grandprix
+msgid "At World's End"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
+msgid "Audio"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: src/tracks/track_object_presentation.cpp:906
+msgid "Avoid bananas!"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:284
+#, c-format
+msgid "Axis %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:272
+#, c-format
+msgid "Axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:279
+#, c-format
+msgid "Axis %d inverted"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
+#: src/states_screens/dialogs/addons_loading.cpp:284
+msgid "Back"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to Game"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Back to Race"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:205
+msgid "Back to challenge selection"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+msgid "Back to device list"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to menu"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:211
+msgid "Back to the menu"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Banana Lover"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/battleisland/track.xml
+msgid "Battle Island"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/beastie/kart.xml
+msgid "Beastie"
+msgstr ""
+
+#. I18N: when failing a GP
+#: src/states_screens/grand_prix_lose.cpp:161
+msgid "Better luck next time!"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
+msgid "Bilinear"
+msgstr ""
+
+#. I18N: Name of the black button on xbox controller
+#: src/input/gamepad_config.cpp:167
+msgid "Black"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mansion/track.xml
+msgid "Blackhill Mansion"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Bloom"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:473
+#, c-format
+msgid "Bloom : %s"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:969
+msgid "Blue Team Wins"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/farm/track.xml
+msgid "Bovine Barnyard"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:239
+msgid "Brake"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"BubbleGum - protect yourself with a shield, or use while looking back to "
+"leave a sticky pink puddle behind you."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "But I'm a fair creature, so I'll make you a deal."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Cake - thrown at the closest rival, best on short ranges and long straights."
+msgstr ""
+
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
+msgid "Can't access stkaddons server..."
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/addons_loading.cpp:227
+#: src/states_screens/dialogs/add_device_dialog.cpp:128
+#: src/states_screens/user_screen.cpp:112
+msgid "Cancel"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:56
+msgid "Cancel Request"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:277
+msgid "Cancel/Back"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cave/track.xml
+msgid "Cave X"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:493
+msgid "Challenge Completed"
+msgstr ""
+
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
+msgid "Challenge Failed"
+msgstr ""
+
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Title for challenges screen
+msgid "Challenges : Trophy Room"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "Change"
+msgstr ""
+
+#. I18N: ./data/gui/karts.stkgui
+#. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts_online.stkgui
+#. I18N: In the kart selection (player setup) screen
+msgid "Choose a Kart"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Christoffel Columbus"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+msgid "Click here to play the tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
+msgid "Close"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+msgid "Cocoa Temple"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Collect at least 5 bananas in one race."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid "Collect blue boxes : they will give you weapons or other powerups"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:916
+#, c-format
+msgid ""
+"Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:938
+msgid "Collect nitro bottles (we will use them after the curve)"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:648
+msgid "Collect nitro!"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"Collecting nitro allows you to get speed boosts whenever you wish by "
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:880
+msgid "Complete all challenges to unlock the big door!"
+msgstr ""
+
+#: src/achievements/achievement.cpp:202
+#, c-format
+msgid "Completed achievement \"%s\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Confirm"
+msgstr ""
+
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
+#, c-format
+msgid "Confirm resolution within %i seconds"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Connect to the Internet"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:387
+msgid ""
+"Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
+"instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:209
+msgid "Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+#. I18N: ./data/gui/tutorial_message_dialog.stkgui
+#. I18N: Button in tutorial
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
+msgid "Continue"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#: src/states_screens/gp_info_screen.cpp:146
+msgid "Continue saved GP"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:156
+msgid "Continue."
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:67
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
+msgid "Controls"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Copy"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
+#, c-format
+msgid "Could not create player '%s'."
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:418
+msgid "Could not detect any wiimote :/"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Create"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Create Server"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Create User"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:117
+msgid "Creating server"
+msgstr ""
+
+#. I18N: ./data/gui/credits.stkgui
+#. I18N: Title in credits screen
+msgid "Credits"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Current Password"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:134
+msgid "Current password invalid."
+msgstr ""
+
+#: src/config/player_manager.cpp:91
+msgid "Currently not signed in"
+msgstr ""
+
+#. I18N: custom video settings
+#: src/states_screens/options_screen_video.cpp:411
+msgid "Custom"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Custom settings..."
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
+msgid "DPad down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
+msgid "DPad left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
+msgid "DPad right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
+msgid "DPad up"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Decline"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:74
+msgid "Default"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Delete"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+#: src/states_screens/options_screen_input2.cpp:111
+msgid "Delete Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Depth of field"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:485
+#, c-format
+msgid "Depth of field : %s"
+msgstr ""
+
+#. I18N: button to disable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:96
+#: src/states_screens/options_screen_input2.cpp:587
+msgid "Disable Device"
+msgstr ""
+
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is disabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
+msgid "Disabled"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Display FPS"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:354
+msgid "Do you really want to abort the Grand Prix?"
+msgstr ""
+
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/user_screen.cpp:583
+#, c-format
+msgid "Do you really want to delete player '%s' ?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:140
+msgid "Do you want to save your changes?"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
+msgid "Don't accelerate before go"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:265
+msgid "Down"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Drive in reverse"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:455
+#, c-format
+msgid "Dynamic lights : %s"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Edit"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Title in edit grand prix screen
+msgid "Edit Grand Prix"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:184
+msgid "Egg Hunt"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Egg hunt: Explore tracks to find all hidden eggs."
+msgstr ""
+
+#: src/modes/easter_egg_hunt.cpp:202
+#, c-format
+msgid "Eggs: %d / %d"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/elephpant/kart.xml
+msgid "Elephpant"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
+msgid "Eliminated"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Email"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:292
+msgid "Email has to be between 4 and 50 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:298
+msgid "Email is invalid!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:276
+msgid "Emails don't match!"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/emule/kart.xml
+msgid "Emule"
+msgstr ""
+
+#. I18N: button to enable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:98
+#: src/states_screens/options_screen_input2.cpp:588
+msgid "Enable Device"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Enable per-player handicaps"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
+msgid "Enabled"
+msgstr ""
+
+#. I18N: animations setting (all karts are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
+msgid "Enabled for all"
+msgstr ""
+
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+msgid "Enter the new player's name"
+msgstr ""
+
+#: src/addons/news_manager.cpp:172
+#, c-format
+msgid "Error downloading news: '%s'."
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:923
+msgid ""
+"Everyone:\n"
+"Press 'Select' now to join the game!"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Exit"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Exit Race"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:111
+msgid "Exit game"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Expert"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:252
+msgid "Explore tracks to find all hidden eggs"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1795
+#, c-format
+msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1804
+#, c-format
+msgid "FPS: %d/%d/%d - %d KTris"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:128
+#: src/states_screens/online_profile_achievements.cpp:168
+msgid "Fetching achievements"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:88
+#: src/states_screens/online_profile_friends.cpp:174
+msgid "Fetching friends"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:171
+msgid "Fetching last vote"
+msgstr ""
+
+#: src/states_screens/server_selection.cpp:67
+#: src/states_screens/server_selection.cpp:210
+msgid "Fetching servers"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+msgid ""
+"Fill in the username and email address you supplied at registration to be "
+"able to reset your password."
+msgstr ""
+
+#: src/modes/linear_world.cpp:276
+msgid "Final lap!"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Find Server"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:242
+msgid "Fire"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"First, you will need several input devices (having multiple gamepads or "
+"joysticks is the best way to play with several people). Go in the input "
+"configuration screen and setup the gamepads. It is also possible to play on "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
+"because they do not support large number of keypresses."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:180
+msgid "Follow the Leader"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:650
+msgid "Follow the leader!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Follow the leader: Run for second place, as the last kart will be "
+"disqualified every time the counter hits zero. Beware : going in front of "
+"the leader will get you eliminated too!"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/fortmagma/track.xml
+msgid "Fort Magma"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:413
+#, c-format
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:313
+msgid "Friend removed!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:215
+msgid "Friend request accepted!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:364
+msgid "Friend request cancelled!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:267
+msgid "Friend request declined!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:158
+msgid "Friend request sent!"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:99
+msgid "Friends"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Fullscreen"
+msgstr ""
+
+#. I18N: Shown when a goal is scored
+#: src/states_screens/race_gui_base.cpp:70
+msgid "GOAL!"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:144
+msgid "Game Keys"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Game Modes"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Game type (Goals limit / Time limit)"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad buttons
+#: src/input/binding.cpp:292
+#, c-format
+msgid "Gamepad button %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad hats
+#: src/input/binding.cpp:260 src/input/binding.cpp:265
+#, c-format
+msgid "Gamepad hat %d"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "General"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Give Up Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Global illumination"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:489
+#, c-format
+msgid "Global illumination : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Glow (outlines)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:477
+#, c-format
+msgid "Glow (outlines) : %s"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/gnu/kart.xml
+msgid "Gnu"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:68
+msgid "Go!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Gold driver"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+msgid "Gran Paradiso Island"
+msgstr ""
+
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+#: src/states_screens/dialogs/select_challenge.cpp:145
+msgid "Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Grand Prix Editor"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Title in grand prix editor screen
+msgid "Grand Prix editor"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1214
+msgid "Grand Prix progress:"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Graphical Effects Level"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
+msgid "Graphics"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Graphics Settings"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/greenvalley/track.xml
+msgid "Green Valley"
+msgstr ""
+
+#. I18N: Name of first guest player (without number)
+#: src/config/player_manager.cpp:392
+msgid "Guest"
+msgstr ""
+
+#. I18N: Name of further guest players, with a 1, 2, ... attached
+#: src/config/player_manager.cpp:397
+#, c-format
+msgid "Guest %d"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Guest Log in"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/hacienda/track.xml
+msgid "Hacienda"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Help"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/hexley/kart.xml
+msgid "Hexley"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1252
+msgid "Highscores"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit 10 karts with a bowling-ball."
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:231
+msgid ""
+"Hit others with weapons until they lose all their lives. (Only in "
+"multiplayer games)"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit the same kart at least 5 times in one race."
+msgstr ""
+
+#. I18N: animations setting (only karts with human players are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
+msgid "Human players only"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "I agree to the above terms and am 13 years or older. "
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "If you can beat me at racing, I will free the old codger."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"If you see a button with a lock like this one, you need to complete a "
+"challenge to unlock it."
+msgstr ""
+
+#: src/input/input_manager.cpp:729
+#, c-format
+msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Install"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Intermediate"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
+msgid "Internet access is disabled, please enable it in the options"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:974
+msgid "It's a draw"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "It's secret"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Join"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:155
+msgid "Joining server"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+msgid "Karts"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+msgid "Keep this resolution"
+msgstr ""
+
+#. I18N: short definition for follow-the-leader game mode
+#: src/states_screens/race_setup_screen.cpp:222
+msgid "Keep up with the leader kart but don't overtake it!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:72
+msgid "Key binding"
+msgstr ""
+
+#: src/states_screens/options_screen_input.cpp:97
+#, c-format
+msgid "Keyboard %i"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/konqi/kart.xml
+msgid "Konqi"
+msgstr ""
+
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui_overworld.cpp:108
+msgid "Lap"
+msgstr ""
+
+#: src/modes/linear_world.cpp:303
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:67
+msgid "Laps"
+msgstr ""
+
+#. I18N: number of laps to race in a challenge
+#: src/challenges/challenge_data.cpp:249
+#, c-format
+msgid "Laps : %i"
+msgstr ""
+
+#: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
+msgid "Leader"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:268
+msgid "Left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:212
+msgid "Left bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:220
+msgid "Left thumb button"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:235
+msgid "Left thumb down"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:233
+msgid "Left thumb left"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:231
+msgid "Left thumb right"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:237
+msgid "Left thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
+msgid "Left trigger"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Light shaft (God rays)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:481
+#, c-format
+msgid "Light shaft (God rays) : %s"
+msgstr ""
+
+#: src/guiengine/engine.cpp:1330
+msgid "Loading"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "Lobby"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Lobby Settings"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Local Name"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:853
+msgid "Locked"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:237
+#: src/states_screens/arenas_screen.cpp:267
+#: src/states_screens/easter_egg_screen.cpp:225
+#: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
+msgid "Locked : solve active challenges to gain access to more!"
+msgstr ""
+
+#: src/states_screens/tracks_screen.cpp:201
+msgid "Locked!"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
+#: src/states_screens/main_menu_screen.cpp:175
+#: src/states_screens/main_menu_screen.cpp:186
+msgid "Login"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:251
+msgid "Look Back"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: In the profile screen
+msgid "Look for more friends:"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make 5 skidding in a single lap."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make a race with 5 laps or more."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Marathoner"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Max. number of players"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Maximum time (min.)"
+msgstr ""
+
+#. I18N: if some kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:436
+msgid "Me Only"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:158
+msgid "Menu Keys"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/minigolf/track.xml
+msgid "Minigolf"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Motion blur"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:458
+#, c-format
+msgid "Motion blur: %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:299
+#, c-format
+msgid "Mouse axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:295
+#, c-format
+msgid "Mouse button %d"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move down"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move up"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Multi­player"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Music"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#: src/states_screens/online_profile_achievements.cpp:73
+#: src/states_screens/server_selection.cpp:91
+msgid "Name"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:132
+msgid "Name has to be between 4 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
+msgid "Name is empty."
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
+msgid "Name is too long."
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Name of the server"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "New"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:502
+#, c-format
+msgid "New Grand Prix '%s' now available"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "New Password"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:145
+msgid "New Request"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:506
+#, c-format
+msgid "New difficulty '%s' now available"
+msgstr ""
+
+#: src/modes/linear_world.cpp:363
+msgid "New fastest lap"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:492
+#, c-format
+msgid "New game mode '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:516
+#, c-format
+msgid "New kart '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:486
+#, c-format
+msgid "New track '%s' now available"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:245
+msgid "Nitro"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:147
+msgid "Nitro challenge"
+msgstr ""
+
+#: src/states_screens/dialogs/message_dialog.cpp:128
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "No"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/nolok/kart.xml
+msgid "Nolok"
+msgstr ""
+
+#. I18N: if no kart animations are enabled
+#: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
+msgid "None"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:176
+msgid "Normal Race"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowmountain/track.xml
+msgid "Northern Resort"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:986
+msgid ""
+"Note that if you manage to skid for several seconds, you will receive a "
+"bonus speedup as a reward!"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Novice"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:68
+#, c-format
+msgid "Number of AI Karts : %i"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of AI karts"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Number of goals to win"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of laps"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Number of laps:"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
+msgid "OK"
+msgstr ""
+
+#. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
+msgid "Off the beaten track"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:150
+msgid "Offline"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mines/track.xml
+msgid "Old Mine"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/olivermath/track.xml
+msgid "Oliver's Math Class"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/main_menu_screen.cpp:170
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
+msgid "Online"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Online Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Online Username"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:280
+msgid "Online username has to be between 3 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:284
+msgid "Online username must not start with a number!"
+msgstr ""
+
+#: src/input/input_manager.cpp:759
+msgid "Only the Game Master may act at this point!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:960
+#, c-format
+msgid "Oops! When you're in trouble, press <%s> to be rescued"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Options"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: Section in the profile screen
+msgid "Overview"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:93
+msgid "POWER"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Parachute - slows down all karts in a better position."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the registration dialog
+msgid "Password"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: In the online account settings screen
+msgid "Password :"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Password Change"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
+msgid "Password has to be between 8 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:210
+msgid "Password successfully changed."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
+msgid "Passwords don't match!"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:257
+msgid "Pause Game"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+msgid "Paused"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
+msgid "Penalty time!!"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:146
+msgid "Pending"
+msgstr ""
+
+#. I18N: ./data/grandprix/1_penguinplayground.grandprix
+msgid "Penguin Playground"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:247
+msgid "Performing vote"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/pidgin/kart.xml
+msgid "Pidgin"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+msgid "Play all"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Play every official track at least once."
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
+msgid "Players"
+msgstr ""
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+msgid "Please enter the name of the grand prix"
+msgstr ""
+
+#. I18N: shown when config file is too old
+#: src/input/device_manager.cpp:500
+msgid "Please re-configure your key bindings."
+msgstr ""
+
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:437
+msgid "Please wait while addons are updated"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:557
+msgid "Please wait while the add-ons are loading"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Plunger - throw straight to pull an opponent back, or throw while looking "
+"back to make one lose sight."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Powerup Love"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:930
+#, c-format
+msgid ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Press ESC to cancel"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+msgid "Press a key"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Press enter or double-click on a device to configure it"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Press enter or double-click on a player to edit him/her"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:462
+msgid "Press fire to play the tutorial"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:532
+msgid "Press fire to start the challenge"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:390
+msgid ""
+"Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
+"mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:357
+#, c-format
+msgid "Problems installing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:394
+#, c-format
+msgid "Problems removing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:474
+msgid "Processing"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Profile"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:79
+msgid "Progress"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/puffy/kart.xml
+msgid "Puffy"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:240
+msgid ""
+"Push the ball to the opposite cage to score goals. (Only in multiplayer "
+"games)"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Quick Play"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Quit"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:159
+msgid "Quit the server."
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "Race Setup"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:77
+msgid "Random"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:277
+msgid "Random Arena"
+msgstr ""
+
+#: src/race/grand_prix_data.hpp:171
+msgid "Random Grand Prix"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:839
+#: src/states_screens/kart_selection.cpp:1467
+msgid "Random Kart"
+msgstr ""
+
+#: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
+msgid "Random Track"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:109
+msgid "Rank"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
+msgid "Rating >="
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:64
+msgid "Ready!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Really ... a secret."
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:965
+msgid "Red Team Wins"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Register"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Regular Race: All blows allowed, so catch weapons and make clever use of "
+"them!"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
+msgid "Reload"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Remember password"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Remember window location"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Remove"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Rename"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:64
+#, c-format
+msgid "Required Nitro Points : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:53
+#, c-format
+msgid "Required Rank : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:58
+#, c-format
+msgid "Required Time : %i"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:254
+msgid "Rescue"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Resolution"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:199
+msgid "Restart"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Restart Race"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Reverse"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Reverse:"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:68
+msgid "Reversed"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:271
+msgid "Right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:214
+msgid "Right bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:222
+msgid "Right thumb button"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
+msgid "Right thumb down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
+msgid "Right thumb left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
+msgid "Right thumb right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
+msgid "Right thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
+msgid "Right trigger"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:89
+msgid "SPEED"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+msgid "STK Enterprise"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Save"
+msgstr ""
+
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+msgid "Save Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "Search"
+msgstr ""
+
+#: src/states_screens/online_user_search.cpp:208
+#: src/states_screens/online_user_search.cpp:288
+msgid "Searching"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:274
+msgid "Select"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a difficulty"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a game mode"
+msgstr ""
+
+#: src/states_screens/edit_track_screen.cpp:238
+msgid "Select a track"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Select kart"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Send anonymous HW statistics"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Server Creation"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Server Info"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_selection.stkgui
+msgid "Server Selection"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Server name :"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:58
+msgid "Server successfully created. You can now join it."
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:66
+msgid "Set!"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+#: src/states_screens/race_result_gui.cpp:209
+msgid "Setup New Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Shadows"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
+#, c-format
+msgid "Shadows: %s"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/sandtrack/track.xml
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/city/track.xml
+msgid "Shiny Suburbs"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In As Guest"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:70
+msgid "Since"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Singleplayer"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:177
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Skid-row"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:248
+msgid "Skidding"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Skin"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+msgid "Snow Peak"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:186
+msgid "Soccer"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/soccer_field/track.xml
+msgid "Soccer field"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Soccer: Only in multiplayer games. Use your kart to push the ball into the "
+"goal."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
+msgid ""
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
+"firewall"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:279
+msgid "Sorry, downloading the add-on failed"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Sound Effects"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#: src/states_screens/grand_prix_editor_screen.cpp:334
+msgid "Standard"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:218
+msgid "Start"
+msgstr ""
+
+#: src/states_screens/dialogs/gp_info_dialog.cpp:209
+msgid "Start Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Start Race"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:71
+msgid "Status"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:230
+msgid "Steer Left"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:233
+msgid "Steer Right"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Story Mode"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Strike!"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Submit"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/subsea/track.xml
+msgid "Subsea"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+msgid "SuperTux"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+msgid "SuperTuxKart Addons"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart Help"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
+msgid "SuperTuxKart Options"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+msgid "SuperTuxKart features several game modes"
+msgstr ""
+
+#: src/main.cpp:1201
+msgid ""
+"SuperTuxKart may connect to a server to download add-ons and notify you of "
+"updates. We also collect anonymous hardware statistics to help with the "
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr ""
+
+#. I18N: ../stk-assets/karts/suzanne/kart.xml
+msgid "Suzanne"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Swatter - will squash karts close by, slowing them down."
+msgstr ""
+
+#. I18N: in the language choice, to select the same language as the OS
+#: src/states_screens/options_screen_ui.cpp:186
+msgid "System Language"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "Terms and Agreement"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture compression"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture filtering"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help menu
+msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stadium/track.xml
+msgid "The Stadium"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:545
+msgid "The add-ons module is currently disabled in the Options screen"
+msgstr ""
+
+#: src/race/highscore_manager.cpp:101
+msgid ""
+"The highscore file was too old,\n"
+"all highscores have been erased."
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:136
+msgid "The maxinum number of players has to be between 2 and 12."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:178
+msgid "Time Trial"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#: src/states_screens/dialogs/add_device_dialog.cpp:64
+msgid ""
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
+"\n"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu
+msgid "To help you win, there are some powerups you can collect :"
+msgstr ""
+
+#. I18N: ./data/grandprix/3_tothemoonandback.grandprix
+msgid "To the moon and back"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:154
+#: src/states_screens/dialogs/user_info_dialog.cpp:211
+msgid "Today"
+msgstr ""
+
+#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/race_gui_base.cpp:103
+#, c-format
+msgid "Top %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:66
+msgid "Track"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1130
+#, c-format
+msgid "Track %i/%i"
+msgstr ""
+
+#. I18N: when showing who is the author of track '%s'
+#. I18N: (place %s where the name of the author should appear)
+#: src/states_screens/track_info_screen.cpp:107
+#, c-format
+msgid "Track by %s"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Track group"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Tracks"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
+msgid "Trilinear"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:369
+#: src/states_screens/dialogs/addons_loading.cpp:406
+msgid "Try again"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#: src/states_screens/race_gui_overworld.cpp:455
+msgid "Tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: Title for tutorials screen
+msgid "Tutorial : Selection Room"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/tux/kart.xml
+msgid "Tux"
+msgstr ""
+
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Type of race, in a challenge
+msgid "Type :"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:502
+msgid "Type: Grand Prix"
+msgstr ""
+
+#: src/online/xml_request.cpp:83
+msgid ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Uninstall"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Unstoppable"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:262
+msgid "Up"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:96
+msgid "Update"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
+msgid "Updated"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:111
+msgid "Updated date"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Use 10 or more powerups in a race."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Use high definition textures"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Use left/right to choose your team and press fire"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:949
+#, c-format
+msgid "Use the nitro you collected by pressing <%s>!"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog' dialog
+msgid "User Info"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
+msgid "User Interface"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:335
+msgid "User defined"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "User search"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
+#: src/states_screens/online_user_search.cpp:74
+msgid "Username"
+msgstr ""
+
+#: src/states_screens/dialogs/recovery_dialog.cpp:121
+msgid "Username and/or email address invalid."
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "VS"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:235
+#: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
+msgid "Validating info"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:108
+#, c-format
+msgid "Version: %d"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Vertical Sync (requires restart)"
+msgstr ""
+
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "View"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Volume"
+msgstr ""
+
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: In the vote dialog
+msgid "Vote"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:230
+msgid "Vote successful! You can now close the window."
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:85
+msgid "WEIGHT"
+msgstr ""
+
+#: src/modes/linear_world.cpp:882
+msgid "WRONG WAY!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:479
+msgid ""
+"Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
+"keys that contain a character that is different in upper-case will stop "
+"working."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Weapons"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Weather Effects"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:447
+#, c-format
+msgid "Weather Effects : %s"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "What's wrong, little hippies? Your great gnu leader is missing?"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"When input devices are configured, you are ready to play. Select the "
+"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
+"game continues when everyone selected their kart. Note that the mouse may "
+"not be used for this operation."
+msgstr ""
+
+#. I18N: Name of the white button on xbox controller
+#: src/input/gamepad_config.cpp:171
+msgid "White"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/wilber/kart.xml
+msgid "Wilber"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win 5 single races in a row."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win in all single player modes, against at least 3 opponents."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/xr591/track.xml
+msgid "XR591"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/xue/kart.xml
+msgid "Xue"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "Yes"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:996
+msgid "You are now ready to race. Good luck!"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+msgid "You are playing as"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:190
+msgid "You can adapt your previous rating by clicking the stars beneath."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:513
+msgid ""
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"the Internet\"."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:488
+msgid ""
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
+"Internet\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid ""
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
+"Please read our privacy statement at http://privacy.supertuxkart.net"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
+msgid "You completed a challenge!"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:176
+msgid "You completed challenges!"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:279
+msgid "You completed the Grand Prix!"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:208
+#, c-format
+msgid ""
+"You completed the difficult challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:200
+#, c-format
+msgid "You completed the easy challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:204
+#, c-format
+msgid ""
+"You completed the intermediate challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/karts/kart.cpp:856
+msgid "You finished the race!"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:466
+#, c-format
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/online/online_player_profile.cpp:472
+msgid "You have a new friend request!"
+msgstr ""
+
+#: src/modes/world.cpp:1144
+msgid "You have been eliminated!"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:195
+msgid ""
+"You have not yet voted for this addon. Select your desired rating by "
+"clicking the stars beneath"
+msgstr ""
+
+#: src/karts/kart.cpp:1913
+msgid ""
+"You need more points\n"
+"to enter this challenge!\n"
+"Check the minimap for\n"
+"available challenges."
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:472
+msgid "You need to enter a password."
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:568
+msgid "You unlocked grand prix %0"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:530
+msgid "You unlocked track %0"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+msgid ""
+"You will receive an email with further instructions on how to reset your "
+"password. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:361
+msgid ""
+"You will receive an email with further instructions regarding account "
+"activation. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
+msgid "You won the race!"
+msgstr ""
+
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
+#: src/config/user_config.cpp:700
+msgid ""
+"Your config file was malformed, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/config/user_config.cpp:711
+msgid ""
+"Your config file was too old, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
+#: src/input/device_manager.cpp:501
+msgid "Your input config file is not compatible with this version of STK."
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:105
+#: src/states_screens/online_profile_base.cpp:115
+msgid "Your profile"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/zengarden/track.xml
+msgid "Zen Garden"
+msgstr ""
+
+#. I18N: Unbound key binding
+#: src/input/binding.cpp:90
+msgid "[none]"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "actions"
+msgstr ""
+
+#. I18N: track group name
+#: src/states_screens/tracks_screen.cpp:151
+msgid "all"
+msgstr ""
+
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
+#: src/states_screens/race_gui_base.cpp:540
+msgid "by"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:139
+msgid "featured"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
+msgid "low"
+msgstr ""
+
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:81
+#: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
+msgid "standard"
+msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr ""
diff --git a/data/po/de.po b/data/po/de.po
index 561af593c..409d67687 100644
--- a/data/po/de.po
+++ b/data/po/de.po
@@ -1,25 +1,24 @@
-#
-# Stefan von Halenbach 2007
-# This translation is licensed under BSD-licens
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Flakebi, 2015
+# konstin <konsti.schuetze@t-online.de>, 2015
+# Wasilis Mandratzis-Walz, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Supertuxkart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-20 00:31+0000\n"
-"Last-Translator: konstin <konstin@konstin.no-ip.biz>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-15 03:03+0000\n"
+"Last-Translator: Wasilis Mandratzis-Walz\n"
+"Language-Team: German (http://www.transifex.com/projects/p/supertuxkart/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-SearchPath-0: /home/constantin/Medien/projekte/stk/svn-"
-"vanilla/supertuxkart\n"
-"X-Poedit-Basepath: .\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -30,26 +29,25 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Aber ihr erbärmlichen Knilche werdet mich niemals besiegen – den König der "
-"Karts!"
+msgstr " Aber ihr erbärmlichen Knilche werdet mich niemals besiegen – den König der Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Freund ist nun online."
+msgstr[1] "%d Freunde sind nun online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (benachteiligt)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -62,7 +60,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s und %s sind jetzt online"
@@ -74,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s von %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s von %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s ist nun online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s ist bereit"
@@ -94,89 +91,71 @@ msgstr "%s ist bereit"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Profil von %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
 msgstr "%s's server"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s und %s sind jetzt online"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s ist ausgeschieden."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Leer)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(Der Netzwerkmodus ist noch nicht verfügbar)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Blaue Einträge deuten auf einen Konflikt mit einer anderen Einstellung hin."
+msgstr "* Blaue Einträge deuten auf einen Konflikt mit einer anderen Einstellung hin."
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
-"* Rot markierte Stellen zeigen einen Konflikt in der aktuellen Konfiguration"
+msgstr "* Rot markierte Stellen zeigen einen Konflikt in der aktuellen Konfiguration"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Die aktuellen Tastenzuweisungen können im Menü Optionen eingesehen und "
-"verändert werden."
+msgstr "* Die aktuellen Tastenzuweisungen können im Menü Optionen eingesehen und verändert werden."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Die meisten dieser Spielmodi können auch als Grand Prix gespielt werden: "
-"Anstatt ein einzelnes Rennen zu spielen, spielt man viele hintereinander. Je "
-"besser der Platz ist, desto mehr Punkte erhält man. Am Ende gewinnt der "
-"Spieler mit den meisten Punkten den Cup."
+msgstr "* Die meisten dieser Spielmodi können auch als Grand Prix gespielt werden: Anstatt ein einzelnes Rennen zu spielen, spielt man viele hintereinander. Je besser der Platz ist, desto mehr Punkte erhält man. Am Ende gewinnt der Spieler mit den meisten Punkten den Cup."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
-"* Starten sie SuperTuxKart neu, um die neuen EInstellungen anzuwenden"
+msgstr "* Starten sie SuperTuxKart neu, um die neuen EInstellungen anzuwenden"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Welche Konfiguration benutzt werden soll, wird von der benutzten „Auswählen“-Taste abgeleitet."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -207,13 +186,10 @@ msgstr "3-Treffer-Kampf"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"3-Treffer-Kampf: Nur in Mehrspieler-Spielen. Triff andere mit Waffen, bis "
-"sie all ihre Leben verloren haben."
+msgstr "3-Treffer-Kampf: Nur in Mehrspieler-Spielen. Triff andere mit Waffen, bis sie all ihre Leben verloren haben."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -228,23 +204,20 @@ msgid "9 months"
 msgstr "9 Monate"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Bestenliste ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "KI Karts"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Grand Prix abbrechen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Ãœber"
 
@@ -253,48 +226,43 @@ msgstr "Ãœber"
 msgid "Accelerate"
 msgstr "Beschleunigen"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Beschleunige und drücke die <%s>-Taste beim Drehen, um zu schleudern. Das "
-"kurzzeitige Schleudern kann dir dabei helfen, Kurven besser zu kratzen."
+msgstr "Beschleunige und drücke die <%s>-Taste beim Drehen, um zu schlittern. Das kurzzeitige Schlittern kann dir dabei helfen, Kurven besser zu kratzen."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Beschleunige mit <%s> und lenke mit <%s> und <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Konten-Wiederherstellung"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Kontoeinstellungen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Auszeichnungen"
 
@@ -304,13 +272,11 @@ msgstr "Aktion"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Freund hinzufügen"
 
@@ -321,7 +287,6 @@ msgstr "Tastaturkonfiguration hinzufügen"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Spieler hinzufügen"
 
@@ -332,32 +297,29 @@ msgstr "Wiimote hinzufügen"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Gerät hinzufügen"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Nutzer hinzufügen"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Add-ons"
 
@@ -367,49 +329,43 @@ msgstr "Add-on-Name"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
-msgstr "Erweiterungen"
+msgstr "Add-ons"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Verbesserte Grafik (Lichteffekte, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alle"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alle Strecken"
 
@@ -419,18 +375,20 @@ msgstr "Alles ist erlaubt, also hol dir Waffen und setze sie geschickt ein!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Anmeldedialog immer zeigen"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Ambient Occlusion"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Ambient Occlusion: %s"
@@ -440,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Die Grand Prix konnte nicht gespeichert werden."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Anker – Bremst das erste Kart stark ab"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animierte Figuren"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animierte Fahrer: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animiertes Gelände"
 
@@ -466,24 +421,24 @@ msgstr "Animiertes Gelände"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animierte Landschaft: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropisch ×16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropisch ×2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropisch ×4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropisch ×8"
 
@@ -493,29 +448,25 @@ msgstr "Ein anderer Grand Prix mit diesem Namen existiert bereits"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Kantenglättung"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Kantenglättung: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Ãœbernehmen"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Neue Auflösung anwenden"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Erzfeind"
 
@@ -530,49 +481,44 @@ msgstr "Willst du diese Konfiguration wirklich unwiderruflich löschen?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Bist du sicher, dass du '%s' entfernen möchtest?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenen"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Um den Leuchtturm"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Nichts zuweisen"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Der ESC-Taste zuweisen"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Am Ende der Welt"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Ton"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Weich den Bananen aus!"
 
@@ -594,81 +540,66 @@ msgstr "Achse %d %s"
 msgid "Axis %d inverted"
 msgstr "Achse %d umgedreht"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Zurück"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Zurück zum Spiel"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Zurück zum Rennen"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Zurück zur Herausforderungs-Auswahl"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Zurück zur Geräteliste"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Zurück zum Menü"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Zurück zum Menü"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Bananenliebhaber"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basketball – springt zum Spitzenreiter und kann andere Karts auf dem Weg "
-"dorthin zerquetschen und abbremsen."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basketball – springt zum Spitzenreiter und kann andere Karts auf dem Weg dorthin zerquetschen und abbremsen."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Kampf-Insel"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Mehr Glück beim nächsten Mal!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinear"
 
@@ -678,39 +609,33 @@ msgid "Black"
 msgstr "Schwarz"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Die Geistervilla"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Bloom"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Bloom : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Blaues Team gewinnt"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Rinderfarm"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingkugel – Prallt von Wänden ab. Wird nach hinten geworfen, wenn nach "
-"hinten geschaut wird."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingkugel – Prallt von Wänden ab. Wird nach hinten geworfen, wenn nach hinten geschaut wird."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -718,70 +643,58 @@ msgid "Brake"
 msgstr "Bremsen"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Kaugummi – schütze dich mit einem Schild, oder benutze ihn beim "
-"Zurückschauen, um eine klebrige rosa Spur zu hinterlassen."
+msgstr "Kaugummi – schütze dich mit einem Schild, oder benutze ihn beim Zurückschauen, um eine klebrige rosa Spur zu hinterlassen."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Aber ich bin fair, also mach ich ein Angebot."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kuchen – Wird auf den Gegner geworfen, der am nächsten ist; wirkt am Besten "
-"auf kurzen und geraden Strecken."
+msgstr "Kuchen – Wird auf den Gegner geworfen, der am nächsten ist; wirkt am Besten auf kurzen und geraden Strecken."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
-msgstr "Konnte nicht auf STK-Add-ons-Server zugreifen."
+msgstr "Konnte nicht auf STK-Add-Ons-Server zugreifen."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Anfrage verwerfen"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -789,26 +702,23 @@ msgid "Cancel/Back"
 msgstr "Abbrechen/Zurück"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Höhle X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Herausforderung gemeistert"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Herausforderung gescheitert"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Herausforderungen : Trophäen"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Ändern"
 
@@ -816,63 +726,52 @@ msgstr "Ändern"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Wähle ein Kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Christoffel Kolumbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klicke hier, um das Tutorial zu spielen"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Schließen"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Cocoa-Tempel"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Sammle mindestens 5 Bananen in einem Rennen"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Sammle blaue Kisten: Sie geben dir Waffen und andere Boni."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Sammle Geschenke und feuer die Waffe mit <%s> ab, um die Kisten "
-"wegzusprengen!"
+msgstr "Sammle Geschenke und feuer die Waffe mit <%s> ab, um die Kisten wegzusprengen!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Sammle Nitro-Flaschen (wir werden sie nach der Kurve brauchen)"
 
@@ -882,34 +781,30 @@ msgstr "Sammel Nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitro sammeln erlaubt dir einen Geschwindigkeits-Schub, wann immer du ihn "
-"brauchst. Benutze die entsprechende Taste. Du kannst die Menge verfügbaren "
-"Nitros in der Anzeige am rechten Rand erkennen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitro sammeln erlaubt dir einen Geschwindigkeits-Schub, wann immer du ihn brauchst. Benutze die entsprechende Taste. Du kannst die Menge verfügbaren Nitros in der Anzeige am rechten Rand erkennen."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Gewinne alle Herausforderungen, um das große Tor zu öffnen"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Errungenschaft „%s“ erhalten."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -917,7 +812,6 @@ msgstr "Auflösung innerhalb von %i Sekunden bestätigen"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Mit dem Internet verbinden"
 
@@ -925,105 +819,86 @@ msgstr "Mit dem Internet verbinden"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Verbinde deine Wiimote mit dem Bluetooth-Manager, dann klicke auf „Ok“. "
-"Genaue Anweisungen sind auf <http://supertuxkart.net/Wiimote>."
+msgstr "Verbinde deine Wiimote mit dem Bluetooth-Manager, dann klicke auf „Ok“. Genaue Anweisungen sind auf <http://supertuxkart.net/Wiimote>."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Enthält keine Boni; es kommt ausschließlich auf dein Können an!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Weiter"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Gespeicherten Grand Prix fortsetzen"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Weiter."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Steuerung"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Spieler '%s' konnte nicht erstellt werden."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Keine Wiimote gefunden :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Erstellen"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Server Erstellen"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Benutzer/in anlegen"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Online Account Erstellen"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Server erstellen"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Mitwirkende"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
@@ -1033,42 +908,40 @@ msgstr "Aktuelles Passwort ist ungültig"
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Momentan nicht eingeloggt"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Benutzerdefiniert ..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "D-Pad unten"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "D-Pad links"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "D-Pad rechts"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "D-Pad oben"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Ablehnen"
 
@@ -1076,31 +949,29 @@ msgstr "Ablehnen"
 msgid "Default"
 msgstr "Vorgabe"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Entfernen"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Konfiguration löschen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Tiefenschärfe"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Tiefenschärfe: %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1110,34 +981,33 @@ msgstr "Gerät deaktivieren"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Deaktiviert"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Bildrate anzeigen"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Möchtest du den Grand Prix wirklich abbrechen?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Willst du den Spieler „%s“ wirklich löschen?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Möchtest du deine Änderungen speichern?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Vor „Los!“ darfst du kein Gas geben"
 
@@ -1148,29 +1018,26 @@ msgstr "Nach unten"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Rückwärts fahren"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Dynamische Lichter: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Grand-Prix bearbeiten"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1179,7 +1046,6 @@ msgstr "Eierjagd"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Eierjagd: Durchsuche Strecken, um alle versteckten Eier zu finden."
 
@@ -1189,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr "Eier: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Ausgeschieden"
 
@@ -1202,24 +1067,22 @@ msgstr "Ausgeschieden"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "E-Mail"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "E-Mail-Adresse muss zwischen 4 und 50 Zeichen lang sein!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Ungültige E-Mail-Adresse!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "E-Mail-Adressen passen nicht zusammen!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1231,64 +1094,61 @@ msgstr "Gerät aktivieren"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Aktivieren Sie per-Player Handicaps"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Aktiviert"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Alle"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Gib den Namen des neuen Spielers ein"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Fehler beim Herunterladen der Nachrichten: „%s“."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"An alle:\n"
-"Drückt jetzt „Auswählen“, um am Spiel teilzunehmen!"
+msgstr "An alle:\nDrückt jetzt „Auswählen“, um am Spiel teilzunehmen!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Existierender Online-Account"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Verlassen"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Rennen beenden"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Spiel verlassen"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Rennfahrer"
 
@@ -1296,51 +1156,49 @@ msgstr "Rennfahrer"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Durchsuche Strecken, um alle versteckten Eier zu finden."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d  – Polygone: %d fest, %d Schatten – Light-Abst. : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d – %d Tsd. Dreiecke"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Errungenschaften abholen"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Freunde abholen"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Letzte Stimme abholen"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Server abholen"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Gib den Benutzernamen und die E-Mail-Adresse von der Registration ein, um dein Passwort zurücksetzen zu können."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Letzte Runde!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Server finden"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1349,22 +1207,14 @@ msgstr "Schießen"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Zuerst brauchst du mehrere Eingabegeräte (mehrere Gamepads oder Joysticks zu "
-"haben, ist die beste Art, mit vielen Leuten gleichzeitig zu spielen). Begib "
-"dich in die Eingangskonfiguration und stelle die Gamepads ein. Es ist "
-"außerdem möglich, auf Tastatur/en zu spielen. Jeder Spieler benötigt dazu "
-"eine eigene Reihe von Tasten. Denke daran, dass die meisten Tastaturen nicht "
-"für den Mehrspielermodus geeignet sind, da sie zu wenig gleichzeitige "
-"Tasteneingaben unterstützen."
+msgstr "Zuerst brauchst du mehrere Eingabegeräte (mehrere Gamepads oder Joysticks zu haben, ist die beste Art, mit vielen Leuten gleichzeitig zu spielen). Begib dich in die Eingangskonfiguration und stelle die Gamepads ein. Es ist außerdem möglich, auf Tastatur/en zu spielen. Jeder Spieler benötigt dazu eine eigene Reihe von Tasten. Denke daran, dass die meisten Tastaturen nicht für den Mehrspielermodus geeignet sind, da sie zu wenig gleichzeitige Tasteneingaben unterstützen."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1377,56 +1227,51 @@ msgstr "Folg dem Spitzenreiter!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Folg dem Spitzenreiter: Bleib auf dem zweiten Platz, weil der letzte Kart "
-"jedes Mal, wenn der Zähler auf null herunterläuft, disqualifiziert wird. "
-"Achtung: Wenn du den Spitzenreiter überholst, wirst du ebenfalls "
-"disqualifiziert!"
+msgstr "Folg dem Spitzenreiter: Bleib auf dem zweiten Platz, weil der letzte Kart jedes Mal, wenn der Zähler auf null herunterläuft, disqualifiziert wird. Achtung: Wenn du den Spitzenreiter überholst, wirst du ebenfalls disqualifiziert!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d Wiimote(s) gefunden"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "%d Wiimote gefunden"
+msgstr[1] "%d Wiimotes gefunden"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Freund entfernt!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Frendschaftsanfrage akzeptiert!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Freundschaftsanfrage abgebrochen!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Freundschaftsanfrage abgelehnt!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Freundschaftsanfrage gesendet!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Freunde"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Vollbildmodus"
 
@@ -1440,24 +1285,21 @@ msgstr "TOR!"
 msgid "Game Keys"
 msgstr "Spiel-Tasten"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spielmodi"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Spieltyp (Tor-/Zeitbegrenzung)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1471,51 +1313,45 @@ msgstr "Gamepad-Taste %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Allgemein"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Rennen aufgeben"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Globale Beleuchtung"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Globale Beleuchtung: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Leuchten (Umrisse)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Leuchten (Umrisse): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1525,61 +1361,53 @@ msgid "Go!"
 msgstr "Los!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Goldfahrer"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Gran-Paradiso-Insel"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Grand-Prix-Editor"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Grand-Prix-Editor"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Grand-Prix-Fortschritt:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafikeffekt-Stufe"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafik"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikeinstellungen"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Im grünen Tal"
 
@@ -1592,16 +1420,14 @@ msgstr "Gast"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Gast Nr. %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Gast-Anmeldung"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1611,120 +1437,105 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hilfe"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Bestenliste"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Triff 10 Karts mit einer Bowlingkugel."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Triff die Anderen mit Waffen, bis sie alle „Leben“ verlieren. (Nur im "
-"Mehrspielermodus)"
+msgstr "Triff die Anderen mit Waffen, bis sie alle „Leben“ verlieren. (Nur im Mehrspielermodus)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Triff das selbe Kart mindestens 5 mal in einem Rennen."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Nur menschliche Spieler"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Ich bin mit den obenstehenden Bedingungen einverstanden und mindestens 13 Jahre alt. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
-"Wenn du mich beim Rennen schlagen kannst, dann werd ich den alten Knacker "
-"freilassen."
+msgstr "Wenn du mich beim Rennen schlagen kannst, dann werd ich den alten Knacker freilassen."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Wenn du einen Knopf mit einem Schloss wie dem da links siehst, musst du eine "
-"Herausforderung meistern, um es zu öffnen."
+msgstr "Wenn du einen Knopf mit einem Schloss wie dem da links siehst, musst du eine Herausforderung meistern, um es zu öffnen."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
-msgstr ""
-"„%s“ wird ignoriert, du hättest früher teilnehmen müssen, um mitzuspielen!"
+msgstr "„%s“ wird ignoriert, du hättest früher teilnehmen müssen, um mitzuspielen!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Bildbasierte Beleuchtung"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installieren"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Fahrer"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Internetzugang ist deaktiviert, bitte aktiviere ihn in den Einstellungen"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Es ist unentschieden"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Das ist geheim"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Verbinden"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Zum Server verbinden"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Diese Auflösung beibehalten"
 
@@ -1735,7 +1546,7 @@ msgstr "Bleib hinter dem Spitzenreiter, aber überhol ihn nicht."
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Tastenbelegung"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1743,7 +1554,6 @@ msgid "Keyboard %i"
 msgstr "Tastatur %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1752,14 +1562,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Runde"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%i. Runde"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Runden"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1779,85 +1589,81 @@ msgstr "Links"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Linker Schulterknopf"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Linker Analogstick"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Linker Analogstick unten"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Linker Analogstick links"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Linker Analogstick rechts"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Linker Analogstick oben"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Linker Trigger"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Lichtschacht (Gottesstrahlen)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Lichtschacht (Gottesstrahlen): %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Lade"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Lobby"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Lobbyeinstellungen"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "Lokaler Name"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Gesperrt: Meistere Herausforderungen, um mehr freizuschalten!"
 
@@ -1865,13 +1671,53 @@ msgstr "Gesperrt: Meistere Herausforderungen, um mehr freizuschalten!"
 msgid "Locked!"
 msgstr "Gesperrt!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Anmelden"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Abmelden"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Angemeldet als:  %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Angemeldet "
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Angemeldet '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Einloggen als Gast können Sie in der Online-Rennen teilnehmen, aber es ist es nicht möglich, für Addons zu stimmen, oder sammeln alle Leistungen, während sie online sind."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Abmelden"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Abmelden '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Einloggen"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1880,46 +1726,35 @@ msgstr "Zurückschauen"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Nach weiteren Freunden suchen:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Schlittere 5 mal in einer Runde."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Fahr ein Rennen mit mindestens 5 Runden."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Marathon-Fahrer"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Max. Spieleranzahl"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Maximale Dauer (min)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Nur ich"
 
@@ -1929,29 +1764,33 @@ msgid "Menu Keys"
 msgstr "Menü-Tasten"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Mosquito Hunter"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Bewegungsunschärfe"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Bewegungsunschärfe: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Mausachse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1959,98 +1798,97 @@ msgstr "Maustaste %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Nach unten bewegen"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Nach oben bewegen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Mehrspieler"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Mehrspieler"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musik"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Der Name muss zwischen 4 und 30 Zeichen lang sein!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Der Name ist leer."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Der Name ist zu lang."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
-msgstr ""
+msgstr "Servername"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Nessies Teich"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "Neuer Grand Prix „%s“ nun verfügbar"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Neuer Online Account"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Neues Passwort"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Neue Anfrage"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "Neue Schwierigkeitsstufe „%s“ verfügbar"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Neue schnellste Runde"
 
@@ -2078,19 +1916,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Nitro-Herausforderung"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Nein"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Keine"
 
@@ -2100,23 +1937,19 @@ msgid "Normal Race"
 msgstr "Normales Rennen"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Im hohen Norden"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Übrigens, wenn du es schaffst, für mehrere Sekunden zu schlittern, bekommst "
-"du einen Geschwindigkeitsschub als Belohnung!"
+msgstr "Übrigens, wenn du es schaffst, für mehrere Sekunden zu schlittern, bekommst du einen Geschwindigkeitsschub als Belohnung!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Fahranfänger"
 
@@ -2127,108 +1960,101 @@ msgstr "Anzahl an KI-Karts: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Anzahl der KI-Karts"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Anzahl der Tore bis zum Sieg"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Anzahl der Runden"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Anzahl der Runden:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Abseits des Mainstreams"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Offline Account"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Oh ja, er ist jetzt in meiner Burg und wird zum Abendessen serviert werden …"
+msgstr "Oh ja, er ist jetzt in meiner Burg und wird zum Abendessen serviert werden …"
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Alte Mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Olivers Mathestunde"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Online-Mehrspieler"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Online-Benutzername"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Der Online-Benutzername muss zwischen 3 und 30 Zeichen lang sein!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Der Online-Benutzername darf nicht mit einer Ziffer beginnen!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Nur der Spielleiter kann hier Änderungen vornehmen!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Upps! Wenn du ein Problem hast, drücke <%s>, um gerettet zu werden"
@@ -2239,62 +2065,54 @@ msgstr "Upps! Wenn du ein Problem hast, drücke <%s>, um gerettet zu werden"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Einstellungen"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Ãœbersicht"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "STÄRKE"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Fallschirm – Bremst alle Karts weiter vorne ab"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Passwort:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Passwort ändern"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Das Passwort muss zwischen 8 und 30 Zeichen lang sein!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Das Passwort wurde erfolgreich geändert."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Passwörter stimmen nicht überein!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2303,120 +2121,114 @@ msgstr "Spiel unterbrechen"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pause"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Zeitstrafe!!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Ausstehend"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pinguin-Spielplatz"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Stimme abgeben"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Alle spielen"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Spiel jede offizielle Strecke mindestens ein mal."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spieler"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Spieler können Behinderte (schwieriger) Profile auf dem Kart-Auswahlbildschirm auswählen"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Bitte gib den Namen des Grand Prix ein."
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Bitte stelle deine Tastenbelegung neu ein."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Lesen Sie bitte die Bestimmungen und Bedingungen"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
-msgstr "Bitte warte, während die Add-ons aktualisiert werden"
+msgstr "Bitte warte, während die Add-Ons aktualisiert werden"
 
 #: src/states_screens/main_menu_screen.cpp:557
 msgid "Please wait while the add-ons are loading"
 msgstr "Bitte warte, bis die Add-Ons geladen sind"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Pömpel – Wirf ihn nach vorne, um einen Gegner zurückzuziehen, oder wirf ihn, "
-"während du nach hinten schaust, um die Sicht des Gegners zu blockieren."
+msgstr "Pömpel – Wirf ihn nach vorne, um einen Gegner zurückzuziehen, oder wirf ihn, während du nach hinten schaust, um die Sicht des Gegners zu blockieren."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Bonus-Liebe"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Drücke <%s>, um nach hinten zu schauen. Drücke <%s>, während du <%s> drückst, um nach hinten zu schießen!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Drücke die Esc-Taste zum Abbrechen"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Eine Taste drücken"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Drücke Enter oder doppelklicke auf ein Gerät, um es zu konfigurieren"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Drücke Enter oder doppelklicke auf einen Spieler, um ihn/sie zu bearbeiten"
+msgstr "Drücke Enter oder doppelklicke auf einen Spieler, um ihn/sie zu bearbeiten"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2430,37 +2242,32 @@ msgstr "Drücke „Schießen“, um die Herausforderung zu starten"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Drücke die Knöpfe 1 und 2 auf deiner Wiimote gleichzeitig, um sie in den "
-"Discovery Mode zu führen, dann klicke auf „Ok“. Genaue Anweisungen auf "
-"<http://supertuxkart.net/Wiimote>."
+msgstr "Drücke die Knöpfe 1 und 2 auf deiner Wiimote gleichzeitig, um sie in den Discovery Mode zu führen, dann klicke auf „Ok“. Genaue Anweisungen auf <http://supertuxkart.net/Wiimote>."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
 msgid "Problems installing the addon '%s'."
-msgstr "Beim Installieren des Add-ons „%s“ ist ein Problem aufgetreten."
+msgstr "Beim Installieren des Add-Ons „%s“ ist ein Problem aufgetreten."
 
 #: src/states_screens/dialogs/addons_loading.cpp:394
 #, c-format
 msgid "Problems removing the addon '%s'."
-msgstr "Beim Entfernen des Add-ons „%s“ ist ein Problem aufgetreten."
+msgstr "Beim Entfernen des Add-Ons „%s“ ist ein Problem aufgetreten."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Verarbeitung läuft"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Fortschritt"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2468,37 +2275,31 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Beförder den Ball in den gegnerischen Korb, um Punkte zu bekommen. (Nur in "
-"Mehrspieler-Spielen)"
+msgstr "Beförder den Ball in den gegnerischen Korb, um Punkte zu bekommen. (Nur in Mehrspieler-Spielen)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Schnelles Spiel"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Den Server verlassen"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Renneinstellungen"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Zufall"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2506,15 +2307,15 @@ msgstr "Zufällige Arena"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Zufälliger Grand Prix"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Zufälliges Kart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Zufällige Strecke"
 
@@ -2523,84 +2324,68 @@ msgid "Rank"
 msgstr "Rang"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Bewertung >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Auf die Plätze!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Wirklich … ein Geheimnis."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Rotes Team gewinnt"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Registrieren"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Normales Rennen: Alles ist erlaubt, also schnapp dir Waffen und gebrauch sie "
-"klug"
+msgstr "Normales Rennen: Alles ist erlaubt, also schnapp dir Waffen und gebrauch sie klug"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Erneut laden"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Passwort speichern"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Fensterposition merken"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Löschen"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -2626,35 +2411,31 @@ msgstr "Retten"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Neu starten"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Rennen neu starten"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Rückwärts"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Umkehren:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Umgekehrt"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2664,84 +2445,78 @@ msgstr "Rechts"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Rechter Schulterknopf"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Rechter Analogstick"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Rechter Analogstick unten"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Rechter Analogstick links"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Rechter Analogstick rechts"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Rechter Analogstick oben"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Rechter Trigger"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "GESCHWINDIGKEIT"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara die Rennfahrerin"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Sara die Hexe"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Grand Prix speichern"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Schottland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Suchen"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Suche läuft"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2749,57 +2524,49 @@ msgid "Select"
 msgstr "Auswählen"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Schwierigkeitsgrad wählen"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Wähle einen Spielmodus"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Strecke auswählen"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Kart auswählen"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Anonyme HW-Statistiken senden"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Servererstellung"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Serverinfo"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Serverauswahl"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Servername:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Server erfolgreich erstellt. Du kannst ihm nun beitreten."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2808,93 +2575,51 @@ msgstr "Fertig?"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Neues Rennen konfigurieren"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Schatten"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Schatten: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Schatten: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Treibsand"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Hochglanz-Vorort"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Einloggen"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Als Gast einloggen"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Seit"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Einzelspieler"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2902,23 +2627,20 @@ msgid "Size: %s"
 msgstr "Größe: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Schlitterfolge"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
 msgid "Skidding"
-msgstr "Schleudern"
+msgstr "Schlittern"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Design"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Schneegipfel"
 
@@ -2928,30 +2650,23 @@ msgid "Soccer"
 msgstr "Fußball"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Fußballfeld"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Fußball: Nur in Mehrspieler-Spielen. Benutz deinen Kart, um den Ball ins Tor "
-"zu schießen."
+msgstr "Fußball: Nur in Mehrspieler-Spielen. Benutz deinen Kart, um den Ball ins Tor zu schießen."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Während der Verbindung zur Add-on-Webseite ist ein Fehler aufgetreten. Bitte "
-"stelle sicher, dass du mit dem Internet verbunden bist und dass die "
-"Verbindung nicht durch eine Firewall blockiert wird."
+msgstr "Während der Verbindung zur Add-on-Webseite ist ein Fehler aufgetreten. Bitte stelle sicher, dass du mit dem Internet verbunden bist und dass die Verbindung nicht durch eine Firewall blockiert wird."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2959,7 +2674,6 @@ msgstr "Add-on-Download fehlgeschlagen"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Klangeffekte"
 
@@ -2968,30 +2682,28 @@ msgstr "Klangeffekte"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Grand Prix starten"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Rennen starten"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -3005,97 +2717,80 @@ msgstr "Rechts lenken"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Story-Modus"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Strike!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Anwenden"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Unter dem Meer"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
-msgstr "SuperTuxKart-Add-ons"
+msgstr "SuperTuxKart-Add-Ons"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart-Hilfe"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart-Optionen"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart kann am selben Computer im Mehrspielermodus gespielt werden"
+msgstr "SuperTuxKart kann am selben Computer im Mehrspielermodus gespielt werden"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart hat mehrere Spielmodi"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart kann mit einem Server verbunden werden, um Add-ons herunterzuladen und Sie über Updates zu informieren. Wir sammeln auch anonyme Statistiken, mit denen die Entwicklung von STK gehofen wird. Bitte lesen Sie unsere Datenschutzerklärung auf der Seite http://privacy.supertuxkart.net. Möchten Sie diese Funktion gerne aktivieren? (Um diese Einstellung zu einem späteren Zeitpunkt zu ändern, gehen Sie auf Optionen, wählen Sie die Registerkarte \"User Interface\", und bearbeiten \"mit dem Internet verbinden\" und \"Send HW anonyme Statistiken\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Wandler – Geschenke werden für kurze Zeit zu Bananen und andersherum."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Wandler – Geschenke werden für kurze Zeit zu Bananen und andersherum."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Fliegenklatsche – Zerquetscht nahe Karts und bremst sie dadurch ab."
 
@@ -3104,33 +2799,37 @@ msgstr "Fliegenklatsche – Zerquetscht nahe Karts und bremst sie dadurch ab."
 msgid "System Language"
 msgstr "Systemsprache"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Nehmen Sie Ihre Gegner als Mücken wahr! Schlagen Sie mit der Klatsche zu, töten Sie mindestens 5 von ihnen in einem Rennen."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Tempel"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Bedingungen und Zustimmung"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Texturenkompression"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Texturfilter"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Mit der „Schleudern“-Taste kannst du schneller durch engen Kurven schleudern."
+msgstr "Mit der „Schlittern“-Taste kannst du schneller durch engen Kurven schlittern."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Das Stadion"
 
@@ -3142,13 +2841,11 @@ msgstr "Das Add-on-Modul ist derzeit in den Optionen deaktiviert"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Die Bestenliste war zu alt,\n"
-"alle Platzierungen wurden gelöscht."
+msgstr "Die Bestenliste war zu alt,\nalle Platzierungen wurden gelöscht."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Die Höchstanzahl der Spieler muss zwischen 2 und 12 liegen."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3157,48 +2854,29 @@ msgstr "Zeitrennen"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "Zeitrennen: Keine Boni – auf dein Können kommt es an!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Um ein neues Gamepad hinzuzufügen, verbinde es mit dem Computer und starte "
-"SuperTuxKart. Es wird dann in der Liste erscheinen.\n"
-"\n"
-"Um eine Tastaturkonfiguration hinzuzufügen, kannst du den unteren Knopf "
-"benutzen, ABER BEACHTE, dass die meisten Tastaturen nur eine beschränkte "
-"Anzahl an gleichzeitig gedrückten Tasten unterstützen und daher ungeeignet "
-"für Mehrspieler-Spiele sind. (Du kannst allerdings mehrere Tastaturen mit "
-"dem Computer verbinden. Dennoch braucht auch in diesem Fall jeder eine "
-"andere Tastenbelegung.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Um ein neues Gamepad hinzuzufügen, verbinde es mit dem Computer und starte SuperTuxKart. Es wird dann in der Liste erscheinen.\n\nUm eine Tastaturkonfiguration hinzuzufügen, kannst du den unteren Knopf benutzen, ABER BEACHTE, dass die meisten Tastaturen nur eine beschränkte Anzahl an gleichzeitig gedrückten Tasten unterstützen und daher ungeeignet für Mehrspieler-Spiele sind. (Du kannst allerdings mehrere Tastaturen mit dem Computer verbinden. Dennoch braucht auch in diesem Fall jeder eine andere Tastenbelegung.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Um dich beim Gewinnen ein wenig zu unterstützen, gibt es kleine Hilfen zum "
-"Aufsammeln:"
+msgstr "Um dich beim Gewinnen ein wenig zu unterstützen, gibt es kleine Boni zum Aufsammeln:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Zum Mond und zurück"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Heute"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3208,12 +2886,12 @@ msgstr "Top %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Strecke"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Strecke %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3224,19 +2902,17 @@ msgstr "Strecke von %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Streckengruppe"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Strecken"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinear"
 
@@ -3247,47 +2923,42 @@ msgstr "Nochmal versuchen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial : Auswahlmenü"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Art:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Typ: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Es konnte keine Verbindung zum Server aufgebaut werden. Überprüfe deine Internetverbindung oder versuch es später noch einmal."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Deinstallieren"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Unaufhaltsam"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3299,8 +2970,8 @@ msgid "Update"
 msgstr "Aktualisieren"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Aktualisiert"
 
@@ -3309,78 +2980,71 @@ msgid "Updated date"
 msgstr "Aktualisiert am"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Benutze mindestens 10 Boni in einem Rennen."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Hochauflösende Texturen benutzen"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Benutze „links“/„rechts“, um dein Team auszuwählen und dann drücke „feuern“"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Nutze das Nitro, das du gesammelt hast, indem du <%s> drückst!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Benutzerinformation"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Benutzeroberfläche"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Benutzerdefiniert"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Benutzersuche"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Benutzername"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Benutzername und/oder E-Mail-Adresse ungültig."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "gegen"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Informationen überprüfen"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3389,39 +3053,35 @@ msgstr "Version: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertical Sync (erfordert Neustart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Ansicht"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Lautstärke"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Abstimmen"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Abstimmung erfolgreich! Du kannst nun das Fenster schließen."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "GEWICHT"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "FALSCHE RICHTUNG!"
 
@@ -3430,142 +3090,121 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Achtung, die Umschalttaste ist als Taste nicht empfohlen: Alle Tasten, die "
-"mit ihr ein anderes Zeichen erzeugen, werden nicht mehr funktionieren."
+msgstr "Achtung, die Umschalttaste ist als Taste nicht empfohlen: Alle Tasten, die mit ihr ein anderes Zeichen erzeugen, werden nicht mehr funktionieren."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Waffen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Wettereffekte"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Wettereffekte: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Was ist los, ihr kleinen Hippies? Fehlt euch euer Gnu-Anführer?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Nachdem die Eingabegeräte konfiguriert worden sind, kannst du mit dem "
-"Spielen beginnen. Klick im Hauptmenü auf „Mehrspieler-Rennen“. Bei der Kart-"
-"Auswahl kann jeder Spieler die „Schießen“-Taste seines Gamepads oder seiner "
-"Tastatur drücken, um am Spiel teilzunehmen. Jeder Spieler kann sein "
-"Eingabegerät benutzen, um sein Kart auszuwählen. Das Spiel geht weiter, "
-"nachdem jeder sein Kart ausgewählt hat. Beachte, dass die Maus für diesen "
-"Vorgang nicht benutzt werden kann."
+msgstr "Nachdem die Eingabegeräte konfiguriert worden sind, kannst du mit dem Spielen beginnen. Klick im Hauptmenü auf „Mehrspieler-Rennen“. Bei der Kart-Auswahl kann jeder Spieler die „Schießen“-Taste seines Gamepads oder seiner Tastatur drücken, um am Spiel teilzunehmen. Jeder Spieler kann sein Eingabegerät benutzen, um sein Kart auszuwählen. Das Spiel geht weiter, nachdem jeder sein Kart ausgewählt hat. Beachte, dass die Maus für diesen Vorgang nicht benutzt werden kann."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Weiß"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Gewinne 5 Einzelrennen hintereinander."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Gewinne in allen Einzelspielermodi gegen jeweils mindestens 3 Gegner."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Du bist jetzt bereit für Rennen. Viel Glück!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Du spielst als"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Du kannst deine vorherige Bewertung, indem du auf die Sterne darunter klickst."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Du kannst keine Add-Ons ohne Internetzugang herunterladen. Falls du Add-Ons herunterladen willst, geh ins Einstellungsmenü, Registerkarte „Benutzeroberfläche“ und bearbeite „Zum Internet verbinden“."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Ohne Internetzugang kannst du nicht online spielen. Falls du online spielen möchtest, geh ins Einstellungsmenü, Registerkarte „Benutzeroberfläche“ und bearbeite „Zum Internet verbinden“."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Sie können ohne ein Online-Konto zu errichten, mit einem Offline-Account spielen. Dann können Sie sich nicht zu Freunden verbinden über Addons abstimmen usw. Bitte lesen Sie unsere Datenschutzerklärung auf http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Du hast eine Herausforderung gemeistert!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Du hast Herausforderungen gemeistert!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Du hast den Grand Prix beendet!"
 
@@ -3573,33 +3212,35 @@ msgstr "Du hast den Grand Prix beendet!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Du hast die schwierige Herausforderung gemeistert. In diesem Level erhaltene Punkte: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Du hast die leichte Herausforderung gemeistert. In diesem Level erhaltene Punkte: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Du hast die mittlere Herausforderung gemeistert. In diesem Level erhaltene Punkte: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Du hast das Rennen beendet!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Du hast %d neue Freundschaftsanfrage!"
+msgstr[1] "Du hast %d neue Freundschaftsanfragen!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Du hast eine neue Freundschaftsanfrage!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Du bist ausgeschieden!"
 
@@ -3607,75 +3248,78 @@ msgstr "Du bist ausgeschieden!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Du hast für dieses Add-On noch keine Stimme abgegeben. Wähle deine gewünschte Bewertung, indem du die Sterne darunter anklickst."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Du brauchst mehr Punkte,\num diese Herausforderung\nspielen zu dürfen. Siehe die\nKarte für die verfügbare\nHerausforderungen."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Du musst ein Passwort eingeben."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Du hast den Grand Prix „%0“ freigeschaltet"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Du hast die Strecke „%0“ freigeschaltet"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Du wirst eine E-Mail mit weiteren Anweisungen, darüber, wie du dein Passwort zurücksetzt, erhalten. Bitte sei geduldig und stell sicher, im Spam-Verzeichnis nachzusehen."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Du wirst eine E-Mail mit weiteren Anweisungen über die Aktivierung deines Benutzerkontos erhalten. Bitte sei geduldig und stell sicher, im Spam-Verzeichnis nachzusehen."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Du hast das Rennen gewonnen!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Ihre OpenGL-Version scheint zu alt zu sein. Bitte überprüfen Sie, ob ein Update für Ihren Grafiktreiber verfügbar ist. SuperTuxKart erfordert OpenGL 3.1 oder besser."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Die Konfigurationsdatei war fehlerhaft, daher wurde sie gelöscht und eine "
-"neue wird erstellt."
+msgstr "Die Konfigurationsdatei war fehlerhaft, daher wurde sie gelöscht und eine neue wird erstellt."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Die Konfigurationsdatei war zu alt, daher wurde sie gelöscht und eine neue "
-"wird erstellt."
+msgstr "Die Konfigurationsdatei war zu alt, daher wurde sie gelöscht und eine neue wird erstellt."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Dein Treiber ist zu alt. Bitte installiere die neuste Version des Graphiktreibers."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Deine Eingabe-Konfigurationsdatei ist mit dieser Version von STK nicht "
-"kompatibel."
+msgstr "Deine Eingabe-Konfigurationsdatei ist mit dieser Version von STK nicht kompatibel."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Dein Profil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zengarten"
 
@@ -3686,16 +3330,16 @@ msgstr "[Keine]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "Aktionen"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "alles"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "von"
@@ -3704,69 +3348,25 @@ msgstr "von"
 msgid "featured"
 msgstr "vorgestellt"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "hoch"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "niedrig"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Bendetto https://launchpad.net/~biengo\n"
-"  DHermit https://launchpad.net/~dhermit\n"
-"  DaBASCHT https://launchpad.net/~dabascht\n"
-"  David Roth https://launchpad.net/~davidroth9\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Dennis https://launchpad.net/~theradialactive\n"
-"  Evolution https://launchpad.net/~marcken-ritter\n"
-"  Felix https://launchpad.net/~felixk\n"
-"  Gerjet Kleine-Weischede https://launchpad.net/~gerjet-deactivatedaccount-"
-"deactivatedaccount\n"
-"  Gregor Santner https://launchpad.net/~gregi94\n"
-"  H0ff1 https://launchpad.net/~stefhoff\n"
-"  John Doe https://launchpad.net/~kulok1493-deactivatedaccount\n"
-"  Matthias Lange https://launchpad.net/~lange-matthias\n"
-"  Robert Kurz https://launchpad.net/~e-robert-kurz-hd\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Salesome https://launchpad.net/~xaver-bastiani-deactivatedaccount\n"
-"  Simeon https://launchpad.net/~simeon5\n"
-"  Tobias Bannert https://launchpad.net/~toba\n"
-"  Wolfs https://launchpad.net/~pizzaservice\n"
-"  Wuzzy https://launchpad.net/~wuzzy\n"
-"  cmdrhenner https://launchpad.net/~cmdrhenner\n"
-"  e https://launchpad.net/~e-blosz\n"
-"  enz https://launchpad.net/~markus-enzenberger\n"
-"  hiker https://launchpad.net/~hiker-luding\n"
-"  konstin https://launchpad.net/~konstin\n"
-"  pert7 https://launchpad.net/~pert7-deactivatedaccount"
+msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Bendetto https://launchpad.net/~biengo\n  DHermit https://launchpad.net/~dhermit\n  DaBASCHT https://launchpad.net/~dabascht\n  David Roth https://launchpad.net/~davidroth9\n  Dawid Gan https://launchpad.net/~deveee\n  Dennis https://launchpad.net/~theradialactive\n  Evolution https://launchpad.net/~marcken-ritter\n  Felix https://launchpad.net/~felixk\n  Gerjet Kleine-Weischede https://launchpad.net/~gerjet-deactivatedaccount-deactivatedaccount\n  Gregor Santner https://launchpad.net/~gregi94\n  H0ff1 https://launchpad.net/~stefhoff\n  John Doe https://launchpad.net/~kulok1493-deactivatedaccount\n  Matthias Lange https://launchpad.net/~lange-matthias\n  Robert Kurz https://launchpad.net/~e-robert-kurz-hd\n  STK-team https://launchpad.net/~stk\n  Salesome https://launchpad.net/~xaver-bastiani-deactivatedaccount\n  Simeon https://launchpad.net/~simeon5\n  Tobias Bannert https://launchpad.net/~toba\n  Wolfs https://launchpad.net/~pizzaservice\n  Wuzzy https://launchpad.net/~wuzzy\n  cmdrhenner https://launchpad.net/~cmdrhenner\n  e https://launchpad.net/~e-blosz\n  enz https://launchpad.net/~markus-enzenberger\n  hiker https://launchpad.net/~hiker-luding\n  konstin https://launchpad.net/~konstin\n  pert7 https://launchpad.net/~pert7-deactivatedaccount"
diff --git a/data/po/el.po b/data/po/el.po
index f54b8e55d..c9b541576 100644
--- a/data/po/el.po
+++ b/data/po/el.po
@@ -1,23 +1,23 @@
-# Greek translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
+# Wasilis Mandratzis-Walz, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:06+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-15 03:09+0000\n"
+"Last-Translator: Wasilis Mandratzis-Walz\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/supertuxkart/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,26 +28,25 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Είσαι λίγο αξιολ�πητος twerps δεν θα είσαι ποτέ σε θέση να με χτυπήσεις - "
-"Βασιλιάς των Karts!"
+msgstr " Είσαι λίγο αξιολ�πητος twerps δεν θα είσαι ποτέ σε θέση να με χτυπήσεις - Βασιλιάς των Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d φίλος είναι τώ�α online."
+msgstr[1] "%d φίλοι είναι τώ�α online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (μειονέκτημα)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -60,10 +59,10 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s και %s είναι τώ�α online."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -72,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s από τον %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s από τον %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s είναι τώ�α online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "Ο %s είναι έτοιμος"
@@ -92,32 +90,30 @@ msgstr "Ο %s είναι έτοιμος"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "π�οφίλ του χ�ήστη %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "διακομιστής %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s και %s είναι τώ�α online."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "Ο «%s» αποκλείστηκε."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Κενό)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(το δικτυακό παιχνίδι δεν είναι ακόμα διαθέσιμο)"
 
@@ -127,53 +123,40 @@ msgstr "* Ένα μπλε στοιχείο σημαίνει ασυμβατότη
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Ένα κόκκινο στοιχείο σημαίνει μια σ�γκ�ουση στην τ�έχουσα διαμό�φωση"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Οι συνδυασμοί πλήκτ�ων μπο�ο�ν να π�οβληθο�ν/αλλαχθο�ν στο μενο� Επιλογές"
+msgstr "* Οι συνδυασμοί πλήκτ�ων μπο�ο�ν να π�οβληθο�ν/αλλαχθο�ν στο μενο� Επιλογές"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Οι πε�ισσότε�οι τ�όποι παιχνιδιο� μπο�ο�ν να παιχτο�ν με τον τ�όπο του "
-"Grand Prix: αντί να παίξετε ένα μόνο αγώνα, μπο�είτε να παίξετε πολλο�ς στην "
-"σει�ά. Όσο πιο ψηλή θέση στην κατάταξη πά�ετε, τόσους πε�ισσότε�ους βαθμο�ς "
-"παί�νετε. Στο τέλος, ο παίκτης με τους πε�ισσότε�ους βαθμο�ς κε�δίζει το "
-"κ�πελο."
+msgstr "* Οι πε�ισσότε�οι τ�όποι παιχνιδιο� μπο�ο�ν να παιχτο�ν με τον τ�όπο του Grand Prix: αντί να παίξετε ένα μόνο αγώνα, μπο�είτε να παίξετε πολλο�ς στην σει�ά. Όσο πιο ψηλή θέση στην κατάταξη πά�ετε, τόσους πε�ισσότε�ους βαθμο�ς παί�νετε. Στο τέλος, ο παίκτης με τους πε�ισσότε�ους βαθμο�ς κε�δίζει το κ�πελο."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Επανεκκίνηση του STK για εφα�μογή νέων �υθμίσεων"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Ποια config για να χ�ησιμοποιήσετε, θα π�έπει να συναχθο�ν από την οποία «Επιλογή» πατηθεί κάποιο πλήκτ�ο για να συμμετάσχετε στο παιχνίδι."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -202,13 +185,10 @@ msgstr "Μάχη 3 χτυπημάτων"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Μάχη 3 χτυπημάτων: Μόνο σε παιχνίδια πολλαπλών παικτών. Χτυπήστε με τα όπλα "
-"τους άλλους, μέχ�ι να χάσουν όλες τις ζωές τους."
+msgstr "Μάχη 3 χτυπημάτων: Μόνο σε παιχνίδια πολλαπλών παικτών. Χτυπήστε με τα όπλα τους άλλους, μέχ�ι να χάσουν όλες τις ζωές τους."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -223,23 +203,20 @@ msgid "9 months"
 msgstr "9 μήνες"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "=Υψηλότε�ες βαθμολογίες="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Ολα τα Κα�τ"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Ματαίωση του Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Σχετικά"
 
@@ -248,67 +225,59 @@ msgstr "Σχετικά"
 msgid "Accelerate"
 msgstr "Επιτάχυνση"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Επιτάχυνε και πάτα το πλήκτ�ο <%s> καθώς στ�ίβεις για να γλυστ�ίσεις. Το "
-"γλ�στ�ιμα για σ�ντομο διάστημα μπο�εί να σε βοηθήσει να στ�ίβεις γ�ηγο�ότε�α "
-"και να παί�νεις κλειστές στ�οφές."
+msgstr "Επιτάχυνε και πάτα το πλήκτ�ο <%s> καθώς στ�ίβεις για να γλυστ�ίσεις. Το γλ�στ�ιμα για σ�ντομο διάστημα μπο�εί να σε βοηθήσει να στ�ίβεις γ�ηγο�ότε�α και να παί�νεις κλειστές στ�οφές."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Επιτάψυνε με το <%s> και στ�ίψε με το <%s> και το <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Αποδοχή"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Ανάκτηση λογα�ιασμο�"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Ρυθμίσεις λογα�ιασμο�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Επιτε�γματα"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Δ�άση"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Π�οσθήκη"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Π�οσθήκη φίλου"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -317,7 +286,6 @@ msgstr "Π�οσθήκη διαμό�φωσης πληκτ�ολογίου"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Π�οσθήκη παίκτη"
 
@@ -328,32 +296,29 @@ msgstr "Π�οσθήκη Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Π�οσθήκη συσκευής"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Π�οσθήκη χ�ήστη"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Π�όσθετα"
 
@@ -363,100 +328,91 @@ msgstr "Όνομα π�όσθετου"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Π�όσθετα"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Σ�νθεση αγωγο� (φώτα, κ.λπ.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Όλες"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Όλες οι πίστες"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Όλα τα χτηπήματα επιτ�έπονται, οπότε πιάστε όπλα και χ�ησιμοποιήστε τα "
-"έξυπνα!"
+msgstr "Όλα τα χτηπήματα επιτ�έπονται, οπότε πιάστε όπλα και χ�ησιμοποιήστε τα έξυπνα!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
-msgstr ""
+msgstr "�α εμφανίζεται πάντα η οθόνη σ�νδεσης"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Αμάντα"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Πε�ιβαλλοντικό κλείσιμο"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Πε�ιβαλλοντικό κλείσιμο : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Πα�ουσιάστηκε σφάλμα π�οσπαθώντας αποθήκευση του γκ�αν π�ι σας."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Άγκυ�α - επιβ�αδ�νει πολ� το κα�τ που β�ίσκεται στην π�ώτη θέση."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Κινο�μενοι χα�ακτή�ες"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Κινο�μενοι χα�ακτή�ες : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Κινο�μενο τοπίο"
 
@@ -464,58 +420,54 @@ msgstr "Κινο�μενο τοπίο"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Κινο�μενο τοπίο: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropic x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropic x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropic x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropic x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Ένα άλλο γκ�αν π�ι με αυτό το όνομα υπά�χει ήδη."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Καταπολέμηση εξομάλυνσης"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Καταπολέμηση εξομάλυνσης : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Εφα�μογή"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Εφα�μογή νέας ανάλυσης"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Κ��ιος εχθ�ός"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -526,51 +478,46 @@ msgstr "Είστε βέβαιοι ότι θέλετε να διαγ�άψετε
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Είστε βέβαιοι ότι θέλετε να κατα�γήσετε το '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Α�ένες"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Γ��ω από τον φά�ο"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Εκχώ�ηση τίποτα"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Αντιστοίχιση του πλήκτ�ου ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Στο τέλος του κόσμου"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Ήχος"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Αποφ�γετε τις μπανάνες!"
 
@@ -592,123 +539,102 @@ msgstr "Άξονας %d %s"
 msgid "Axis %d inverted"
 msgstr "Άξονας %d ανεστ�αμμένος"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Πίσω"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Πίσω στο παιχνίδι"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Πίσω στον αγώνα"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Πίσω στην επιλογή π�όκλησης"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Πίσω στην λίστα συσκευών"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Πίσω στο μενο�"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Πίσω στο μενο�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Banana Lover"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Μπάλα μπάσκετ - αναπηδά π�ος τον ηγέτη, και μπο�εί να τσαλαπατήσει και να "
-"καθυστε�ήσει τα κα�τ που θα β�εθο�ν στον δ�όμο της."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Μπάλα μπάσκετ - αναπηδά π�ος τον ηγέτη, και μπο�εί να τσαλαπατήσει και να καθυστε�ήσει τα κα�τ που θα β�εθο�ν στον δ�όμο της."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Το νησί της μάχης"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Καλ�τε�η τ�χη την επόμενη φο�ά!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
-msgstr ""
+msgstr "Διγ�αμμικό"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Μα��ο"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Blackhill Mansion"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Μπλουμ"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Μπλουμ : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Κέ�δισε η μπλε ομάδα"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Μπάλα του μποουλινγκ - αναπηδά στους τοίχους. Αν κοιτάζετε πίσω, θα �ιχτεί "
-"π�ος τα πίσω."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Μπάλα του μποουλινγκ - αναπηδά στους τοίχους. Αν κοιτάζετε πίσω, θα �ιχτεί π�ος τα πίσω."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -716,70 +642,58 @@ msgid "Brake"
 msgstr "Φ�ένο"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Τσιχλόφουσκα - π�οστάτεψε τον εαυτό σου με μια ασπίδα, ή χ�ησιμοποίησε την "
-"καθώς κοιτάς πίσω για να αφήσεις μία κολώδη �οζ λακο�βα πίσω σου."
+msgstr "Τσιχλόφουσκα - π�οστάτεψε τον εαυτό σου με μια ασπίδα, ή χ�ησιμοποίησε την καθώς κοιτάς πίσω για να αφήσεις μία κολώδη �οζ λακο�βα πίσω σου."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Αλλά είμαι ενα δίκαιο πλάσμα, γι 'αυτό θα κάνουμε μια συμφωνία."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Κέικ - �ίχνεται στον κοντινότε�ο αντίπαλο, το καλ�τε�ο σε κοντινές "
-"αποστάσεις και μακ�ιές ευθείες."
+msgstr "Κέικ - �ίχνεται στον κοντινότε�ο αντίπαλο, το καλ�τε�ο σε κοντινές αποστάσεις και μακ�ιές ευθείες."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Δεν υπά�χει π�όσβαση στον εξυπη�ετητή π�όσθετων του STK"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Άκυ�ο"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Ακ��ωση Αίτησης"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -787,90 +701,76 @@ msgid "Cancel/Back"
 msgstr "Άκυ�ο/Πίσω"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Η π�όκληση ολοκλη�ώθηκε"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Η π�όκληση απέτυχε"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Π�οκλήσεις : Δωμάτιο τ�οπαίου"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Αλλαγή"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Επιλέξτε  ένα Κα�τ"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Christoffel Columbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Κάντε κλικ εδώ για εκμάθηση"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Cocoa Temple"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Συλλέξτε τουλάχιστον 5 μπανάνες σε έναν αγώνα."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Συλλογή μπλε κουτιών: θα σας δώσουν όπλα και άλλα ενισχυτικά"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Συλλέξτε κουτιά δώ�ων και �ίξτε το όπλο με <%s> για να �ίξετε μακ�ιά αυτά τα "
-"κουτιά!"
+msgstr "Συλλέξτε κουτιά δώ�ων και �ίξτε το όπλο με <%s> για να �ίξετε μακ�ιά αυτά τα κουτιά!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Συλλέξτε μπουκάλια νίτ�ου (θα τα χ�ησιμοποιήσουμε μετά την στ�οφή)"
 
@@ -880,34 +780,30 @@ msgstr "Συλλέξτε νίτ�ο!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Συλλέγοντας nitro σας επιτ�έπει να αυξάνετε την ταχ�τητα σας όποτε θέλετε "
-"πατώντας το κατάλληλο πλήκτ�ο. Μπο�είτε να δείτε το τ�έχον επίπεδο του nitro "
-"στην στήλη δεξιά στην οθόνη του παιχνιδιο�."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Συλλέγοντας nitro σας επιτ�έπει να αυξάνετε την ταχ�τητα σας όποτε θέλετε πατώντας το κατάλληλο πλήκτ�ο. Μπο�είτε να δείτε το τ�έχον επίπεδο του nitro στην στήλη δεξιά στην οθόνη του παιχνιδιο�."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Συμπλη�ώστε όλες τις π�οκλήσεις για να ξεκλειδώσετε την μεγάλη πό�τα!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Ολοκλη�ώση επίτευγματος \"%s\"."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Επιβεβαίωση"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -915,191 +811,166 @@ msgstr "Επιβεβαίωση ανάλυσης μέσα σε %i δευτε�ό
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Σ�νδεση στο Διαδικτυο"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Συνδέστε το wiimote σας στο διαχει�ιστή Bluetooth και κάντε κλικ στο ΟΚ. "
-"Λεπτομε�είς οδηγίες στο supertuxcart.net/Wiimote"
+msgstr "Συνδέστε το wiimote σας στο διαχει�ιστή Bluetooth και κάντε κλικ στο ΟΚ. Λεπτομε�είς οδηγίες στο supertuxcart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Δεν πε�ιέχει ενισχυτικά, έτσι παίζουν �όλο μόνο οι οδηγικές σας ικανότητες!"
+msgstr "Δεν πε�ιέχει ενισχυτικά, έτσι παίζουν �όλο μόνο οι οδηγικές σας ικανότητες!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Συνέχεια"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Συνέχεια αποθηκε�μενου GP"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Συνέχεια."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Στοιχεία ελέγχου"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Αντιγ�αφή"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Αδυναμία δημιου�γίας παίκτη '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Δεν ανιχνε�θηκε κάποιο wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Δημιου�γία"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Δημιου�γία διακομιστή"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Δημιου�γία χ�ήστη"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Δημιου�γία διακομιστή"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Συντελεστές"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Τ�έχον Κωδικός"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Τ�έχον λάθος κωδικός."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Επί του πα�όντος δεν έχει συνδεθεί"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Π�οσα�μογή"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Π�οσα�μοσμένες �υθμίσεις..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "Dpad κάτω"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "Dpad α�ιστε�ά"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "Dpad δεξιά"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "Dpad επάνω"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Πτώση"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Π�οεπιλογή"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Διαγ�αφή"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Διαγ�αφή διαμό�φωσης"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Βάθος πεδίου"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Βάθος πεδίου: %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1109,34 +980,33 @@ msgstr "Απενε�γοποίηση συσκευής"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Απενε�γοποιημένο"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Εμφάνιση FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Θέλετα π�αγματικά να εγκαταλείψετε το Grand Prix;"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Θέλετε π�αγματικά να διαγ�άψετε τον παίκτη  '%s' ;"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Θέλετε να αποθηκε�σετε τις αλλαγές σας;"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Μην επιταχ�νεις π�ιν το Πάμε"
 
@@ -1147,29 +1017,26 @@ msgstr "Κάτω"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Οδηγήστε σε ανάστ�οφη"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Δυναμικά φώτα :%s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Επεξε�γασία"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Επεξε�γασία Γκ�αν Π�ι"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1178,7 +1045,6 @@ msgstr "Κυνήγι αυγο�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Κυνήγι αυγο�: Εξε�ευνήστε πίστες για να β�είτε όλα τα κ�υμένα αυγά."
 
@@ -1188,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Αυγά: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Ελέφαντας"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Αποκλείστηκε"
 
@@ -1201,24 +1066,22 @@ msgstr "Αποκλείστηκε"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Email π�έπει να είναι μήκους μεταξ� 4 και 50 χα�ακτή�ων!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Άκυ�ο email!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Τα email δεν ται�ιάζουν!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1230,64 +1093,61 @@ msgstr "Ενε�γοποίηση συσκευής"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Ενε�γοποίηση ανά παίκτη μειονεκτήματα"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Ενε�γοποιημένο"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Ενε�γοποιημένο για όλα"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Πληκτ�ολογήστε το όνομα του νέου παίκτη"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Σφάλμα κατά τη λήψη ειδήσεων: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Όλοι:\n"
-"Πατήστε 'Επιλογή' τώ�α για να συμμετέχετε στο παιχνίδι!"
+msgstr "Όλοι:\nΠατήστε 'Επιλογή' τώ�α για να συμμετέχετε στο παιχνίδι!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Υφιστάμενος Online Λογα�ιασμός"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Έξοδος "
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Έξοδος από τον αγώνα"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Έξοδος παιχνιδιο�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ειδήμονας"
 
@@ -1295,51 +1155,49 @@ msgstr "Ειδήμονας"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Εξε�ευνήστε  πίστες για να β�είτε όλα τα κ�υμένα αυγά"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d - PolyCount: %d Στε�εά, %d Σκιές - LightDist: %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Ανάκτηση επιτευγμάτων"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Ανάκτηση φίλων"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Ανάκτηση τελευταία ψηφοφο�ία"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Ανάκτηση διακομιστών"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Συμπλη�ώστε τη διε�θυνση όνομα χ�ήστη και το email που δώσατε κατά την εγγ�αφή να είναι σε θέση να επαναφέ�ετε τον κωδικό σας."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Τελευταίος γ��ος!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Αναζήτηση διακομιστή"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1348,22 +1206,14 @@ msgstr "Πυ�"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Π�ώτα θα χ�ειαστείτε α�κετές συσκευές εισόδου (το να έχετε πολλαπλά gamepad "
-"ή joystick είναι ο καλ�τε�ος τ�όπος για να παίξετε με πολλο�ς ανθ�ώπους). "
-"Πηγαίνετε στην οθόνη διαμό�φωσης εισόδου και �υθμίστε τα gamepad. Είναι "
-"επίσης δυνατό να παίξετε με πληκτ�ολόγιο(α), πάντως κάθε παίκτης θα "
-"χ�ειαστεί διαφο�ετικό σ�νολο πλήκτ�ων, και να έχετε υπ'όψιν ότι τα "
-"πε�ισσότε�α πληκτ�ολόγια δεν είναι κατάλληλα για παιχνίδι πολλαπλών παικτών "
-"γιατί δεν υποστη�ίζουν μεγάλο α�ιθμό από ταυτόχ�ονα πατήματα πλήκτ�ων."
+msgstr "Π�ώτα θα χ�ειαστείτε α�κετές συσκευές εισόδου (το να έχετε πολλαπλά gamepad ή joystick είναι ο καλ�τε�ος τ�όπος για να παίξετε με πολλο�ς ανθ�ώπους). Πηγαίνετε στην οθόνη διαμό�φωσης εισόδου και �υθμίστε τα gamepad. Είναι επίσης δυνατό να παίξετε με πληκτ�ολόγιο(α), πάντως κάθε παίκτης θα χ�ειαστεί διαφο�ετικό σ�νολο πλήκτ�ων, και να έχετε υπ'όψιν ότι τα πε�ισσότε�α πληκτ�ολόγια δεν είναι κατάλληλα για παιχνίδι πολλαπλών παικτών γιατί δεν υποστη�ίζουν μεγάλο α�ιθμό από ταυτόχ�ονα πατήματα πλήκτ�ων."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1376,55 +1226,51 @@ msgstr "Ακολο�θησε τον ηγέτη!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Ακολο�θησε τον ηγέτη: Τ�έξε για την δε�τε�η θέση, καθώς το τελευταίο κα�τ θα "
-"αποκλείεται κάθε φο�ά που ο μετ�ητής θα φτάνει στο μηδέν. Π�οσοχή: αν πας "
-"μπ�οστά από τον ηγέτη, επίσης θα αποκλειστείς!"
+msgstr "Ακολο�θησε τον ηγέτη: Τ�έξε για την δε�τε�η θέση, καθώς το τελευταίο κα�τ θα αποκλείεται κάθε φο�ά που ο μετ�ητής θα φτάνει στο μηδέν. Π�οσοχή: αν πας μπ�οστά από τον ηγέτη, επίσης θα αποκλειστείς!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Δυνατό Μάγμα"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Β�έθηκαν %d wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Β�έθηκε %d wiimote"
+msgstr[1] "Β�έθηκαν %d wiimote"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Φίλο αφαι�εθεί!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Αίτημα φίλου αποδεκτο!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Αίτημα φίλου ακυ�ωθείκε!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Τα Αίτηματα φίλων μειώθηκαν!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Αίτημα φίλου εστάλη!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Φίλοι"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Πλή�ης οθόνη"
 
@@ -1438,24 +1284,21 @@ msgstr "ΓΚΟΛ!"
 msgid "Game Keys"
 msgstr "Πλήκτ�α παιχνιδιο�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Τ�όποι παιχνιδιο�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Τ�πος Παιχνιδιο� (Στόχοι ό�ιο / Π�οθεσμία)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1469,51 +1312,45 @@ msgstr "Πλήκτ�ο gamepad %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Γενικά"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Πα�αίτηση από τον αγώνα"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Παγκόσμιος φωτισμός"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Γενικός φωτισμός: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Λάμψη (πε�ιγ�άμματα)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Λάμψη (πε�ιγ�άμματων): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1523,61 +1360,53 @@ msgid "Go!"
 msgstr "Πάμε!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Χ�υσός οδηγός"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Gran Paradiso Island"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Γκ�αν Π�ι Επιμέλεια"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Γκ�αν Π�ι Επιμέλεια"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Π�όοδος του Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Επίπεδο εφέ γ�αφικών"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Γ�αφικά"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Ρυθμίσεις γ�αφικών"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Π�άσινη κοιλάδα"
 
@@ -1590,16 +1419,14 @@ msgstr "Επισκέπτης"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Επισκέπτης %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Επισκέπτης Είσοδος"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1609,118 +1436,105 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Βοήθεια"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Υψηλές βαθμολογίες"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Χτυπήστε 10 κα�τ με μπόουλινγκ μπάλα."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Χτ�πα τους άλλους με τα όπλα, μέχ�ι να χάσουν όλες τις ζωές τους. (Μόνο σε "
-"παιχνίδι με πολλαπλο�ς παίκτες)"
+msgstr "Χτ�πα τους άλλους με τα όπλα, μέχ�ι να χάσουν όλες τις ζωές τους. (Μόνο σε παιχνίδι με πολλαπλο�ς παίκτες)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Έπληξαν την ίδια κα�τ τουλάχιστον 5 φο�ές σε έναν αγώνα."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Παίκτες μόνο άνθ�ωποι"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Συμφωνώ με τους πα�απάνω ό�ους και είμαι 13 ετών και άνω."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
-"Αν μπο�είς να με κε�δίσεις στον αγώνα, θα ελευθε�ώσω  το παλιό codger."
+msgstr "Αν μπο�είς να με κε�δίσεις στον αγώνα, θα ελευθε�ώσω  το παλιό codger."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Αν δεις ένα πλήκτ�ο με μία κλειδα�ιά σαν αυτό, χ�ειάζεται να ολοκλη�ώσεις "
-"μία π�όκληση για να το ξεκλειδώσεις."
+msgstr "Αν δεις ένα πλήκτ�ο με μία κλειδα�ιά σαν αυτό, χ�ειάζεται να ολοκλη�ώσεις μία π�όκληση για να το ξεκλειδώσεις."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Αγνόηση του '%s', χ�ειαζόταν να συνδεθείς νω�ίτε�α για να παίξεις!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Φωτισμός εικόνας με βάση"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Εγκατάσταση"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Ενδιάμεσος"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Η Π�όσβαση στο Διαδίκτυο είναι απενε�γοποιημένη, πα�ακαλώ ενε�γοποιήστε την στις επιλογές"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Είναι ισοπαλία"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Είναι μυστικό"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Εγγ�αφή"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Συμμετοχή διακομιστή"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Κα�τ"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Κ�άτα αυτή την ανάλυση"
 
@@ -1731,7 +1545,7 @@ msgstr "Μείνετε με το ηγετικό κα�τ αλλά μην το π
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Κλειδιά δέσμευσης"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1739,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Πληκτ�ολόγιο %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1748,14 +1561,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Γ��ος"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Γ��ος %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Γ��οι"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1775,101 +1588,135 @@ msgstr "Α�ιστε�ά"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Πληκτ�ο Α�ιστε�όυ π�οφυλακτή�α"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Α�ιστε�ό κουμπί αντίχει�α"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Α�ιστε�ό αντίχει�α π�ος τα κάτω"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Α�ιστε�ός αντίχει�ας Α�ιστε�ά"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Α�ιστε�ός αντίχει�ας δεξια"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Α�ιστε�ός αντίχει�ας επάνω"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Σκανδάλη στα α�ιστε�ά"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Φως άξονα (ακτίνες του Θεο�)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Φως άξονα (ακτίνες του Θεο�)  : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Φό�τωση"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Αίθουσα Υποδοχής"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Αίθουσας Υποδοχής"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "Τοπικό Όνομα"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Κλειδωμένο: λ�στε ενε�γές π�οκλήσεις για να κε�δίσετε π�όσβαση σε "
-"πε�ισσότε�ες!"
+msgstr "Κλειδωμένο: λ�στε ενε�γές π�οκλήσεις για να κε�δίσετε π�όσβαση σε πε�ισσότε�ες!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Κλειδωμένο!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Σ�νδεση"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Έξοδος"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Έχετε συνδεθεί ως :%s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Σ�νδεση στο"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Σ�νδεση στο '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Η Σ�νδεση ως επισκέπτης σας επιτ�έπει να συμμετέχεται σε διαδικτυακους αγώνες, αλλά δεν σας επιτ�έπει να ψηφίζετε για Π�όσθετα, ή να συλλέγετε επιτε�γματα, ενώ είστε online"
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Έξοδος"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Έξοδος '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Σ�νδεση"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1878,46 +1725,35 @@ msgstr "Κοίταγμα πίσω"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Ψάξτε για πε�ισσότε�ους φίλους:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Κάντε 5 ολίσθησεις σε ένα γ��ο."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Κάντε έναν αγώνα με 5 γ��ους ή πε�ισσότε�ο."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Μα�αθωνιος"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Μέγ. α�ιθμός παικτών"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Μέγιστος χ�όνος (λεπ.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Εμένα μόνο"
 
@@ -1927,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Πλήκτ�α μενο�"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Μίνιγκολφ"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Κυνηγός κουνουπιών"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Θόλωμα κίνησης"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Θόλωμα κίνησης: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Άξονας ποντικιο� %d%s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1957,98 +1797,97 @@ msgstr "Πλήκτ�ο ποντικιο� %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Μετακίνηση π�ος τα κάτω"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Μετακίνηση π�ος τα επάνω"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Πολλαπλοί παίκτες"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Πολλαπλοί παίκτες"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Μουσική"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Ονομα"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Το Όνομα π�έπει να εχει μήκος μεταξ� 4 και 30 χα�ακτή�ων!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Το όνομα είναι άδειο."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Το όνομα είναι πολ� μεγάλο."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
-msgstr ""
+msgstr "Όνομα του διακομιστή"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Λίμνη της �έσσυ"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "�έο"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "Το νέο Grand Prix '%s' είναι διαθέσιμο"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "�έος διαδικτυακος Λογα�ιασμός"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "�έος κωδικός"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "�έο αίτημα"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "Η νέα δυσκολία '%s' είναι τώ�α διαθέσιμη"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�έος ταχ�τε�ος γ��ος"
 
@@ -2076,19 +1915,18 @@ msgstr "�ίτ�ο"
 msgid "Nitro challenge"
 msgstr "Π�όκληση νίτ�ο"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Οχι"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Κανένα"
 
@@ -2098,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Κανονικός αγώνας"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Βό�ειο θέ�ετ�ο"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Σημειώστε ότι αν καταφέ�ετε να γλυστίσετε για α�κετά δευτε�όλεπτα, θα λάβετε "
-"ωε ανταμοιβή ένα δώ�ο επιτάχυνσης!"
+msgstr "Σημειώστε ότι αν καταφέ�ετε να γλυστίσετε για α�κετά δευτε�όλεπτα, θα λάβετε ωε ανταμοιβή ένα δώ�ο επιτάχυνσης!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Α�χά�ιος"
 
@@ -2125,108 +1959,101 @@ msgstr "Α�ιθμός κα�τ με τεχνητή ευφυ�α : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Α�ιθμός κα�τ με τεχνητή ευφυ�α"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Α�ιθμός γκολ για νίκη"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Α�ιθμός γ��ων"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Α�ιθμός γ��ων:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Εντάξει"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Εκτός πεπατημένης"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Εκτός Σ�νδεσης"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Εκτός Σ�νδεσης Λογα�ιασμός"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Α ναι, βλέπεις, είναι στο κάστ�ο μου τώ�α και θα σε�βι�ιστεί για δείπνο..."
+msgstr "Α ναι, βλέπεις, είναι στο κάστ�ο μου τώ�α και θα σε�βι�ιστεί για δείπνο..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Παλιό ο�υχείο"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Τάξη μαθηματικών του Όλιβε�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Συνδεση στο διαδικτυο"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Διαδικτυακη σ�νδεση multiplayer"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Διαδικτυακο Όνομα Χ�ήστη"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Το Διαδικτυακο Όνομα Χ�ήστη π�έπει να είναι μήκους μεταξ� 3 και 30 χα�ακτή�ων!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Το Διαδικτυακο Όνομα Χ�ήστη δεν π�έπει να ξεκιναει με έναν α�ιθμό!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Μόνο το αφεντικό του παιχνιδιο� μπο�εί να δ�άσει σε αυτό το σημείο!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ουπς! Όταν είσαι σε μπελάδες πάτα το <%s> για να διασωθείς"
@@ -2237,63 +2064,54 @@ msgstr "Ουπς! Όταν είσαι σε μπελάδες πάτα το <%s> 
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Επιλογές"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Επισκόπηση"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "ΔΥ�ΑΜΗ"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
-msgstr ""
-"Αλεξίπτωτο - επιβ�αδ�νει όλα τα κα�τ που β�ίσκονται σε καλ�τε�η θέση."
+msgstr "Αλεξίπτωτο - επιβ�αδ�νει όλα τα κα�τ που β�ίσκονται σε καλ�τε�η θέση."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Κωδικός"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Κωδικός :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Αλλαγή κωδικο� "
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Το μηκος του Κωδικόυ π�έπει να είναι μεταξ� 8 και 30 χα�ακτή�ες!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Ο κωδικός σας άλλαξε με επιτυχία."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Οι κωδικοί δεν ται�ιάζουν!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2302,68 +2120,71 @@ msgstr "Πα�ση παιχνιδιο�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Σε πα�ση"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Ποινή χ�όνου!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Εν αναμονή"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Παιχνιδότοπος πιγκουίνου"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Εκτέλεση ψηφοφο�ίας"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Παίξε όλα"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Αναπα�αγωγή κάθε επισημου τ�αγοδιου τουλάχιστον μία φο�ά."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Παίκτες"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Οι παίκτες μπο�ο�ν να επιλέξουν π�οφιλ με ειδικές ανάγκες (πιο δ�σκολο) π�οφίλ στην οθόνη επιλογής κα�τ"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Πα�ακαλώ εισάγετε το όνομα του γκ�αν π�ι"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Πα�ακαλώ επαναδιαμο�φώστε τους συνδυασμο�ς πλήκτ�ων."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Πα�ακαλο�με διαβάστε τους ό�ους και τις π�οϋποθέσεις"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Πα�ακαλώ πε�ιμένετε καθώς ενημε�ώνονται τα π�όσθετα"
@@ -2373,46 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Πα�ακαλώ πε�ιμένετε καθώς φο�τώνονται τα π�όσθετα"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Βεντο�ζα - �ίξτε ευθεία για να τ�αβήξετε ένα αντίπαλο πίσω, ή �ίξτε καθώς "
-"κοιτάτε πίσω για να κάνετε κάποιον να χάσει την ο�ατότητα του."
+msgstr "Βεντο�ζα - �ίξτε ευθεία για να τ�αβήξετε ένα αντίπαλο πίσω, ή �ίξτε καθώς κοιτάτε πίσω για να κάνετε κάποιον να χάσει την ο�ατότητα του."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Powerup Love"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Πατήστε <%s> για να κοιτάξετε πίσω, και πυ�οβοληστε με <%s>, ενώ πατώντας <%s> πυ�οβολειτε π�ος τα πίσω!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Πίεσε το πλήκτ�ο ESC για ακ��ωση"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Πιέστε ένα πλήκτ�ο"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Πάτα enter ή κάντε διπλό κλικ σε μία συσκευή για να την διαμο�φώσεις"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Πάτα enter ή κάνε διπλό κλικ σε ένα παίκτη για να τον επεξε�γαστείς"
 
@@ -2428,10 +2241,7 @@ msgstr "Πάτα πυ� για να α�χίσει η π�όκληση."
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Πάτα τα πλήκτ�α 1+2 ταυτόχ�ονα στο wiimote σου, για να το θέσεις σε "
-"κατάσταση ανακάλυψης και μετά πάτα στο Εντάξει. Λεπτομε�είς οδηγίες στο "
-"supertuxkart.net/Wiimote"
+msgstr "Πάτα τα πλήκτ�α 1+2 ταυτόχ�ονα στο wiimote σου, για να το θέσεις σε κατάσταση ανακάλυψης και μετά πάτα στο Εντάξει. Λεπτομε�είς οδηγίες στο supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2445,20 +2255,18 @@ msgstr "Π�οβλήματα κατά την αφαί�εση του π�όσθ
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Επεξε�γασία"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Π�οφίλ"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Π�όοδος"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2466,37 +2274,31 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Σπ�ώξτε την μπάλα στην απέναντι εστία για να βάλετε γκολ. (Μόνο σε παιχνίδι "
-"πολλαπλών παικτών)"
+msgstr "Σπ�ώξτε την μπάλα στην απέναντι εστία για να βάλετε γκολ. (Μόνο σε παιχνίδι πολλαπλών παικτών)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Γ�ήγο�ο παιχνίδι"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Κλείσιμο του διακομιστή."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Ρ�θμιση αγώνα"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Τυχαία"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2504,15 +2306,15 @@ msgstr "Τυχαία α�ένα"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Τυχαίο Γκ�αν Π�ι"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Τυχαίο κα�τ"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Τυχαία πίστα"
 
@@ -2521,84 +2323,68 @@ msgid "Rank"
 msgstr "Κατάταξη"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Αξιολόγηση >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Λάβετε θέσεις!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Π�αγματικά ... ένα μυστικό."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Κέ�δισε η κόκκινη ομάδα"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Εγγ�αφή"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Κανονικός αγώνας: Όλα τα χτυπήματα επιτ�έπονται, οπότε πιάστε όπλα και "
-"χ�ησιμοποιήστε τα έξυπνα!"
+msgstr "Κανονικός αγώνας: Όλα τα χτυπήματα επιτ�έπονται, οπότε πιάστε όπλα και χ�ησιμοποιήστε τα έξυπνα!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Ανανέωση"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Απομνημόνευση κωδικο� π�όσβασης"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Απομνημόνευση θέσης πα�αθ��ου"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Αφαί�εση"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Μετονομασία"
 
@@ -2624,35 +2410,31 @@ msgstr "Διάσωση"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Επανεκκίνηση αγώνα"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Αντίστ�οφα"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Αντίστ�οφα:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Αντίστ�οφα"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2662,84 +2444,78 @@ msgstr "Δεξιά"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Πληκτ�ο δεξίου  π�οφυλακτή�α"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Δεξί κουμπί αντίχει�α"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr " Δεξί αντίχει�α π�ος τα κάτω"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Δεξίς  αντίχει�ας Δεξία "
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Δεξίς αντίχει�ας δεξια"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Δεξίς  αντίχει�ας επάνω"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Σκανδάλη στα Δεξία "
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "ΤΑΧΥΤΗΤΑ"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr ""
+msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Σά�α ο οδηγός"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Σά�α ο οδηγός"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Αποθήκευση Γκ�αν Π�ι"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Σκωτία"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Αναζήτηση"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Αναζήτηση"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2747,57 +2523,49 @@ msgid "Select"
 msgstr "Επιλογή"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Επιλέξτε μια δυσκολία"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Επιλογή τ�όπου παιχνιδιο�"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Επιλέξτε ένα κομμάτι"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Επιλογή κα�τ"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Αποστολή ανώνυμων στατιστικών στοιχείων HW"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Δημιου�γία διακομιστή"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Πλη�οφο�ίες διακομιστή"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Επιλογή διακομιστή"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Όνομα διακομιστή:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Ο Διακομιστής δημιου�γήθηκε με επιτυχία. Μπο�είτε τώ�α τον χ�ησιμοποιησετε."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2806,93 +2574,51 @@ msgstr "Έτοιμοι!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "�έος αγώνας"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Σκιές"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Σκιές: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Σκιές: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Shifting Sands"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Εγγ�αφή "
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Εγγ�αφή ως επισκέπτης"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Από"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Ένας παίκτης"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2900,9 +2626,8 @@ msgid "Size: %s"
 msgstr "Mέγεθος: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Πέλματα ολίσθησης γ�αμμής"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2911,12 +2636,10 @@ msgstr "Ολίσθηση"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Θέμα"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snow Peak"
 
@@ -2926,30 +2649,23 @@ msgid "Soccer"
 msgstr "Ποδόσφαι�ο"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Γήπεδο ποδοσφαί�ου"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Ποδόσφαι�ο: Μόνο σε παιχνίδι πολλαπλών παικτών. Χ�ησιμοποίησε το κα�τ σου "
-"για να σπ�ώξεις την μπάλα στην εστία."
+msgstr "Ποδόσφαι�ο: Μόνο σε παιχνίδι πολλαπλών παικτών. Χ�ησιμοποίησε το κα�τ σου για να σπ�ώξεις την μπάλα στην εστία."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Λυπάμαι , ένα σφάλμα συνέβη κατά την επικοινωνία με τον ιστοτόπο των "
-"π�όσθετων. Σιγου�έψου ότι είσαι συνδεδεμένος στο Internet και ότι το "
-"SuperTuxKart δεν είναι μπλοκα�ισμένο από ένα firewall."
+msgstr "Λυπάμαι , ένα σφάλμα συνέβη κατά την επικοινωνία με τον ιστοτόπο των π�όσθετων. Σιγου�έψου ότι είσαι συνδεδεμένος στο Internet και ότι το SuperTuxKart δεν είναι μπλοκα�ισμένο από ένα firewall."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2957,7 +2673,6 @@ msgstr "Λυπο�μαστε,το κατέβασμα του π�όσθετου 
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Ηχητικά εφέ"
 
@@ -2966,30 +2681,28 @@ msgstr "Ηχητικά εφέ"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Τυπικό"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Ένα�ξη"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Ένα�ξη Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Ένα�ξη αγώνα"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -3003,136 +2716,119 @@ msgstr "Στ�ίψιμο δεξιά"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Κατάσταση αφήγησης"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr " Χτ�πημα!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Υποβολή"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Υποθαλάσσια"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Π�όσθετα SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Βοήθεια SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Ρυμίσεις SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"Το SuperTuxKart μπο�εί να παιχτεί σε κατάσταση πολλαπλών παικτών στον ίδιο "
-"υπολογιστή"
+msgstr "Το SuperTuxKart μπο�εί να παιχτεί σε κατάσταση πολλαπλών παικτών στον ίδιο υπολογιστή"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "Το SuperTuxKart έχει α�κετο�ς τ�όπους παιχνιδιο�"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "Το SuperTuxKart μπο�εί να συνδεθεί με ένα διακομιστή για να κατεβάζετε add-ons και σας ειδοποιεί για ενημε�ώσεις. Επίσης συλλέγουμε ανώνυμα στατιστικά στοιχεία για να βοηθήθει η ανάπτυξη του STK. Πα�ακαλο�με διαβάστε την πολιτική απο��ήτου στην σελιδα http://privacy.supertuxkart.net. Θελετε αυτό το χα�ακτη�ιστικό να ενε�γοποιηθεί; (Για να αλλάξετε αυτή τη ��θμιση σε μεταγενέστε�ο χ�όνο, πηγαίνετε στις επιλογές, επιλέξτε την κα�τέλα «διεπαφή χ�ήστη» και επεξε�γασία \"Σ�νδεση στο Διαδικτυο\" και \"Αποστολή στατιστικών ανώνυμα HW\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Σουζάννα"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Αντικαταστάτης - τα κουτιά δώ�ων μεταμο�φώνονται σε μπανάνες και αντίστ�οφα, "
-"για σ�ντομο χ�όνο."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Αντικαταστάτης - τα κουτιά δώ�ων μεταμο�φώνονται σε μπανάνες και αντίστ�οφα, για σ�ντομο χ�όνο."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Ρακέτα - θα χτυπήσει τα κα�τ που β�ίσκονται κοντά, επιβ�αδ�νοντας τα."
+msgstr "Ρακέτα - θα χτυπήσει τα κα�τ που β�ίσκονται κοντά, επιβ�αδ�νοντας τα."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Γλώσσα συστήματος"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Πά�τε τους αντιπάλους σας για κουνο�πια! Με την σκοτωστ�α, χτυπηστε τουλάχιστον 5 από αυτους σε έναν αγώνα."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "�αός"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Ό�οι και Συμφωνία"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Συμπίεση υφής"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Φιλτ�ά�ισμα υφής"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Το κουμπί της ολίσθησης σου επιτ�έπει να γλιστ�άς σε απότομες στ�οφές και να "
-"παί�νεις ώθηση."
+msgstr "Το κουμπί της ολίσθησης σου επιτ�έπει να γλιστ�άς σε απότομες στ�οφές και να παί�νεις ώθηση."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Το στάδιο"
 
@@ -3144,13 +2840,11 @@ msgstr "Τα π�όσθετα είναι π�ος το πα�όν απενε�γ
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Το α�χείο με τις υψηλότε�ες βαθμολογίες ήταν πολ� παλιό,\n"
-"όλες οι υψηλότε�ες βαθμολογίες έχουν διαγ�αφεί."
+msgstr "Το α�χείο με τις υψηλότε�ες βαθμολογίες ήταν πολ� παλιό,\nόλες οι υψηλότε�ες βαθμολογίες έχουν διαγ�αφεί."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Ο μεγιστος α�ιθμός παικτών π�έπει να είναι μεταξ� 2 και 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3159,51 +2853,29 @@ msgstr "Χ�ονική δοκιμασία"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Χ�ονική δοκιμασία: Δεν πε�ιέχει ενισχυτικά,  παίζουν �όλο μόνο οι οδηγικές "
-"ικανότητες!"
+msgstr "Χ�ονική δοκιμασία: Δεν πε�ιέχει ενισχυτικά,  παίζουν �όλο μόνο οι οδηγικές ικανότητες!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Για να π�οσθέσεις μία νέα συσκευή Gamepad/Joystick, απλά ξεκίνα το "
-"SuperTuxKart με τη συσκευή συνδεμένη, και θα εμφανιστεί στη λίστα.\n"
-"\n"
-"Για να π�οσθέσεις μια διαμό�φωση πληκτ�ολογίου, μπο�είς να χ�ησιμοποιήσεις "
-"το πλήκτ�ο πα�ακάτω, ΩΣΤΟΣΟ πα�ακαλώ να θυμάσαι ότι τα πε�ισσότε�α "
-"πληκτ�ολόγια υποστη�ίζουν πε�ιο�ισμένο α�ιθμό από ταυτόχ�ονα πατήματα "
-"πλήκτ�ων και έτσι είναι ακατάλληλα για παιχνίδι με πολλαπλο�ς παίκτες. "
-"(Μπο�είς, πάντως, να συνδέσεις πολλαπλά πληκτ�ολόγια στον υπολογιστή. "
-"Θυμίσου ότι σε αυτή την πε�ίπτωση ο καθένας χ�ειάζεται διαφο�ετικο�ς "
-"συνδυασμο�ς πλήκτ�ων.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Για να π�οσθέσεις μία νέα συσκευή Gamepad/Joystick, απλά ξεκίνα το SuperTuxKart με τη συσκευή συνδεμένη, και θα εμφανιστεί στη λίστα.\n\nΓια να π�οσθέσεις μια διαμό�φωση πληκτ�ολογίου, μπο�είς να χ�ησιμοποιήσεις το πλήκτ�ο πα�ακάτω, ΩΣΤΟΣΟ πα�ακαλώ να θυμάσαι ότι τα πε�ισσότε�α πληκτ�ολόγια υποστη�ίζουν πε�ιο�ισμένο α�ιθμό από ταυτόχ�ονα πατήματα πλήκτ�ων και έτσι είναι ακατάλληλα για παιχνίδι με πολλαπλο�ς παίκτες. (Μπο�είς, πάντως, να συνδέσεις πολλαπλά πληκτ�ολόγια στον υπολογιστή. Θυμίσου ότι σε αυτή την πε�ίπτωση ο καθένας χ�ειάζεται διαφο�ετικο�ς συνδυασμο�ς πλήκτ�ων.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Για να βοηθηθείς να κε�δίσεις, υπά�χουν με�ικά ενισχυτικά που μπο�είς να "
-"συλλέξεις:"
+msgstr "Για να βοηθηθείς να κε�δίσεις, υπά�χουν με�ικά ενισχυτικά που μπο�είς να συλλέξεις:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Στο φεγγά�ι και πίσω"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Σήμε�α"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3213,12 +2885,12 @@ msgstr "Κο�υφαίοι %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Πίστα"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Πίστα %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3229,21 +2901,19 @@ msgstr "Πίστα από τον %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Ομάδα Πίστας"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Πίστες"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
-msgstr ""
+msgstr "Τ�ιγ�αμμική"
 
 #: src/states_screens/dialogs/addons_loading.cpp:369
 #: src/states_screens/dialogs/addons_loading.cpp:406
@@ -3252,47 +2922,42 @@ msgstr "Π�οσπαθη�στε ξανα�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Εκμάθηση"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Εκμάθηση: Επιλογή δωματίου"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Είδος :"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Τ�πος: Γκ�αν Π�ι"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Δεν είναι δυνατή η σ�νδεση με το διακομιστή. Ελέγξτε τη σ�νδεσή σας με το διαδίκτυο ή δοκιμάστε ξανά α�γότε�α."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Απεγκατάσταση"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Ασταμάτητος"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3304,8 +2969,8 @@ msgid "Update"
 msgstr "Ενημέ�ωση"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Ενημε�ωμένα"
 
@@ -3314,78 +2979,71 @@ msgid "Updated date"
 msgstr "Ημε�ομηνία ενημέ�ωσης"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Χ�ησιμοποιήστε 10 ή πε�ισσότε�α powerups σε έναν αγώνα. "
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Χ�ησιμοποιήστε υψηλής ευκ�ίνειας υφές"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Χ�ησιμοποιήστε το α�ιστε�ό / δεξί για να επιλέξετε την ομάδα σας και πατήστε φωτιά"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Χ�ησιμοποίησε το νίτ�ο που μάζεψες πατώντας  <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Πλη�οφο�ίες Χ�ήστη"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Διεπαφή χ�ήστη"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Καθο�ισμένο από το χ�ήστη"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Αναζήτηση χ�ήστη"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr " Όνομα Χ�ήστη"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr " Το Όνομα Χ�ήστη ή / και διε�θυνση email άκυ�η."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "εναντίον"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Επικ��ωση πλη�οφο�ιών"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3394,39 +3052,35 @@ msgstr "Έκδοση: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Κατακό�υφος συγχ�ονισμός (απαιτεί επανεκκίνηση)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Εμφάνιση"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Ένταση"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Ψήφος"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Η Ψηφοφο�ία ηταν επιτυχής! Μπο�είτε τώ�α να κλείσετε το πα�άθυ�ο."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "ΒΑΡΟΣ"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ΛΑΘΟΣ ΚΑΤΕΥΘΥ�ΣΗ!"
 
@@ -3435,143 +3089,121 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Π�οσοχή, το 'Shift' δεν είναι συνιστώμενο πλήκτ�ο: όταν το shift πιέζεται "
-"κάτω, όλα τα πλήκτ�α που πε�ιέχουν χα�ακτή�α διαφο�ετικό από κεφαλαίο, θα "
-"σταματήσουν να δουλε�ουν."
+msgstr "Π�οσοχή, το 'Shift' δεν είναι συνιστώμενο πλήκτ�ο: όταν το shift πιέζεται κάτω, όλα τα πλήκτ�α που πε�ιέχουν χα�ακτή�α διαφο�ετικό από κεφαλαίο, θα σταματήσουν να δουλε�ουν."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Όπλα"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Εφέ και�ο�"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Εφέ και�ο� : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Τι συμβαίνει, μικ�οί χίππιδες; Ο σπουδαίος α�χηγός gnu σας λείπει;"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Όταν οι συσκευές εισαγωγής διαμο�φωθο�ν, είσαι έτοιμος να παίξεις. Επέλεξε "
-"'Αγώνας πολλαπλών παικτών' στο κ��ιο μενο�. Όταν έ�θει η ώ�α επιλογής κα�τ, "
-"κάθε παίκτης μπο�εί να πατήσει το πλήκτ�ο 'fire' του gamepad ή πληκτ�ολογίου "
-"για να συνδεθεί στο παιχνίδι. Κάθε παίκτης μπο�εί να χ�ησιμοποιήσει την "
-"συσκευή εισαγωγής του για να επιλέξει το κα�τ του. Το παιχνίδι συνεχίζεται "
-"όταν όλοι έχουν επιλέξει το κα�τ τους. Σημειώστε ότι το ποντίκι δεν μπο�εί "
-"να χ�ησιμοποιηθεί για αυτή την λειτου�γία."
+msgstr "Όταν οι συσκευές εισαγωγής διαμο�φωθο�ν, είσαι έτοιμος να παίξεις. Επέλεξε 'Αγώνας πολλαπλών παικτών' στο κ��ιο μενο�. Όταν έ�θει η ώ�α επιλογής κα�τ, κάθε παίκτης μπο�εί να πατήσει το πλήκτ�ο 'fire' του gamepad ή πληκτ�ολογίου για να συνδεθεί στο παιχνίδι. Κάθε παίκτης μπο�εί να χ�ησιμοποιήσει την συσκευή εισαγωγής του για να επιλέξει το κα�τ του. Το παιχνίδι συνεχίζεται όταν όλοι έχουν επιλέξει το κα�τ τους. Σημειώστε ότι το ποντίκι δεν μπο�εί να χ�ησιμοποιηθεί για αυτή την λειτου�γία."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "λευκό"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Κε�δίστε 5 αγώνες μόνο σε μια σει�ά."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Κε�δίστε σε όλες τις λειτου�γίες για έναν παίκτη, τουλάχιστον 3 αντιπάλους."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "�αι"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Τώ�α είσαι έτοιμος για τον αγώνα. Καλή τ�χη!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Παίζεις ως"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Μπο�είτε να π�οσα�μόσετε π�οηγο�μενη βαθμολογία σας κάνοντας κλικ στα αστέ�ια κάτω."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Δεν μπο�είτε να κατεβάσετε Π�όσθετα που δεν έχουν π�όσβαση στο διαδίκτυο. Αν θέλετε να κατεβάσετε Π�όσθετα, πηγαίνετε στις επιλογές, επιλέξτε την κα�τέλα «διεπαφή χ�ήστη», και  επεξε�γαστε την �υθμιση \"Σ�νδεση στο Διαδικτυο\""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Δεν μπο�είτε να παίξετε online χω�ίς π�όσβαση στο διαδίκτυο. Αν θέλετε να παίξετε online, πηγαίνετε στις επιλογές, επιλέξτε την κα�τέλα «διεπαφή χ�ήστη» και επεξε�γασία \"Σ�νδεση στο Internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Μπο�είτε να παίξετε χω�ίς να δημιου�γήσετε ένα online λογα�ιασμό επιλέγοντας ένα λογα�ιασμό εκτός σ�νδεσης. Αν και τότε δεν μπο�είτε να συνδεθείτε με τους φίλους, ψηφοφο�ίας για Π�όσθετα κλπ Πα�ακαλο�με διαβάστε τη δήλωση απο��ήτου μας στο http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Ολοκλή�ωσες την π�όκληση!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Ολοκλή�ωσες τις π�οκλήσεις!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Ολοκλή�ωσες το Grand Prix!"
 
@@ -3579,33 +3211,35 @@ msgstr "Ολοκλή�ωσες το Grand Prix!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Έχετε ολοκλη�ώσει την δ�σκολη π�όκληση! Συλλέξετε πόντους σε αυτό το επίπεδο: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Έχετε ολοκλη�ώσει την ε�κολη π�όκληση! Συλλέξετε πόντους σε αυτό το επίπεδο: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Έχετε ολοκλη�ώσει την ενδιάμεση π�όκληση! Συλλέξετε πόντους σε αυτό το επίπεδο: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Έχεις τελειώσει την κο��σα!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Έχετε %d νέο αιτήμα φιλίας!"
+msgstr[1] "Έχετε %d νέα αιτήματα φιλίας!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Έχετε ένα νέο αίτημα φιλίας!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Έχεις νικηθεί!"
 
@@ -3613,74 +3247,78 @@ msgstr "Έχεις νικηθεί!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Δεν έχετε ακόμη ψηφίσει για αυτό το addon. Επιλέξετε την επιθυμητή βαθμολογία σας κάνοντας κλικ στα αστέ�ια κάτω"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Χ�ειάζεστε πε�ισσότε�ους βαθμους\nγια να εισέλθετε σε αυτή την π�όκληση! \nΕλέγξτε το μικ�ο χά�τη για\nδιαθέσιμες π�οκλήσεις."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Θα π�έπει να εισάγετε έναν κωδικό π�όσβασης."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Ξεκλείδωσες το grand prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Ξεκλείδωσες την πίστα %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Θα λάβετε ένα email με πε�αιτέ�ο οδηγίες για το πώς να επαναφέ�ετε τον κωδικό π�όσβασής σας. Πα�ακαλώ να είστε υπομονετικοί και να είστε σίγου�οι οτι ελέγξατε τον φάκελο spam."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Θα λάβετε ένα email με πε�αιτέ�ο οδηγίες για το πώς να επαναφέ�ετε τον κωδικό π�όσβασής σας. Πα�ακαλώ να είστε υπομονετικοί και να είστε σίγου�οι οτι ελέγξατε τον φάκελο spam."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Κέ�δισες τον αγώνα!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Η Έκδοση του OpenGL φαίνεται να είναι πά�α πολ� παλιά. Πα�ακαλο�με επιβεβαιώστε αν μια ενημε�ωμένη έκδοση για το π�όγ�αμμα οδήγησης οθόνης σας είναι διαθέσιμη. Το SuperTuxKart απαιτεί OpenGL 3.1 ή καλ�τε�α."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Το α�χείο διαμό�φωσης ήταν κακόμο�φο, έτσι διαγ�άφηκε και ένα νέο θα "
-"δημιου�γηθεί."
+msgstr "Το α�χείο διαμό�φωσης ήταν κακόμο�φο, έτσι διαγ�άφηκε και ένα νέο θα δημιου�γηθεί."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Το α�χείο διαμό�φωσης ήταν πολ� παλιό, έτσι διαγ�άφηκε και ένα νέο θα "
-"δημιου�γηθεί."
+msgstr "Το α�χείο διαμό�φωσης ήταν πολ� παλιό, έτσι διαγ�άφηκε και ένα νέο θα δημιου�γηθεί."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Έκδοση των driver σας είναι πολ� παλιά. Πα�ακαλώ εγκαταστήστε τα πιο π�όσφατα video drivers."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Το α�χείο διαμό�φωσης εισαγωγής δεν είναι συμβατό με αυτή την έκδοση του STK"
+msgstr "Το α�χείο διαμό�φωσης εισαγωγής δεν είναι συμβατό με αυτή την έκδοση του STK"
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Το π�οφίλ σας"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Ο κήπος του Zen"
 
@@ -3691,16 +3329,16 @@ msgstr "[κανένα]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "δ�άσεις"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "Όλες"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "από τον"
@@ -3709,48 +3347,25 @@ msgstr "από τον"
 msgid "featured"
 msgstr "π�οτεινόμενο"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "υψηλες"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "χαμηλες"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "βασικό"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Konstantinos Thermos https://launchpad.net/~subdee\n"
-"  Nefeli Stylla https://launchpad.net/~nefeli-st\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Vangelis Skarmoutsos https://launchpad.net/~skarmoutsosv\n"
-"  Yannis Kaskamanidis https://launchpad.net/~ttnfy17\n"
-"  tzem https://launchpad.net/~athmakrigiannis"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Konstantinos Thermos https://launchpad.net/~subdee\n  Nefeli Stylla https://launchpad.net/~nefeli-st\n  STK-team https://launchpad.net/~stk\n  Vangelis Skarmoutsos https://launchpad.net/~skarmoutsosv\n  Yannis Kaskamanidis https://launchpad.net/~ttnfy17\n  tzem https://launchpad.net/~athmakrigiannis"
diff --git a/data/po/en_AU.po b/data/po/en_AU.po
index 4ee82e471..bd71d6193 100644
--- a/data/po/en_AU.po
+++ b/data/po/en_AU.po
@@ -1,23 +1,22 @@
-# English (Australia) translation for stk
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 11:58+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: English (Australia) <en_AU@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/supertuxkart/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
+"Language: en_AU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,23 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" But you pathetic little twerps will never be able to beat me - King of the "
-"Karts!"
+msgstr " But you pathetic little twerps will never be able to beat me - King of the Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +58,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -99,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -131,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -147,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -215,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -240,37 +224,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -278,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -289,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -306,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -317,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -352,49 +327,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -404,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -425,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -451,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -478,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -515,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -579,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -661,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -699,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -707,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -766,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -793,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -857,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -877,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -889,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -903,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1006,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1038,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1046,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1080,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1106,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1118,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1149,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1159,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1172,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1201,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1236,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1264,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1294,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1317,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1338,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1346,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1377,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1397,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1428,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1482,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1553,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1568,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1594,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1668,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1693,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1702,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1764,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1815,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1830,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1858,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1879,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1909,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1970,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1985,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2000,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2028,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2050,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2075,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2122,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2186,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2202,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2238,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2250,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2264,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2273,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2312,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2321,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2392,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2401,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2413,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2452,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2462,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2563,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2642,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2686,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2701,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2745,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2839,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2850,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2865,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2891,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2900,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2913,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2937,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2950,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3034,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3084,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3126,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3140,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3163,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3188,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3215,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3225,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3267,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3288,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3305,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3337,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3348,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3397,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3442,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3493,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3516,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3524,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3566,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3576,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3587,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3596,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3605,43 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Jackson Doak https://launchpad.net/~noskcaj"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Jackson Doak https://launchpad.net/~noskcaj"
diff --git a/data/po/en_GB.po b/data/po/en_GB.po
index 44d348703..247819fe3 100644
--- a/data/po/en_GB.po
+++ b/data/po/en_GB.po
@@ -1,23 +1,22 @@
-# English (United Kingdom) translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Michael Torpey <mctorpey@gmail.com>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/supertuxkart/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,26 +27,25 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" But you pathetic little twerps will never be able to beat me - King of the "
-"Karts!"
+msgstr " But you pathetic little twerps will never be able to beat me - King of the Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d friend is now online."
+msgstr[1] "%d friends are now online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (handicapped)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -60,10 +58,10 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s and %s are now online."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -72,104 +70,90 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s by %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s by %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s is now online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
-msgstr ""
+msgstr "%s is ready"
 
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "%s's profile"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "%s's server"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s and %s are now online."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' has been eliminated."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Empty)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(network play is not yet available)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
+msgstr "* A blue item means a conflict with another configuration"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* A red item means a conflict in the current configuration"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Current key bindings can be seen/changed in menu Options"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Most of these game modes can also be played in a Grand Prix fashion: "
-"instead of playing a single race, you play many in a row. The better you "
-"rank, the more points you get. In the end, the player with the most points "
-"wins the cup."
+msgstr "* Most of these game modes can also be played in a Grand Prix fashion: instead of playing a single race, you play many in a row. The better you rank, the more points you get. In the end, the player with the most points wins the cup."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -200,7 +184,6 @@ msgstr "3 Strikes Battle"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -219,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -244,37 +224,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -282,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -293,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -310,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -321,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -356,49 +327,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -408,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -429,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -455,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -482,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -519,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -583,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -665,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -703,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -711,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -770,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -797,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -861,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -881,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -893,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -907,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1010,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1042,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1050,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1084,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1110,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1122,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1153,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1163,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1176,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1205,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1240,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1268,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1298,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1321,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1342,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1350,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1381,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1401,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1432,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1486,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1557,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1572,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1598,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1672,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1697,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1706,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1768,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1819,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1834,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1862,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1883,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1913,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1974,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1989,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2004,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2032,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2054,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2079,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2126,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2190,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2206,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2242,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2254,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2268,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2277,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2316,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2325,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2396,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2405,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2417,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2456,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2466,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2567,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2646,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2690,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2705,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2749,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2843,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2854,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2869,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2895,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2904,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2917,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2941,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2954,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3038,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3088,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3130,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3144,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3167,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3192,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3219,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3229,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3271,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3292,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3309,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3341,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3352,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3401,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3446,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3497,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3520,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3528,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3570,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3580,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3591,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3600,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3609,44 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Andi Chandler https://launchpad.net/~bing\n"
-"  Michael Torpey https://launchpad.net/~mctorpey\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Andi Chandler https://launchpad.net/~bing\n  Michael Torpey https://launchpad.net/~mctorpey\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/eo.po b/data/po/eo.po
index 9f219c96e..bc9a19182 100644
--- a/data/po/eo.po
+++ b/data/po/eo.po
@@ -1,22 +1,22 @@
-# Esperanto translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2013-05-20 04:04+0000\n"
-"Last-Translator: Rubén <sleepwalkdroid@gmail.com>\n"
-"Language-Team: Esperanto <eo@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/supertuxkart/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s pretas"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s estis nuligita"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Malplena)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(Retludon ankoraÅ­ ne disponeblas)"
 
@@ -128,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Rekordoj ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Pri"
 
@@ -237,37 +224,35 @@ msgstr "Pri"
 msgid "Accelerate"
 msgstr "Plirapidigi"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Plirapidig kun <%s> kaj stiri kun <%s> kaj <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr "Aldoni klavarila agordo"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Aldoni ludanton"
 
@@ -314,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Aldoni disponaĵon"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +327,43 @@ msgstr "Nomo de Aldonaĵo"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Aldonaĵoj"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Ĉio"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Ĉiuj trakoj"
 
@@ -401,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Apliki novan ekrandistingivo"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr "Ĉu vi vere volas nuligi tiun agordon?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenoj"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Atribui al Eskapa Klavo"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ĉe la mondfino."
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "AÅ­do"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evitu la bananojn!"
 
@@ -576,79 +538,66 @@ msgstr "Akso %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Reen"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Reveni al ludo"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Reveni al vetkurado"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Reveni al listo de disponaĵoj"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Reveni al menuo"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Reveni al menuo"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Plibona sorto venontfoje!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +641,6 @@ msgid "Brake"
 msgstr "Bremso"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Rezigni"
 
@@ -763,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Rezigni/Reen"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Elektu gokarton"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klaku ĉi tien por ludi la instruilon"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Fermi"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "DaÅ­rigi"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Stiriloj"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Ne eblas detekti ajnan Vii-kontrolilon :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Kreditoj"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Propra"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Propraj agordoj..."
 
@@ -1035,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Nuligi agordon"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +979,23 @@ msgstr "Malvalidigi disponaĵon"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Malvalidigi"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Montri Bildoj-Per-Sekundon"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ĉu vi volas nuligi '%s' ludanton?"
@@ -1103,8 +1004,8 @@ msgstr "Ĉu vi volas nuligi '%s' ludanton?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Ovoj: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Nuligita"
 
@@ -1169,24 +1065,22 @@ msgstr "Nuligita"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1092,24 @@ msgstr "Validigi disponaĵon"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Validigita"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Skribu nomon de la nova ludanto"
 
@@ -1233,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr "Ĉiuj"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Eliri vetkuradon"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Spertula"
 
@@ -1261,12 +1154,12 @@ msgstr "Spertula"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1205,12 @@ msgstr "Fajro"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Plenekrana"
 
@@ -1394,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1311,45 @@ msgstr "Ludila butono %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1359,53 @@ msgid "Go!"
 msgstr "Ek!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivelo de Grafikaj efektoj"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafikoj"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikaj agordoj"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Helpo"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Klasifiko"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Nur homaj ludantoj"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instali"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Gokartoj"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Klavarilo %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr "Etapo"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Etapo %i"
@@ -1761,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Ŝar�anta"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Åœlosita"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr "Åœlosita!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Nur mi"
 
@@ -1876,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Klavoj de menuo"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,44 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Rubén https://launchpad.net/~sleepwalkdroid\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Éfrit https://launchpad.net/~efrit"
+msgstr "Launchpad Contributions:\n  Rubén https://launchpad.net/~sleepwalkdroid\n  STK-team https://launchpad.net/~stk\n  Éfrit https://launchpad.net/~efrit"
diff --git a/data/po/es.po b/data/po/es.po
index 2d03d37b7..c986d8379 100644
--- a/data/po/es.po
+++ b/data/po/es.po
@@ -1,20 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Marc Coll Carrillo <marc.coll.carrillo@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-04 18:28+0000\n"
-"Last-Translator: Marc Coll Carrillo <Unknown>\n"
-"Language-Team: STK spanish team\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 20:39+0000\n"
+"Last-Translator: Marc Coll Carrillo <marc.coll.carrillo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/supertuxkart/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,189,-1,-1,-1\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,23 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" ¡Pero nunca podréis vencerme, patéticos idiotas, porque yo soy el rey de "
-"los karts!"
+msgstr " ¡Pero nunca podréis vencerme, patéticos idiotas, porque yo soy el rey de los karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] "%d amigo está en línea."
 msgstr[1] "%d amigos están en línea."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (limitado)"
@@ -57,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s y %s están en línea."
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s está en línea."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s está listo"
@@ -96,25 +96,23 @@ msgstr "Perfil de %s"
 msgid "%s's server"
 msgstr "Servidor de %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s y %s están en línea."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' ha sido eliminado."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Vacío)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(el juego en red aún no está disponible)"
 
@@ -128,48 +126,34 @@ msgstr "Un elemento rojo indica un conflicto en la configuración actual"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* La asignación de teclas actual puede verse/cambiarse en el menú Opciones."
+msgstr "* La asignación de teclas actual puede verse/cambiarse en el menú Opciones."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* La mayoría de estos modos de juego pueden jugarse como un campeonato: en "
-"vez de jugar una sola carrera, juegas varias consecutivamente. Cuanto mejor "
-"sea tu posición, más puntos obtendrás. Al final, el jugador con más puntos "
-"ganará la copa."
+msgstr "* La mayoría de estos modos de juego pueden jugarse como un campeonato: en vez de jugar una sola carrera, juegas varias consecutivamente. Cuanto mejor sea tu posición, más puntos obtendrás. Al final, el jugador con más puntos ganará la copa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "Hay que reiniciar STK para aplicar la nueva configuración"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* La configuración a usar dependerá de qué tecla 'Seleccionar' se pulse para "
-"unirse a la partida."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* La configuración a usar dependerá de qué tecla 'Seleccionar' se pulse para unirse a la partida."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -200,13 +184,10 @@ msgstr "Batalla a 3 golpes"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Batalla a 3 golpes: Sólo en partidas multijugador. Usa las armas para "
-"golpear a los otros jugadores hasta que pierdan todas sus vidas."
+msgstr "Batalla a 3 golpes: Sólo en partidas multijugador. Usa las armas para golpear a los otros jugadores hasta que pierdan todas sus vidas."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -221,23 +202,20 @@ msgid "9 months"
 msgstr "9 meses"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Máximas puntuaciones ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Karts controlados por el ordenador"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Cancelar el campeonato"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Acerca de"
 
@@ -246,39 +224,35 @@ msgstr "Acerca de"
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Acelera y pulsa la tecla <%s> mientras giras para derrapar. Derrapar un poco "
-"puede ayudarte a girar más rápido para tomar curvas cerradas."
+msgstr "Acelera y pulsa la tecla <%s> mientras giras para derrapar. Derrapar un poco puede ayudarte a girar más rápido para tomar curvas cerradas."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Acelera con <%s> y gira con <%s> y <%s>."
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Aceptar"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Recuperación de la cuenta"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
@@ -286,8 +260,7 @@ msgstr "Configuración de la cuenta"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Logros"
 
@@ -297,13 +270,11 @@ msgstr "Acción"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Añadir"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Añadir amigo"
 
@@ -314,7 +285,6 @@ msgstr "Añadir configuración de teclado"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Añadir jugador"
 
@@ -325,32 +295,29 @@ msgstr "Añadir Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Añadir un dispositivo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Añadir usuario"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Complementos"
 
@@ -360,100 +327,91 @@ msgstr "Nombre del complemento"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Complementos"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Efectos avanzados (luces, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Todos"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Todos los circuitos"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"¡Todo está permitido, así que coge las armas y haz un buen uso de ellas!"
+msgstr "¡Todo está permitido, así que coge las armas y haz un buen uso de ellas!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Mostrar siempre la pantalla de inicio de sesión"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Oclusión ambiental"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Oclusión ambiental: %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
-"Se ha producido un error mientras se intentaba guardar tu campeonato."
+msgstr "Se ha producido un error mientras se intentaba guardar tu campeonato."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ancla - frena mucho al kart que va en primer lugar."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personajes animados"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personajes animados: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Escenario animado"
 
@@ -461,24 +419,24 @@ msgstr "Escenario animado"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Escenario animado: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotrópico x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotrópico x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotrópico x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotrópico x8"
 
@@ -488,29 +446,25 @@ msgstr "Ya existe otro campeonato con ese nombre."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Antialiasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Antialiasing: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Aplicar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplicar la nueva resolución"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Archienemigo"
 
@@ -525,49 +479,44 @@ msgstr "¿Seguro que quieres eliminar permanentemente esta configuración?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "¿Estás seguro de que quieres eliminar '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenas"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Alrededor del faro"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "No asignes nada"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Asignar a la tecla ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "En el fin del mundo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Sonido"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "¡Evita los plátanos!"
 
@@ -589,81 +538,66 @@ msgstr "Eje %d %s"
 msgid "Axis %d inverted"
 msgstr "Eje %d invertido"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Volver"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Volver al juego"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Volver a la carrera"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Volver a la selección de retos"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Volver a la lista de dispositivos"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Volver al menú"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Volver al menú"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Amante de los plátanos"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Pelota de baloncesto - rebota tras el líder, y puede aplastar y frenar karts "
-"por el camino."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Pelota de baloncesto - rebota tras el líder, y puede aplastar y frenar karts por el camino."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Isla de batalla"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "¡Más suerte la próxima vez!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineal"
 
@@ -673,41 +607,33 @@ msgid "Black"
 msgstr "Negro"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mansión Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Resplandor"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Resplandor: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "El equipo azul gana"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Granja bovina"
 
-# Alternativa para latinoamerica:
-# Bola de boliche
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bola de bolos - rebota en las paredes. Si estás mirando atrás, la bola se "
-"lanzará hacia atrás."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bola de bolos - rebota en las paredes. Si estás mirando atrás, la bola se lanzará hacia atrás."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -715,64 +641,52 @@ msgid "Brake"
 msgstr "Frenar"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Chicle - protégete con un escudo, o úsalo mientras miras hacia atrás para "
-"dejar una mancha rosa y pegadiza detrás de ti."
+msgstr "Chicle - protégete con un escudo, o úsalo mientras miras hacia atrás para dejar una mancha rosa y pegadiza detrás de ti."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr "Pero soy una criatura justa, así que os ofreceré un trato."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Pastel - lanzado al rival más cercano, mejor a corta distancia y en rectas "
-"largas."
+msgstr "Pastel - lanzado al rival más cercano, mejor a corta distancia y en rectas largas."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "No se puede acceder al servidor de complementos de STK..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -786,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Cancelar/Volver"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cueva X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Reto completado"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Reto no superado"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Retos: sala de trofeos"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Cambiar"
 
@@ -813,63 +724,52 @@ msgstr "Cambiar"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Elige un kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Cristóbal Colón"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Pulsa aquí para jugar al tutorial"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Cerrar"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr "Templo del cacao"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Recoge al menos 5 plátanos en una carrera."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Recoge las cajas azules: te darán armas u otras mejoras."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"¡Recoge cajas de regalo, y dispara el arma con <%s> para hacer explotar esas "
-"cajas!"
+msgstr "¡Recoge cajas de regalo, y dispara el arma con <%s> para hacer explotar esas cajas!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Recoge botellas de nitro (las usaremos después de la curva)"
 
@@ -879,17 +779,13 @@ msgstr "Recoge nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Recoger nitros te permite alcanzar mayor velocidad cuando quieras pulsando "
-"la tecla apropiada. Puedes ver tu nivel actual de nitro en la barra situada "
-"a la derecha de la pantalla de juego."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Recoger nitros te permite alcanzar mayor velocidad cuando quieras pulsando la tecla apropiada. Puedes ver tu nivel actual de nitro en la barra situada a la derecha de la pantalla de juego."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "¡Completa todos los retos para desbloquear la puerta grande!"
 
@@ -902,11 +798,11 @@ msgstr "Has completado el logro \"%s\"."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Confirmar"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -914,7 +810,6 @@ msgstr "Confirma la resolución antes de %i segundos"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Conectarse a Internet"
 
@@ -922,105 +817,86 @@ msgstr "Conectarse a Internet"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Conecta tu Wiimote al gestor de Bluetooth y después haz clic en \"Aceptar\". "
-"Instrucciones detalladas en supertuxkart.net/Wiimote"
+msgstr "Conecta tu Wiimote al gestor de Bluetooth y después haz clic en \"Aceptar\". Instrucciones detalladas en supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "No hay armas, así que ¡sólo importa tu habilidad al volante!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuar"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Continuar un campeonato guardado"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Continuar."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controles"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "No se ha podido crear el jugador '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "No se ha podido detectar ningún Wiimote"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Crear"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Crear servidor"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Crear usuario"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Crear cuenta en línea"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Creando servidor"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Créditos"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Contraseña actual"
 
@@ -1033,13 +909,12 @@ msgid "Currently not signed in"
 msgstr "No estás conectado"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizada"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Configuración personalizada..."
 
@@ -1065,7 +940,6 @@ msgstr "D-Pad arriba"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Rechazar"
 
@@ -1073,28 +947,26 @@ msgstr "Rechazar"
 msgid "Default"
 msgstr "Predeterminado"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Borrar"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Eliminar configuración"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Profundidad de campo"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Profundidad de campo: %s"
@@ -1107,24 +979,23 @@ msgstr "Desactivar dispositivo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Desactivado"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Mostrar FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "¿Realmente quieres abortar el campeonato?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "¿ Realmente quieres eliminar al jugador '%s' ?"
@@ -1133,8 +1004,8 @@ msgstr "¿ Realmente quieres eliminar al jugador '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr "¿Quieres guardar los cambios?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "No aceleres antes de la salida"
 
@@ -1145,27 +1016,24 @@ msgstr "Abajo"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Conducir al revés"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Luces dinámicas: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Editar"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Editar campeonato"
 
@@ -1176,11 +1044,8 @@ msgstr "En busca de los huevos perdidos"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"En busca de los huevos perdidos: Explora circuitos para encontrar todos los "
-"huevos escondidos."
+msgstr "En busca de los huevos perdidos: Explora circuitos para encontrar todos los huevos escondidos."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1188,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Huevos: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefante"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminado"
 
@@ -1201,24 +1065,22 @@ msgstr "Eliminado"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "¡El correo electrónico debe tener entre 4 y 50 caracteres!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "¡El correo electrónico no es válido!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "¡Los correos electrónicos no coinciden!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1230,27 +1092,24 @@ msgstr "Activar dispositivo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr "Activa los usuarios limitados"
+msgid "Enable per-player handicaps"
+msgstr "Activa las limitaciones por jugador"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Activado"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Activado para todos"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Introduce el nombre del nuevo jugador"
 
@@ -1263,31 +1122,31 @@ msgstr "Error descargando noticias: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Todo el mundo:\n"
-"¡Pulsad 'Seleccionar' ahora para uniros a la partida!"
+msgstr "Todo el mundo:\n¡Pulsad 'Seleccionar' ahora para uniros a la partida!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Cuenta en línea existente"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Salir"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Salir de la carrera"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Salir del juego"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Experto"
 
@@ -1295,12 +1154,12 @@ msgstr "Experto"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explora circuitos para encontrar todos los huevos escondidos"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1325,21 +1184,17 @@ msgid "Fetching servers"
 msgstr "Obteniendo servidores"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Introduce el nombre de usuario y la dirección de correo electrónico que "
-"proporcionaste al registrarte para poder restablecer tu contraseña."
+msgstr "Introduce el nombre de usuario y la dirección de correo electrónico que proporcionaste al registrarte para poder restablecer tu contraseña."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "¡Última vuelta!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Encontrar servidor"
 
@@ -1350,22 +1205,14 @@ msgstr "Fuego"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"En primer lugar, necesitarás varios dispositivos de entrada (múltiples "
-"consolas de juego o joysticks es la mejor manera de jugar con varias "
-"personas). Ve a la pantalla de configuración y configura las consolas de "
-"juego. También es posible jugar en los teclado(s). Sin embargo, cada jugador "
-"necesitará un conjunto diferente de teclas, y ten en cuenta que la mayoría "
-"de teclados no son apropiados para un juego multijugador, ya que no permiten "
-"pulsar muchas teclas a la vez."
+msgstr "En primer lugar, necesitarás varios dispositivos de entrada (múltiples consolas de juego o joysticks es la mejor manera de jugar con varias personas). Ve a la pantalla de configuración y configura las consolas de juego. También es posible jugar en los teclado(s). Sin embargo, cada jugador necesitará un conjunto diferente de teclas, y ten en cuenta que la mayoría de teclados no son apropiados para un juego multijugador, ya que no permiten pulsar muchas teclas a la vez."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1378,25 +1225,22 @@ msgstr "Sigue al líder!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Sigue al líder: Corre por el segundo lugar, ya que el último kart será "
-"descalificado cada vez que el contador llegue a cero. Cuidado: ¡si vas por "
-"delante del líder también serás eliminado!"
+msgstr "Sigue al líder: Corre por el segundo lugar, ya que el último kart será descalificado cada vez que el contador llegue a cero. Cuidado: ¡si vas por delante del líder también serás eliminado!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Se han encontrado %d Wiimote(s)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Se ha encontrado %d wiimote"
+msgstr[1] "Se han encontrado %d wiimotes"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1420,13 +1264,12 @@ msgstr "¡Petición de amistad enviada!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Amigos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
@@ -1440,22 +1283,19 @@ msgstr "¡GOL!"
 msgid "Game Keys"
 msgstr "Teclas del juego"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modos de juego"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Tipo de juego (límite de goles / límite de tiempo)"
 
@@ -1471,51 +1311,45 @@ msgstr "Botón del mando %d"
 msgid "Gamepad hat %d"
 msgstr "Botón direccional %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "General"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Abandonar la carrera"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Iluminación global"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Iluminación global: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Resplandor (contornos)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Resplandor (contornos): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1525,61 +1359,53 @@ msgid "Go!"
 msgstr "¡Ya!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "Conductor de oro"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr "Isla Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Campeonatos"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Editor de campeonatos"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Editor de campeonatos"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progreso del campeonato:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivel de efectos gráficos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Gráficos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Configuración gráfica"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Valle verde"
 
@@ -1596,12 +1422,10 @@ msgstr "Invitado %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr "Entrar como invitado"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1611,22 +1435,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Ayuda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Máximas puntuaciones"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Golpea a 10 karts con una bola de bolos"
 
@@ -1634,79 +1454,71 @@ msgstr "Golpea a 10 karts con una bola de bolos"
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Golpea a otros con armas hasta que pierdan todas sus vidas. (Sólo en modo "
-"multijugador)"
+msgstr "Golpea a otros con armas hasta que pierdan todas sus vidas. (Sólo en modo multijugador)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Golpea al mismo kart al menos 5 veces en una carrera."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Sólo jugadores humanos"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Acepto los términos y tengo 13 años o más. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Si podéis ganarme en una carrera, soltaré al vejestorio."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Si ves un botón con un candado como este, necesitas completar un reto para "
-"desbloquearlo."
+msgstr "Si ves un botón con un candado como este, necesitas completar un reto para desbloquearlo."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorando a '%s', ¡tenías que haberte unido antes para jugar!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Iluminación basada en imágenes"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalar"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermedio"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
-"El acceso a Internet se encuentra desactivado, actívalo en las opciones"
+msgstr "El acceso a Internet se encuentra desactivado, actívalo en las opciones"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Empatados"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr "Es secreto"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Unirse"
 
@@ -1716,13 +1528,12 @@ msgstr "Uniéndose al servidor"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Mantener esta resolución"
 
@@ -1741,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Teclado %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1750,7 +1560,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Vuelta"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Vuelta %i"
@@ -1812,50 +1622,46 @@ msgstr "Gatillo izquierdo"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Rayos crepusculares"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Rayos crepusculares: %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Cargando"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Lista de jugadores"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Parámetros de la lista de jugadores"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Nombre de usuario local"
+msgid "Local Name"
+msgstr "Nombre local"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloqueado : ¡completa los retos activos para tener acceso a más!"
 
@@ -1863,11 +1669,51 @@ msgstr "Bloqueado : ¡completa los retos activos para tener acceso a más!"
 msgid "Locked!"
 msgstr "¡Bloqueado!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Iniciar sesión"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Cerrar sesión"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Conectado como: %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Iniciando sesión"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Iniciando sesión '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Entrar como invitado te permite participar en carreras en línea, pero no te permite votar complementos, ni alcanzar ningún logro mientras estás en línea."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Cerrando sesión"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Cerrando sesión '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -1878,27 +1724,18 @@ msgstr "Mirar atrás"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Buscar más amigos:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr "Luna"
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Derrapa 5 veces en una misma vuelta."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Haz una carrera de 5 vueltas o más."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Corredor de maratones"
 
@@ -1906,18 +1743,16 @@ msgstr "Corredor de maratones"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Máximo número de jugadores"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Tiempo máximo (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Sólo yo"
 
@@ -1927,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Teclas del menú"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr "Minigolf"
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Cazador de mosquitos"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Desenfoque de movimiento"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Desenfoque de movimiento: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Eje del ratón %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1957,48 +1796,41 @@ msgstr "Botón del ratón %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Mover hacia abajo"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Mover hacia arriba"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multijugador"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multijugador"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Música"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Nombre"
 
@@ -2018,13 +1850,15 @@ msgstr "El nombre es demasiado largo"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Nombre del servidor"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "El estanque de Nessie"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Nuevo"
 
@@ -2033,9 +1867,13 @@ msgstr "Nuevo"
 msgid "New Grand Prix '%s' now available"
 msgstr "Nuevo campeonato '%s' ahora disponible"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nueva cuenta en línea"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nueva contraseña"
 
@@ -2048,7 +1886,7 @@ msgstr "Nueva petición"
 msgid "New difficulty '%s' now available"
 msgstr "Nueva dificultad '%s' ahora disponible"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nueva vuelta rápida"
 
@@ -2076,19 +1914,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Reto de nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "No"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ninguno"
 
@@ -2098,23 +1935,19 @@ msgid "Normal Race"
 msgstr "Carrera normal"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Resort nórdico"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Ten en cuenta que si consigues derrapar durante varios segundos, ¡recibirás "
-"un incremento de velocidad como recompensa!"
+msgstr "Ten en cuenta que si consigues derrapar durante varios segundos, ¡recibirás un incremento de velocidad como recompensa!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Principiante"
 
@@ -2125,46 +1958,41 @@ msgstr "Karts controlados por el ordenador: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Karts controlados por el ordenador"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Número de goles para ganar"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Número de vueltas"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Número de vueltas:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Fuera del circuito habitual"
 
@@ -2172,60 +2000,59 @@ msgstr "Fuera del circuito habitual"
 msgid "Offline"
 msgstr "Desconectado"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Cuenta fuera de línea"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "¡Oh,sí! Ahora está en mi castillo, y será servido como cena..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "La vieja mina"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Clase de mates de Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Conectado"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Multijugador en línea"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Nombre de usuario en línea"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "¡El nombre de usuario en línea debe tener entre 3 y 30 caracteres!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "¡El nombre de usuario en línea no puede empezar por un número!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "¡Sólo el creador de la partida puede actuar en este punto!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "¡Ups! Cuando tengas problemas, pulsa <%s> para que te rescaten"
@@ -2236,14 +2063,11 @@ msgstr "¡Ups! Cuando tengas problemas, pulsa <%s> para que te rescaten"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opciones"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Vista general"
 
@@ -2252,35 +2076,30 @@ msgid "POWER"
 msgstr "POTENCIA"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paracaídas - frena a todos los karts mejor posicionados"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Contraseña"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Contraseña:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "¡La contraseña debe tener entre 8 y 30 caracteres!"
 
@@ -2288,8 +2107,8 @@ msgstr "¡La contraseña debe tener entre 8 y 30 caracteres!"
 msgid "Password successfully changed."
 msgstr "Contraseña cambiada correctamente."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "¡Las contraseñas no coinciden!"
 
@@ -2300,12 +2119,11 @@ msgstr "Pausar el juego"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "En pausa"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "¡Tiempo de penalización!"
 
@@ -2314,7 +2132,6 @@ msgid "Pending"
 msgstr "Pendiente"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Patio del pingüino"
 
@@ -2323,37 +2140,38 @@ msgid "Performing vote"
 msgstr "Realizando voto"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Reproducir todo"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr "Juega a todos los circuitos oficiales al menos una vez."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jugadores"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Los jugadores pueden seleccionar perfiles limitados (más difíciles) en la pantalla de selección de karts"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Introduce el nombre del campeonato"
 
@@ -2362,6 +2180,10 @@ msgstr "Introduce el nombre del campeonato"
 msgid "Please re-configure your key bindings."
 msgstr "Por favor, reconfigura tus teclas."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Por favor, lee los términos y condiciones"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Espera mientras se cargan los complementos"
@@ -2371,48 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Espera mientras se cargan los complementos"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Desatascador - lánzalo hacia adelante para tirar de un oponente hacia atrás, "
-"o lánzalo mientras miras hacia atrás para que pierda visión."
+msgstr "Desatascador - lánzalo hacia adelante para tirar de un oponente hacia atrás, o lánzalo mientras miras hacia atrás para que pierda visión."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr "Amante de las mejoras"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"¡Pulsa <%s> para mirar detrás de ti, y dispara el arma con <%s> mientras "
-"pulsas <%s> para disparar hacia atrás!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "¡Pulsa <%s> para mirar detrás de ti, y dispara el arma con <%s> mientras pulsas <%s> para disparar hacia atrás!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pulsa ESC para cancelar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Pulsa una tecla"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Pulsa intro o haz doble clic sobre un dispositivo para configurarlo"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Pulsa intro o haz doble clic en un jugador para editarlo"
 
@@ -2428,10 +2240,7 @@ msgstr "Pulsa 'Fuego' para comenzar el reto"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Pulsa los botones 1+ 2 a la vez en tu Wiimote para ponerlo en modo "
-"descubrimiento, y después haz clic en \"Aceptar\". Instrucciones detalladas "
-"en supertuxkart.net/Wiimote"
+msgstr "Pulsa los botones 1+ 2 a la vez en tu Wiimote para ponerlo en modo descubrimiento, y después haz clic en \"Aceptar\". Instrucciones detalladas en supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2449,7 +2258,6 @@ msgstr "Procesando"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Perfil"
 
@@ -2458,7 +2266,6 @@ msgid "Progress"
 msgstr "Progreso"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2466,31 +2273,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Empuja la pelota hacia la portería contraria para marcar goles. (Sólo en "
-"modo multijugador)"
+msgstr "Empuja la pelota hacia la portería contraria para marcar goles. (Sólo en modo multijugador)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Partida rápida"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Salir"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Abandonar el servidor"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Configuración de la carrera"
 
@@ -2511,8 +2312,8 @@ msgstr "Campeonato aleatorio"
 msgid "Random Kart"
 msgstr "Kart aleatorio"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Circuito aleatorio"
 
@@ -2521,84 +2322,68 @@ msgid "Rank"
 msgstr "Posición"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Puntuación >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr "Mansión Ravenbridge"
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "¡Preparados!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr "En serio... un secreto."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "El equipo rojo gana"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Regístrate"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Carrera normal: ¡Todo está permitido, así que coge armas y haz un buen uso "
-"de ellas!"
+msgstr "Carrera normal: ¡Todo está permitido, así que coge armas y haz un buen uso de ellas!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Volver a cargar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Recordar la contraseña"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Recordar la posición de la ventana"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Eliminar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -2624,29 +2409,25 @@ msgstr "Rescate"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reiniciar"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Reiniciar la carrera"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Al revés"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Al revés"
 
@@ -2703,41 +2484,35 @@ msgstr "Gatillo derecho"
 msgid "SPEED"
 msgstr "VELOCIDAD"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara la corredora"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr "Sara la hechicera"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Guardar"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Guardar el campeonato"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Escocia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Buscar"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Buscando"
 
@@ -2747,12 +2522,10 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Elige una dificultad"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Selecciona un modo de juego"
 
@@ -2762,36 +2535,30 @@ msgstr "Selecciona un circuito"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Selecciona un kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Enviar estadísticas de hardware anónimas"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Creación del servidor"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Información del servidor"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Selección del servidor"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Nombre del servidor:"
 
@@ -2806,94 +2573,49 @@ msgstr "¡Listos!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Configurar una nueva carrera"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Sombras"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Sombras: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Sombras: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Arenas movedizas"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Suburbios relucientes"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Entrar como invitado"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Cerrar sesión"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Conectado como: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Iniciando sesión"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Iniciando sesión '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Entrar como invitado te permite participar en carreras en línea, pero no te "
-"permite votar complementos, ni conseguir ningún logro mientras estás en "
-"línea."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Cerrando sesión"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Cerrando sesión '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Desde"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Un jugador"
 
@@ -2903,7 +2625,6 @@ msgid "Size: %s"
 msgstr "Tamaño: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr "Derrape compulsivo"
 
@@ -2914,12 +2635,10 @@ msgstr "Derrapar"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Apariencia"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Pico nevado"
 
@@ -2929,30 +2648,23 @@ msgid "Soccer"
 msgstr "Fútbol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Campo de fútbol"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Fútbol: Sólo en partidas multijugador. Usa tu kart para empujar la pelota "
-"dentro de la portería."
+msgstr "Fútbol: Sólo en partidas multijugador. Usa tu kart para empujar la pelota dentro de la portería."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Ocurrió un error cuando se conectaba con la página de complementos. "
-"Asegúrate de que estás conectado a Internet y de que SuperTuxKart no está "
-"bloqueado por un cortafuegos"
+msgstr "Ocurrió un error cuando se conectaba con la página de complementos. Asegúrate de que estás conectado a Internet y de que SuperTuxKart no está bloqueado por un cortafuegos"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2960,7 +2672,6 @@ msgstr "No se ha podido descargar el complemento"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efectos de sonido"
 
@@ -2969,7 +2680,6 @@ msgstr "Efectos de sonido"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Estándar"
 
@@ -2982,11 +2692,10 @@ msgstr "Botón 'Start'"
 msgid "Start Grand Prix"
 msgstr "Iniciar el campeonato"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Empezar la carrera"
 
@@ -3006,12 +2715,10 @@ msgstr "Girar a la derecha"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Historia"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr "¡Diana!"
 
@@ -3019,92 +2726,69 @@ msgstr "¡Diana!"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Enviar"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Bajo el mar"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Complementos de SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Ayuda de SupertuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opciones de SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxCart puede jugarse en modo multijugador en el mismo ordenador."
+msgstr "SuperTuxCart puede jugarse en modo multijugador en el mismo ordenador."
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart contiene diversos modos de juego"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
-"SuperTuxKart puede conectarse a un servidor para descargar complementos y "
-"notificarte actualizaciones. También recogemos estadísticas anónimas de "
-"hardware para ayudar en el desarrollo de STK. ¿Te gustaría habilitar esta "
-"característica? (Para cambiar este parámetro más adelante, ve a las "
-"opciones, selecciona la pestaña \"Interfaz de usuario\", y edita los "
-"parámetros \"Conectarse a Internet\" y \"Enviar estadísticas de hardware "
-"anónimas\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart puede conectarse a un servidor para descargar complementos y notificarte actualizaciones. También recogemos estadísticas anónimas de hardware para ayudar en el desarrollo de STK. Lee nuestra declaración de privacidad en http://privacy.supertuxkart.net. ¿Te gustaría habilitar esta característica? (Para cambiar este parámetro más adelante, ve a las opciones, selecciona la pestaña \"Interfaz de usuario\", y edita los parámetros \"Conectarse a Internet\" y \"Enviar estadísticas de hardware anónimas\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Intercambiador - las cajas se transforman en plátanos y viceversa por un "
-"corto periodo de tiempo."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Intercambiador - las cajas se transforman en plátanos y viceversa por un corto periodo de tiempo."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Matamoscas - aplastará a los karts a su alrededor, frenándolos."
 
@@ -3113,49 +2797,49 @@ msgstr "Matamoscas - aplastará a los karts a su alrededor, frenándolos."
 msgid "System Language"
 msgstr "Idioma del sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "¡Toma a tus oponentes por mosquitos! Aplasta con el matamoscas al menos a 5 de ellos en una carrera."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Templo"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Términos y acuerdo"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Compresión de texturas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtrado de texturas"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"La tecla 'Derrapar' te permite derrapar en curvas cerradas y obtener un plus "
-"de velocidad."
+msgstr "La tecla 'Derrapar' te permite derrapar en curvas cerradas y obtener un plus de velocidad."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "El estadio"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"El módulo de complementos está desactivado en la pantalla de opciones"
+msgstr "El módulo de complementos está desactivado en la pantalla de opciones"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"El archivo de máximas puntuaciones era demasiado antiguo,\n"
-"todas las máximas puntuaciones han sido borradas."
+msgstr "El archivo de máximas puntuaciones era demasiado antiguo,\ntodas las máximas puntuaciones han sido borradas."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3168,40 +2852,22 @@ msgstr "Contrarreloj"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Contrarreloj: no hay armas, así que ¡sólo importa tu habilidad al volante!"
+msgstr "Contrarreloj: no hay armas, así que ¡sólo importa tu habilidad al volante!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Para añadir un nuevo mando/joystick, simplemente inicia SuperTuxKart con el "
-"dispositivo conectado y aparecerá en la lista.\n"
-"\n"
-"Para añadir una configuración de teclado, usa el botón de abajo, SIN EMBARGO "
-"ten en cuenta que la mayoría de los teclados sólo permiten pulsar "
-"simultáneamente un número limitado de teclas y por tanto son inadecuados "
-"para el modo multijugador. (Puedes, no obstante, conectar varios teclados a "
-"tu ordenador. Recuerda que en este caso cada uno seguirá necesitando "
-"distintas combinaciones de teclas)."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Para añadir un nuevo mando/joystick, simplemente inicia SuperTuxKart con el dispositivo conectado y aparecerá en la lista.\n\nPara añadir una configuración de teclado, usa el botón de abajo, SIN EMBARGO ten en cuenta que la mayoría de los teclados sólo permiten pulsar simultáneamente un número limitado de teclas y por tanto son inadecuados para el modo multijugador. (Puedes, no obstante, conectar varios teclados a tu ordenador. Recuerda que en este caso cada uno seguirá necesitando distintas combinaciones de teclas)."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Para ayudarte a ganar, hay ciertos elementos que puedes recoger:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Hasta la luna y volver"
 
@@ -3220,7 +2886,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr "Circuito"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Circuito %i/%i"
@@ -3234,19 +2900,17 @@ msgstr "Circuito creado por %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Conjunto de circuitos"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Circuitos"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineal"
 
@@ -3257,24 +2921,21 @@ msgstr "Inténtalo de nuevo"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial: lugar de selección"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipo:"
 
@@ -3282,22 +2943,18 @@ msgstr "Tipo:"
 msgid "Type: Grand Prix"
 msgstr "Tipo: campeonato"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"No se ha podido conectar al servidor. Comprueba tu conexión a Internet o "
-"vuelve a intentarlo más tarde."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "No se ha podido conectar al servidor. Comprueba tu conexión a Internet o vuelve a intentarlo más tarde."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Desinstalar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr "Imparable"
 
@@ -3311,8 +2968,8 @@ msgid "Update"
 msgstr "Actualizar"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -3321,40 +2978,36 @@ msgid "Updated date"
 msgstr "Fecha de actualización"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr "Usa 10 mejoras o más en una carrera."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Texturas de alta definición"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr "Usa izquierda/derecha para elegir tu equipo y pulsa 'Fuego'."
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "¡Usa la nitro que has recogido pulsando <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Información del usuario"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interfaz de usuario"
 
@@ -3363,19 +3016,17 @@ msgid "User defined"
 msgstr "Definidos por el usuario"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Buscar usuarios"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -3384,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr "Nombre de usuario y/o correo electrónico no válido."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Validando información"
 
@@ -3401,27 +3051,23 @@ msgstr "Versión: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronización vertical (requiere reiniciar)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Vista"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volumen"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Votar"
 
@@ -3433,7 +3079,7 @@ msgstr "¡El voto se ha enviado correctamente! Ya puedes cerrar la ventana."
 msgid "WEIGHT"
 msgstr "PESO"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "¡DIRECCIÓN CONTRARIA!"
 
@@ -3442,61 +3088,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Cuidado, la tecla 'Mayúsculas' no se recomienda: cuando se pulse esta tecla, "
-"dejarán de funcionar todas las teclas que contengan un carácter que sea "
-"diferente en mayúsculas."
+msgstr "Cuidado, la tecla 'Mayúsculas' no se recomienda: cuando se pulse esta tecla, dejarán de funcionar todas las teclas que contengan un carácter que sea diferente en mayúsculas."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efectos climáticos"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efectos climáticos: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-"¿Qué pasa, pequeños hippies? ¿Vuestro gran líder Gnu ha desaparecido?"
+msgstr "¿Qué pasa, pequeños hippies? ¿Vuestro gran líder Gnu ha desaparecido?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Una vez que se han configurado los dispositivos de entrada, ya estás listo "
-"para jugar. Selecciona el icono \"Multijugador\" en el menú principal. En el "
-"momento de elegir un kart, cada jugador puede presionar la tecla 'Fuego' de "
-"su mando o teclado para unirse a la partida. Cada jugador puede utilizar su "
-"propio dispositivo para seleccionar su kart. El juego continúa cuando todos "
-"los jugadores han seleccionado su kart. Hay que tener presente que no se "
-"puede usar el ratón para esta operación."
+msgstr "Una vez que se han configurado los dispositivos de entrada, ya estás listo para jugar. Selecciona el icono \"Multijugador\" en el menú principal. En el momento de elegir un kart, cada jugador puede presionar la tecla 'Fuego' de su mando o teclado para unirse a la partida. Cada jugador puede utilizar su propio dispositivo para seleccionar su kart. El juego continúa cuando todos los jugadores han seleccionado su kart. Hay que tener presente que no se puede usar el ratón para esta operación."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3504,95 +3134,75 @@ msgid "White"
 msgstr "Botón blanco"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr "Gana 5 carreras individuales seguidas."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
-"Gana en todos los modos de un jugador, contra un mínimo de 4 oponentes."
+msgstr "Gana en todos los modos de un jugador, contra un mínimo de 4 oponentes."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Sí"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Ya estás preparado para competir. ¡Buena suerte!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Estás jugando como"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
-"Puedes cambiar tu calificación anterior haciendo clic en las estrellas "
-"inferiores."
+msgstr "Puedes cambiar tu calificación anterior haciendo clic en las estrellas inferiores."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
-"No puedes descargar complementos sin acceso a Internet. Si quieres descargar "
-"complementos, ve a las opciones, selecciona la pestaña \"Interfaz de "
-"usuario\", y edita el parámetro \"Conectarse a Internet\"."
+msgstr "No puedes descargar complementos sin acceso a Internet. Si quieres descargar complementos, ve a las opciones, selecciona la pestaña \"Interfaz de usuario\", y edita el parámetro \"Conectarse a Internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
-"No puedes jugar en línea sin acceso a Internet. Si quieres jugar en línea, "
-"ve a las opciones, selecciona la pestaña \"Interfaz de usuario\", y edita el "
-"parámetro \"Conectarse a Internet\"."
+msgstr "No puedes jugar en línea sin acceso a Internet. Si quieres jugar en línea, ve a las opciones, selecciona la pestaña \"Interfaz de usuario\", y edita el parámetro \"Conectarse a Internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
-"Puedes jugar sin crear una cuenta en línea desmarcando la casilla "
-"correspondiente, aunque entonces no podrás conectarte con amigos, votar "
-"complementos, etc. Lee nuestra declaración de privacidad en "
-"http://privacy.supertuxkart.net"
+msgstr "Puedes jugar sin crear una cuenta en línea seleccionando una cuenta fuera de línea. Pero entonces no podrás conectarte con amigos, votar complementos, etc. Lee nuestra declaración de privacidad en http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "¡Has completado un reto!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "¡Has completado retos!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "¡Has completado el campeonato!"
 
@@ -3600,37 +3210,35 @@ msgstr "¡Has completado el campeonato!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"¡Has completado el reto de nivel difícil! Puntos ganados en este nivel: %i/%i"
+msgstr "¡Has completado el reto de nivel difícil! Puntos ganados en este nivel: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
-"¡Has completado el reto de nivel fácil! Puntos ganados en este nivel: %i/%i"
+msgstr "¡Has completado el reto de nivel fácil! Puntos ganados en este nivel: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"¡Has completado el reto de nivel intermedio! Puntos ganados en este nivel: "
-"%i/%i"
+msgstr "¡Has completado el reto de nivel intermedio! Puntos ganados en este nivel: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "¡Has finalizado la carrera!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "¡Tienes %d nuevas peticiones de amistad!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "¡Tienes %d nueva petición de amistad!"
+msgstr[1] "¡Tienes %d nuevas peticiones de amistad!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "¡Tienes una nueva petición de amistad!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "¡Has sido eliminado!"
 
@@ -3638,77 +3246,71 @@ msgstr "¡Has sido eliminado!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Todavía no has votado por este complemento. Selecciona la calificación que "
-"desees haciendo clic en las estrellas inferiores"
+msgstr "Todavía no has votado por este complemento. Selecciona la calificación que desees haciendo clic en las estrellas inferiores"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"¡Necesitas más puntos\n"
-"para entrar en este reto!\n"
-"Busca los retos disponibles\n"
-"en el mapa en miniatura."
+msgstr "¡Necesitas más puntos\npara entrar en este reto!\nBusca los retos disponibles\nen el mapa en miniatura."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Has desbloqueado el campeonato %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Has desbloqueado el circuito %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Recibirás un correo electrónico con más instrucciones sobre como reiniciar "
-"tu contraseña. Sé paciente y asegúrate de comprobar tu carpeta de correo "
-"basura."
+msgstr "Recibirás un correo electrónico con más instrucciones sobre como reiniciar tu contraseña. Sé paciente y asegúrate de comprobar tu carpeta de correo basura."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Recibirás un correo electrónico con más instrucciones sobre la activación de "
-"la cuenta. Sé paciente y asegúrate de comprobar tu carpeta de correo basura."
+msgstr "Recibirás un correo electrónico con más instrucciones sobre la activación de la cuenta. Sé paciente y asegúrate de comprobar tu carpeta de correo basura."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "¡Has ganado la carrera!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Tu versión de OpenGL parece ser demasiado antigua. Comprueba si hay disponible una actualización de tu controlador gráfico. SuperTuxKart necesita OpenGL 3.1 o superior."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Tu fichero de configuración estaba mal formado, así que ha sido borrado y "
-"uno nuevo será creado."
+msgstr "Tu fichero de configuración estaba mal formado, así que ha sido borrado y uno nuevo será creado."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Tu fichero de configuración era demasiado antiguo, así que ha sido borrado y "
-"uno nuevo será creado."
+msgstr "Tu fichero de configuración era demasiado antiguo, así que ha sido borrado y uno nuevo será creado."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "La versión de tu controlador gráfico es demasiado antigua. Por favor, instala la última versión."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Tu fichero de configuración no es compatible con esta versión de STK."
+msgstr "Tu fichero de configuración no es compatible con esta versión de STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3716,7 +3318,6 @@ msgid "Your profile"
 msgstr "Tu perfil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Jardín zen"
 
@@ -3727,7 +3328,6 @@ msgstr "[ninguna]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "acciones"
 
@@ -3736,7 +3336,8 @@ msgstr "acciones"
 msgid "all"
 msgstr "Todos"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "por"
@@ -3745,70 +3346,25 @@ msgstr "por"
 msgid "featured"
 msgstr "Destacados"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr "Cosecha"
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "altas"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "bajas"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "Newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr "Sara la corredora"
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Estándar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Adolfo Jayme https://launchpad.net/~fitojb\n"
-"  Alejandro Pérez https://launchpad.net/~alexperezalonso\n"
-"  Alvaro Ortiz https://launchpad.net/~kirtash1197\n"
-"  CaArRi https://launchpad.net/~caarri91\n"
-"  David Ballesteros Mayo https://launchpad.net/~dividio\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  DiegoJ https://launchpad.net/~diegojromerolopez\n"
-"  Eduardo Battaglia https://launchpad.net/~eduardo-battaglia\n"
-"  Eugenio M. Vigo https://launchpad.net/~evigo\n"
-"  Felipe Hommen https://launchpad.net/~felihommen\n"
-"  Jonay https://launchpad.net/~jonay-santana\n"
-"  Jose https://launchpad.net/~jose-medina-moreno\n"
-"  José Luis Bandala Pérez https://launchpad.net/~luis449bp\n"
-"  Leo Juszkiewicz https://launchpad.net/~juszr\n"
-"  LinuxNerdo https://launchpad.net/~catastro1\n"
-"  Louis DC https://launchpad.net/~1109558-y\n"
-"  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n"
-"  Mariano Agüero https://launchpad.net/~nero1000000\n"
-"  Morgan w c. https://launchpad.net/~bunk-v\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Simón Roca https://launchpad.net/~simonaaf\n"
-"  Tae-Wong SEO https://launchpad.net/~seotaewong40\n"
-"  VPablo https://launchpad.net/~villumar\n"
-"  elhoir https://launchpad.net/~jfarroyo82\n"
-"  juanman https://launchpad.net/~juanmalbye\n"
-"  raven2286 https://launchpad.net/~r-casola\n"
-"  simon https://launchpad.net/~sianhulo\n"
-"  zer berros https://launchpad.net/~cerverros\n"
-"  �ngel https://launchpad.net/~pikapikan"
+msgstr "Launchpad Contributions:\n  Adolfo Jayme https://launchpad.net/~fitojb\n  Alejandro Pérez https://launchpad.net/~alexperezalonso\n  Alvaro Ortiz https://launchpad.net/~kirtash1197\n  CaArRi https://launchpad.net/~caarri91\n  David Ballesteros Mayo https://launchpad.net/~dividio\n  Dawid Gan https://launchpad.net/~deveee\n  DiegoJ https://launchpad.net/~diegojromerolopez\n  Eduardo Battaglia https://launchpad.net/~eduardo-battaglia\n  Eugenio M. Vigo https://launchpad.net/~evigo\n  Felipe Hommen https://launchpad.net/~felihommen\n  Jonay https://launchpad.net/~jonay-santana\n  Jose https://launchpad.net/~jose-medina-moreno\n  José Luis Bandala Pérez https://launchpad.net/~luis449bp\n  Leo Juszkiewicz https://launchpad.net/~juszr\n  LinuxNerdo https://launchpad.net/~catastro1\n  Louis DC https://launchpad.net/~1109558-y\n  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n  Mariano Agüero https://launchpad.net/~nero1000000\n  Morgan w c. https://launchpad.net/~bunk-v\n  STK-team https://launchpad.net/~stk\n  Simón Roca https://launchpad.net/~simonaaf\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  VPablo https://launchpad.net/~villumar\n  elhoir https://launchpad.net/~jfarroyo82\n  juanman https://launchpad.net/~juanmalbye\n  raven2286 https://launchpad.net/~r-casola\n  simon https://launchpad.net/~sianhulo\n  zer berros https://launchpad.net/~cerverros\n  �ngel https://launchpad.net/~pikapikan"
diff --git a/data/po/eu.po b/data/po/eu.po
index a68234ea5..da662a999 100644
--- a/data/po/eu.po
+++ b/data/po/eu.po
@@ -1,23 +1,22 @@
-# Basque translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Ander Elortondo <ander.elor@gmail.com>\n"
-"Language-Team: Basque <eu@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/supertuxkart/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,23 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Baina zuok ziztrinok ez zarete inoiz gai izango ni garaitzeko - Karten "
-"Erregea!"
+msgstr " Baina zuok ziztrinok ez zarete inoiz gai izango ni garaitzeko - Karten Erregea!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s eta %s linean daude orain."
@@ -72,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s %s(e)k egina"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s %s(e)k egina"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s linean dago."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s prest dago"
@@ -99,79 +96,64 @@ msgstr "%s(r)en profila"
 msgid "%s's server"
 msgstr "%s(r)en zerbitzaria"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s eta %s linean daude orain."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' kaleratua izan da."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Hutsik)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(Sare jolasa ez dago oraindik erabilgarri)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Elementu urdinak beste konfigurazio batekin gatazka dagoela esan nahi du"
+msgstr "* Elementu urdinak beste konfigurazio batekin gatazka dagoela esan nahi du"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
-"* Elementu gorri batek gatazka bat adierazten du uneko konfigurazioan"
+msgstr "* Elementu gorri batek gatazka bat adierazten du uneko konfigurazioan"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Uneko laster-teklak Aukerak menuan ikus/alda daitezke"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Jokatzeko modu gehienak txapelketa eran jolas daitezke: Lasterketa bakarra "
-"korritu beharrean, hainbat jarraian egiten dira. Gero eta hobe ibili "
-"bakoitzean, puntu gehiago lortuko dituzu. Amaieran puntu gehien duen "
-"jokalariak irabaziko du txapelketa."
+msgstr "* Jokatzeko modu gehienak txapelketa eran jolas daitezke: Lasterketa bakarra korritu beharrean, hainbat jarraian egiten dira. Gero eta hobe ibili bakoitzean, puntu gehiago lortuko dituzu. Amaieran puntu gehien duen jokalariak irabaziko du txapelketa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Berrabiarazi STK ezarpen berriak aplikatzeko"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -202,13 +184,10 @@ msgstr "3 joaldietara borroka jokoa"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"3 joaldietara borroka jokoa: Hainbat jokalariko moduan soilik. Jo besteak "
-"armekin beren bizitza guztiak galtzen dituzten arte."
+msgstr "3 joaldietara borroka jokoa: Hainbat jokalariko moduan soilik. Jo besteak armekin beren bizitza guztiak galtzen dituzten arte."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -223,23 +202,20 @@ msgid "9 months"
 msgstr "9 hilabete"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= puntuazio onenak ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Bertan behera utzi txapelketa"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Honi buruz"
 
@@ -248,39 +224,35 @@ msgstr "Honi buruz"
 msgid "Accelerate"
 msgstr "Azeleratu"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Azeleratu eta sakatu <%s> biratu bitartean irristatzeko. Aldi batez "
-"irristatzeak bihurgune itxiak azkarrago hartzen lagun zaitzake."
+msgstr "Azeleratu eta sakatu <%s> biratu bitartean irristatzeko. Aldi batez irristatzeak bihurgune itxiak azkarrago hartzen lagun zaitzake."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Azeleratu <%s>(r)ekin eta gidatu <%s> eta <%s>(r)ekin"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Onartu"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Kontua berreskuratzea"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Kontuaren ezarpenak"
 
@@ -288,8 +260,7 @@ msgstr "Kontuaren ezarpenak"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Lorpenak"
 
@@ -299,13 +270,11 @@ msgstr "Ekintza"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Gehitu"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Gehitu laguna"
 
@@ -316,7 +285,6 @@ msgstr "Gehitu teklatu konfigurazioa"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Gehitu jokalaria"
 
@@ -327,32 +295,29 @@ msgstr "Gehitu Wiimote-a"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Gehitu gailua"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Gehitu erabiltzailea"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Gehigarriak"
 
@@ -362,49 +327,43 @@ msgstr "Gehigarriaren izena"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Gehigarriak"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Guztiak"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Zirkuitu guztiak"
 
@@ -414,18 +373,20 @@ msgstr "Leherketa guztiak onartuak, batu armak eta egin erabilerarik onena!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Erakutsi beti saio hasierako pantaila"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -435,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Aingura: Lehen doan kart ibilgailua nabarmen moteltzen du."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Pertsonaia animatuak"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Pertsonaia animatuak: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Paisaia animatua"
 
@@ -461,24 +419,24 @@ msgstr "Paisaia animatua"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Paisaia animatua: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropoa x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropoa x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropoa x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropoa x8"
 
@@ -488,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Aplikatu"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplikatu bereizmen berria"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -525,49 +479,44 @@ msgstr "Ziur zaude konfigurazio hau betiko ezabatu nahi duzula?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Ziur zaude '%s' kendu nahi duzula?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Borroka-zelaia"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Itsasargiaren inguruan"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Esleitu ESC teklari"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Munduaren amaieran"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Soinua"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Ez zapaldu bananak"
 
@@ -589,81 +538,66 @@ msgstr "Ardatza %d %s"
 msgid "Axis %d inverted"
 msgstr "%d ardatza alderantzikatuta"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Atzera"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Itzuli jokora"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Itzuli lasterketara"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Itzuli erronka hautapenera"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Itzuli gailu zerrendara"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Itzuli menura"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Itzuli menura"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Saskibaloiko baloia - liderraren bila joaten da punpaka eta bidean kart-ak "
-"mantsotu ditzake."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Saskibaloiko baloia - liderraren bila joaten da punpaka eta bidean kart-ak mantsotu ditzake."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Borroka irla"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Saiatu hurrengoan ere!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineala"
 
@@ -673,39 +607,33 @@ msgid "Black"
 msgstr "Beltza"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mendi beltzeko etxea"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Lorea"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Lorea : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Talde urdinak irabazi du"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Baserri inguruak"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bolatokiko bola - hormetan errebotatzen du. Atzeraka begira bazaude atzekoei "
-"bota diezaiekezu."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bolatokiko bola - hormetan errebotatzen du. Atzeraka begira bazaude atzekoei bota diezaiekezu."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -713,64 +641,52 @@ msgid "Brake"
 msgstr "Frenatu"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Txiklea - babes zaitez ezkutu batekin edo erabil ezazu atzera begiratzean, "
-"zure atzean putzu arrosa itsaskor bat uzteko."
+msgstr "Txiklea - babes zaitez ezkutu batekin edo erabil ezazu atzera begiratzean, zure atzean putzu arrosa itsaskor bat uzteko."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Pastela - Irauli gertuko aurkaria, onena distantzia motzetan edo bide zuzen "
-"luzeetan."
+msgstr "Pastela - Irauli gertuko aurkaria, onena distantzia motzetan edo bide zuzen luzeetan."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Ezin sartu stk gehigarrien zerbitzarira..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Utzi"
 
@@ -784,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Utzi/Atzera"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "X kobazuloa"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Erronka betea"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Erronka ez betea"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Erronkak: trofeoen gela"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Aldatu"
 
@@ -811,65 +724,52 @@ msgstr "Aldatu"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Aukeratu Kart bat"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klikatu hemen tutoriala erreproduzitzeko"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Itxi"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Batu kutxa urdinak: tiro egiteko armak eta bestelako hobekuntzak jasoko "
-"dituzu"
+msgstr "Batu kutxa urdinak: tiro egiteko armak eta bestelako hobekuntzak jasoko dituzu"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Bildu opari kutxak eta egin tiro armarekin <%s> erabiliz kutxa hauek "
-"lehertzeko!"
+msgstr "Bildu opari kutxak eta egin tiro armarekin <%s> erabiliz kutxa hauek lehertzeko!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Bildu nitro botilak (kurbaren ondoren erabiliko ditugu)"
 
@@ -879,16 +779,13 @@ msgstr "Bildu nitroak!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitroak batzean dagokion teklan sakatuz zure abiadura handitu dezakezu "
-"edonon. Zure nitro bilketa maila eskumako barran dago ikusgai."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitroak batzean dagokion teklan sakatuz zure abiadura handitu dezakezu edonon. Zure nitro bilketa maila eskumako barran dago ikusgai."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -901,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Berretsi"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -913,7 +810,6 @@ msgstr "Baieztatu bereizmena %i segundotan"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Konektatu internetera"
 
@@ -921,105 +817,86 @@ msgstr "Konektatu internetera"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"zure wiimote Bluetooth kudeatzailera konektatu ondoren sakatu OK. Azalpen "
-"zehatzak  supertuxkart.net/Wiimote helbidean."
+msgstr "zure wiimote Bluetooth kudeatzailera konektatu ondoren sakatu OK. Azalpen zehatzak  supertuxkart.net/Wiimote helbidean."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Ez dago oparirik, zure gidatze gaitasunak bakarrik balio du!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Jarraitu"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Jarraitu."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontrolak"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Ezin izan da '%s' jokalaria sortu."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Ezin da wiimote antzeman :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Sortu"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Sortu zerbitzaria"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Sortu erabiltzailea"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Sortu lineako kontua"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Zerbitzaria sortzen"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Kredituak"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Uneko pasahitza"
 
@@ -1032,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Ezarpen pertsonalizatuak..."
 
@@ -1064,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Baztertu"
 
@@ -1072,28 +947,26 @@ msgstr "Baztertu"
 msgid "Default"
 msgstr "Lehenetsia"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Ezabatu"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Ezabatu konfigurazioa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Eremu-sakonera"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Eremu-sakonera: %s"
@@ -1106,24 +979,23 @@ msgstr "Desgaitu gailua"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Desgaitua"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Erakutsi FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Ziur zaude txapelketa bertan behera utzi nahi duzula?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ziur '%s' jokalaria ezabatu nahi duzula?"
@@ -1132,8 +1004,8 @@ msgstr "Ziur '%s' jokalaria ezabatu nahi duzula?"
 msgid "Do you want to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Ez azeleratu irten aurretik"
 
@@ -1144,27 +1016,24 @@ msgstr "Behera"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Argi dinamikoak: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Editatu"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1175,7 +1044,6 @@ msgstr "Arrautza ehiza"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Arrautza ehiza: Arakatu zirkuituak arrautza guztiak aurkitzeko."
 
@@ -1185,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Arrautzak: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpantea"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Kanporatua"
 
@@ -1198,24 +1065,22 @@ msgstr "Kanporatua"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "E-posta"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "E-postak 4 eta 50 karaktere artean izan behar ditu"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "E-posta baliogabea"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "E-postak ez datoz bat"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1227,27 +1092,24 @@ msgstr "Gaitu gailua"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Gaitua"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Gaitu guztientzat"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Sartu jokalari berriaren izena"
 
@@ -1260,31 +1122,31 @@ msgstr "Errorea albisteak deskargatzean: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Besteok:\nSakatu orain 'aukeratu' jokora batzeko!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Besteok:\n"
-"Sakatu orain 'aukeratu' jokora batzeko!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Irten"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Irten lasterketatik"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Irten jokotik"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Aditua"
 
@@ -1292,12 +1154,12 @@ msgstr "Aditua"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Arakatu zirkuituak ezkutuko arrautza guztiak aurkitzeko"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1322,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Azken bira!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Bilatu zerbitzaria"
 
@@ -1345,21 +1205,14 @@ msgstr "Tiro"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Lehenik, hainbat sarrera gailu behar dituzu (hainbat joystick edo jolas "
-"gailu izatea da erarik egokiena). Zoaz sarrera gailuen konfigurazio "
-"pantailara eta jolas gailuen konfiguratu. Teklatu(ar)ekin jolastea ere "
-"posible da, baina jokalari bakoitzak tekla ezarpen ezberdinak behar ditu eta "
-"kontuan izan behar da teklatu gehienak ez direla egokiak, ez dutelako "
-"onartzen aldi berean hainbat tekla sakatzea."
+msgstr "Lehenik, hainbat sarrera gailu behar dituzu (hainbat joystick edo jolas gailu izatea da erarik egokiena). Zoaz sarrera gailuen konfigurazio pantailara eta jolas gailuen konfiguratu. Teklatu(ar)ekin jolastea ere posible da, baina jokalari bakoitzak tekla ezarpen ezberdinak behar ditu eta kontuan izan behar da teklatu gehienak ez direla egokiak, ez dutelako onartzen aldi berean hainbat tekla sakatzea."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1372,25 +1225,22 @@ msgstr "Jarraitu liderra!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Jarraitu liderra: bigarren postuaren bila joan, kontagailua zerora iristen "
-"den aldiro azken kart-a kaleratua izango baita. Kontuz, liderraren aurretik "
-"bazoaz ere kanporatua izango zara!"
+msgstr "Jarraitu liderra: bigarren postuaren bila joan, kontagailua zerora iristen den aldiro azken kart-a kaleratua izango baita. Kontuz, liderraren aurretik bazoaz ere kanporatua izango zara!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Magma gaztelua"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d wiimote aurkitu dira"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1414,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Lagunak"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Pantaila osoa"
 
@@ -1434,22 +1283,19 @@ msgstr "GOLA!"
 msgid "Game Keys"
 msgstr "Jolas teklak"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Jolas moduak"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1465,51 +1311,45 @@ msgstr "Jolas gailu botoia %d"
 msgid "Gamepad hat %d"
 msgstr "Norabide botoian: %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Orokorra"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Utzi lasterketa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1519,61 +1359,53 @@ msgid "Go!"
 msgstr "Aurrera!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Txapelketa"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Txapelketaren egoera:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Efektu grafikoen maila"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafikoak"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikoen ezarpenak"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Bailara orlegia"
 
@@ -1590,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Etxaldea"
 
@@ -1605,22 +1435,18 @@ msgstr "Etxaldea"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Laguntza"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Puntuazio onenak"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1628,78 +1454,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Jo beste jokalariak tiro eginez bizitza guztiak galdu arte. (Hainbat "
-"jokalariko moduan bakarrik)"
+msgstr "Jo beste jokalariak tiro eginez bizitza guztiak galdu arte. (Hainbat jokalariko moduan bakarrik)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Giza-jokalariak bakarrik"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Lasterketan irabazten badidak, aguretxoa askatuko diat."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Botoi bat giltzapetuta ikusten baduzu, horrek erronka bat betetzear duzula "
-"esan nahi du."
+msgstr "Botoi bat giltzapetuta ikusten baduzu, horrek erronka bat betetzear duzula esan nahi du."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s' alboratzen. Lehenago etorri behar zinen jolasteko!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalatu"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Tartekoa"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Berdinketa"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1709,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kartak"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Mantendu bereizmen hau"
 
@@ -1734,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Teklatua %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1743,7 +1560,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Bira"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%i. bira"
@@ -1805,63 +1622,98 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Kargatzen"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Giltzatuta"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Giltzatuta: gainditu erronka aktiboak gehiagotara sartu ahal izateko!"
+msgstr "Giltzatuta: gainditu erronka aktiboak gehiagotara sartu ahal izateko!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Giltzatuta!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1872,27 +1724,18 @@ msgstr "Begiratu atzera"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1900,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Ni bakarrik"
 
@@ -1921,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Menu teklak"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Saguaren ardatza %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1951,48 +1796,41 @@ msgstr "Saguaren botoia %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Hainbat jokalari"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Hainbat jokalari"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musika"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2012,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2027,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Txapelketa berria '%s' orain erabilgarri"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2042,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Zailtasun berria '%s' orain erabilgarri"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Bira azkarren berria"
 
@@ -2070,19 +1914,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "NItro erronka"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -2092,23 +1935,19 @@ msgid "Normal Race"
 msgstr "Lasterketa normala"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Oporrak elurretan"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Kontutan izan zenbait segundoz irristatzea lortzen baduzu abiadura bizkortze "
-"bat jasoko duzula sari bezala!"
+msgstr "Kontutan izan zenbait segundoz irristatzea lortzen baduzu abiadura bizkortze bat jasoko duzula sari bezala!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Hasiberria"
 
@@ -2119,46 +1958,41 @@ msgstr "AA kart kopurua: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "AA kart kopurua"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Gol kopurua irabazteko"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Ados"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Ohiko bideetatik kanpo"
 
@@ -2166,60 +2000,59 @@ msgstr "Ohiko bideetatik kanpo"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Entzun ondo, nire gazteluan dago orain eta afarian jango dugu..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Meatze zaharra"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliver-en matematika klasea"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Une honetan jolasaren arduraduna bakarrik aritu daiteke."
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oops! Arazotan zaudenean sakatu  <%s> erreskata zaitzaten"
@@ -2230,14 +2063,11 @@ msgstr "Oops! Arazotan zaudenean sakatu  <%s> erreskata zaitzaten"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Aukerak"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2246,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Jausgailua - Zure aurretik doazen kart guztiak moteltzen ditu."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2282,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2294,12 +2119,11 @@ msgstr "Eten jolasa"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Etenaldia egina"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Atzerapen denbora!"
 
@@ -2308,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pinguinoen jolastokia"
 
@@ -2317,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Jolastu guztiak"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jokalariak"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2356,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Mesedez, berriz konfiguratu zure laster-teklak"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Itxaron gehigarriak eguneratu arte mesedez"
@@ -2365,46 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Itxaron gehigarriak kargatu arte mesedez"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Bentosa - Bota aurrekoari honi atzeraka eginaz azkartzeko, edo atzera begira "
-"bota atzekoak ikusmena gal dezan."
+msgstr "Bentosa - Bota aurrekoari honi atzeraka eginaz azkartzeko, edo atzera begira bota atzekoak ikusmena gal dezan."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Sakatu ESC uzteko"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Sakatu tekla bat"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Sakatu enter edo klik bikoitza gailu gainean konfiguratzeko"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Sakatu enter edo klik bikoitza jokalariaren gainean konfiguratzeko"
 
@@ -2420,9 +2240,7 @@ msgstr "Sakatu tiroa txapelketa hasteko"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Sakatu wiimote-ko 1 eta 2 botoiak aldi berean aurkitze moduan jartzeko eta "
-"ondoren sakatu Ados. Xehetasun gehiago supertuxkart.net/Wiimote orrian."
+msgstr "Sakatu wiimote-ko 1 eta 2 botoiak aldi berean aurkitze moduan jartzeko eta ondoren sakatu Ados. Xehetasun gehiago supertuxkart.net/Wiimote orrian."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2440,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2449,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2457,31 +2273,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Golak sartzeko bultza baloia aurkatu kaiolara (hainbat jokalariko moduan "
-"soilik)."
+msgstr "Golak sartzeko bultza baloia aurkatu kaiolara (hainbat jokalariko moduan soilik)."
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Irten"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Lasterketa konfigurazioa"
 
@@ -2502,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Ausazko karta"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Ausazko zirkuitua"
 
@@ -2512,84 +2322,68 @@ msgid "Rank"
 msgstr "Sailkapena"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Balorazioa >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Prest!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Talde gorriak irabazi du"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Lasterketa normala: Kolpe guztiak onartzen dira, beraz hartu armak eta "
-"erabili burua!"
+msgstr "Lasterketa normala: Kolpe guztiak onartzen dira, beraz hartu armak eta erabili burua!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Gogoratu leihoaren kokapena"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Ezabatu"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Berrizendatu"
 
@@ -2615,29 +2409,25 @@ msgstr "Berreskuratu"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Bereizmena"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Hasi berriro"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Hasi berriz lasterketa"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Birak alderantzizkoan"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2694,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Eskozia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2738,12 +2522,10 @@ msgid "Select"
 msgstr "Hautatu"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Hautatu jolasteko era"
 
@@ -2753,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Hautatu karta"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2797,91 +2573,49 @@ msgstr "Prest!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Konfiguratu lasterketa berria"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Hondar mugikorrak"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Aldiri distiratsuak"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2891,7 +2625,6 @@ msgid "Size: %s"
 msgstr "Tamaina: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2902,12 +2635,10 @@ msgstr "Irristatu"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Itxura"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Tontor edurtua"
 
@@ -2917,30 +2648,23 @@ msgid "Soccer"
 msgstr "Futbola"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Futbol zelaia"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Futbola: Hainbat jokalariko moduan soilik. Erabili zure karta baloia atean "
-"sartzeko."
+msgstr "Futbola: Hainbat jokalariko moduan soilik. Erabili zure karta baloia atean sartzeko."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Barkatu, errore bat egon da gehigarrien webguneaz konektatzean. Ziurtatu "
-"internetera konektatua zaudela eta SuperTuxKart ez duela suhesi batek "
-"blokeatzen."
+msgstr "Barkatu, errore bat egon da gehigarrien webguneaz konektatzean. Ziurtatu internetera konektatua zaudela eta SuperTuxKart ez duela suhesi batek blokeatzen."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2948,7 +2672,6 @@ msgstr "Barkatu, gehigarria jaisteak huts egin du"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Soinu-efektuak"
 
@@ -2957,7 +2680,6 @@ msgstr "Soinu-efektuak"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Arrunta"
 
@@ -2970,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Hasi txapelketa"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Hasi lasterketa"
 
@@ -2994,12 +2715,10 @@ msgstr "Eskuinera gidatu"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Istorio modua"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3007,85 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Itsasazpia"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart gehigarriak"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart laguntza"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart aukerak"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart hainbat jokalariekin jolas daiteke konputagailu berdinean"
+msgstr "SuperTuxKart hainbat jokalariekin jolas daiteke konputagailu berdinean"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart jolasteko era ezberdinak daude"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Aldatzailea -  opari kutxak banana bihurtzen ditu eta alderantziz denbora "
-"tartetxo batean."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Aldatzailea -  opari kutxak banana bihurtzen ditu eta alderantziz denbora tartetxo batean."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Euli hiltzekoa - gertuko Kartak zapaltzen ditu, motelduz."
 
@@ -3094,33 +2797,37 @@ msgstr "Euli hiltzekoa - gertuko Kartak zapaltzen ditu, motelduz."
 msgid "System Language"
 msgstr "Sistemaren hizkuntza"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Testura iragazketa"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"''irristatu\" teklaz bihurgune itxietan irristatuz bultzada bat lor dezakezu."
+msgstr "''irristatu\" teklaz bihurgune itxietan irristatuz bultzada bat lor dezakezu."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Estadioa"
 
@@ -3132,9 +2839,7 @@ msgstr "Gehigarrien modulua ezgaitua dago aukeren pantailan"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Puntuazio onenen fitxategia oso zaharra da.\n"
-"Puntuazio on zahar horiek ezabatuko dira."
+msgstr "Puntuazio onenen fitxategia oso zaharra da.\nPuntuazio on zahar horiek ezabatuko dira."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3147,40 +2852,22 @@ msgstr "Ordulariaren kontra"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Ordulariaren kontra: ez daude opariak, zure gidatze gaitasunak du garrantzia!"
+msgstr "Ordulariaren kontra: ez daude opariak, zure gidatze gaitasunak du garrantzia!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Jolas gailu bat edo Joystick bat gehitzeko, hasi STK gailua konektaturik "
-"dagoela eta zerrendan agertuko da.\n"
-"\n"
-"Teklatu konfigurazio bat gehitzeko azpiko botoia erabil dezakezu, EDONOLA "
-"kontuan izan teklatu gehienek aldi berean tekla kopuru mugatu bat sakatzea "
-"onartzen dutela eta hainbat jokalarik batera jokatzeko arazo bat izan "
-"daitekeela. (Hala ere, hainbat teklatu konekta ditzakezu ordenagailura. "
-"Gogoratu kasu honetan jokalari bakoitzak bere laster-tekla ezberdinak behar "
-"dituela.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Jolas gailu bat edo Joystick bat gehitzeko, hasi STK gailua konektaturik dagoela eta zerrendan agertuko da.\n\nTeklatu konfigurazio bat gehitzeko azpiko botoia erabil dezakezu, EDONOLA kontuan izan teklatu gehienek aldi berean tekla kopuru mugatu bat sakatzea onartzen dutela eta hainbat jokalarik batera jokatzeko arazo bat izan daitekeela. (Hala ere, hainbat teklatu konekta ditzakezu ordenagailura. Gogoratu kasu honetan jokalari bakoitzak bere laster-tekla ezberdinak behar dituela.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Irabazten lagunduko dizuten hainbat opari daude batzeko:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Ilargira eta itzuli"
 
@@ -3199,7 +2886,7 @@ msgstr "lehen %iak"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3213,19 +2900,17 @@ msgstr "Zirkuituaren egilea: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Zirkuituak"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineala"
 
@@ -3236,24 +2921,21 @@ msgstr "Saiatu berriro"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutoriala"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Turoriala: Aukeraketa gela"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Mota:"
 
@@ -3261,20 +2943,18 @@ msgstr "Mota:"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Desinstalatu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3288,8 +2968,8 @@ msgid "Update"
 msgstr "Eguneratu"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Eguneratuta"
 
@@ -3298,40 +2978,36 @@ msgid "Updated date"
 msgstr "Eguneratze data"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Erabili bildutako nitroak <%s> sakatuz!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Erabiltzaile-interfazea"
 
@@ -3340,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3361,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3378,27 +3051,23 @@ msgstr "Bertsioa: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sinkronizazio bertikala (berrabiarazi behar da)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Bolumena"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3410,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ALDERANTZIZKO BIDEA!"
 
@@ -3419,59 +3088,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Kontuz!, 'shift' tekla ez da gomendatzen. Bera sakatua dagoenean maiuskula "
-"bihurtzen ditu tekla gehienak eta ez dute erantzungo."
+msgstr "Kontuz!, 'shift' tekla ez da gomendatzen. Bera sakatua dagoenean maiuskula bihurtzen ditu tekla gehienak eta ez dute erantzungo."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armak"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Eguraldi efektuak"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Eguraldi efektuak: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-"Zer gertatzen da hippy txiki hori? Zure gnu buruzagi handia galdurik?"
+msgstr "Zer gertatzen da hippy txiki hori? Zure gnu buruzagi handia galdurik?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Sarrerako gailuak konfiguratuta daudenean jolasteko prest zaude. Hautatu "
-"\"hainbat jokalari\" aukera menu nagusian. Karta aukeratzeko orduan "
-"jokalariek \"tiro\" sakatu behar dute parte hartzeko. Jokalari bakoitzak "
-"bere gailua erabiliko du Kart aukeraketan. Denek Kart bana aukeratzean "
-"jarraituko du jolasak. Kontutan izan operazio honetan ezin dela sagua "
-"erabili."
+msgstr "Sarrerako gailuak konfiguratuta daudenean jolasteko prest zaude. Hautatu \"hainbat jokalari\" aukera menu nagusian. Karta aukeratzeko orduan jokalariek \"tiro\" sakatu behar dute parte hartzeko. Jokalari bakoitzak bere gailua erabiliko du Kart aukeraketan. Denek Kart bana aukeratzean jarraituko du jolasak. Kontutan izan operazio honetan ezin dela sagua erabili."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3479,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Bai"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Lasterketa asteko prest zaude. Zorte on!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Zure jokalaria hau da:"
 
@@ -3524,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Erronka bete duzu!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Erronkak bete dituzu!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Txapelketa amaitu duzu!"
 
@@ -3575,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Lasterketa amaitu duzu!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Kanporatua izan zara!"
 
@@ -3598,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3606,56 +3256,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "%0 txapelketara   sarrera daukazu"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "%0 zirkuitura sarrera lortu duzu"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Lasterketa irabazi duzu!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Zure konfigurazio fitxategia hondatua dago, ezabatu egingo da eta berria "
-"sortu."
+msgstr "Zure konfigurazio fitxategia hondatua dago, ezabatu egingo da eta berria sortu."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Zure konfigurazio fitxategia zaharregia da, ezabatu egingo da eta berria sortu."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Zure konfigurazio fitxategia zaharregia da, ezabatu egingo da eta berria "
-"sortu."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Zure sarrera konfigurazio fitxategia ez da bateragarria STK bertsio honekin"
+msgstr "Zure sarrera konfigurazio fitxategia ez da bateragarria STK bertsio honekin"
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3663,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen lorategia"
 
@@ -3674,7 +3328,6 @@ msgstr "[bat ere ez]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3683,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "Egilea:"
@@ -3692,47 +3346,25 @@ msgstr "Egilea:"
 msgid "featured"
 msgstr "Nabarmendua"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "arrunta"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Amy Smile Kerkhof https://launchpad.net/~amy\n"
-"  Ander Elortondo https://launchpad.net/~ander-elor\n"
-"  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde\n"
-"  Jan Mees https://launchpad.net/~jmees001\n"
-"  Mikel Iturbe Urretxa https://launchpad.net/~mik-iturbe\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Amy Smile Kerkhof https://launchpad.net/~amy\n  Ander Elortondo https://launchpad.net/~ander-elor\n  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde\n  Jan Mees https://launchpad.net/~jmees001\n  Mikel Iturbe Urretxa https://launchpad.net/~mik-iturbe\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/fa.po b/data/po/fa.po
index 1b0d3a02d..c20094bed 100644
--- a/data/po/fa.po
+++ b/data/po/fa.po
@@ -1,22 +1,22 @@
-# Persian translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:08+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Persian <fa@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/supertuxkart/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,21 @@ msgstr "   Y"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +57,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -96,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(خالی)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(بازی تحت شبکه هنوز در دسترس نیست)"
 
@@ -128,13 +125,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +183,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= رکوردها ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "درباره"
 
@@ -237,37 +223,35 @@ msgstr "درباره"
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +284,6 @@ msgstr "ا�زودن پیکربندی ص�حه‌کلید"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "ا�زودن بازیکن"
 
@@ -314,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +326,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "همه"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -401,18 +372,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "اعمال وضوح جدید"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +478,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "محیط‌ها"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "صدا"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -576,79 +537,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "بازگشت"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "بازگشت به مسابقه"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +606,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +640,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +699,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +809,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +978,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1003,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1015,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1091,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1153,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1204,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1309,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1357,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1433,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1455,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1558,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1667,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1722,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1760,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1794,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1912,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1933,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1956,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +1998,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2061,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2117,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2191,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2320,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2407,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2520,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2571,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2623,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2633,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2646,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2670,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2678,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2713,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2795,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2850,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2884,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2898,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2919,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2941,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2966,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2976,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3049,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3088,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3253,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3300,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3325,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,44 +3343,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Danial Behzadi https://launchpad.net/~dani.behzi\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  nava https://launchpad.net/~nava.a"
+msgstr "Launchpad Contributions:\n  Danial Behzadi https://launchpad.net/~dani.behzi\n  Dawid Gan https://launchpad.net/~deveee\n  nava https://launchpad.net/~nava.a"
diff --git a/data/po/fi.po b/data/po/fi.po
index a7efb7e21..58d8db02e 100644
--- a/data/po/fi.po
+++ b/data/po/fi.po
@@ -1,19 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.5\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:06+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:15+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/supertuxkart/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-Language: finnish\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -24,23 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Mutta te typerykset ette koskaan tule voittamaan minua, mikroautoilun "
-"kuningasta!"
+msgstr " Mutta te typerykset ette koskaan tule voittamaan minua, mikroautoilun kuningasta!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kaveri on nyt linjoilla."
+msgstr[1] "%d kaveria on nyt linjoilla."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -56,10 +58,10 @@ msgstr "%s kt"
 msgid "%s MB"
 msgstr "%s Mt"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s ja %s ovat nyt linjoilla."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -68,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, tekijä: %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s (%s)"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s on nyt linjoilla."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s on valmis"
@@ -88,32 +89,30 @@ msgstr "%s on valmis"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Käyttäjän %s profiili"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Käyttäjän %s palvelin"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s ja %s ovat nyt linjoilla."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s on poistettu."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tyhjä)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(verkkopeli ei ole vielä käytössä)"
 
@@ -123,50 +122,40 @@ msgstr "Sininen merkintä tarkoittaa ristiriitaa toisten asetusten kanssa"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Punainen merkintä tarkoittaa ristiriitaa nykyisten asetusten kanssa"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "Nykyisiä näppäinasetuksia voi tarkastella/muokata Valinnat-valikossa"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"Suurinta osaa näistä pelimuodoista voi pelata myös grand prix -tyyliin, eli "
-"yhden kisan sijasta pelataan monta peräkkäin. Mitä paremmin sijoitut, sitä "
-"enemmän saat pisteitä. Eniten pisteitä saanut voittaa."
+msgstr "Suurinta osaa näistä pelimuodoista voi pelata myös grand prix -tyyliin, eli yhden kisan sijasta pelataan monta peräkkäin. Mitä paremmin sijoitut, sitä enemmän saat pisteitä. Eniten pisteitä saanut voittaa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Käynnistä STK uudelleen, jotta muutokset tulevat voimaan"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -195,13 +184,10 @@ msgstr "Kolmen iskun taistelu"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Kolmen iskun taistelu: vain moninpelinä. Ammu aseilla kunnes muut menettävät "
-"kaikki elämänsä."
+msgstr "Kolmen iskun taistelu: vain moninpelinä. Ammu aseilla kunnes muut menettävät kaikki elämänsä."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -216,91 +202,81 @@ msgid "9 months"
 msgstr "9 kuukautta"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Ennätykset ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Keskeytä grand prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
-msgstr "Tietoja ohjelmasta"
+msgstr "Tietoja"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:236
 msgid "Accelerate"
 msgstr "Kiihdytä"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Kiihdytä ja paina kääntyessäsi näppäintä <%s> päästäksesi sivuluisuun. Lyhyt "
-"sivuluisu voi nopeuttaa tiukoista mutkista selviämistä."
+msgstr "Kiihdytä ja paina kääntyessäsi näppäintä <%s> päästäksesi sivuluisuun. Lyhyt sivuluisu voi nopeuttaa tiukoista mutkista selviämistä."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Kiihdytä painamalla <%s> ja ohjaa näppäimillä <%s> ja <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Hyväksy"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Tilin palautus"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Tilin asetukset"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Saavutukset"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Lisää kaveri"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -309,7 +285,6 @@ msgstr "Lisää uudet näppäinasetukset"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Lisää pelaaja"
 
@@ -320,32 +295,29 @@ msgstr "Lisää Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Lisää laite"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Lisää käyttäjä"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Lisäosat"
 
@@ -355,99 +327,91 @@ msgstr "Lisäosan nimi"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Lisäosat"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Kaikki"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Kaikki radat"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Kaikki keinot ovat sallittuja, joten poimi aseita ja käytä niitä järkevästi!"
+msgstr "Kaikki keinot ovat sallittuja, joten poimi aseita ja käytä niitä järkevästi!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
+msgstr "Näytä aina kirjautumisnäkymä"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Grand prix'tä tallennettaessa tapahtui virhe."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ankkuri - hidastaa merkittävästi ensimmäisenä olevaa autoa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animoidut hahmot"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animoidut hahmot: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animoitu maisema"
 
@@ -455,58 +419,54 @@ msgstr "Animoitu maisema"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animoitu maisema: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotrooppinen x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotrooppinen x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotrooppinen x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotrooppinen x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Toinen grand prix samalla nimellä on jo olemassa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Reunanpehmennys"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Reunanpehmennys: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Toteuta"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Käytä uutta resoluutiota"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Arkkivihollinen"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -517,51 +477,46 @@ msgstr "Haluatko varmasti poistaa nämä asetukset?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Poistetaanko varmasti '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Areenat"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Majakan ympäri"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Aseta näppäimelle ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Maailman laidalla"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Ääni"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Vältä banaaneja!"
 
@@ -583,123 +538,102 @@ msgstr "Akseli %d%s"
 msgid "Axis %d inverted"
 msgstr "Akseli %d käännetty"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Takaisin"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Takaisin peliin"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Takaisin kilpailuun"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Takaisin haasteen valintaan"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Takaisin laitelistaan"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Takaisin valikkoon"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Takaisin valikkoon"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Banaanirohmu"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Koripallo - pomppii kärjessä olevan perään, saattaa lytätä ja hidastaa muita "
-"autoja."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Koripallo - pomppii kärjessä olevan perään, saattaa lytätä ja hidastaa muita autoja."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Taistelusaari"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Parempi onni ensi kerralla!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineaarinen"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Musta"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Kummituskartano"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Sininen joukkue voittaa"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Karjapihan kierros"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Keilapallo - kimpoaa seinistä. Jos olet katsomassa taakse, se heitetään "
-"taaksepäin."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Keilapallo - kimpoaa seinistä. Jos olet katsomassa taakse, se heitetään taaksepäin."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -707,69 +641,58 @@ msgid "Brake"
 msgstr "Jarruta"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Purkka - käytä suojakilpenä, tai jätä tahmea pinkki klöntti taaksesi."
+msgstr "Purkka - käytä suojakilpenä, tai jätä tahmea pinkki klöntti taaksesi."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Mutta olen reilu otus, joten teen sinulle tarjouksen."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kakku - heitetään lähimpää kilpailijaa kohti, toimii parhaiten lyhyillä "
-"etäisyyksillä ja pitkillä suorilla."
+msgstr "Kakku - heitetään lähimpää kilpailijaa kohti, toimii parhaiten lyhyillä etäisyyksillä ja pitkillä suorilla."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Yhteyttä stkaddons-palvelimeen ei saada..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Peruuta"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Peru pyyntö"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -777,89 +700,76 @@ msgid "Cancel/Back"
 msgstr "Peruuta/takaisin"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Luola X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Haaste suoritettu"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Haasteen suorittaminen epäonnistui"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Haasteet: Palkintohuone"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Vaihda"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Valitse auto"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Kristoffer Kolumbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Paina tästä pelataksesi opaskierroksen"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Sulje"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Kaakaotemppeli"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Kerää vähintään 5 banaania yhdessä kilpailussa."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Kerää sinisiä laatikoita: niistä saat aseita tai muita hyödyllisiä esineitä"
+msgstr "Kerää sinisiä laatikoita: niistä saat aseita tai muita hyödyllisiä esineitä"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "Kerää lahjapaketteja. Näppäimellä <%s> voit ampua paketteja pois."
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Kerää nitropulloja (voit käyttää niitä mutkan jälkeen)"
 
@@ -869,34 +779,30 @@ msgstr "Kerää nitroa!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitroa keräämällä voit lisätä nopeuttasi milloin haluat painamalla siihen "
-"tarkoitettua näppäintä. Keräämäsi nitron määrän näet ruudun oikeassa "
-"reunassa olevasta palkista."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitroa keräämällä voit lisätä nopeuttasi milloin haluat painamalla siihen tarkoitettua näppäintä. Keräämäsi nitron määrän näet ruudun oikeassa reunassa olevasta palkista."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Suorita kaikki haasteet avataksesi suuren oven!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Suoritettiin saavutus \"%s\"."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -904,132 +810,111 @@ msgstr "Vahvista resoluutio %i sekunnin kuluessa"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Yhdistä internetiin"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Liitä Wiimote Bluetooth-hallintaan ja paina sitten Ok. Tarkemmat ohjeet: "
-"supertuxkart.net/Wiimote"
+msgstr "Liitä Wiimote Bluetooth-hallintaan ja paina sitten Ok. Tarkemmat ohjeet: supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Ei kerättäviä esineitä, joten vain ajotaito ratkaisee!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Jatka"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Jatka tallennettua GP'tä"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Jatka."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Ohjaimet"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Kopioi"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Käyttäjän '%s' luominen epäonnistui."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Yhtään Wiimotea ei löydetty :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Luo palvelin"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Luo käyttäjä"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Luodaan palvelinta"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Tekijät"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Nykyinen salasana"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Nykyinen salasana on virheellinen."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Ei sisäänkirjautuneena"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Oma"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Omat asetukset..."
 
@@ -1055,39 +940,36 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Kieltäydy"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Oletus"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Poista näppäinasetukset"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Terävyysalue"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Terävyysalue: %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1097,34 +979,33 @@ msgstr "Poista laite käytöstä"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Ei käytössä"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Näytä ruudunpäivitysnopeus (FPS)"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Haluatko varmasti keskeyttää Grand Prixin?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Haluatko varmasti poistaa pelaajan %s?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Haluatko tallentaa muutoksesi?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Älä kiihdytä ennen lähtömerkkiä"
 
@@ -1135,29 +1016,26 @@ msgstr "Alas"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Dynaamiset valot: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Muokkaa Grand Prix'tä"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1166,7 +1044,6 @@ msgstr "Munajahti"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Munajahti: löydä kaikki radoille piilotetut munat."
 
@@ -1176,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Munia: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Fantti"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Poistettu"
 
@@ -1189,24 +1065,22 @@ msgstr "Poistettu"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Sähköpostin tulee olla sisältää neljästä 50:een merkkiä!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Sähköposti on virheellinen!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Sähköpostiosoitteet eivät täsmää!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1218,64 +1092,61 @@ msgstr "Ota laite käyttöön"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Käytössä"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Kaikki"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Anna uuden pelaajan nimi"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Virhe uutisia ladattaessa: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Kaikki pelaajat:\n"
-"Painakaa \"Valitse\"-nappia liittyäksenne peliin!"
+msgstr "Kaikki pelaajat:\nPainakaa \"Valitse\"-nappia liittyäksenne peliin!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Olemassa oleva verkkotili"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Poistu"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Poistu kilpailusta"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Poistu pelistä"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Kokenut"
 
@@ -1283,12 +1154,12 @@ msgstr "Kokenut"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Löydä kaikki radoille piilotetut munat"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1296,38 +1167,36 @@ msgstr ""
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Noudetaan saavutuksia"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Noudetaan kavereita"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Noudetaan viimeistä ääntä"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Noudetaan palvelimia"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Anna rekisteröitymisen yhteydessä antamasi käyttäjätunnus ja salasana, jotta voit nollata salasanan."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Viimeinen kierros!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Etsi palvelin"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1336,21 +1205,14 @@ msgstr "Ampumisnäppäin"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Tarvitset useamman syöttölaitteen (peliohjaimet tai joystickit ovat hyviä "
-"useamman pelaajan pelissä). Laita peliohjainten asetukset kuntoon "
-"valikoista. Myös näppäimistö(i)llä pelaaminen on mahdollista, mutta "
-"jokaisella pelaajalla täytyy olla eri näppäinasetukset ja useimmat "
-"näppäimistöt tukevat varsin rajoitettua määrää yhtäaikaisia "
-"näppäimenpainalluksia."
+msgstr "Tarvitset useamman syöttölaitteen (peliohjaimet tai joystickit ovat hyviä useamman pelaajan pelissä). Laita peliohjainten asetukset kuntoon valikoista. Myös näppäimistö(i)llä pelaaminen on mahdollista, mutta jokaisella pelaajalla täytyy olla eri näppäinasetukset ja useimmat näppäimistöt tukevat varsin rajoitettua määrää yhtäaikaisia näppäimenpainalluksia."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1363,37 +1225,34 @@ msgstr "Seuraa johtajaa!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Seuraa johtajaa: pysy toisena, sillä viimeisenä oleva kilpailija poistetaan "
-"kisasta joka kerta kun laskuri menee nollaan. Varo myös menemästä johtajan "
-"edelle - silloinkin sinut poistetaan!"
+msgstr "Seuraa johtajaa: pysy toisena, sillä viimeisenä oleva kilpailija poistetaan kisasta joka kerta kun laskuri menee nollaan. Varo myös menemästä johtajan edelle - silloinkin sinut poistetaan!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Magman linnake"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d Wiimote(a) löydetty"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Löydetty %d wiimote"
+msgstr[1] "Löydetty %d wiimotea"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Kaveri poistettu!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Kaveripyyntö hyväksytty!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Kaveripyyntö peruttu!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
@@ -1401,17 +1260,16 @@ msgstr ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Kaveripyyntö lähetetty!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Kaverit"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Kokoruututila"
 
@@ -1425,22 +1283,19 @@ msgstr "MAALI!"
 msgid "Game Keys"
 msgstr "Pelinäppäimet"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Pelimuodot"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1456,51 +1311,45 @@ msgstr "Peliohjaimen nappi %d"
 msgid "Gamepad hat %d"
 msgstr "Peliohjaimen hattu %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Yleistä"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Luovuta kilpailu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1510,61 +1359,53 @@ msgid "Go!"
 msgstr "Aja!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Kultakuski"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Gran Paradiso -saari"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
-msgstr "Grand prix"
+msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Grand Prix -editori"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Grand Prix -editori"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Grand prixin tilanne:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Graafisten tehosteiden taso"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafiikka"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Graafiset asetukset"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Vihreä laakso"
 
@@ -1577,16 +1418,14 @@ msgstr "Vierailija"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Vieras %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Vieraskirjautuminen"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1596,118 +1435,105 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Apua"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Ennätykset"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Osu 10 autoon keilapallolla."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Käytä aseistustasi muihin pelaajiin kunnes heiltä loppuu elämät. (Vain "
-"moninpelinä)"
+msgstr "Käytä aseistustasi muihin pelaajiin kunnes heiltä loppuu elämät. (Vain moninpelinä)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Osu samaan autoon vähintään 5 kertaa yhden kisan aikana."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Vain ihmispelaajat"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Hyväksyn yllä olevat ehdot ja olen vähintään 13 vuotta vanha."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Jos voitatte minut kilvanajossa, vapautan vanhan höppänän."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Jos näet oheisen kaltaisen lukollisen painikkeen, sinun täytyy suorittaa "
-"haaste avataksesi lukituksen."
+msgstr "Jos näet oheisen kaltaisen lukollisen painikkeen, sinun täytyy suorittaa haaste avataksesi lukituksen."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "Jätetään %s huomiotta. Pelataksesi sinun olisi pitänyt liittyä aikaisemmin!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
-"Jätetään %s huomiotta. Pelataksesi sinun olisi pitänyt liittyä aikaisemmin!"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Asenna"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Keskitaso"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Pääsy internetiin on estetty, muuta valintaa asetuksista"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Tasapeli"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Se on salaisuus"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Liity"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Liitytään palvelimelle"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Autot"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Säilytä tämä resoluutio"
 
@@ -1718,7 +1544,7 @@ msgstr "Pysy johtaja-auton vauhdissa, mutta älä ohita sitä!"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Näppäinsidos"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1726,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Näppäimistö %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1735,14 +1560,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Kierros"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%i. kierros"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Kierrokset"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1797,66 +1622,100 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Ladataan"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Aula"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Aulan asetukset"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "Paikallinen nimi"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Lukittu"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Lukittu. Suorita aktiivisia haasteita saadaksesi käyttöön uusia "
-"ominaisuuksia!"
+msgstr "Lukittu. Suorita aktiivisia haasteita saadaksesi käyttöön uusia ominaisuuksia!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Lukittu!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Kirjaudu sisään"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Kirjaudu ulos"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Kirjauduttu käyttäjänä: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Kirjaudutaan sisään"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Kirjataan sisään '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Sisäänkirjautuminen vieraana mahdollistaa osallistumisen kilpailuihin verkossa, mutta ei salli äänestystä lisäosista tai saavutusten keräämistä verkossa."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Kirjaudutaan ulos"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Kirjataan ulos '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Kirjaudu"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1865,46 +1724,35 @@ msgstr "Katso taakse"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Etsi lisää kavereita:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Suorita viisi sivuluisua yhden kierroksen aikana."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Suorita kilpailu, jossa on vähintään 5 kierrosta."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratoonari"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Pelaajien enimmäismäärä"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Enimmäisaika (min)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Vain oma auto"
 
@@ -1914,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Valikkonäppäimet"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Itikan metsästäjä!"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Hiiren akseli %d%s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1944,98 +1796,97 @@ msgstr "Hiiren näppäin %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Siirry alas"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Siirry ylös"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Moninpeli"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Moninpeli"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musiikki"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Nimen tulee sisältää vähintään 4 merkkiä, enintään 30 merkkiä!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Nimi on tyhjä."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Nimi on liian pitkä."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
+msgstr "Palvelimen nimi"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "Uusi grand prix, \"%s\", on nyt käytössäsi"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Uusi verkkotili"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Uusi salasana"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Uusi määrä"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "Uusi vaikeusaste, \"%s\", on nyt käytössäsi"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Uusi nopein kierros"
 
@@ -2063,19 +1914,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Nitro-haaste"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ei"
 
@@ -2085,23 +1935,19 @@ msgid "Normal Race"
 msgstr "Normaali kilpailu"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Pohjoinen hiihtokeskus"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Jos onnistut pysymään sivuluisussa useamman sekunnin ajan, saat "
-"nopeusbonuksen palkinnoksi!"
+msgstr "Jos onnistut pysymään sivuluisussa useamman sekunnin ajan, saat nopeusbonuksen palkinnoksi!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Aloittelija"
 
@@ -2112,46 +1958,41 @@ msgstr "Tietokoneen ohjaamien pelaajien määrä: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Tietokoneen ohjaamien pelaajien määrä"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Voittoon tarvittavien maalien määrä"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Kierrosten määrä"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Kierrosten määrä:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Sivussa valtavirrasta"
 
@@ -2159,62 +2000,59 @@ msgstr "Sivussa valtavirrasta"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Niin, nähkääs, hän on nyt linnassani ja kohta hänet tarjoillaan "
-"illallisena..."
+msgstr "Niin, nähkääs, hän on nyt linnassani ja kohta hänet tarjoillaan illallisena..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Vanha kaivos"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliverin matikantunti"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Moninpeli verkossa"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Käyttäjätunnus verkkopeleissä"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Verkkokäyttäjätunnuksen tulee olla vähintään 3 merkkiä pitkä, enintään 30 merkkiä pitkä!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Verkkokäyttäjätunnus ei saa alkaa numerolla!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Vain pelin johtaja voi tehdä muutoksia tässä vaiheessa!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Hupsis! Kun joudut pulaan, paina <%s> pelastuaksesi tilanteesta"
@@ -2225,62 +2063,54 @@ msgstr "Hupsis! Kun joudut pulaan, paina <%s> pelastuaksesi tilanteesta"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Valinnat"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Yhteenveto"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Laskuvarjo - hidastaa kaikkia edelläsi olevia kilpailijoita."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Salasana:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Salasanan vaihto"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Salasanan tulee sisältää vähintään 8 merkkiä, enintään 30 merkkiä!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Salasana vaihdettu onnistuneesti."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Salasanat eivät täsmää!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2289,68 +2119,71 @@ msgstr "Pysäytä peli"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pysäytetty"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Sakkoaika!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Odottaa"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingviinien leikkikenttä"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Suoritetaan äänestystä"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Pelaa kaikkia"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Pelaa jokaista virallista rataa vähintään kerran."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Pelaajat"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Anna nimi Grand Prix'lle"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Ole hyvä ja tee näppäinasetukset uudelleen."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Lue käyttöehdot"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Odota, lisäosia päivitetään"
@@ -2360,47 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Odota, lisäosia ladataan"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Imukuppi - Heitä eteenpäin kiskoaksesi edeltäjääsi, tai taaksepäin "
-"seuraajasi näköesteeksi."
+msgstr "Imukuppi - Heitä eteenpäin kiskoaksesi edeltäjääsi, tai taaksepäin seuraajasi näköesteeksi."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Esinerakkautta"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Paina <%s> katsoaksesi taaksesi, ammu käyttäen <%s> ja ammu taakse painamalla samalla <%s>!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Paina ESCiä peruuttaaksesi"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Paina näppäintä"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Kaksoisnapsauta laitetta tai paina enter sen kohdalla säätääksesi asetuksia"
+msgstr "Kaksoisnapsauta laitetta tai paina enter sen kohdalla säätääksesi asetuksia"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Paina enter tai kaksoisnapsauta pelaajaa muokataksesi"
 
@@ -2416,9 +2240,7 @@ msgstr "Paina ampumisnäppäintä aloittaaksesi haasteen"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Paina Wiimoten näppäimiä 1 ja 2 yhtä aikaa laittaaksesi sen hakutilaan ja "
-"paina sitten Ok. Tarkemmat ohjeet: supertuxkart.net/Wiimote"
+msgstr "Paina Wiimoten näppäimiä 1 ja 2 yhtä aikaa laittaaksesi sen hakutilaan ja paina sitten Ok. Tarkemmat ohjeet: supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2432,20 +2254,18 @@ msgstr "Lisäosan \"%s\" poistaminen epännistui."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Käsitellään"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Profiili"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Edistyminen"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2453,36 +2273,31 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Työnnä pallo vastapuolen verkkoon tehdäksesi maalin. (vain moninpelissä)"
+msgstr "Työnnä pallo vastapuolen verkkoon tehdäksesi maalin. (vain moninpelissä)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Pikapeli"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Poistu"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Lopeta palvelin."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Kilpailun asetukset"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Satunnainen"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2490,15 +2305,15 @@ msgstr "Satunnainen areena"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Satunnainen Grand Prix"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Satunnainen auto"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Satunnainen rata"
 
@@ -2507,84 +2322,68 @@ msgid "Rank"
 msgstr "Sijoitus"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Arvostelu >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Paikoillenne!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Oikeasti... salaisuus."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Punainen joukkue voittaa"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Rekisteröidy"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Normaali kilpailu - kaikki keinot sallittuja, joten poimi aseita ja käytä "
-"niitä järkevästi!"
+msgstr "Normaali kilpailu - kaikki keinot sallittuja, joten poimi aseita ja käytä niitä järkevästi!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Päivitä"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Muista salasana"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Muista ikkunan sijainti"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Poista"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -2610,35 +2409,31 @@ msgstr "Pelastus"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resoluutio"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Käynnistä kilpailu uudelleen"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Käänteinen suunta"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Käänteinen:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Käänteinen"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2687,45 +2482,39 @@ msgstr ""
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "NOPEUS"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
+msgstr "STK Enterprise"
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Tallenna Grand Prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skotlanti"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Etsi"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Etsitään"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2733,57 +2522,49 @@ msgid "Select"
 msgstr "Valitse"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Valitse vaikeustaso"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Valitse pelimuoto"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Valitse rata"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Valitse auto"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Lähetä anonyymeja tietoja laitteistosta"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Palvelimen luonti"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Palvelimen tiedot"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Palvelinvalinta"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Palvelimen nimi:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Palvelin luotiin onnistuneesti. Voit liittyä palvelimelle nyt."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2792,83 +2573,42 @@ msgstr "Valmiit!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Uusi kilpailu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Varjot"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Varjot: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Varjot: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Liikkuvat hiekat"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Lähiöiden loisto"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Kirjaudu"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Kirjaudu vieraana"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
@@ -2876,9 +2616,8 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Yksinpeli"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2886,9 +2625,8 @@ msgid "Size: %s"
 msgstr "Koko: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Luisuttaja"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2897,12 +2635,10 @@ msgstr "Sivuluisu"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Ulkoasu"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Lumihuippu"
 
@@ -2912,28 +2648,23 @@ msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Jalkapallokenttä"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr "Jalkapallo: vain moninpelinä. Työnnä autollasi pallo maaliin."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Lisäosasivustoon ei saatu yhteyttä. Tarkista, että yhteys Internetiin on "
-"kunnossa ja että palomuuri ei estä SuperTuxKartia ottamasta yhteyttä "
-"verkkoon."
+msgstr "Lisäosasivustoon ei saatu yhteyttä. Tarkista, että yhteys Internetiin on kunnossa ja että palomuuri ei estä SuperTuxKartia ottamasta yhteyttä verkkoon."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2941,7 +2672,6 @@ msgstr "Lisäosan lataaminen epäonnistui"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Äänitehosteet"
 
@@ -2950,30 +2680,28 @@ msgstr "Äänitehosteet"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Vakio"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Aloita grand prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Aloita kilpailu"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2987,97 +2715,80 @@ msgstr "Ohjaa oikealle"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Tarinamoodi"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Kaato!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Merenalainen maailma"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKartin lisäosat"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKartin ohje"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKartin valinnat"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKartia voi pelata moninpelinä yhdellä tietokoneella"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart sisältää erilaisia pelimuotoja"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Vaihtaja - lahjapaketit muutetaan banaaneiksi ja banaanit lahjapaketeiksi "
-"lyhyeksi aikaa."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Vaihtaja - lahjapaketit muutetaan banaaneiksi ja banaanit lahjapaketeiksi lyhyeksi aikaa."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Kärpäslätkä - mätkii ja hidastaa lähellä olevia kilpailijoita."
 
@@ -3086,32 +2797,37 @@ msgstr "Kärpäslätkä - mätkii ja hidastaa lähellä olevia kilpailijoita."
 msgid "System Language"
 msgstr "Järjestelmän kieli"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Käyttöehdot"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Tekstuuripakkaus"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Tekstuurisuodatus"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "Sivuluisu-näppäimellä selvität tiukat mutkat nopeammin."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3123,9 +2839,7 @@ msgstr "Lisäosamoduuli ei ole tällä hetkellä käytössä Valinnat-valikossa"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Ennätystiedosto oli liian vanha.\n"
-"Ennätykset on nyt nollattu."
+msgstr "Ennätystiedosto oli liian vanha.\nEnnätykset on nyt nollattu."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3138,47 +2852,29 @@ msgstr "Aika-ajo"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Aika-ajo: Käytettävissäsi ei ole apuvälineitä, joten vain ajotaidoillasi on "
-"merkitystä!"
+msgstr "Aika-ajo: Käytettävissäsi ei ole esineitä, joten vain ajotaidoillasi on merkitystä!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Lisätäksesi uuden peliohjaimen/joystickin, kytke se koneeseen ja käynnistä "
-"SuperTuxKart. Tällöin ohjain ilmestyy listalle.\n"
-"\n"
-"Lisätäksesi uudet näppäinasetukset käytä alla olevaa nappia. Huomaa "
-"kuitenkin, että useimmat näppäimistöt tukevat varsin rajoitettua määrää "
-"yhtäaikaisia näppäimenpainalluksia ja soveltuvat huonosti moninpeliin. (Voit "
-"kytkeä tietokoneeseen useamman näppäimistön, mutta tässäkin tapauksessa "
-"jokaisella pelaajalla täytyy olla eri näppäimet pelin hallintaan.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Lisätäksesi uuden peliohjaimen/joystickin, kytke se koneeseen ja käynnistä SuperTuxKart. Tällöin ohjain ilmestyy listalle.\n\nLisätäksesi uudet näppäinasetukset käytä alla olevaa nappia. Huomaa kuitenkin, että useimmat näppäimistöt tukevat varsin rajoitettua määrää yhtäaikaisia näppäimenpainalluksia ja soveltuvat huonosti moninpeliin. (Voit kytkeä tietokoneeseen useamman näppäimistön, mutta tässäkin tapauksessa jokaisella pelaajalla täytyy olla eri näppäimet pelin hallintaan.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Seuraavat kerättävät esineet voivat auttaa sinua voittoon:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Kuuhun ja takaisin"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Tänään"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3188,12 +2884,12 @@ msgstr "%i:n kärki"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Rata"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Rata %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3204,19 +2900,17 @@ msgstr "Radan tekijä: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Rataryhmä"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Radat"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineaarinen"
 
@@ -3227,47 +2921,42 @@ msgstr "Yritä uudelleen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Opaskierros"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Opastusvalikko"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tyyppi:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Tyyppi: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Palvelimeen yhdistäminen epäonnistui. Tarkista internetyhteyden tila tai yritä myöhemmin uudelleen."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Poista asennus"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Pysäyttämätön"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3279,8 +2968,8 @@ msgid "Update"
 msgstr "Päivitä"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Päivitetty"
 
@@ -3289,40 +2978,36 @@ msgid "Updated date"
 msgstr "Päivityksen aika"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Käytä vähintään kymmentä esinettä kilpailussa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Käytä tarkkoja tekstuureita"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Käytä keräämääsi nitroa näppäimellä <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Käyttäjätiedot"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Käyttöliittymä"
 
@@ -3331,34 +3016,31 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Käyttäjähaku"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Käyttäjätunnus"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Virheellinen käyttäjätunnus ja/tai sähköpostiosoite."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "vastaan"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3369,39 +3051,35 @@ msgstr "Versio: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Pystytahdistus (vsync) (vaatii uudelleenkäynnistyksen)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Näytä"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Voimakkuus"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Äänestä"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Äänestys onnistui! Voit nyt sulkea ikkunan."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "VÄÄRÄ SUUNTA!"
 
@@ -3410,101 +3088,82 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Varoitus: vaihtonäppäimen käyttöä ei suositella. Vaihtonäppäintä "
-"painettaessa kaikki ne näppäimet, jotka tuottavat eri merkin yhdessä "
-"vaihtonäppäimen kanssa, eivät toimi."
+msgstr "Varoitus: vaihtonäppäimen käyttöä ei suositella. Vaihtonäppäintä painettaessa kaikki ne näppäimet, jotka tuottavat eri merkin yhdessä vaihtonäppäimen kanssa, eivät toimi."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Aseet"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Säätehosteet"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Säätehosteet: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Mikä hätänä, pikkukaverit? Onko suuri johtajanne Gnu kadonnut?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Kun syöttölaitteiden asetukset on tehty, peli voi alkaa. Valitse Moninpeli-"
-"kuvake päävalikosta. Autoja valitessa pelaajat voivat liittyä peliin "
-"painamalla omaa ampumisnäppäintään. Jokainen pelaaja voi käyttää omia "
-"näppäimiään autonsa valitsemiseen. Peli jatkuu, kun kaikki ovat valinneet "
-"autonsa. Huomaa, että hiirtä ei voi käyttää valitsemiseen."
+msgstr "Kun syöttölaitteiden asetukset on tehty, peli voi alkaa. Valitse Moninpeli-kuvake päävalikosta. Autoja valitessa pelaajat voivat liittyä peliin painamalla omaa ampumisnäppäintään. Jokainen pelaaja voi käyttää omia näppäimiään autonsa valitsemiseen. Peli jatkuu, kun kaikki ovat valinneet autonsa. Huomaa, että hiirtä ei voi käyttää valitsemiseen."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Valkoinen"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Voita 5 yksittäistä kilpailua putkeen."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Olet nyt valmiina kisaamaan. Onnea!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Pelaajahahmosi on"
 
@@ -3514,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Suoritit haasteen!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Suoritit haasteet!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Sait grand prixin päätökseen!"
 
@@ -3565,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Saavuit maaliin!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Sinulla on %d uusi kaveripyyntö!"
+msgstr[1] "Sinulla on %d uutta kaveripyyntöä!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Sinulla on uusi kaveripyyntö!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Sinut poistettiin kisasta!"
 
@@ -3588,57 +3248,65 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Tarvitset enemmän pisteitä\nvoidaksesi ottaa osaa tähän\nhaasteeseen! Katso mini-\nkartasta saatavilla olevat haasteet."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Salasana vaaditaan."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Avasit %0 -grand prixin lukituksen"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Avasit radan %0 lukituksen"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Saat sähköpostiviestin, jossa on lisäohjeet salasanan nollausta varten. Ole kärsivällinen ja tarvittaessa tarkista roskapostikansiosi."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Saat sähköpostiviestin, jossa on lisäohjeet tilin aktivointia varten. Ole kärsivällinen ja tarvittaessa tarkista roskapostikansiosi."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Voitit kilpailun!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Käyttämäsi OpenGL-versio vaikuttaa olevan liian vanha. Tarkista onko näytönohjaimesi ajurille saatavilla päivitystä. SuperTuxKart vaatii OpenGL 3.1:n tai uudemman."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Asetustiedosto oli viallinen, joten se poistettiin ja uusi luodaan tilalle."
+msgstr "Asetustiedosto oli viallinen, joten se poistettiin ja uusi luodaan tilalle."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Asetustiedosto oli liian vanha, joten se poistettiin ja uusi luodaan tilalle."
+msgstr "Asetustiedosto oli liian vanha, joten se poistettiin ja uusi luodaan tilalle."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Ajuriversiosi on liian vanha. Asenna näytönohjaimen uusin ajuri."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3647,10 +3315,9 @@ msgstr "Asetustiedosto ei ole yhteensopiva tämän STK:n version kanssa."
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Profiilisi"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen-puutarha"
 
@@ -3661,16 +3328,16 @@ msgstr "[ei mitään]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "toiminnot"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "kaikki"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "tekijä:"
@@ -3679,45 +3346,25 @@ msgstr "tekijä:"
 msgid "featured"
 msgstr "suositeltu"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "korkea"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "matala"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "vakio"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Joonas Nurmi https://launchpad.net/~joonas-nurmi\n"
-"  Kristian Laakkonen https://launchpad.net/~kristian-laakkonen\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Jiri Grönroos\n\nLaunchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Joonas Nurmi https://launchpad.net/~joonas-nurmi\n  Kristian Laakkonen https://launchpad.net/~kristian-laakkonen\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/fr.po b/data/po/fr.po
index 6b56b96f9..d191529d1 100644
--- a/data/po/fr.po
+++ b/data/po/fr.po
@@ -1,46 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Auria <auria.mg@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: supertuxkart\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-20 00:39+0000\n"
-"Last-Translator: Éfrit <Unknown>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-20 23:17+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/supertuxkart/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-Language: French\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
 #. N (or nothing) otherwise
 #: src/utils/translation.cpp:262
 msgid "   Is this a RTL language?"
-msgstr "   N"
+msgstr "N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Mais jamais de pathétiques petits abrutis comme vous ne réussiront à me "
-"vaincre moi, le roi du karting !"
+msgstr " Mais jamais de pathétiques petits abrutis comme vous ne réussiront à me vaincre moi, le roi du karting !"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ami est maintenant en ligne."
+msgstr[1] "%d amis sont maintenant en ligne."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (handicapé)"
@@ -49,14 +51,14 @@ msgstr "%s (handicapé)"
 #: src/states_screens/dialogs/addons_loading.cpp:176
 #, c-format
 msgid "%s KB"
-msgstr "%s Kio"
+msgstr "%s Ko"
 
 #: src/states_screens/dialogs/addons_loading.cpp:165
 #, c-format
 msgid "%s MB"
-msgstr "%s Mio"
+msgstr "%s Mo"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s et %s sont connectés."
@@ -68,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s par %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s par %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s s'est connecté."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s est prêt"
@@ -95,80 +96,64 @@ msgstr "profile de %s"
 msgid "%s's server"
 msgstr "serveur de %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s et %s sont connectés."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "\"%s\" a été éliminé"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Vide)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(le jeu en réseau n'est pas encore disponible)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Un objet en bleu représente un conflit avec une autre configuration"
+msgstr "* Un objet en bleu représente un conflit avec une autre configuration"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
-"* Une entrée en rouge représente un conflit avec la configuration actuelle"
+msgstr "* Une entrée en rouge représente un conflit avec la configuration actuelle"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Les commandes peuvent être consultées ou modifiées dans le menu Options"
+msgstr "* Les commandes peuvent être consultées ou modifiées dans le menu Options"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* La majorité de ces modes de jeu sont disponibles en mode Grand Prix : "
-"plusieurs courses sont disputées au lieu d’une seule. Plus la position au "
-"classement est haute, plus vous gagnez de points. À la fin, celui qui a le "
-"plus de points remporte la coupe."
+msgstr "* La majorité de ces modes de jeu sont disponibles en mode Grand Prix : plusieurs courses sont disputées au lieu d’une seule. Plus la position au classement est haute, plus vous gagnez de points. À la fin, celui qui a le plus de points remporte la coupe."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Redémarrer STK pour appliquer la nouvelle configuration"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* La configuration à utiliser sera sélectionnée selon quelle touche 'Sélectionner' est utilisée pour rejoindre le jeu."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -199,13 +184,10 @@ msgstr "Bataille en 3 coups"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Combat 3 prises : Disponible en mode multijoueur seulement. Attaque les "
-"autres joueurs avec tes armes jusqu'à ce qu'ils perdent toutes leurs vies."
+msgstr "Combat 3 prises : Disponible en mode multijoueur seulement. Attaque les autres joueurs avec tes armes jusqu'à ce qu'ils perdent toutes leurs vies."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +202,20 @@ msgid "9 months"
 msgstr "9 mois"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Meilleurs scores ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Karts de l'IA"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Abandonner le Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "À propos"
 
@@ -245,66 +224,59 @@ msgstr "À propos"
 msgid "Accelerate"
 msgstr "Accélérer"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Accélère et appuie sur la touche <%s> pendant un tournant pour déraper. "
-"Déraper pendant un court temps permet de mieux aborder les virages serrés."
+msgstr "Accélère et appuie sur la touche <%s> pendant un tournant pour déraper. Déraper pendant un court temps permet de mieux aborder les virages serrés."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Accélère avec <%s> et dirige toi avec <%s> et <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Récupération de compte"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Paramètres du compte"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Accomplissements"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Action"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Ajouter"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Ajouter un ami"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -313,7 +285,6 @@ msgstr "Ajouter une configuration de clavier"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Ajouter un joueur"
 
@@ -324,32 +295,29 @@ msgstr "Ajouter une Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Ajouter un périphérique"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Ajouter une utilisateur"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Extensions"
 
@@ -359,100 +327,91 @@ msgstr "Nom de l'extension"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Extensions"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Moteur de rendu avancé (lumières, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Tout"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Toutes les pistes"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Tous les coups sont permis, alors collecte des armes et utilise-les "
-"astucieusement !"
+msgstr "Tous les coups sont permis, alors collecte des armes et utilise-les astucieusement !"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
-msgstr ""
+msgstr "Toujours afficher l'écran de connexion"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Occlusion ambiante"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Occlusion ambiante : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Une erreur est survenue en sauvegardant le grand prix."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ancre - ralentit beaucoup le kart en première position."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personnages animés"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personnages animés : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Paysage animé"
 
@@ -460,64 +419,59 @@ msgstr "Paysage animé"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Paysaye animé : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotrope x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotrope x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotrope x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotrope x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Un autre grand prix portant le même nom existe déjà."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Anticrénelage"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Anticrénelage : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Appliquer"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Appliquer la nouvelle résolution"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "L'ennemi juré"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
-"Êtes-vous sûr de vouloir définitivement supprimer cette configuration ?"
+msgstr "Êtes-vous sûr de vouloir définitivement supprimer cette configuration ?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
@@ -525,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Êtes-vous certain de vouloir supprimer '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arènes"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Autour du phare"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Ne rien assigner"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Assigner à la touche Échap"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Au bout du monde"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Audio"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Évite les bananes !"
 
@@ -589,123 +538,102 @@ msgstr "Axe %d %s"
 msgid "Axis %d inverted"
 msgstr "Axe %d inversé"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Retour"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Retour au jeu"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Retour à la course"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Retour au choix du défi"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Retour à la liste des périphériques"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Retour au menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Retour au menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Le petit singe"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Balle de basket - poursuit le premier, écrase et éclabousse les joueurs sur "
-"son passage"
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Balle de basket - poursuit le premier, écrase et éclabousse les joueurs sur son passage"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Zone de combat"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Meilleure chance la prochaine fois!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinéaire"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Noir"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Le Manoir De La Colline Noire"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Flou lumineux (bloom)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Flou lumineux (bloom) : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Les Bleus l'emportent"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Basse-cour Cocorico"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Boule de Bowling - rebondit sur les murs. Tu peux aussi la lancer derrière "
-"toi en utilisant la touche \"regarder derrière\"."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Boule de Bowling - rebondit sur les murs. Tu peux aussi la lancer derrière toi en utilisant la touche \"regarder derrière\"."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -713,70 +641,58 @@ msgid "Brake"
 msgstr "Freiner"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Chewing Gum - protège-toi avec un bouclier, ou utilise-le en regardant en "
-"arrière pour laisser une flaque collante sur ton chemin."
+msgstr "Chewing Gum - protège-toi avec un bouclier, ou utilise-le en regardant en arrière pour laisser une flaque collante sur ton chemin."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Puisque je suis une créature au bon coeur, je vais te faire une offre."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Gâteau - lancé sur ton plus proche rival, idéal sur courtes distances et sur "
-"les routes droites."
+msgstr "Gâteau - lancé sur ton plus proche rival, idéal sur courtes distances et sur les routes droites."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Impossible d'accéder au serveur..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Annuler"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Annuler la requête"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -784,94 +700,78 @@ msgid "Cancel/Back"
 msgstr "Annuler/Retour"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Caverne X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Défi réussi"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Défi échoué"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Défis : salle des trophées"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Modifier"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Choisis un Kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Christoffel Columbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Clique ici pour accéder au tutoriel"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Fermer"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Temple cacao"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Récolte au moins 5 bananes en une course."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Ramasse les boîtes bleues : elles contiennent des armes et divers bonus"
+msgstr "Ramasse les boîtes bleues : elles contiennent des armes et divers bonus"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Récolte des cadeaux, et lance l'arme grâce à la touche <%s> pour détruire "
-"ces boîtes !"
+msgstr "Récolte des cadeaux, et lance l'arme grâce à la touche <%s> pour détruire ces boîtes !"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
-msgstr ""
-"Récolte des bouteilles de nitro (pour les utiliser après le tournant)"
+msgstr "Récolte des bouteilles de nitro (pour les utiliser après le tournant)"
 
 #: src/states_screens/race_gui_base.cpp:648
 msgid "Collect nitro!"
@@ -879,34 +779,30 @@ msgstr "Ramasse de la nitro !"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"La nitro que tu collectes peut être ensuite utilisée pour te propulser vers "
-"l'avant en utilisant la touche correspondante. Ton niveau de nitro est "
-"visible dans la barre à la droite de l'écran."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "La nitro que tu collectes peut être ensuite utilisée pour te propulser vers l'avant en utilisant la touche correspondante. Ton niveau de nitro est visible dans la barre à la droite de l'écran."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Remporte tous les défis pour déverrouiller la grande porte!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Accomplissement \"%s\" complété"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -914,190 +810,166 @@ msgstr "Confirme la résolution dans les %i prochaines secondes."
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Se connecter à Internet"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Connecte ta wiimote dans le gestionnaire Bluetooth, puis clique sur ok. Des "
-"instructions détaillées sont disponibles sur supertuxkart.net/Wiimote"
+msgstr "Connecte ta wiimote dans le gestionnaire Bluetooth, puis clique sur ok. Des instructions détaillées sont disponibles sur supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Aucun bonus dans les pistes - seule ton habileté compte !"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuer"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Continuer GP sauvegardé"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Continuer."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Contrôles"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Copier"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Impossible de créer le joueur '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Aucune wiimote détectée :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Créer un serveur"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Créer un utilisateur"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Création du serveur"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Crédits"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Mot de passe actuel"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Mauvais mot de passe actuel."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Présentement non-connecté"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Réglages personnalisés..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "DPad bas"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "DPad gauche"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "DPad droit"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "DPad haut"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Refuser"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Par défaut"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Supprimer la configuration"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Profondeur de champ"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Profondeur de champ : %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1107,34 +979,33 @@ msgstr "Désactiver cette manette"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Désactivé"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Afficher le nombre d'image par seconde (FPS)"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Souhaites-tu vraiment quitter le Grand Prix ?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Voulez-vous vraiment supprimer le joueur \"%s\" ?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "N'accélère pas avant le départ !"
 
@@ -1145,29 +1016,26 @@ msgstr "Bas"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Conduire en sens opposé"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Lumières dynamiques : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Éditer"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Éditer le Grand Prix"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1176,10 +1044,8 @@ msgstr "Chasse aux oeufs"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"Chasse aux oeufs : explore les pistes pour découvrir les oeufs cachés"
+msgstr "Chasse aux oeufs : explore les pistes pour découvrir les oeufs cachés"
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1187,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Œufs : %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Éliminé"
 
@@ -1200,24 +1065,22 @@ msgstr "Éliminé"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Courriel"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "La taille du courriel doit être comprise entre 4 et 50 caractères."
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Le courriel n'est pas valide!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Les courriels entrés ne concordent pas!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1229,65 +1092,61 @@ msgstr "Activer cette manette"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Activer les handicaps par joueur"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Activé"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Activé pour tous"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Entre le nom du nouveau joueur"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Erreur durant le téléchargement des nouvelles : '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Tout le monde :\n"
-"appuyez sur \"Sélection\"\n"
-"pour rejoindre le jeu !"
+msgstr "Tout le monde :\nappuyez sur \"Sélection\"\npour rejoindre le jeu !"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Connexion à un compte existant"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Sortir"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Quitter la course"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Quitter le jeu"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1295,12 +1154,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explore les pistes pour trouver les oeufs cachés"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1308,38 +1167,36 @@ msgstr ""
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Récupération des accomplissements"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Récupération des amis"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Récupération du dernier vote"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Récupération de la liste des serveurs"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Entre le nom et le courriel que tu as utilisé lors de l'inscription pour retrouver ton mot de passe."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Dernier tour !"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Chercher un serveur"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1348,22 +1205,14 @@ msgstr "Tirer"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Tout d'abord, tu vas avoir besoin de plusieurs périphériques (avoir "
-"plusieurs manettes ou joysticks est le meilleur moyen de jouer à plusieurs). "
-"Va dans le menu des options et configure les manettes. Il est également "
-"possible de jouer à plusieurs sur clavier(s), mais chaque joueur aura besoin "
-"d'un ensemble différent de touches, et garde à l'esprit que la plupart des "
-"claviers ne sont pas appropriés pour le jeu multijoueurs, car ils ne "
-"supportent qu'un nombre limité de touches simultanées."
+msgstr "Tout d'abord, tu vas avoir besoin de plusieurs périphériques (avoir plusieurs manettes ou joysticks est le meilleur moyen de jouer à plusieurs). Va dans le menu des options et configure les manettes. Il est également possible de jouer à plusieurs sur clavier(s), mais chaque joueur aura besoin d'un ensemble différent de touches, et garde à l'esprit que la plupart des claviers ne sont pas appropriés pour le jeu multijoueurs, car ils ne supportent qu'un nombre limité de touches simultanées."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1376,55 +1225,51 @@ msgstr "Suis le meneur !"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Suis le meneur : vide le second rang, car le dernier kart sera éliminé à "
-"chaque fois que le décompte atteint zéro. Attention : dépasser le meneur va "
-"aussi conduire à l'élimination !"
+msgstr "Suis le meneur : vide le second rang, car le dernier kart sera éliminé à chaque fois que le décompte atteint zéro. Attention : dépasser le meneur va aussi conduire à l'élimination !"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d wiimote(s) trouvée(s)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "%d wiimote trouvée"
+msgstr[1] "%d wiimotes trouvées"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Ami effacé de la liste d'amis!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Requête d'amitié acceptée!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Requête d'amitié annulée!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Requête d'amitié refusée!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Requête d'amitié envoyée!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Friends"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Plein-écran"
 
@@ -1438,24 +1283,21 @@ msgstr "BUT !"
 msgid "Game Keys"
 msgstr "Touches pour le jeu"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modes de jeu"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Type de jeu (Limite de buts / Limite de temps)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1469,51 +1311,45 @@ msgstr "Manette, bouton %d"
 msgid "Gamepad hat %d"
 msgstr "Manette de jeu %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Général"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Abandonner la course"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Illumination globale"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Illumination globale : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Contours en surbrillance"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Contours en surbrillance : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1523,61 +1359,53 @@ msgid "Go!"
 msgstr "Partez!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "Un vrai pilote de Formule 1!"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "L'île Grand Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Éditeur de Grand Prix"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Éditeur de Grand Prix"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progrès dans le Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Niveau d'effets visuels"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Graphismes"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Réglages visuels"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Vallée luxuriante"
 
@@ -1590,16 +1418,14 @@ msgstr "Invité"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Invité %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Se connecter en tant qu'invité"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1609,22 +1435,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Aide"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Meilleurs scores"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Attaque 10 joueurs avec une boule de bowling."
 
@@ -1632,94 +1454,86 @@ msgstr "Attaque 10 joueurs avec une boule de bowling."
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Tire sur tes rivaux jusqu'à ce qu'ils perdent toutes leurs vies ! "
-"(uniquement disponible en mode multijoueur)"
+msgstr "Tire sur tes rivaux jusqu'à ce qu'ils perdent toutes leurs vies ! (uniquement disponible en mode multijoueur)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Attaque le même joueur au moins 5 fois dans une course."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Joueurs humains seulement"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "J'accepte les conditions et je certifie être agé de 13 ans et plus. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Si vous me battez à la course, je libérerai le vieux bonhomme."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Certains boutons ont un cadenas comme celui-ci. Tu dois réussir un défi pour "
-"le débloquer."
+msgstr "Certains boutons ont un cadenas comme celui-ci. Tu dois réussir un défi pour le débloquer."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Désolé « %s », il est trop tard pour rejoindre la partie !"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Éclairage basé sur l'image"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installer"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermédiaire"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "L'accès internet est désactivé, veuillez l'activer dans les options."
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Match nul"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Un secret bien caché!"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Joindre"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Connexion au serveur en cours..."
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Conserver cette résolution."
 
@@ -1730,7 +1544,7 @@ msgstr "Talonne le meneur, mais sans le dépasser!"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Touche assignée"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1738,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Clavier %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1747,14 +1560,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Tour"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Tour %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Tours"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1774,85 +1587,81 @@ msgstr "Gauche"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Index gauche (LB)"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Gauche (pouce gauche)"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Bas (pouce gauche)"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Gauche (pouce gauche)"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Droite (pouce gauche)"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Haut (pouce gauche)"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Majeur gauche (LT)"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Puits de lumière"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Puits de lumière : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Chargement"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "Nom local"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Verrouillé : relève des défis pour accéder à plus !"
 
@@ -1860,13 +1669,53 @@ msgstr "Verrouillé : relève des défis pour accéder à plus !"
 msgid "Locked!"
 msgstr "Verrouillé!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Connexion"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Se déconnecter"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Connecté sous le nom : %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Connexion en cours"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Connexion sous le nom '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "S'identifier en tant qu'invitié te permet de participer à des courses en réseau, mais ne permet pas de noter les extensions, ou d'obtenir des accomplissements en ligne."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Déconnexion"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Déconnexion de '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Connexion"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1875,27 +1724,18 @@ msgstr "Regarder en arrière"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Chercher des amis:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Fais déraper ton kart 5 fois en un tour de piste."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Participe à une course avec au moins 5 tours de piste."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Le coureur de marathon"
 
@@ -1903,18 +1743,16 @@ msgstr "Le coureur de marathon"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Nombre max. de joueurs"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Temps maximum (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Seulement moi"
 
@@ -1924,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Touches pour le menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Chasseur de moustique"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Flou Cinétique"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Flou cinétique : %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Souris, axe %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1954,98 +1796,97 @@ msgstr "Souris, bouton %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Descendre d'un niveau"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Monter d'un niveau"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multijoueur"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multijoueur"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musique"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "La taille du nom doit être comprise entre 4 et 30 caractères!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Le nom est vide."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Le nom est trop long"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
-msgstr ""
+msgstr "Nom du serveur"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "La marre de Nessie"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "Nouveau Grand Prix « %s » déverrouillé"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nouveau compte en ligne"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Nouveau mot de passe"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Nouvelle requête"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "Nouvelle difficulté « %s » déverrouillée"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Meilleur temps"
 
@@ -2073,19 +1914,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Défi nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Aucun"
 
@@ -2095,23 +1935,19 @@ msgid "Normal Race"
 msgstr "Course normale"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Station nordique"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Note que si tu arrives à déraper pendant plusieurs secondes, tu recevras une "
-"impulsion en récompense !"
+msgstr "Note que si tu arrives à déraper pendant plusieurs secondes, tu recevras une impulsion en récompense !"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Débutant"
 
@@ -2122,109 +1958,101 @@ msgstr "Nombre de joueurs virtuels : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Nombre de karts IA"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
-msgstr "Nombre d'objectifs à accomplir"
+msgstr "Nombre de buts pour l'emporter"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Nombre de tours"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Nombre de tours:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Hors des sentiers battus"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Déconnecté"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Compte non-connecté"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Oh, voyez-vous, c'est qu'il est dans mon château en ce moment et sera servi "
-"pour le diner..."
+msgstr "Oh, voyez-vous, c'est qu'il est dans mon château en ce moment et sera servi pour le diner..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "La vieille mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Classe de maths d'Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "En ligne"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Jeu en ligne"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Nom d'utilisateur en ligne"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "La taille du nom d'utilisateur en ligne doit être comprise entre 3 et 30 caractères!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Le nom d'utilisateur ne doit pas commencer par un nombre!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Seul le Maître de Jeu peut agir en ce moment!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oups ! Quand tu es en difficulté, clique sur <%s> pour être secouru"
@@ -2235,62 +2063,54 @@ msgstr "Oups ! Quand tu es en difficulté, clique sur <%s> pour être secouru"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Options"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Vue d'Ensemble"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "PUISSANCE"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Parachute - ralentit tous les karts en meilleure position que toi."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Mot de passe :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Changement de mot de passe"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "La taille du mot de passe doit être comprise entre 8 et 30 caractères!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Mot de passe modifié avec succès."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Les mots de passe ne correspondent pas!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2299,120 +2119,112 @@ msgstr "Suspendre le jeu"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pause"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Temps de pénalité !"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "En attente"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pour jeunes manchots"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Vote en cours..."
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Tout jouer"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Joue à chaque piste officielle au moins une fois."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Joueurs"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Les joueurs peuvent sélectionner des profils avec handicaps (difficulté accrue) sur l'écran de sélection de karts"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Entrez le nom du grand prix"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Veuillez reconfigurer vos touches"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Veuillez lire les termes et conditions"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
-msgstr ""
-"Veuillez patienter pendant que les extensions sont en train d'être mises à "
-"jour"
+msgstr "Veuillez patienter pendant que les extensions sont en train d'être mises à jour"
 
 #: src/states_screens/main_menu_screen.cpp:557
 msgid "Please wait while the add-ons are loading"
 msgstr "Veuillez patienter pendant que la liste des extensions charge"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Débouchoir à ventouse - lance-le droit devant pour tirer un opposant vers "
-"l'arrière, ou lance-le en regardant vers l'arrière pour lui obstruer la vue !"
+msgstr "Débouchoir à ventouse - lance-le droit devant pour tirer un opposant vers l'arrière, ou lance-le en regardant vers l'arrière pour lui obstruer la vue !"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Mordu des bonus"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Appuie sur <%s> pour regarder en arrière, et lance ton arme avec le bouton <%s> tout en laissant <%s> appuyé pour le lancer derrière toi!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Appuie sur <échap> pour annuler"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Appuie sur une touche"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Presse entrée ou double-clique sur un périphérique pour le configurer"
+msgstr "Presse entrée ou double-clique sur un périphérique pour le configurer"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Tu peux éditer un joueur avec la touche entrée ou un double-clic"
 
@@ -2428,10 +2240,7 @@ msgstr "Clique sur \"tirer\" pour démarrer le défi"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Appuie simultanément sur les boutons 1 et 2 sur ta wiimote pour la régler en "
-"mode découverte, puis appuie sur Ok. Des instructions détaillées sont "
-"disponibles sur supertuxkart.net/Wiimote"
+msgstr "Appuie simultanément sur les boutons 1 et 2 sur ta wiimote pour la régler en mode découverte, puis appuie sur Ok. Des instructions détaillées sont disponibles sur supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2441,24 +2250,22 @@ msgstr "Problème lors de l'installation de l'extension « %s »."
 #: src/states_screens/dialogs/addons_loading.cpp:394
 #, c-format
 msgid "Problems removing the addon '%s'."
-msgstr "Problème lors de la suppression de l'extension \"%s\"."
+msgstr "Problème lors de la suppression de l’extension « %s »."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Traitement en cours"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Avancement"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2466,37 +2273,31 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Pousse la balle dans la cage adverse pour marquer un but. (Uniquement "
-"disponible en mode multijoueur)"
+msgstr "Pousse la balle dans la cage adverse pour marquer un but. (Uniquement disponible en mode multijoueur)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Partie rapide"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Quitter le serveur."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Réglages de la course"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Aléatoire"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2504,15 +2305,15 @@ msgstr "Arène aléatoire"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Grand Prix aléatoire"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Kart aléatoire"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Piste aléatoire"
 
@@ -2521,84 +2322,68 @@ msgid "Rank"
 msgstr "Classement"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Note >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "À vos marques..."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Un secret bien gardé"
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Les Rouges l'emportent"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "S'inscrire"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Course normale: tous les coups sont permis, alors ramasse des armes et "
-"utilise les à ton avantage!"
+msgstr "Course normale: tous les coups sont permis, alors ramasse des armes et utilise les à ton avantage!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Actualiser"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Mémoriser le mot de passe"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Se souvenir de la position de la fenêtre"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Supprimer"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Renommer"
 
@@ -2610,7 +2395,7 @@ msgstr "Quantité de nitro requise : %i unités"
 #: src/states_screens/dialogs/select_challenge.cpp:53
 #, c-format
 msgid "Required Rank : %i"
-msgstr "Rang requis : %i"
+msgstr "Position requise : %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:58
 #, c-format
@@ -2624,35 +2409,31 @@ msgstr "Sauvetage"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Recommencer"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Recommencer la course"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "À l'envers"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Direction inverse :"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Direction inverse"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2662,84 +2443,78 @@ msgstr "Droite"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Index droit (RB)"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Bouton pouce droit"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Bas (pouce droit)"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Gauche (pouce droit)"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Droite (pouce droit)"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Haut (pouce droit)"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Majeur droit (RT)"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "VITESSE"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Enregistrer"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Enregistrer le Grand Prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Écosse"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Rechercher"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Recherche"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2747,152 +2522,102 @@ msgid "Select"
 msgstr "Sélectionner"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Sélectionne une difficulté"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Choisis un mode de jeu"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Sélectionne une piste de course"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Sélectionner un kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Envoyer des statistiques matérielles anonymes"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Création du serveur"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Informations serveur"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Sélection du serveur"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Nom du serveur:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Serveur créé avec succès. Tu peux maintenant le joindre."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
 msgid "Set!"
-msgstr "Prêts"
+msgstr "Prêt !"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nouvelle course"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Ombres"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Ombres : %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Ombres : %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Sables mouvants"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Banlieue Lustrée"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Connexion"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Connexion en tant qu'invité"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Depuis"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Solo"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2900,9 +2625,8 @@ msgid "Size: %s"
 msgstr "Taille : %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Dérapages en série"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2911,12 +2635,10 @@ msgstr "Dérapage"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Thème"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Pic enneigé"
 
@@ -2926,30 +2648,23 @@ msgid "Soccer"
 msgstr "Tir au but"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Terrain de foot"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Football : Seulement en mode multijoueur. Utilise ton kart pour pousser le "
-"ballon dans le but."
+msgstr "Football : Seulement en mode multijoueur. Utilise ton kart pour pousser le ballon dans le but."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Désolé, une erreur s'est produite lors de la connexion au site Web des "
-"extensions. Assure-toi d'être connecté à Internet et vérifie que "
-"SuperTuxKart n'est pas bloqué par ton pare-feu"
+msgstr "Désolé, une erreur s'est produite lors de la connexion au site Web des extensions. Assure-toi d'être connecté à Internet et vérifie que SuperTuxKart n'est pas bloqué par ton pare-feu"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2957,7 +2672,6 @@ msgstr "Désolé, le téléchargement a échoué"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Effets sonores"
 
@@ -2966,30 +2680,28 @@ msgstr "Effets sonores"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Démarrer"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Commencer le Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Commencer la course"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "État"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -3003,134 +2715,119 @@ msgstr "Tourner à droite"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Mode histoire"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "C'est un abat!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Soumettre"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Sous la mer"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Extensions"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart : Aide"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart : Options"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart peut être joué à plusieurs sur le même ordinateur"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart contient plusieurs modes de jeu"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart peut se connecter à un serveur pour télécharger des extensions et t'avertir des mises à jour. Nous collectons aussi des statistiques matérielles anonymes pour nous aider à améliorer STK. Notre politique de confidentialité est disponbile sur http://privacy.supertuxkart.net. Souhaites-tu que ces fonctionnalités soient activées ?\n(Pour modifier ton choix à un autre moment, va dans les options, choisis l'onglet \"Interface Utilisateur\", et modifie \"Se connecter à Internet\" et \"Envoyer des statistiques matérielles anonymes\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Échangeur - les boîtes à cadeaux sont transformées en bananes et vice-versa "
-"pour une courte durée"
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Échangeur - les boîtes à cadeaux sont transformées en bananes et vice-versa pour une courte durée"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Tapette - aplatit les karts qui s'approchent de toi pour les ralentir."
+msgstr "Tapette - aplatit les karts qui s'approchent de toi pour les ralentir."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Langue du système"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Traite des adversaires comme des moustiques! Avec la tapette, aplatit au moins 5 opposants durant une course."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Temple"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Conditions d'utilisation"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Compression des textures"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtrage des textures"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"La touche \"dérapage\"  permet de déraper dans les tournants serrés et "
-"d'obtenir une impulsion bonus."
+msgstr "La touche dérapage permet de déraper dans les virages serrés et d’obtenir une accélération."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Le Stade"
 
@@ -3142,63 +2839,42 @@ msgstr "Le menu des extensions est actuellement désactivé dans les options"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Le fichier des meilleurs scores était\n"
-"trop vieux, il a donc été supprimé."
+msgstr "Le fichier des meilleurs scores était\ntrop vieux, il a donc été supprimé."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Le nombre maximum de joueurs est de 2 à 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
 msgid "Time Trial"
-msgstr "Contre la Montre"
+msgstr "Contre-la-montre"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Contre la montre : aucun bonus dans les pistes - seule ton habileté compte !"
+msgstr "Contre-la-montre : aucun bonus sur les pistes — seule l’habileté compte !"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Pour ajouter une nouvelle manette ou un nouveau Joystick, assure-toi "
-"simplement qu'il est connecté avant d'ouvrir SuperTuxKart, il apparaitra "
-"automatiquement dans la liste.\n"
-"\n"
-"Pour ajouter une configuration clavier supplémentaire, tu peux utiliser le "
-"bouton ci-dessous. TOUTEFOIS, il est important de noter que la majorité des "
-"claviers ne peuvent pas gérer plus de quelques touches enfoncées à la fois "
-"et sont donc inappropriés pour le jeu multijoueur. (Il demeure possible de "
-"connecter plusieurs claviers, mais chaque joueur doit tout de même avoir des "
-"touches distinctes)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Pour ajouter une nouvelle manette ou un nouveau Joystick, assure-toi simplement qu'il est connecté avant d'ouvrir SuperTuxKart, il apparaitra automatiquement dans la liste.\n\nPour ajouter une configuration clavier supplémentaire, tu peux utiliser le bouton ci-dessous. TOUTEFOIS, il est important de noter que la majorité des claviers ne peuvent pas gérer plus de quelques touches enfoncées à la fois et sont donc inappropriés pour le jeu multijoueur. (Il demeure possible de connecter plusieurs claviers, mais chaque joueur doit tout de même avoir des touches distinctes)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Pour t'aider à gagner, voici les bonus que tu peux ramasser :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Jusqu'à la lune"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3208,12 +2884,12 @@ msgstr "%i premiers"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Piste"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Piste %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3224,19 +2900,17 @@ msgstr "Piste par %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Groupe de piste"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Circuits"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinéaire"
 
@@ -3247,47 +2921,42 @@ msgstr "Réessayer"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutoriel"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutoriel : salle de sélection"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Type :"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Type: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Impossible de se connecter au serveur. Vérifie que tu es bien connecté à Internet ou réessaie plus tard."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Désinstaller"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Impossible de t'arrêter!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3299,8 +2968,8 @@ msgid "Update"
 msgstr "Mettre à jour"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Mise à jour"
 
@@ -3309,78 +2978,71 @@ msgid "Updated date"
 msgstr "Date de mise à jour"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Utilise 10 bonus ou plus dans une course."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Utiliser des texture HD"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Utilise les boutons gauche/droite pour choisir ton équipe puis appuie sur feu"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Utilise la nitro que tu as récolté en appuyant sur <%s> !"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Informations sur l’utilisateur"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interface utilisateur"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Défini par l'utilisateur"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Recherche d'utilisateurs"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Le nom d'utilisateur et/ou le courriel sont invalides."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Validation des infos"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3389,40 +3051,35 @@ msgstr "Version : %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
-msgstr ""
-"Se synchroniser sur le taux de rafraichissement (actif après redémarrage)"
+msgstr "Se synchroniser sur le taux de rafraichissement (actif après redémarrage)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Afficher"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Vote"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Vote réussi! Tu peux fermer la fenêtre."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "POIDS"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "MAUVAISE DIRECTION !"
 
@@ -3431,145 +3088,121 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Avertissement : utiliser la touche \"majuscule\" peut être problématique, "
-"car toute touche qui contient un caractère différent lorsque le blocage "
-"majuscule est enfoncé va cesser de fonctionner."
+msgstr "Avertissement : utiliser la touche \"majuscule\" peut être problématique, car toute touche qui contient un caractère différent lorsque le blocage majuscule est enfoncé va cesser de fonctionner."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armes"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Météo"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Météo : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-"Qu'y a-t-il, petits hippies ? Votre chef le grand gnu manque-t-il à l'appel ?"
+msgstr "Qu'y a-t-il, petits hippies ? Votre chef le grand gnu manque-t-il à l'appel ?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Lorsque les périphériques sont configurés, tu es prêt à jouer. Il suffit de "
-"démarrer une nouvelle course en sélectionnant l'icône de jeu multijoueur "
-"dans le menu principal. Quand il est temps de choisir un kart, chaque joueur "
-"peut appuyer sur la touche \"tirer\" de sa manette ou son clavier pour "
-"rejoindre la partie. Chaque joueur peut alors utiliser sa manette/ses "
-"touches clavier pour sélectionner son kart. Le jeu continue quand tout le "
-"monde a choisi son kart. Note que la souris ne peut être utilisée pour cette "
-"opération."
+msgstr "Lorsque les périphériques sont configurés, tu es prêt à jouer. Il suffit de démarrer une nouvelle course en sélectionnant l'icône de jeu multijoueur dans le menu principal. Quand il est temps de choisir un kart, chaque joueur peut appuyer sur la touche \"tirer\" de sa manette ou son clavier pour rejoindre la partie. Chaque joueur peut alors utiliser sa manette/ses touches clavier pour sélectionner son kart. Le jeu continue quand tout le monde a choisi son kart. Note que la souris ne peut être utilisée pour cette opération."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Blanc"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Gagne 5 courses de suite."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Gagne dans tous les modes solo contre au moins 3 adversaires."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Oui"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Tu es maintenant prêt à rouler. Bonne chance !"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Joueur courant:"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Tu peux modifier ton vote en sélectionnant une autre étoile."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "La connexion internet doit être activée pour télécharger des extensions. Va dans le menu options, sélectionne l'onglet \"Interface utilisateur\" et coche le champ \"Se connecter à internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "La connexion internet doit être activée pour jouer en ligne. Va dans le menu options, sélectionne l'onglet \"Interface utilisateur\" et coche le champ \"Se connecter à internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Tu peux jouer sans t'enregistrer en sélectionnant l'option compte non-connecté. Dans ce cas, toutefois, tu ne pourras pas entrer en contact avec tes amis, noter des extensions, etc. Notre déclaration de confidentialité est disponible sur http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
-msgstr "Tu as complété un défi!"
+msgstr "Tu as complété un accomplissement!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Tu as complété des défis!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Tu as complété le Grand Prix !"
 
@@ -3577,33 +3210,35 @@ msgstr "Tu as complété le Grand Prix !"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Bravo, tu as complété ce défi difficile et gagné %i/%i points."
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Bravo, tu as complété ce défi facile et gagné %i/%i points."
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Bravo, tu as complété ce défi intermédiaire et gagné %i/%i points."
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Tu as fini la course !"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Tu as %d nouvelle demande d'amitié!"
+msgstr[1] "Tu as %d nouvelles demandes d'amitié!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Tu as une nouvelle demande d'amitié."
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Vous avez été éliminé !"
 
@@ -3611,73 +3246,78 @@ msgstr "Vous avez été éliminé !"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Tu n'as pas encore voté pour cette extension. Sélectionne l'étoile qui correspond à ton vote."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Tu as besoin de plus de\npoints pour faire ce défi!\nConsulte la carte pour\nvoir les défis accessibles."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Le mot de passe est obligatoire."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Le grand prix %0 est déverrouillé"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "La piste %0 est déverrouillée"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Tu vas bientôt recevoir un courriel avec les instructions pour changer ton mot de passe. Soit patient et regarde ton dossier de spam."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Tu vas bientôt recevoir un courriel avec les instructions pour activer ton compte. Soit patient et regarde ton dossier de spam."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Tu as gagné la course !"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "La version de OpenGL de ton ordinateur semble trop vieille. Il est recommandé de vérifier si une mise à jour du pilote graphique est disponible. SuperTuxKart requiert OpenGL 3.1 ou supérieur."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr "Votre fichier de configuration était malformé, il a été supprimé."
+msgstr "Votre fichier de configuration était malformé, il a donc été réinitialisé."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Votre fichier de configuration est périmé, il a donc été remplacé par un "
-"nouveau fichier."
+msgstr "Votre fichier de configuration est périmé, il a donc été remplacé par un nouveau fichier."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Votre pilote graphique est trop vieux. Veuillez s'il-vous-plait le mettre à jour."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Votre fichier de configuration des contrôles n'est pas compatible avec cette "
-"version de STK."
+msgstr "Votre fichier de configuration des contrôles n'est pas compatible avec cette version de STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Votre profil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Jardin Zen"
 
@@ -3688,16 +3328,16 @@ msgstr "[aucun]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "actions"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "toutes"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "par"
@@ -3706,64 +3346,25 @@ msgstr "par"
 msgid "featured"
 msgstr "à l'honneur"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "élevé"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "faible"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Alexis Lavaud https://launchpad.net/~alexislavaud191\n"
-"  Audiger Jeremy https://launchpad.net/~tankypon\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Baptiste Fontaine https://launchpad.net/~bfontaine\n"
-"  Florent (LSc) https://launchpad.net/~lorkscorguar\n"
-"  Juju Croco https://launchpad.net/~juju-croco\n"
-"  Kalsan https://launchpad.net/~info-kalsan\n"
-"  Louis-Philippe Breton https://launchpad.net/~bf5man\n"
-"  MCMic https://launchpad.net/~come-bernigaud\n"
-"  Marwane K. https://launchpad.net/~marwane-ka\n"
-"  Max Perkins https://launchpad.net/~maxperkinstoki\n"
-"  Nicolas Delvaux https://launchpad.net/~malizor\n"
-"  Otourly https://launchpad.net/~otourly\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Syl https://launchpad.net/~syl-\n"
-"  Thomas P T https://launchpad.net/~thomaspt\n"
-"  londumas https://launchpad.net/~helion331990\n"
-"  math07 https://launchpad.net/~mathlaprise\n"
-"  noname120 https://launchpad.net/~devnoname120\n"
-"  tipiak https://launchpad.net/~tipiak\n"
-"  xapantu https://launchpad.net/~xapantu\n"
-"  xemard.nicolas https://launchpad.net/~xemard.nicolas\n"
-"  Éfrit https://launchpad.net/~efrit"
+msgstr "Launchpad Contributions:\n  Alexis Lavaud https://launchpad.net/~alexislavaud191\n  Audiger Jeremy https://launchpad.net/~tankypon\n  Auria https://launchpad.net/~auria-mg\n  Baptiste Fontaine https://launchpad.net/~bfontaine\n  Florent (LSc) https://launchpad.net/~lorkscorguar\n  Juju Croco https://launchpad.net/~juju-croco\n  Kalsan https://launchpad.net/~info-kalsan\n  Louis-Philippe Breton https://launchpad.net/~bf5man\n  MCMic https://launchpad.net/~come-bernigaud\n  Marwane K. https://launchpad.net/~marwane-ka\n  Max Perkins https://launchpad.net/~maxperkinstoki\n  Nicolas Delvaux https://launchpad.net/~malizor\n  Otourly https://launchpad.net/~otourly\n  STK-team https://launchpad.net/~stk\n  Syl https://launchpad.net/~syl-\n  Thomas P T https://launchpad.net/~thomaspt\n  londumas https://launchpad.net/~helion331990\n  math07 https://launchpad.net/~mathlaprise\n  noname120 https://launchpad.net/~devnoname120\n  tipiak https://launchpad.net/~tipiak\n  xapantu https://launchpad.net/~xapantu\n  xemard.nicolas https://launchpad.net/~xemard.nicolas\n  Éfrit https://launchpad.net/~efrit"
diff --git a/data/po/fr_CA.po b/data/po/fr_CA.po
index d473c9e0e..965cede37 100644
--- a/data/po/fr_CA.po
+++ b/data/po/fr_CA.po
@@ -1,20 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 11:59+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: French (Canada) (http://www.transifex.com/projects/p/supertuxkart/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: CANADA\n"
-"Language: \n"
-"X-Poedit-Language: French\n"
+"Language: fr_CA\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,21 +26,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -55,7 +57,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -67,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -94,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -126,13 +125,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -142,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -191,7 +183,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -210,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -235,37 +223,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -273,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -284,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -301,7 +284,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -312,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -347,49 +326,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -399,18 +372,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -420,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -446,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -473,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -510,49 +478,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -574,79 +537,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -656,39 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Boule de Quilles - rebondit sur les murs. Tu peux aussi la lancer derrière "
-"toi en utilisant la touche 'regarder derrière'."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Boule de Quilles - rebondit sur les murs. Tu peux aussi la lancer derrière toi en utilisant la touche 'regarder derrière'."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -696,62 +640,52 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Gomme - protège-toi avec un bouclier, ou utilise-le en regardant en arrière "
-"pour laisser une flaque collante sur ton chemin."
+msgstr "Gomme - protège-toi avec un bouclier, ou utilise-le en regardant en arrière pour laisser une flaque collante sur ton chemin."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -765,26 +699,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -792,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -856,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -876,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -888,7 +809,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -902,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1005,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1037,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1045,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1079,24 +978,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1105,8 +1003,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1117,27 +1015,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1148,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1158,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1171,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1200,27 +1091,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1235,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1263,12 +1153,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1293,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1316,13 +1204,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1337,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1345,14 +1231,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1376,13 +1263,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1396,22 +1282,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1427,51 +1310,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1481,61 +1358,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1552,12 +1421,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1567,22 +1434,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1593,71 +1456,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1667,13 +1527,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1692,7 +1551,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1701,7 +1559,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1763,50 +1621,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1814,11 +1668,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1829,27 +1723,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1857,18 +1742,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1878,29 +1761,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1908,48 +1795,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1969,13 +1849,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1984,9 +1866,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1999,7 +1885,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2027,19 +1913,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2049,21 +1934,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2074,46 +1957,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2121,60 +1999,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2185,14 +2062,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2201,35 +2075,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2237,8 +2106,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2249,12 +2118,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2263,7 +2131,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2272,37 +2139,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2311,6 +2179,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2320,44 +2192,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2391,7 +2257,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2400,7 +2265,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2412,25 +2276,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2451,8 +2311,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2461,82 +2321,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2562,29 +2408,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2641,41 +2483,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2685,12 +2521,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2700,36 +2534,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2744,91 +2572,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2838,7 +2624,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2849,12 +2634,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2864,25 +2647,21 @@ msgid "Soccer"
 msgstr "Soccer"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Terrain de soccer"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Soccer : Seulement en mode multijoueur. Utilise ton kart pour pousser le "
-"ballon dans le but."
+msgstr "Soccer : Seulement en mode multijoueur. Utilise ton kart pour pousser le ballon dans le but."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2892,7 +2671,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2901,7 +2679,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2914,11 +2691,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2938,12 +2714,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2951,82 +2725,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3035,32 +2796,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3085,30 +2851,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3127,7 +2885,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3141,19 +2899,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3164,24 +2920,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3189,20 +2942,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3216,8 +2967,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3226,40 +2977,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3268,19 +3015,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3289,13 +3034,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3306,27 +3050,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3338,7 +3078,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3349,45 +3089,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3398,42 +3133,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3443,37 +3172,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3494,20 +3222,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3517,7 +3247,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3525,36 +3255,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3567,6 +3302,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3577,7 +3317,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3588,7 +3327,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3597,7 +3335,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3606,43 +3345,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Dawid Gan https://launchpad.net/~deveee"
+msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee"
diff --git a/data/po/ga.po b/data/po/ga.po
index fca60addb..88cacf903 100644
--- a/data/po/ga.po
+++ b/data/po/ga.po
@@ -1,19 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.6\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-04 23:05+0000\n"
-"Last-Translator: Daithí Mac an Aircinn <dmaa60@gmail.com>\n"
-"Language-Team: Aaron Kearns <ajkearns6@gmail.com>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Irish (http://www.transifex.com/projects/p/supertuxkart/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-Language: Irish\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -24,25 +26,28 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Is scalltáin truamhéalach sibh nach mbeidh in ann buachan orm riamh - Rí na "
-"Karts!"
+msgstr " Is scalltáin truamhéalach sibh nach mbeidh in ann buachan orm riamh - Rí na Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] "Tá cara %d ar líne anois"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr "%s ciste"
+msgstr "%s (ciste)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -55,7 +60,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s agus %s ar líne anois"
@@ -67,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s le %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s le %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s ar líne anois"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "Tá %s réidh"
@@ -87,94 +91,85 @@ msgstr "Tá %s réidh"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Próifíl %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Freastalaí %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s agus %s ar líne anois"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "Bhí '%s' eisiamh."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Folamh)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
-msgstr ""
+msgstr "(gan imirt líonra ar fáil fós)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
+msgstr "* Ciallaíonn mír gorm coinbhleacht sa chumraíocht reatha"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* ciallaíaonn mír dearg  coinbhleacht sa chumraíocht reatha"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
+msgstr "* Is féidir an cuid is mó de na móid cluichí a imirt i modh Grand Prix: in áit rás aonarach a imirt, is féidir leat imirt in iomaí sraith. Is fearrde do rang, is fearrde na pointí a fhaigheann tú. Sa dheireadh, an imeoir leis na pointí is mó a bhuann an chorn."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Athosaigh STK do na socraithe nua a chur i bhfeidhm"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Aithneófar cén cumraíocht le húsáid ón Eochair' Roghnaithe' a brútar chun dul isteach sa chluiche"
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "...."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
-msgstr "1 mhí"
+msgstr ""
 
 #: src/states_screens/addons_screen.cpp:50
 msgid "1 week"
-msgstr "1 seachtain"
+msgstr "seachtain amháin"
 
 #: src/states_screens/addons_screen.cpp:56
 msgid "1 year"
-msgstr "1 bhliain"
+msgstr "bliain amháin"
 
 #: src/states_screens/addons_screen.cpp:51
 msgid "2 weeks"
@@ -191,7 +186,6 @@ msgstr "Trí Bhuillí Cath"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -210,23 +204,20 @@ msgid "9 months"
 msgstr "9 mí"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Scóir Ard ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Tobscoir Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Maidir Leis"
 
@@ -235,37 +226,35 @@ msgstr "Maidir Leis"
 msgid "Accelerate"
 msgstr "Luathaigh"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -273,8 +262,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -284,13 +272,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -301,7 +287,6 @@ msgstr "Cuir Cumraíocht Mhéarchlár leis"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Cuir Imreoir Leis"
 
@@ -312,32 +297,29 @@ msgstr "Cuir Wiimote leis"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Cuir Gléas Leis"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Forlíontáin"
 
@@ -347,49 +329,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Forlíontáin"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Gach"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Gach Ráschúrsaí"
 
@@ -399,18 +375,20 @@ msgstr "Rás Normálta"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -420,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Carachtair �omhá: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -446,24 +421,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Radharcra �omhá: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropic x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropic x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropic x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropic x8"
 
@@ -473,29 +448,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Cuir taifeach nua i bhfeidhm"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -510,49 +481,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Airéiní"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ag Deireadh an Domhain"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Fuaim"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Seachain bananaí!"
 
@@ -574,79 +540,66 @@ msgstr "Ais %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Ar Ais"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Téigh ar ais go rás"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Ar ais go liosta feiste"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Ar ais go roghchlár"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Pocadán Beag"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Beidh lá eile ag an bPaorach!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinear"
 
@@ -656,36 +609,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "Liathróid Bhallaí - Má feíceann tú siar, caithfear an balla ar gcúl."
 
 #. I18N: Key binding name
@@ -694,7 +643,6 @@ msgid "Brake"
 msgstr "Coscán"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -702,52 +650,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -761,28 +702,23 @@ msgid "Cancel/Back"
 msgstr "Cealaigh/Ar Ais"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "PluaisX"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
-# lenition?
-# comh - m
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Dúshláin : Seomra Comhramh"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +726,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Roghnaigh Kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Dún"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +781,13 @@ msgstr "Bailigh Nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +800,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +812,6 @@ msgstr "Deimhnigh taifeach taobh istigh de %i soicindí"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +825,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Rás Am"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Lean ar aghaidh"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Rialtáin"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Buíochas le"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +911,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Saincheaptha"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +942,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +949,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Scrios Cumraíocht"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +981,23 @@ msgstr "Díchumasaigh Gléas"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Díchumasaithe"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Taispeáin FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ar mhaith leat i ndáirire imreoir '%s' a scriosadh?"
@@ -1103,8 +1006,8 @@ msgstr "Ar mhaith leat i ndáirire imreoir '%s' a scriosadh?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1018,24 @@ msgstr "Síos"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1046,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Eilifint"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1067,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1198,28 +1094,24 @@ msgstr "Cumasaigh Gléas"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "cumasaithe"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
-# lenition
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Iontráil ainm an imreoir nua"
 
@@ -1234,27 +1126,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Scortha Rás"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Saineolaí"
 
@@ -1262,12 +1156,12 @@ msgstr "Saineolaí"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1292,19 +1186,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Cuaird leiridh!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1315,13 +1207,12 @@ msgstr "Scaoil"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1336,7 +1227,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1344,14 +1234,18 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Dún Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1375,13 +1269,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Lánscáileán"
 
@@ -1395,27 +1288,22 @@ msgstr "CÚL!"
 msgid "Game Keys"
 msgstr ""
 
-# ending
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modhanna Cluiche"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
-# game controller
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
 #, c-format
@@ -1428,51 +1316,45 @@ msgstr "Cnaipe an rialaitheoir cluichíochta %d"
 msgid "Gamepad hat %d"
 msgstr "Rialaitheoir cluichíochta \"hat\"%d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Coiteann"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1482,61 +1364,53 @@ msgid "Go!"
 msgstr "Téigh!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafaicí"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1553,12 +1427,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1568,22 +1440,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Cabhair"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Na scóir is fearr"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1594,71 +1462,68 @@ msgid ""
 msgstr "Trí Bhuillí Cath. Buail an cairtíní eile."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Suiteáil"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Idirmheánach"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Comhscór a bhí ann"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1668,13 +1533,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Cairtíní"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "coinnigh an taifeach seo"
 
@@ -1693,7 +1557,6 @@ msgid "Keyboard %i"
 msgstr "Méarchlár %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1702,7 +1565,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Cuairt"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Cuairt %i"
@@ -1764,50 +1627,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Lódáil"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Faoi ghlas"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Glasáilte : Buaigh dúshláin a dhíghlasáil!"
 
@@ -1815,11 +1674,51 @@ msgstr "Glasáilte : Buaigh dúshláin a dhíghlasáil!"
 msgid "Locked!"
 msgstr "Glasáilte!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1830,27 +1729,18 @@ msgstr "Féach Siar"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1858,18 +1748,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1879,29 +1767,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Ais na luiche %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1909,48 +1801,41 @@ msgstr "Cnaipe luiche %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Ilimreoir"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Ilimreoir"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Ceol"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1970,13 +1855,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1985,9 +1872,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Grand Prix nua '%s' ar fáil anois"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2000,7 +1891,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Deacracht nua '%s' ar fáil anois"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Cuairt is tapaidh nua"
 
@@ -2028,19 +1919,18 @@ msgstr "Nítro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Dada"
 
@@ -2050,21 +1940,19 @@ msgid "Normal Race"
 msgstr "Rás Normálta"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nóibhíseach"
 
@@ -2075,46 +1963,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Líon na gCairteacha"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Ceart go leor"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2122,60 +2005,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Sean-Mianach"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Rang matamaitic Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2186,14 +2068,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Roghanna"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2202,35 +2081,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2238,8 +2112,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2250,12 +2124,11 @@ msgstr "Cuir an cluiche ar sos"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Moillithe"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Am píonóis!!"
 
@@ -2264,7 +2137,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "�it Shúgartha na Phiongáin"
 
@@ -2273,37 +2145,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Imreoirí"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2312,6 +2185,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2321,44 +2198,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Brúigh ESC a Chealú"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Brúigh eochair"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2392,7 +2263,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2401,7 +2271,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2413,25 +2282,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Scoir"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Cumraigh Rás"
 
@@ -2439,7 +2304,6 @@ msgstr "Cumraigh Rás"
 msgid "Random"
 msgstr ""
 
-# gender kart is m
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
 msgstr "Airéine Randamach"
@@ -2448,15 +2312,13 @@ msgstr "Airéine Randamach"
 msgid "Random Grand Prix"
 msgstr ""
 
-# gender kart is m
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Cairtín Randamach"
 
-# gender kart is m
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Cairtín Raon"
 
@@ -2465,82 +2327,68 @@ msgid "Rank"
 msgstr "Rang"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Rátáil >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Ullmhaigh!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Scríos"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Athainmnigh"
 
@@ -2566,29 +2414,25 @@ msgstr "Tarrtháil"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Taifeach"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Atosaigh"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Tosaigh Rás"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2645,41 +2489,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Albain"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2689,12 +2527,10 @@ msgid "Select"
 msgstr "Roghnaigh"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Roghnaigh mód cluichí"
 
@@ -2704,36 +2540,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Roghnaigh kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2748,91 +2578,49 @@ msgstr "Ullmhaigh!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Buanaigh Rás Nua"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Shifting Sands"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2842,7 +2630,6 @@ msgid "Size: %s"
 msgstr "Méid: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2853,12 +2640,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Craiceann"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Buaic Sneachta"
 
@@ -2868,23 +2653,21 @@ msgid "Soccer"
 msgstr "Sacar"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Páirc shacair"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2894,7 +2677,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Maisíochtaí Fuaime"
 
@@ -2903,7 +2685,6 @@ msgstr "Maisíochtaí Fuaime"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Caighdeán"
 
@@ -2916,11 +2697,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Tosaigh Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Tosaigh Rás"
 
@@ -2940,12 +2720,10 @@ msgstr "Tiontaigh ar Dheis"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2953,82 +2731,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Forlíontáin SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Cabhair SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Roghanna SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3037,32 +2802,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Teanga Córais"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "An Staidiam"
 
@@ -3074,9 +2844,7 @@ msgstr ""
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Bhí comhad scór ard róshean,\n"
-"léirscriosadh gach uile scór ard."
+msgstr "Bhí comhad scór ard róshean,\nléirscriosadh gach uile scór ard."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3089,38 +2857,22 @@ msgstr "Rás Am"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "Rás Am"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
-"\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n\nTo add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Tá rudaí go bhfuil féidir leat a fáil cuidiú leat buaigh:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3139,7 +2891,7 @@ msgstr "Rogha %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3153,19 +2905,17 @@ msgstr "Raon le %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Raonta"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinear"
 
@@ -3176,24 +2926,21 @@ msgstr "Triail arís é"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Teagaisc"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Cineál :"
 
@@ -3201,20 +2948,18 @@ msgstr "Cineál :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Díshuiteáil"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3228,8 +2973,8 @@ msgid "Update"
 msgstr "Nuashonraigh"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Nuashonraithe"
 
@@ -3238,40 +2983,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Comhéadan Úsáideora"
 
@@ -3280,19 +3021,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3301,13 +3040,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3318,27 +3056,23 @@ msgstr "Leagan: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Airde"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3350,7 +3084,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "Aird chontráilte!!"
 
@@ -3361,45 +3095,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Airm"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3410,42 +3139,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Tá"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3455,37 +3178,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Chríochnaigh tú an Grand Prix!"
 
@@ -3506,20 +3228,25 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Chríochnaigh tú an rás!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Bhí tú eisiamh!"
 
@@ -3529,7 +3256,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3537,36 +3264,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Bhuaigh tú an rás!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3579,6 +3311,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3589,7 +3326,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Gairdín Zen"
 
@@ -3600,7 +3336,6 @@ msgstr "[neamhní]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3609,7 +3344,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "le"
@@ -3618,43 +3354,25 @@ msgstr "le"
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "caighdeánach"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Aaron Kearns https://launchpad.net/~ajkearns6\n"
-"  Daithí Mac an Aircinn https://launchpad.net/~dmaa60"
+msgstr "Launchpad Contributions:\n  Aaron Kearns https://launchpad.net/~ajkearns6\n  Daithí Mac an Aircinn https://launchpad.net/~dmaa60"
diff --git a/data/po/gd.po b/data/po/gd.po
index 326f183f9..5c2e4cf0a 100644
--- a/data/po/gd.po
+++ b/data/po/gd.po
@@ -1,24 +1,24 @@
-# Gaelic; Scottish translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-# GunChleoc <fios@foramnagaidhlig.net>, 2012, 2013, 2014.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# GunChleoc, 2015
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
+# GunChleoc, 2012-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Fòram na Gàidhlig\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-15 12:27+0000\n"
+"Last-Translator: GunChleoc\n"
+"Language-Team: Gaelic, Scottish (http://www.transifex.com/projects/p/supertuxkart/language/gd/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
-"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: gd\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -29,25 +29,27 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Ach cha dèan sibhs’ a’ chùis orm, amadain, oir is mise rìgh nan cartaichean!"
+msgstr " Ach cha dèan sibhs’ a’ chùis orm, amadain, oir is mise rìgh nan cartaichean!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tha %d charaid air loidhne a-nis."
+msgstr[1] "Tha %d charaid air loidhne a-nis."
+msgstr[2] "Tha %d caraidean air loidhne a-nis."
+msgstr[3] "Tha %d caraid air loidhne a-nis."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (ana-cothrom air)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -60,7 +62,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "Tha %s agus %s air loidhne a-nis."
@@ -72,19 +74,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s le %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s le %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "Tha %s air loidhne a-nis."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "Tha %s deiseil"
@@ -99,83 +100,64 @@ msgstr "A’ phròifil aig %s"
 msgid "%s's server"
 msgstr "Am frithealaiche aig %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "Tha %s, %s agus %s air loidhne a-nis."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "Tha “%s� air a ruaig"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Falamh)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(chan eil geamannan lìonraidh ri fhaighinn fhathast)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Tha nì gorm a’ ciallachadh gu bheil còmhstri le rèiteachadh eile ann"
+msgstr "* Tha nì gorm a’ ciallachadh gu bheil còmhstri le rèiteachadh eile ann"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
-"* Tha nì dearg a’ ciallachadh gu bheil còmhstri san rèiteachadh seo ann"
+msgstr "* Tha nì dearg a’ ciallachadh gu bheil còmhstri san rèiteachadh seo ann"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Faic/Atharraich nasgadh nan iuchraichean sa chlàr-taice “Roghainnean�"
+msgstr "* Faic/Atharraich nasgadh nan iuchraichean sa chlàr-taice “Roghainnean�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Faodaidh tu a’ mhòrchuid dhe na modhan-geama seo a chluiche ann an dòigh "
-"Grand Prix cuideachd: an àite a bhith a’ cluiche rèis a-mhàin, cluichidh tu "
-"sreath dhiubh. Mar as fhearr an rang agad, ’s ann as motha na puingean a "
-"gheibh thu. Aig deireadh an latha, ’s e an cluicheadair aig a bheil na "
-"puingean as motha a bhuannaicheas a’ chuach."
+msgstr "* Faodaidh tu a’ mhòrchuid dhe na modhan-geama seo a chluiche ann an dòigh Grand Prix cuideachd: an àite a bhith a’ cluiche rèis a-mhàin, cluichidh tu sreath dhiubh. Mar as fhearr an rang agad, ’s ann as motha na puingean a gheibh thu. Aig deireadh an latha, ’s e an cluicheadair aig a bheil na puingean as motha a bhuannaicheas a’ chuach."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Tòisich STK às ùr gus na roghainnean ùra a chur an sàs"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Thèid co-dhùnadh dè an rèiteachadh a tha ri chleachdadh a-rèir dè an "
-"iuchair “Tagh� a chaidh a bhrùthadh gus pàirt a ghabhail sa gheama."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Thèid co-dhùnadh dè an rèiteachadh a tha ri chleachdadh a-rèir dè an iuchair “Tagh� a chaidh a bhrùthadh gus pàirt a ghabhail sa gheama."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -206,13 +188,10 @@ msgstr "Cath 3 buillean"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Cath 3 buillean: ri làimh ann an geamannan ioma-chluicheadair a-mhàin. Buail "
-"air càch le airm gus an caill iad am beathannan uile."
+msgstr "Cath 3 buillean: ri làimh ann an geamannan ioma-chluicheadair a-mhàin. Buail air càch le airm gus an caill iad am beathannan uile."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -227,23 +206,20 @@ msgid "9 months"
 msgstr "9 mìosan"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Sgòran àrda ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Cartaichean IF"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Sguir dhen Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Mu dhèidhinn"
 
@@ -252,39 +228,35 @@ msgstr "Mu dhèidhinn"
 msgid "Accelerate"
 msgstr "Luathaich"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Luathaich is brùth air an iuchair <%s> gus sleamhnachadh. Ma nì thu "
-"sleamhnachadh greiseag, tionndaidhidh tu nas luaithe ann an lùban casa."
+msgstr "Luathaich is brùth air an iuchair <%s> gus sleamhnachadh. Ma nì thu sleamhnachadh greiseag, tionndaidhidh tu nas luaithe ann an lùban casa."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Luathaich le <%s> is stiùirich le <%s> is <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Gabh ris"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Aiseag cunntais"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Roghainnean a’ chunntais"
 
@@ -292,10 +264,9 @@ msgstr "Roghainnean a’ chunntais"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr "Coileanasan"
+msgstr "Euchdan"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
@@ -303,13 +274,11 @@ msgstr "Gnìomh"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Cuir ris"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Cuir caraid ris"
 
@@ -320,7 +289,6 @@ msgstr "Cuir rèiteachadh meur-chlàir ris"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Cuir cluicheadair ris"
 
@@ -331,32 +299,29 @@ msgstr "Cuir Wiimote ris"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Cuir uidheam ris"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Cuir cleachdaiche ris"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Tuilleadain"
 
@@ -366,72 +331,66 @@ msgstr "Ainm an tuilleadain"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Tuilleadain"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Pìob-loidhne adhartach (solasan is msaa.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Na h-uile"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "A h-uile slighe"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Tha gach seòrsa de bhuille ceadaichte, mar sin tog airm is cleachd gu glic "
-"iad!"
+msgstr "Tha gach seòrsa de bhuille ceadaichte, mar sin tog airm is cleachd gu glic iad!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Seall an sgrìn logaidh a-steach an-còmhnaidh"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Ambient Occlusion"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Ambient occlusion: %s"
@@ -441,25 +400,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Thachair mearachd a’ feuchainn ris a’ Ghrand Prix agad a shàbhaladh."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Acair - nì e a’ chiad chart glè shlaodach"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Pearsachan beòthaichte"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Beòthachadh air pearsachan : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Cruth-tìre beòthaichte"
 
@@ -467,24 +423,24 @@ msgstr "Cruth-tìre beòthaichte"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Beòthachadh air an t-sealladh: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "An-iosa-tropach x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "An-iosa-tropach x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "An-iosa-tropach x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "An-iosa-tropach x8"
 
@@ -494,38 +450,32 @@ msgstr "Tha Grand Prix eile air a bheil an t-ainm seo ann mar-thà."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Anti-aliasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Anti-aliasing: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Cuir an sàs"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Cuir an dùmhlachd-bhreacaidh ùr an gnìomh"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Prìomh nàmhaid"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
-"A bheil thu cinnteach gu bheil thu airson sguabadh às dhan rèiteachadh seo "
-"gu bràth tuilleadh?"
+msgstr "A bheil thu cinnteach gu bheil thu airson sguabadh às dhan rèiteachadh seo gu bràth tuilleadh?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
@@ -533,49 +483,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr "A bheil thu cinnteach gu bheil thu airson “%s� a thoirt air falbh?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Raon spòrs"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Timcheall air an taigh-sholais"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Na sònraich dad dha"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Ceangail ris an iuchair ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Aig deireadh an t-saoghail"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Fuaim"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Seachnaich bananathan!"
 
@@ -597,81 +542,66 @@ msgstr "Aiseal %d %s"
 msgid "Axis %d inverted"
 msgstr "Aiseal %d air ais-tionndadh"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Air ais"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Till dhan gheama"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Till dhan rèis"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Till dha thaghadh nan dùbhlan"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Till dha liosta nan uidheam"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Till dhan chlàr-taice"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Till dhan chlàr-taice"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Dèidheil air bananathan"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Bàla basket - bocaidh e an tòir an toisiche is cuiridh e cartaichean air an "
-"rathad ’nan spleuchd no maille orra, ’s dòcha."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Bàla basket - bocaidh e an tòir an toisiche is cuiridh e cartaichean air an rathad ’nan spleuchd no maille orra, ’s dòcha."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Eilean a’ bhlàir"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Gun tèid nas fhearr leat an ath thuras!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Dà-loidhneach"
 
@@ -681,39 +611,33 @@ msgid "Black"
 msgstr "Dubh"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Taigh-mòr a’ chnuic dhuibh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Bloom"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Bloom: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Bhuannaich an sgioba gorm"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Lios nam bò"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bàla bobhlaireachd - bocaidh e ri ballaichean. Ma tha thu a’ toirt sùil air "
-"ais, thèid a thilgeil air do chùlaibh."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bàla bobhlaireachd - bocaidh e ri ballaichean. Ma tha thu a’ toirt sùil air ais, thèid a thilgeil air do chùlaibh."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -721,70 +645,58 @@ msgid "Brake"
 msgstr "Brèig"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"BubbleGum - dìon thu fhèin le sgiath no cleachd fear a’ coimhead air ais gus "
-"badan steigeach pinc fhàgail air do chùlaibh."
+msgstr "BubbleGum - dìon thu fhèin le sgiath no cleachd fear a’ coimhead air ais gus badan steigeach pinc fhàgail air do chùlaibh."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Co-dhiù, ’s e creutair cothromach a th’ annam is bheir mi seans dhuibh."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Cèic - tilg air an fharpaiseach as fhaisge e, as fhearr air amasan faisg ort "
-"no air slighean dìreach."
+msgstr "Cèic - tilg air an fharpaiseach as fhaisge e, as fhearr air amasan faisg ort no air slighean dìreach."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Cha ghabh ceangail ris an fhrithealaiche stkaddons"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Sguir dheth"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Sguir dhen iarrtas"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -792,26 +704,23 @@ msgid "Cancel/Back"
 msgstr "Sguir dheth/Till"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Uamh X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Dùbhlan air a choileanadh"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Cha deach an dùbhlan leat"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Dùbhlain: Rùm nan triathach"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Atharraich"
 
@@ -819,63 +728,52 @@ msgstr "Atharraich"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Tagh cart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Bréanainn"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Briog an-seo gus an t-oideachadh a chluiche"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Dùin"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Teampall Còco"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Cruinnich co-dhiù 5 bananathan san aon rèis."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Tog bogsaichean gorma: bheir iad airm no cumhachdan eile dhut"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Tog bogsaichean prèasaint is loisg an arm le <%s> gus na bogsaichean ud a "
-"sprèidheadh!"
+msgstr "Tog bogsaichean prèasaint is loisg an arm le <%s> gus na bogsaichean ud a sprèidheadh!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Tog botalan naidhtreo (cleachdaidh sinn taobh thall na lùib iad)"
 
@@ -885,17 +783,13 @@ msgstr "Cruinnich naidhtreo!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Ma thogas tu naidhtreo, gheibh thu neartachadh air an astar agad nuair a "
-"thogras tu is cha leig thu leas ach an iuchair iomchaidh a bhrùthadh. Chì "
-"thu cò mheud naidhtreo a th’ agad sa bhàr ri taobh dheas an sgrìn."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Ma thogas tu naidhtreo, gheibh thu neartachadh air an astar agad nuair a thogras tu is cha leig thu leas ach an iuchair iomchaidh a bhrùthadh. Chì thu cò mheud naidhtreo a th’ agad sa bhàr ri taobh dheas an sgrìn."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Coilean na dùbhlain uile gus an doras mòr fhosgladh!"
 
@@ -908,11 +802,11 @@ msgstr "Choilean thu “%s�."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Dearbhaich"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -920,7 +814,6 @@ msgstr "Dearbhaich dùmhlachd-bhreacaidh ann an %i diog"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Ceangail ris an eadar-lìon"
 
@@ -928,107 +821,86 @@ msgstr "Ceangail ris an eadar-lìon"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Ceangail a’ wiimote agad ris an stiùiriche Bluetooth is an uairsin briog air "
-"“Ceart ma-thà�. Gheibh thu stiùireadh mionaideach air "
-"supertuxkart.net/Wiimote"
+msgstr "Ceangail a’ wiimote agad ris an stiùiriche Bluetooth is an uairsin briog air “Ceart ma-thà�. Gheibh thu stiùireadh mionaideach air supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Chan eil cumhachdan ann is chan eil a’ cunntadh ach do sgilean draibhidh!"
+msgstr "Chan eil cumhachdan ann is chan eil a’ cunntadh ach do sgilean draibhidh!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Lean air adhart"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Lean air Grand Prix air a shàbhaladh"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Lean air adhart."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Smachdan"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Dèan lethbhreac"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Cha deach leinn an cluicheadair “%s� a chruthachadh."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Cha deach wiimote aithneachadh :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Cruthaich"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Cruthaich frithealaiche"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Cruthaich cleachdaiche"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Cruthaich cunntas air loidhne"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "A’ cruthachadh cunntas"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Cliù"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Am facal-faire làithreach"
 
@@ -1041,13 +913,12 @@ msgid "Currently not signed in"
 msgstr "Chan eil thu air do logadh a-steach"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Gnàthaichte"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Roghainnean gnàthaichte"
 
@@ -1073,7 +944,6 @@ msgstr "DPad suas"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Diùlt"
 
@@ -1081,28 +951,26 @@ msgstr "Diùlt"
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Sguab às"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Sguab às an rèiteachadh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Doimhne an raoin"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Doimhne an raoin: %s"
@@ -1115,24 +983,23 @@ msgstr "Cuir an t-uidheam à comas"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "À comas"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Seall FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "A bheil thu cinnteach gu behil thu airson sgur dhen Grand Prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "A bheil thu airson an cluicheadair “%s� a sguabadh às?"
@@ -1141,8 +1008,8 @@ msgstr "A bheil thu airson an cluicheadair “%s� a sguabadh às?"
 msgid "Do you want to save your changes?"
 msgstr "A bheil thu airson na h-atharraichean agad a shàbhaladh?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Na luathaich ron chomharra “Dèan às!�"
 
@@ -1153,27 +1020,24 @@ msgstr "Sìos"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Rach an comhair contrarra"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Solasan innsgineach: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Deasaich"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Deasaich an Grand Prix"
 
@@ -1184,7 +1048,6 @@ msgstr "Lorg uighean"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Lorg uighean: rùraich slighean gus a h-uile ugh am falach a lorg."
 
@@ -1194,12 +1057,11 @@ msgid "Eggs: %d / %d"
 msgstr "Uighean: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Air a ruaig"
 
@@ -1207,24 +1069,22 @@ msgstr "Air a ruaig"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Post-d"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "Feumaidh am post-d a bhith eadar 4 is 59 caractar a dh’fhaid!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "Chan eil am post-d dligheach!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Chan eil an dà phost-d co-ionnann!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1236,27 +1096,24 @@ msgstr "Cuir uidheam an comas"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Cuir ana-cothrom air cluicheadairean an comas"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "An comas"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "An comas airson na h-uile"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Cuir a-steach ainm a’ chluicheadair ùir"
 
@@ -1269,31 +1126,31 @@ msgstr "Mearachd le luchdadh a-nuas nan naidheachdan: “%s�."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"A h-uile duine:\n"
-"Brùth air “Tagh� an-dràsta gus pàirt a ghabhail sa gheama!"
+msgstr "A h-uile duine:\nBrùth air “Tagh� an-dràsta gus pàirt a ghabhail sa gheama!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Cunntas air loidhne a tha ann"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Fàg an-seo"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Fàg an rèis"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Fàg an geama"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Eòlaiche"
 
@@ -1301,13 +1158,12 @@ msgstr "Eòlaiche"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Rùraich slighean gus a h-uile ugh am falach a lorg."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
-"FPS: %d/%d/%d  - Ioma-cheàrnaich: %d Soladach, %d Sgàilean - Astar solais: %d"
+msgstr "FPS: %d/%d/%d  - Ioma-cheàrnaich: %d Soladach, %d Sgàilean - Astar solais: %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1315,7 +1171,7 @@ msgstr "FPS: %d/%d/%d - %d KTris"
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr "A’ faighinn nan coileanasan"
+msgstr "A’ faighinn nan euchdan"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
@@ -1332,22 +1188,17 @@ msgid "Fetching servers"
 msgstr "A’ faighinn nam frithealaichean"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Cuir a-steach an t-ainm-cleachdaiche ’s an seòladh puist-d a chuir thu "
-"seachad nuair a chlàraich thu ach an urrainn dhut am facal-faire agad ath-"
-"shuidheachadh."
+msgstr "Cuir a-steach an t-ainm-cleachdaiche ’s an seòladh puist-d a chuir thu seachad nuair a chlàraich thu ach an urrainn dhut am facal-faire agad ath-shuidheachadh."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Cuairt mu dheireadh!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Lorg frithealaiche"
 
@@ -1358,23 +1209,14 @@ msgstr "Loisg"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Sa chiad dol a-mach, bidh feum agad air barrachd air aon uidheam ion-chuir "
-"(’s e iomadh pada-geama no joysticks an dòigh as fhearr gus cluiche le "
-"daoine eile). Rach gu sgrìn nan roghainnean ion-chuir is suidhich na "
-"padaichean-geama. ’S urrainn dhut cluiche air meur-chlàr(an) cuideachd, ach "
-"bidh feum air buidheann dhe dh’iuchraichean eadar-dhealaichte airson gach "
-"cluicheadair. Thoir an aire nach eil a’ mhòrchuid dhe na meur-chlàran "
-"freagarrach airson geama ioma-chluicheadair on nach cuir iad taic ri "
-"brùthadh air àireamh mhòr de dh’iuchraichean."
+msgstr "Sa chiad dol a-mach, bidh feum agad air barrachd air aon uidheam ion-chuir (’s e iomadh pada-geama no joysticks an dòigh as fhearr gus cluiche le daoine eile). Rach gu sgrìn nan roghainnean ion-chuir is suidhich na padaichean-geama. ’S urrainn dhut cluiche air meur-chlàr(an) cuideachd, ach bidh feum air buidheann dhe dh’iuchraichean eadar-dhealaichte airson gach cluicheadair. Thoir an aire nach eil a’ mhòrchuid dhe na meur-chlàran freagarrach airson geama ioma-chluicheadair on nach cuir iad taic ri brùthadh air àireamh mhòr de dh’iuchraichean."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1387,26 +1229,24 @@ msgstr "Lean an toisiche!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Lean an toisiche: feuch an crìochnaich thu air an dàrna àite on a thèid an "
-"cart mu dheireadh a dhì-chòireachadh gach turas a ruigeas an cunntair a "
-"neoni. Thoir an aire: thèid do ruaig cuideachd ma thèid thu seachad air an "
-"toisiche!"
+msgstr "Lean an toisiche: feuch an crìochnaich thu air an dàrna àite on a thèid an cart mu dheireadh a dhì-chòireachadh gach turas a ruigeas an cunntair a neoni. Thoir an aire: thèid do ruaig cuideachd ma thèid thu seachad air an toisiche!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Dùn Mhagma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d wiimote(ichean) air a(n) lorg"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Chaidh %d wiimote a lorg"
+msgstr[1] "Chaidh %d wiimotes a lorg"
+msgstr[2] "Chaidh %d wiimotes a lorg"
+msgstr[3] "Chaidh %d wiimotes a lorg"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1430,13 +1270,12 @@ msgstr "Chaidh iarrtas càirdeis a chur!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Caraidean"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Làn-sgrìn"
 
@@ -1450,24 +1289,19 @@ msgstr "TADHAL!"
 msgid "Game Keys"
 msgstr "Iuchraichean a’ gheama"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
-msgstr ""
-"Modhan-\r\n"
-"geama"
+msgstr "Modhan-\r\ngeama"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Seòrsa a’ gheama (cuingeachaidhean nan tadhal / na h-ùine)"
 
@@ -1483,51 +1317,45 @@ msgstr "Putan pada-geama %d"
 msgid "Gamepad hat %d"
 msgstr "Ad pada-geama %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Coitcheann"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Thoir seachad an rèis"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Soillseachadh uile-choitcheann"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Soillseachadh uile-choitcheann: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Riomball (oir-loidhnichean)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Riomball (oir-loidhnichean): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1537,61 +1365,53 @@ msgid "Go!"
 msgstr "Dèan às!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Buannaichear nam bonn"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Eilean Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Deasaiche nan Grand Prix"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Deasaiche nan Grand Prix"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Adhartas a’ Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Ìre nan èifeachdan grafaigeachd"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafaigeachd"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Roghainnean grafaigeachd"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Gleann gorm"
 
@@ -1608,12 +1428,10 @@ msgstr "Aoigh “%d�"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Logadh a-steach nan aoigh"
+msgid "Guest Log in"
+msgstr "Logadh a-steach aoigh"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1623,105 +1441,90 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Cobhair"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Sgòran àrda"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Buail ri 10 cartaichean le bàla bobhlaireachd."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Buail càch le airm gus an caill iad am beathannan uile. (Ri fhaighinn ann an "
-"geamannan ioma-chluicheadair a-mhàin)"
+msgstr "Buail càch le airm gus an caill iad am beathannan uile. (Ri fhaighinn ann an geamannan ioma-chluicheadair a-mhàin)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Cuimsich an aon chart co-dhiù 5 tursan san aon rèis."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Cluicheadairean daonna a-mhàin"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
-"Gabhaidh mi ris na teirmichean gu h-àrd ’s tha mi 13 bliadhna a dh’aois no "
-"nas aosta. "
+msgstr "Gabhaidh mi ris na teirmichean gu h-àrd ’s tha mi 13 bliadhna a dh’aois no nas aosta. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Ma nì sibh a chùis orm air an rèis, leigidh mi am bodach fa sgaoil."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Ma chì thu putan le glas coltach ris an tè seo, feumaidh tu dùbhlan "
-"fhuasgladh gus fhosgladh."
+msgstr "Ma chì thu putan le glas coltach ris an tè seo, feumaidh tu dùbhlan fhuasgladh gus fhosgladh."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
-msgstr ""
-"A’ leigeil seachad “%s�, feumaidh tu gabhail ann nas tràithe gus cluiche!"
+msgstr "A’ leigeil seachad “%s�, feumaidh tu gabhail ann nas tràithe gus cluiche!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Soillseachadh stèidhichte air dealbhan"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Stàlaich"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Meadhanach"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
-"Tha an t-inntrigeadh dhan eadar-lìon à comas, cuir an comas e sna roghainnean"
+msgstr "Tha an t-inntrigeadh dhan eadar-lìon à comas, cuir an comas e sna roghainnean"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Geama co-ionnan"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Tha seo dìomhair"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Gabh pàirt ann"
 
@@ -1731,13 +1534,12 @@ msgstr "A’ gabhail pàirt san fhrithealaiche"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Cartaichean"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Cùm an dùmhlachd-bhreacaidh seo"
 
@@ -1756,7 +1558,6 @@ msgid "Keyboard %i"
 msgstr "Meur-chlàr %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1765,7 +1566,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Cuairt"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Cuairt %i"
@@ -1827,50 +1628,46 @@ msgstr "Trigear clì"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Cas-chairbe (gathan dhè)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Cas-chairbe (gathan dhè): %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "’Ga luchdadh"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Lobaidh"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Roghainnean na lobaidh"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Ainm-cleachdaiche ionadail"
+msgid "Local Name"
+msgstr "Ainm ionadail"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Glaiste"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Glaiste: fuasgail dùbhlain gus faighinn a-steach dhan a bharrachd!"
 
@@ -1878,11 +1675,51 @@ msgstr "Glaiste: fuasgail dùbhlain gus faighinn a-steach dhan a bharrachd!"
 msgid "Locked!"
 msgstr "Glaiste!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Log a-steach"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Log a-mach"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Air do logadh a-steach mar: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "’Gad logadh a-steach"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "A' logadh a-steach \"%s\""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Ma nì thu logadh a-steach ’nad aoigh, ’s urrainn dhut pàirt a ghabhail an nan rèisean air loidhne ach chan urrainn dhut bhòtadh airson thuilleadan no euchdan a chruinneachadh fhad ’s a bhios tu air loidhne."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "’Gad logadh a-mach"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "A' logadh a-mach \"%s\""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Logadh a-steach"
 
@@ -1893,46 +1730,35 @@ msgstr "Sùil air ais"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Lorg airson barrachd charaidean:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Dèan sleamhnachadh co-dhiù 5 tursan san aon cuairt."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Buannaich rèis le 5 cuairtean no a bharrachd."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Gaisgeach Mharathon"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "An àireamh as motha de chluicheadairean"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "An ùine as motha (mion.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Mise a-mhàin"
 
@@ -1942,29 +1768,33 @@ msgid "Menu Keys"
 msgstr "Iuchraichean clàir-thaice"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Meanbh-ghoilf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Sealgair nam meanbh-chuileag"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Sgleò gluasaid"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Sgleò gluasaid: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Aiseal luchaige %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1972,52 +1802,41 @@ msgstr "Putan luchaige %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Gluais sìos"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Gluais suas"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
-msgstr ""
-"Ioma-\r\n"
-"chluicheadair"
+msgstr "Ioma-\r\nchluicheadair"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
-msgstr ""
-"Ioma-\r\n"
-"chluicheadair"
+msgstr "Ioma-\r\nchluicheadair"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Ceòl"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Ainm"
 
@@ -2037,13 +1856,15 @@ msgstr "Tha an t-ainm ro fhada."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Ainm an fhrithealaiche"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Lòn Niseige"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Ùr"
 
@@ -2052,9 +1873,13 @@ msgstr "Ùr"
 msgid "New Grand Prix '%s' now available"
 msgstr "Tha Grand Prix ùr “%s� ri fhaighinn a-nis"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Cunntas air loidhne ùr"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Facal-faire ùr"
 
@@ -2067,7 +1892,7 @@ msgstr "Iarrtas ùr"
 msgid "New difficulty '%s' now available"
 msgstr "Tha duilgheas ùr “%s� ri fhaighinn a-nis"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Cuairt as luaithe ùr"
 
@@ -2095,19 +1920,18 @@ msgstr "Naidhtreo"
 msgid "Nitro challenge"
 msgstr "Dùbhlan naidhtreo"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "Chan eil"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Gin"
 
@@ -2117,23 +1941,19 @@ msgid "Normal Race"
 msgstr "Rèis àbhaisteach"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Baile taobh tuath"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Thoir an aire nuair a thèid leat sleamhnachadh diog no dhà gum fàs thu nas "
-"luaithe mar dhuais!"
+msgstr "Thoir an aire nuair a thèid leat sleamhnachadh diog no dhà gum fàs thu nas luaithe mar dhuais!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Foghlamaiche"
 
@@ -2144,46 +1964,41 @@ msgstr "Àireamh de chartaichean IF : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Àireamh de chartaichean IF"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Àireamh de thadhalan gus buaidh a thoirt"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Àireamh de chuairtean"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Àireamh de chuairtean:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Ceart ma-thà"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Slighe iomallach"
 
@@ -2191,64 +2006,59 @@ msgstr "Slighe iomallach"
 msgid "Offline"
 msgstr "Far loidhne"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Cunntas far loidhne"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Ò, seadh, tha e sa chaisteal agam an-dràsta is thèid e ’na dhìnnear ..."
+msgstr "Ò, seadh, tha e sa chaisteal agam an-dràsta is thèid e ’na dhìnnear ..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Seann mhèinn"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Clas matamataig Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Air loidhne"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Ioma-chluicheadair air loidhne"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Ainm-cleachdaiche air loidhne"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
-"Feumaidh an t-ainm-cleachdaiche air loidhne a bhith eadar 3 is 30 caractar a "
-"dh’fhaid!"
+msgstr "Feumaidh an t-ainm-cleachdaiche air loidhne a bhith eadar 3 is 30 caractar a dh’fhaid!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Chan fhaod ainm-cleachdaiche tòiseachadh le àireamh."
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
-msgstr ""
-"Chan fhaod ach maighstir a’ gheama atharraichean a dhèanamh an-dràsta!"
+msgstr "Chan fhaod ach maighstir a’ gheama atharraichean a dhèanamh an-dràsta!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oich! Ma tha thu ann an staing, brùth air <%s> gus cobhair fhaighinn"
@@ -2259,51 +2069,43 @@ msgstr "Oich! Ma tha thu ann an staing, brùth air <%s> gus cobhair fhaighinn"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Roghainnean"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Foir-shealladh"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "CUMHACHD"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paraisiut - cuir maille air a h-uile cart air do bheulaibh."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Facal-faire"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Facal-faire:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Atharrachadh an fhacail-fhaire"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Feumaidh am facal-faire a bhith eadar 8 is 30 caractar a dh’fhaid!"
 
@@ -2311,8 +2113,8 @@ msgstr "Feumaidh am facal-faire a bhith eadar 8 is 30 caractar a dh’fhaid!"
 msgid "Password successfully changed."
 msgstr "Chaidh am facal-faire atharrachadh."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Chan eil an dà fhacal-faire co-ionnann!"
 
@@ -2323,12 +2125,11 @@ msgstr "Gabh anail"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Na stad"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Peanas ùine!"
 
@@ -2337,7 +2138,6 @@ msgid "Pending"
 msgstr "Ri dhèiligeadh"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Raon-cluiche nan ceann-fionn"
 
@@ -2346,37 +2146,38 @@ msgid "Performing vote"
 msgstr "A’ cur bhòt"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Cluich na h-uile"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Cluich gach slighe oifigeil co-dhiù aon turas."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Cluicheadairean"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "'S urrainn dha na cluicheadairean pròifil le ana-chothrom (nas dorra) a thaghadh air sgrìn taghadh nan cartaichean"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Cuir a-steach ainm a’ Ghrand Prix"
 
@@ -2385,6 +2186,10 @@ msgstr "Cuir a-steach ainm a’ Ghrand Prix"
 msgid "Please re-configure your key bindings."
 msgstr "An ath-rèitich thu nasgadh nan iuchraichean agad?"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Feuch an leugh thu na teirmichean is cumhaichean"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Fuirich ort fhad ’s a thèid tuilleadain ùrachadh"
@@ -2394,53 +2199,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Fuirich ort fhad ’s a tha tuilleadain ’gan luchdadh"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Loinid - tilg gu dìreach gus maille a chur air co-fharpaisiche, no tilg a’ "
-"coimhead air ais gus fear a dhalladh."
+msgstr "Loinid - tilg gu dìreach gus maille a chur air co-fharpaisiche, no tilg a’ coimhead air ais gus fear a dhalladh."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Dèidheil air cumhachdan"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Brùth air <%s> gus coimhead air do chùlaibh is loisg an t-arm le <%s> fhad "
-"’s a tha thu a’ brùthadh <%s> gus losgadh gun chùlaibh!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Brùth air <%s> gus coimhead air do chùlaibh is loisg an t-arm le <%s> fhad ’s a tha thu a’ brùthadh <%s> gus losgadh gun chùlaibh!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Brùth air ESC gus sgur dheth"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Brùth air iuchair"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Brùth air enter no dèan briogadh dùbailte air uidheam gus a rèiteachadh"
+msgstr "Brùth air enter no dèan briogadh dùbailte air uidheam gus a rèiteachadh"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Brùth air enter no dèan briogadh dùbailte air cluicheadair gus a "
-"d(h)easachadh"
+msgstr "Brùth air enter no dèan briogadh dùbailte air cluicheadair gus a d(h)easachadh"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2454,10 +2246,7 @@ msgstr "Brùth air loisg gus an dùbhlan a thòiseachadh"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Brùth air na putanan 1+2 air a’ wiimote agad aig an aon àm gus a chur sa "
-"mhodh luirg is an uairsin briog air “Ceart ma-thà�. Gheibh thu stiùireadh "
-"mionaideach air supertuxkart.net/Wiimote"
+msgstr "Brùth air na putanan 1+2 air a’ wiimote agad aig an aon àm gus a chur sa mhodh luirg is an uairsin briog air “Ceart ma-thà�. Gheibh thu stiùireadh mionaideach air supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2475,7 +2264,6 @@ msgstr "’Ga làimhseachadh"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Pròifil"
 
@@ -2484,7 +2272,6 @@ msgid "Progress"
 msgstr "Adhartas"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2492,31 +2279,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Brùth am bàla dhan chèidse taobh thall gus tadhal a chur. (Le geamannan ioma-"
-"chluicheadair a-mhàin)"
+msgstr "Brùth am bàla dhan chèidse taobh thall gus tadhal a chur. (Le geamannan ioma-chluicheadair a-mhàin)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Grad-chluich"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Fàg an-seo"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Fàg am frithealaiche."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Suidhich rèis"
 
@@ -2537,8 +2318,8 @@ msgstr "Grand Prix air thuaiream"
 msgid "Random Kart"
 msgstr "Cart air thuaiream"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Slighe air thuaiream"
 
@@ -2547,84 +2328,68 @@ msgid "Rank"
 msgstr "Rang"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Rangachadh >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Deiseil!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "’S ann gu bheil seo ’na rùn-dìomhair."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Bhuannaich an sgioba dearg"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Clàraich"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Rèis àbhaisteach: tha a h-uile buille ceadaichte, mar sin tog airm is "
-"cleachd gu glic iad!"
+msgstr "Rèis àbhaisteach: tha a h-uile buille ceadaichte, mar sin tog airm is cleachd gu glic iad!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Ath-luchdaich"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Cuimhnich am facal-faire"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Cùm cuimhne air àite na h-uinneige"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Thoir air falbh"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Ainm ùr air"
 
@@ -2650,29 +2415,25 @@ msgstr "Teasairg"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Dùmhlachd-bhreacaidh"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Ath-thòisich"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Ath-thòisich an rèis"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Contrarra"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Contrarra:"
 
@@ -2727,43 +2488,37 @@ msgstr "Trigear deas"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "LUATHS"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "Iomairt STK"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "An rèisear Sara"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "A’ bhan-draoidh Sara"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Sàbhail"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Sàbhail an Grand Prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Alba"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Lorg"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "’Ga lorg"
 
@@ -2773,12 +2528,10 @@ msgid "Select"
 msgstr "Tagh"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Tagh duilgheas"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Tagh modh-geama"
 
@@ -2788,44 +2541,36 @@ msgstr "Tagh slighe"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Tagh cart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Cuir stadastaireachd a’ Bh-chr gun ainm"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Cruthachadh frithealaiche"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Fiosrachadh an fhrithealaiche"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Taghadh an fhrithealaiche"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Ainm an fhrithealaiche:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
-"chaidh am frithealaiche a chruthachadh. ’S urrainn dhut pàirt a ghabhail ann "
-"a-nis."
+msgstr "chaidh am frithealaiche a chruthachadh. ’S urrainn dhut pàirt a ghabhail ann a-nis."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2834,98 +2579,51 @@ msgstr "Dèonach!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Suidhich rèis ùr"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Sgàilean"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Sgàilean: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Sgàilean: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Beò-ghainmheach"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Iomall-bhaile gleansach"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Clàraich a-steach"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Log a-steach ’nad aoigh"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Clàraich a-mach"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Air logadh a-steach mar: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "’Gad logadh a-steach"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "A’ logadh a-steach “%s�"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"’S urrainn dhut pàirt a ghabhail ann an rèisean air loidhne ’nad aoigh, ach "
-"chan urrainn dhut bhòtadh airson tuilleadain no coileanas sam bith a "
-"chruinneachadh fhad ’s a bhios tu air loidhne."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "’Gad logadh a-mach"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "A’ logadh a-mach “%s�"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "O chionn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
-"Aon-\r\n"
-"chluicheadair"
+msgstr "Aon-\r\nchluicheadair"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2933,9 +2631,8 @@ msgid "Size: %s"
 msgstr "Meud: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Sleamhnag"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2944,12 +2641,10 @@ msgstr "Sleamhnachadh"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Uachdar"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Sgurr an t-sneachda"
 
@@ -2959,30 +2654,23 @@ msgid "Soccer"
 msgstr "Ball-coise"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Raon ball-coise"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Ball-coise: ri fhaighinn le geamannan ioma-chluicheadair a-mhàin. Cleachd an "
-"cart agad gus am bàla a bhrùthadh dhan tadhal."
+msgstr "Ball-coise: ri fhaighinn le geamannan ioma-chluicheadair a-mhàin. Cleachd an cart agad gus am bàla a bhrùthadh dhan tadhal."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Duilich, ach thachair mearachd le ceangal ri làrach-lìn nan tuilleadan. Dèan "
-"cinnteach gu bheil ceangal dhan eadar-lìn agad is nach tèid SuperTuxKart a "
-"bhacadh le cachaileith-theine."
+msgstr "Duilich, ach thachair mearachd le ceangal ri làrach-lìn nan tuilleadan. Dèan cinnteach gu bheil ceangal dhan eadar-lìn agad is nach tèid SuperTuxKart a bhacadh le cachaileith-theine."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2990,7 +2678,6 @@ msgstr "Duilich, ach dh’fhàillig le luchdadh a-nuas an tuilleadain"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Èifeachdan fuaime"
 
@@ -2999,7 +2686,6 @@ msgstr "Èifeachdan fuaime"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Bun-tomhasach"
 
@@ -3012,17 +2698,16 @@ msgstr "Tòisich"
 msgid "Start Grand Prix"
 msgstr "Tòisich air Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Tòisich air an rèis"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Staid"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -3036,156 +2721,135 @@ msgstr "Rach gu deas"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Le sgeulachd"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Buille!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Cuir a-null"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Fon chuan"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Tuilleadain SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Cuideachadh SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Roghainnean SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"’S urrainn dhut SuperTuxKart a chluiche ann am modh ioma-chluicheadair air "
-"an aon choimpiutair"
+msgstr "’S urrainn dhut SuperTuxKart a chluiche ann am modh ioma-chluicheadair air an aon choimpiutair"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "Tha iomadh modh-geama aig SuperTuxKart"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "Dh’fhaoidte gun ceangail SuperTuxKart ri frithealaiche gus tuilleadain a luchdadh a-nuas is naidheachdan mu ùrachaidhean a thoirt dhut. Cruinnichidh sinn stadastaireachd gun ainm air a’ bhathar-chruaidh cuideachd gus taic a thoirt dhuinn le leasachadh STK. Leugh a' phoileasaidh phrìobhaideachd againn air http://privacy.supertuxkart.net.  A bheil thu airson an roghainn seo a chur an comas? (Gus an roghainn seo atharrachadh uair sam bith, rach gu “Roghainnean�, tagh an taba “Eadar-aghaidh� agus deasaich “Ceangail ris an eadar-lìon� agus “Cuir stadastaireachd a’ Bh-chr gun ainm�)."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Suaipear - thèid bogsaichean tìodhlaic ’nan bananathan is taobh mu seach fad "
-"greiseag."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Suaipear - thèid bogsaichean tìodhlaic ’nan bananathan is taobh mu seach fad greiseag."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Bualadair - cuiridh e cartaichean faisg ort ’nan spleuchd is maille orra."
+msgstr "Bualadair - cuiridh e cartaichean faisg ort ’nan spleuchd is maille orra."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Cànan an t-siostaim"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Làimhsich na co-fharpaisichean ’nam meanbh-chuileagan! Cuir co-dhiù 5 dhiubh ’nan spleuchd leis a’ bhualadair san aon rèis."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Teampall"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Teirmichean ’s aontachadh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Dùmhlachadh nan inneach"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Criathrag innich"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Leigidh an iuchair “sleamhnachadh� leat sleamhnachadh ann an lùban casa is "
-"neartachadh fhaighinn."
+msgstr "Leigidh an iuchair “sleamhnachadh� leat sleamhnachadh ann an lùban casa is neartachadh fhaighinn."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "An lann-cluiche"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"Chaidh mòideil nan tuilleadan a chur à comas ann an sgrìn nan roghainnean"
+msgstr "Chaidh mòideil nan tuilleadan a chur à comas ann an sgrìn nan roghainnean"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Bha faidhle nan sgòran àrda ro shean,\n"
-"chaidh na h-uile sgòr àrd a sguabadh às."
+msgstr "Bha faidhle nan sgòran àrda ro shean,\nchaidh na h-uile sgòr àrd a sguabadh às."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
-"Feumaidh an àireamh as motha de chluicheadairean a bhith eadar 2 is 12."
+msgstr "Feumaidh an àireamh as motha de chluicheadairean a bhith eadar 2 is 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3194,43 +2858,22 @@ msgstr "An aghaidh na h-ùine"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"An aghaidh na h-ùine: chan eil cumhachdan ann is chan eil a’ cunntadh ach do "
-"sgilean draibhidh!"
+msgstr "An aghaidh na h-ùine: chan eil cumhachdan ann is chan eil a’ cunntadh ach do sgilean draibhidh!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Gus uidheam pada-geama/joystick ùr a chur ris, cha leig thu leas ach "
-"SuperTuxKart a thòiseachadh nuair a bhios iad ceangailte is nochdaidh iad "
-"air an liosta.\n"
-"\n"
-"Gus rèiteachadh meur-chlàir a chur ris, faodaidh tu am putan gu h-ìosal a "
-"chleachdadh. Co-dhiù, thoir an AIRE nach cuir a’ mhòrchuid dhe na meur-"
-"chlàran taic ach ri àireamh cuingichte de bhrùthadh air iuchraichean aig an "
-"aon àm is mar sin chan eil iad freagarrach airson geama ioma-chluicheadair. "
-"(Co-dhiù, ’s urrainn dhut iomadh meur-chlàr a cheangal ris a’ choimpiutair "
-"agad. Cum ’nad aire gu bheil nasgadh iuchraichean eadar-dhealaichte a dhìth "
-"aig gach cluicheadair fhathast.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Gus uidheam pada-geama/joystick ùr a chur ris, cha leig thu leas ach SuperTuxKart a thòiseachadh nuair a bhios iad ceangailte is nochdaidh iad air an liosta.\n\nGus rèiteachadh meur-chlàir a chur ris, faodaidh tu am putan gu h-ìosal a chleachdadh. Co-dhiù, thoir an AIRE nach cuir a’ mhòrchuid dhe na meur-chlàran taic ach ri àireamh cuingichte de bhrùthadh air iuchraichean aig an aon àm is mar sin chan eil iad freagarrach airson geama ioma-chluicheadair. (Co-dhiù, ’s urrainn dhut iomadh meur-chlàr a cheangal ris a’ choimpiutair agad. Cum ’nad aire gu bheil nasgadh iuchraichean eadar-dhealaichte a dhìth aig gach cluicheadair fhathast.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "’S urrainn dhut cumhachdan a thogail gus do chuideachadh:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Dhan ghealaich is air ais"
 
@@ -3249,7 +2892,7 @@ msgstr "An %i as àirde"
 msgid "Track"
 msgstr "Slighe"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Slighe %i/%i"
@@ -3263,19 +2906,17 @@ msgstr "Slighe le %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Buidheann shlighean"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Slighean"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trì-loidhneach"
 
@@ -3286,24 +2927,21 @@ msgstr "Feuch ris a-rithist"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Oideachadh"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Oideachadh: an taghadh"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Seòrsa:"
 
@@ -3311,24 +2949,20 @@ msgstr "Seòrsa:"
 msgid "Type: Grand Prix"
 msgstr "Seòrsa: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"Chan urrainn dhuinn ceangal ris an fhrithealaiche. Thoir sùil air a’ "
-"cheangal dhan eadar-lìon agad no feuch ris a-rithist an ceann greis."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Chan urrainn dhuinn ceangal ris an fhrithealaiche. Thoir sùil air a’ cheangal dhan eadar-lìon agad no feuch ris a-rithist an ceann greis."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Dì-stàlaich"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Gun stad"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3340,8 +2974,8 @@ msgid "Update"
 msgstr "Ùrachadh"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Air ùrachadh"
 
@@ -3350,41 +2984,36 @@ msgid "Updated date"
 msgstr "Air ùrachadh"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Cleachd 5 no a bharrachd cumhachdan rè rèis."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Cleachd innich high definition"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
-"Cleachd gu clì/gu deas gus an sgioba agad a thaghadh ’s brùth air “Loisg�"
+msgstr "Cleachd gu clì/gu deas gus an sgioba agad a thaghadh ’s brùth air “Loisg�"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Cleachd an naidhtreo a thog thu ’s tu a’ brùthadh air <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Fiosrachadh mun chleachdaiche"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Eadar-aghaidh"
 
@@ -3393,19 +3022,17 @@ msgid "User defined"
 msgstr "Gnàthaichte"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Lorg cleachdaichean"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Ainm-cleachdaiche"
 
@@ -3414,13 +3041,12 @@ msgid "Username and/or email address invalid."
 msgstr "Tha an t-ainm-cleachdaiche no seòladh puist-d mì-dhligheach."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "an aghaidh"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "A’ dearbhadh an fhiosrachaidh"
 
@@ -3431,27 +3057,23 @@ msgstr "Tionndadh: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sioncronachadh inghearach (ath-thòiseachadh a dhìth)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Seall"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Àirde fuaime"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Cuir bhòt"
 
@@ -3461,9 +3083,9 @@ msgstr "Chaidh a’ bhòt a chur. ’S urrainn dhut an uinneag a dhùnadh a-nis.
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "CUIDEAM"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "RATHAD CEÀRR!"
 
@@ -3472,61 +3094,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Rabhadh, cha mholamaid an iuchair “Shift�: ma bhrùthas tu air, sguiridh a h-"
-"uile iuchair de bhith ag obrachadh aig a bheil caractar eadar-dhealaichte "
-"nuair a bhios e ’na litir mhòr."
+msgstr "Rabhadh, cha mholamaid an iuchair “Shift�: ma bhrùthas tu air, sguiridh a h-uile iuchair de bhith ag obrachadh aig a bheil caractar eadar-dhealaichte nuair a bhios e ’na litir mhòr."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Airm"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Èifeachdan sìde"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Èifeachdan sìde: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Dè tha cearr, hippies beaga? A bheil an ceannard mòr Gnu air falbh?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Nuair a bhios na h-uidheaman ion-chuir air an rèiteachadh, bidh thu ullamh "
-"airson cluiche. Tagh an ìomhaigheag “Ioma-chluicheadair� air a’ phrìomh "
-"chlàr-taice. Nuair a thig an àm gus cart a thaghadh, faodaidh gach "
-"cluicheadair brùthadh air an iuchair “loisg� air a’ phada-gheama no mheur-"
-"chlàr aige gus pàirt a ghabhail sa gheama. Faodaidh gach cluicheadair an t-"
-"uidheam ion-chuir aige a chleachdadh gus cart a thaghadh. Leanaidh an geama "
-"air adhart nuair a bhios a h-uile duine air cart a thaghadh. Thoir an aire "
-"nach urrainn dhut an luchag a chleachdadh gus seo a dhèanamh."
+msgstr "Nuair a bhios na h-uidheaman ion-chuir air an rèiteachadh, bidh thu ullamh airson cluiche. Tagh an ìomhaigheag “Ioma-chluicheadair� air a’ phrìomh chlàr-taice. Nuair a thig an àm gus cart a thaghadh, faodaidh gach cluicheadair brùthadh air an iuchair “loisg� air a’ phada-gheama no mheur-chlàr aige gus pàirt a ghabhail sa gheama. Faodaidh gach cluicheadair an t-uidheam ion-chuir aige a chleachdadh gus cart a thaghadh. Leanaidh an geama air adhart nuair a bhios a h-uile duine air cart a thaghadh. Thoir an aire nach urrainn dhut an luchag a chleachdadh gus seo a dhèanamh."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3534,84 +3140,75 @@ msgid "White"
 msgstr "Geal"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Buannaich 5 rèisean às dèidh càch a chèile."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Buannaich sna h-uile modhan aon-chluicheadair an aghaidh 3 co-fharpaisichean no a bharrachd."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Tha"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Tha thu ullamh gus rèis a dhraibheadh a-nis. Guma math a thèid leat!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Tha thu a’ cluiche mar"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
-"’S urrainn dhut an rangachadh roimhe agad a ghleusadh ’s tu a’ briogadh air "
-"na rionnagan gu h-ìosal."
+msgstr "’S urrainn dhut an rangachadh roimhe agad a ghleusadh ’s tu a’ briogadh air na rionnagan gu h-ìosal."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Chan urrainn dhut tuilleadain a luchdadh a-nuas gun inntrigeadh gun eadar-lìon. Ma tha thu airson tuilleadain a luchdadh a-nuas, rach gu na roghainnean, tagh an taba \"Eadar-aghaidh\" is deasaich \"Ceangail ris an eadar-lìon\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Chan urrainn cluich air loidhne gun inntrigeadh gun eadar-lìon. Ma tha thu airson cluich air loidhne, rach gu na roghainnean, tagh an taba \"Eadar-aghaidh\" is deasaich \"Ceangail ris an eadar-lìon\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "’S urrainn dhut cluich às aonais cunntais air loidhne ’s tu a’ taghadh cunntas far loidhne. Ach chan urrainn dhut ceangal ri caraidean no bhòtadh airson thuilleadan is msaa. an uairsin. Feuch an leugh thu an aithris prìobhaideachd againn air http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Choilean thu dùbhlan!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Choilean thu dùbhlain!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Choilean thu an Grand Prix!"
 
@@ -3619,33 +3216,37 @@ msgstr "Choilean thu an Grand Prix!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Choilean thu an dùbhlan doirbh! Seo na puingean a bhuannaich thu air an leibheil seo: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Choilean thu an dùbhlan furasta! Seo na puingean a bhuannaich thu air an leibheil seo: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Choilean thu an dùbhlan meadhanach! Seo na puingean a bhuannaich thu air an leibheil seo: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Choilean thu an rèis!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Dh’iarr %d càirdeas ort!"
+msgstr[1] "Dh’iarr %d càirdeas ort!"
+msgstr[2] "Dh’iarr %d càirdeas ort!"
+msgstr[3] "Dh’iarr %d càirdeas ort!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Dh’iarr cuideigin càirdeas ort!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Chaidh do ruaig!"
 
@@ -3653,67 +3254,71 @@ msgstr "Chaidh do ruaig!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Cha bhòt thu airson an tuilleadain seo fhathast. Briog air na rionnagan gu h-ìosal gus an rangachadh a thogras tu a thaghadh."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Tha puing no dhà a dhìth ort\ngus dol a-steach dhan dùbhlan seo!\nThoir sùil air a’ mheanbh-mhapa\nairson dùbhlain a tha ri làimh dhut."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Feumaidh tu facal-faire a chur a-steach."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Neo-ghlais thu grand prix: %0!"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Neo-ghlais thu slighe: %0!"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Gheibh thu post-d le barrachd stiùiridhean air mar a nì thu ath-shuidheachadh an fhacail-fhaire agad. Bi foighidinneach is thoir sùil air a’ phasgan spama agad cuideachd."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Gheibh thu post-d le barrachd stiùiridhean a thaobh gnìomhachadh a’ chunntais agad. Bi foighidinneach is thoir sùil air a’ phasgan spama agad cuideachd."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Bhuannaich thu an rèis!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Tha coltas gu bheil an tionndadh agad de dh'OpenGL ro shean. Thoir sùil a bheil ùrachadh air draibhear a' video agad ri fhaighinn. Tha OpenGL 3.1 no nas fhearr riatanach airson SuperTuxKart."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Bha cruth cearr air an fhaidhle rèiteachaidh agad, mar sin chaidh sguabadh "
-"às is thèid fear ùr a chruthachadh."
+msgstr "Bha cruth cearr air an fhaidhle rèiteachaidh agad, mar sin chaidh sguabadh às is thèid fear ùr a chruthachadh."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Bha am faidhle rèiteachaidh agad ro shean, mar sin chaidh sguabadh às is "
-"thèid fear ùr a chruthachadh."
+msgstr "Bha am faidhle rèiteachaidh agad ro shean, mar sin chaidh sguabadh às is thèid fear ùr a chruthachadh."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Tha tionndadh an draibheir agad ro shean. Feuch an stàlaich thu na draibhearan video as ùire."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Chan eil am faidhle rèiteachaidh ion-chuir agad co-chòrdail ris an tionndadh "
-"seo de STK."
+msgstr "Chan eil am faidhle rèiteachaidh ion-chuir agad co-chòrdail ris an tionndadh seo de STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3721,7 +3326,6 @@ msgid "Your profile"
 msgstr "Do phròifil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Lios Zen"
 
@@ -3732,16 +3336,16 @@ msgstr "[gin]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "gnìomhan"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "na h-uile"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "le"
@@ -3750,44 +3354,25 @@ msgstr "le"
 msgid "featured"
 msgstr "brosnaichte"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "àrd"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "ìosal"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "coitcheann"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  GunChleoc https://launchpad.net/~gunchleoc\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  GunChleoc https://launchpad.net/~gunchleoc\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/gl.po b/data/po/gl.po
index 5e3131d25..12f86c9c9 100644
--- a/data/po/gl.po
+++ b/data/po/gl.po
@@ -1,23 +1,24 @@
-# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2010.
-# Adrian Chaves Fernandez (Gallaecio) <adriyetichaves@gmail.com>, 2010.
-# Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2010, 2011, 2013.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2010
+# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2010
+# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2010-2011,2013
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.6\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Adrián Chaves Fernández <adriyetichaves@gmail.com>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/supertuxkart/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: SPAIN\n"
-"Language: glPlural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Galician\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,23 +29,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Pero xa vos aviso, ningún de vós —patéticos ananos— conseguirá vencerme. "
-"Son o rei dos karts!"
+msgstr " Pero xa vos aviso, ningún de vós —patéticos ananos— conseguirá vencerme. Son o rei dos karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr "%s KiB"
 msgid "%s MB"
 msgstr "%s MiB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, de %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%2$s: %1$s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s está listo."
@@ -99,33 +98,29 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s quedou eliminado."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(baleiro)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(as partidas en rede aínda non están dispoñíbeis)."
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Cando apareza un elemento en azul, será porque entra en conflito con outra "
-"configuración."
+msgstr "* Cando apareza un elemento en azul, será porque entra en conflito con outra configuración."
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
@@ -133,45 +128,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Podes ver ou cambiar os controis no menú de «Configuración»."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* A meirande parte destes modos de xogo poden tamén xogarse nun campionato: "
-"en vez de xogar unha carreira única, xóganse varias seguidas. Os puntos "
-"vanse conseguindo en función no posto no que se rematan as carreiras, e ao "
-"final do campionato, o xogador con máis puntos leva a copa."
+msgstr "* A meirande parte destes modos de xogo poden tamén xogarse nun campionato: en vez de xogar unha carreira única, xóganse varias seguidas. Os puntos vanse conseguindo en función no posto no que se rematan as carreiras, e ao final do campionato, o xogador con máis puntos leva a copa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -202,13 +186,10 @@ msgstr "Loita a tres toques"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Loita a tres toques. Só se pode empregar en partidas con varios xogadores. "
-"Consiste en golpear aos opoñentes con armas ata que perdan todas as vidas."
+msgstr "Loita a tres toques. Só se pode empregar en partidas con varios xogadores. Consiste en golpear aos opoñentes con armas ata que perdan todas as vidas."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -223,23 +204,20 @@ msgid "9 months"
 msgstr "9 meses"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "Mellores puntuacións"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Cancelar o campionato"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Información"
 
@@ -248,40 +226,35 @@ msgstr "Información"
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Acelera e preme a tecla <%s> durante o xiro para derrapar. Derrapar durante "
-"un curto período de tempo pode axudarche a xirar máis rápido e tomar curvas "
-"moi pronunciadas."
+msgstr "Acelera e preme a tecla <%s> durante o xiro para derrapar. Derrapar durante un curto período de tempo pode axudarche a xirar máis rápido e tomar curvas moi pronunciadas."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Acelera con <%s> e xira con <%s> e <%s>."
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -289,8 +262,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -300,13 +272,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -317,7 +287,6 @@ msgstr "Engadir uns controis para o teclado."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Engadir un novo usuario"
 
@@ -328,32 +297,29 @@ msgstr "Engadir un mando de Wii"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Engadir un dispositivo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Complementos"
 
@@ -363,49 +329,43 @@ msgstr "Nome do complemento"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Complementos"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Todo"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Todos os circuítos"
 
@@ -415,18 +375,20 @@ msgstr "Permítense todas as armas, así que sácalles o mellor partido!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -436,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "�ncora — Ralentiza considerabelmente o kart que vai de primeiro."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animación das personaxes:"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animación das personaxes: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animacións nos mapas."
 
@@ -462,24 +421,24 @@ msgstr "Animacións nos mapas."
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animacións nos mapas: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotrópico x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotrópico x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotrópico x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotrópico x8"
 
@@ -489,29 +448,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplicar a nova resolución"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -526,49 +481,44 @@ msgstr "Seguro que queres eliminar a configuración?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenas"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Arredores do faro"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Asignar á tecla «Esc»"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Fin do mundo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Son"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Esquiva os plátanos!"
 
@@ -590,83 +540,66 @@ msgstr "Eixo %d %s"
 msgid "Axis %d inverted"
 msgstr "Eixo %d invertido"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Volver"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Seguir xogando"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Volver á carreira"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Volver á sección de desafíos"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Volver á lista de dispositivos"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Volver ao menú"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Volver ao menú"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Bóla de baloncesto — Vai saltando en dirección ao líder, e ralentiza os "
-"karts que se atope polo camiño."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Bóla de baloncesto — Vai saltando en dirección ao líder, e ralentiza os karts que se atope polo camiño."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Illa bélica"
 
-# Nome propio.
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
-# Nome propio.
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Máis sorte a próxima vez!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinear"
 
@@ -676,39 +609,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mansión escura"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Gaña o equipo azul"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Curral bobino"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bóla dos bolos. Rebota nas paredes. Se estás mirando cara atrás, lanzarala "
-"cara atrás."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bóla dos bolos. Rebota nas paredes. Se estás mirando cara atrás, lanzarala cara atrás."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -716,64 +643,52 @@ msgid "Brake"
 msgstr "Freo"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Goma de mascar — Protéxete cun escudo, ou úsaa mentres miras cara atrás para "
-"deixar tras de ti unha substancia rosa pegañenta."
+msgstr "Goma de mascar — Protéxete cun escudo, ou úsaa mentres miras cara atrás para deixar tras de ti unha substancia rosa pegañenta."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Torta — Tíraselle ao opoñente máis próximo. Efectiva nas distancias curtas e "
-"en liña recta."
+msgstr "Torta — Tíraselle ao opoñente máis próximo. Efectiva nas distancias curtas e en liña recta."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Non se pode acceder ao servidor de complementos."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -787,27 +702,23 @@ msgid "Cancel/Back"
 msgstr "Cancelar ou volver"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cova X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Desafío superado"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Desafío non superado"
 
-# Emprégase «desafío» por recomendación de Miguel Bouzada.
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Sala dos desafíos"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -815,62 +726,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Escolle un kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Preme para xogar a aprendizaxe"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Pechar"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Recolle caixas azuis. Conteñen armas ou outras bonificacións."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Recolle caixas de agasallos, e dispara con <%s> para estoupar estas caixas!"
+msgstr "Recolle caixas de agasallos, e dispara con <%s> para estoupar estas caixas!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Recolle botellas de nitro (usaralas despois da curva)"
 
@@ -880,16 +781,13 @@ msgstr "Recolle nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Cando teñas nitro poderás acelerar premendo a tecla correspondente. A "
-"cantidade de nitro reflíctese na barra á dereita da pantalla."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Cando teñas nitro poderás acelerar premendo a tecla correspondente. A cantidade de nitro reflíctese na barra á dereita da pantalla."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -902,11 +800,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -914,7 +812,6 @@ msgstr "Confirma a resolución ou volverase á anterior en %i segundos."
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -922,107 +819,86 @@ msgstr ""
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Conecta un mando da Wii ao xestor de Bluetooth e preme «Aceptar». Para máis "
-"información, véxase «supertuxkart.net/Wiimote» (en inglés)."
+msgstr "Conecta un mando da Wii ao xestor de Bluetooth e preme «Aceptar». Para máis información, véxase «supertuxkart.net/Wiimote» (en inglés)."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Non hai bonificacións, así que o único que importará serán as túas "
-"habilidades de condución!"
+msgstr "Non hai bonificacións, así que o único que importará serán as túas habilidades de condución!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuar"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controis"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Non se detectou ningún mando de Wii."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Contribuidores"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1035,13 +911,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizada"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Configuración personalizada…"
 
@@ -1067,7 +942,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1075,28 +949,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Eliminar a configuración"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1109,24 +981,23 @@ msgstr "Desactivar o dispositivo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Desactivado"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Amosar os fotogramas por segundo (FPS)."
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Seguro que queres cancelar o campionato?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Seguro que queres eliminar o xogador «%s»?"
@@ -1135,8 +1006,8 @@ msgstr "Seguro que queres eliminar o xogador «%s»?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Non aceleres antes da saída"
 
@@ -1147,27 +1018,24 @@ msgstr "Abaixo"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1178,10 +1046,8 @@ msgstr "A caza do ovo"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"A caza do ovo: Explora circuítos para atopar todos os ovos agochados."
+msgstr "A caza do ovo: Explora circuítos para atopar todos os ovos agochados."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1189,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr "Ovos: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefante"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminado"
 
@@ -1202,24 +1067,22 @@ msgstr "Eliminado"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1231,27 +1094,24 @@ msgstr "Activar o dispositivo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Activado"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Activar para todos"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Escribe o nome do xogador:"
 
@@ -1264,31 +1124,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Isto vai para todos:\nPremede «Escoller» para unirvos á partida!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Isto vai para todos:\n"
-"Premede «Escoller» para unirvos á partida!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Saír da carreira"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Experto"
 
@@ -1296,12 +1156,12 @@ msgstr "Experto"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explora circuítos para atopar todos os ovos agochados."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1326,19 +1186,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Última volta!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1349,22 +1207,14 @@ msgstr "Disparar"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Primeiro necesitarás varios dispositivos de entrada (o mellor para xogar "
-"varias persoas é contar con varios mandos). Vai á pantalla de configuración "
-"dos controis e configura os mandos. Tamén se pode xogar nun ou varios "
-"teclados, pero cada xogador terá que empregar teclas distintas, e hai que "
-"ter en conta que a meirande parte dos teclados non están preparados para "
-"xogar con eles varios xogadores, xa que a cantidade de teclas que se poden "
-"premer ao mesmo tempo está limitada."
+msgstr "Primeiro necesitarás varios dispositivos de entrada (o mellor para xogar varias persoas é contar con varios mandos). Vai á pantalla de configuración dos controis e configura os mandos. Tamén se pode xogar nun ou varios teclados, pero cada xogador terá que empregar teclas distintas, e hai que ter en conta que a meirande parte dos teclados non están preparados para xogar con eles varios xogadores, xa que a cantidade de teclas que se poden premer ao mesmo tempo está limitada."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1377,25 +1227,22 @@ msgstr "Seguir ao líder!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Seguir ao líder. Mantente segundo, xa que o último kart quedará "
-"descualificado cada vez que o contador chegue a cero. Pero coidado: ir "
-"diante do líder tamén é motivo de descualificación!"
+msgstr "Seguir ao líder. Mantente segundo, xa que o último kart quedará descualificado cada vez que o contador chegue a cero. Pero coidado: ir diante do líder tamén é motivo de descualificación!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Castelo de lava"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Atopáronse %d mandos de Wii"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1419,13 +1266,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Pantalla completa."
 
@@ -1439,22 +1285,19 @@ msgstr "Gol!"
 msgid "Game Keys"
 msgstr "Teclas do xogo"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modos de xogo"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1470,51 +1313,45 @@ msgstr "Botón %d do mando"
 msgid "Gamepad hat %d"
 msgstr "Control direccional %d do mando"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Xeral"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Abandonar a carreira"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Ñu"
 
@@ -1524,61 +1361,53 @@ msgid "Go!"
 msgstr "Xa!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Campionatos"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progreso do campionato:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivel dos efectos gráficos:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Gráficos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Configuración gráfica"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Val verde"
 
@@ -1595,12 +1424,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Facenda"
 
@@ -1610,22 +1437,18 @@ msgstr "Facenda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Axuda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Mellores puntuacións"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1633,78 +1456,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Atina aos demais con armas ata que perdan todas as vidas (só para varios "
-"xogadores)."
+msgstr "Atina aos demais con armas ata que perdan todas as vidas (só para varios xogadores)."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Só os xogadores"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Se me gañades ás carreiras, soltarei ao mamífero."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Cando vexas un botón cun cadeado coma este, significa que tes que superar un "
-"desafío para desbloquealo."
+msgstr "Cando vexas un botón cun cadeado coma este, significa que tes que superar un desafío para desbloquealo."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "«%s» non vai xogar, hai que unirse antes!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalar"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermedio"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Empate"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1714,13 +1530,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Quedar con esta resolución"
 
@@ -1739,7 +1554,6 @@ msgid "Keyboard %i"
 msgstr "Teclado %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1748,7 +1562,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Volta"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%iª volta"
@@ -1810,51 +1624,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Cargando"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloqueado"
 
-# Emprégase «desafío» por recomendación de Miguel Bouzada.
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloqueado: supera os desafíos activos para conseguir acceso a máis!"
 
@@ -1862,11 +1671,51 @@ msgstr "Bloqueado: supera os desafíos activos para conseguir acceso a máis!"
 msgid "Locked!"
 msgstr "Bloqueado"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1877,27 +1726,18 @@ msgstr "Mirar cara atrás"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1905,18 +1745,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Só eu"
 
@@ -1926,29 +1764,33 @@ msgid "Menu Keys"
 msgstr "Teclas do menú"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Eixo %d do rato %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1956,48 +1798,41 @@ msgstr "Botón %d do rato"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Varios xogadores"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Varios xogadores"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Música"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2017,13 +1852,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2032,9 +1869,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Hai un novo campionato dispoñíbel: %s."
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2047,7 +1888,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Hai unha nova dificultade dispoñíbel: %s."
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Volta máis rápida:"
 
@@ -2075,19 +1916,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Desafío de nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "ningunha"
 
@@ -2097,23 +1937,19 @@ msgid "Normal Race"
 msgstr "Carreira normal"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Vila na montaña"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Ten en conta que se consegues derrapar durante varios segundos, conseguirás "
-"unha bonificación de velocidade como recompensa!"
+msgstr "Ten en conta que se consegues derrapar durante varios segundos, conseguirás unha bonificación de velocidade como recompensa!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Principiante"
 
@@ -2124,46 +1960,41 @@ msgstr "Opoñentes: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Número de opoñentes:"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Número de obxectivos para gañar"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Aceptar"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Camiños descoñecidos"
 
@@ -2171,81 +2002,74 @@ msgstr "Camiños descoñecidos"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Pois é que está no meu castelo. Apetecíame cear un bo prato de lacón con "
-"grelos… e porco ou ñu, todo é carne."
+msgstr "Pois é que está no meu castelo. Apetecíame cear un bo prato de lacón con grelos… e porco ou ñu, todo é carne."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Mina vella"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Clase de mates de Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Iso só pode facelo o anfitrión!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ups! Cando esteas en apuros, preme <%s> para que te rescaten."
 
-# Non puxen «Configuración» por problemas de espazo.
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Configuración"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2254,35 +2078,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paracaídas — Ralentiza todos os karts por diante de ti."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2290,8 +2109,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2302,12 +2121,11 @@ msgstr "Pór en pausa a partida"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pausa"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Penalización de tempo!"
 
@@ -2316,7 +2134,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Patio do pingüín"
 
@@ -2325,37 +2142,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Xogalos todos"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Usuarios"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2364,6 +2182,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Configura de novo as teclas."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Actualizando os complementos…"
@@ -2373,46 +2195,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Cargando os complementos…"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Chupón — Lánzao cara adiante para ralentizar a un opoñente, ou lánzao cara "
-"atrás para cegar a quen lle atines."
+msgstr "Chupón — Lánzao cara adiante para ralentizar a un opoñente, ou lánzao cara atrás para cegar a quen lle atines."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Preme «Esc» para cancelar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Preme unha tecla"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Preme «Intro» ou dúas veces co botón secundario para configuralo."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Preme «Intro» ou dúas veces co botón secundario para modificalo."
 
@@ -2428,10 +2242,7 @@ msgstr "Dálle a disparar para comezar o desafío."
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Preme os botóns 1 e 2 de maneira simultánea no mando da Wii para poñelo en "
-"modo de descubrimento, e preme «Aceptar». Para máis información, véxase "
-"«supertuxkart.net/Wiimote» (en inglés)."
+msgstr "Preme os botóns 1 e 2 de maneira simultánea no mando da Wii para poñelo en modo de descubrimento, e preme «Aceptar». Para máis información, véxase «supertuxkart.net/Wiimote» (en inglés)."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2449,7 +2260,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2458,7 +2268,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Globo"
 
@@ -2466,31 +2275,25 @@ msgstr "Globo"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Empurra a bóla á cela do lado contrario para marcar puntos. Só dispoñíbel "
-"para partidas de varios xogadores."
+msgstr "Empurra a bóla á cela do lado contrario para marcar puntos. Só dispoñíbel para partidas de varios xogadores."
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Saír"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Configuración da carreira"
 
@@ -2511,8 +2314,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Kart ao chou"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Circuíto ao chou"
 
@@ -2521,84 +2324,68 @@ msgid "Rank"
 msgstr "Posición"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Puntuación >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Preparados…"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Gaña o equipo vermello"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Carreira normal: permítense todas as armas, así que sácalles o mellor "
-"partido!"
+msgstr "Carreira normal: permítense todas as armas, así que sácalles o mellor partido!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Lembrar a posición da xanela."
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Eliminar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Cambiar o nome"
 
@@ -2624,29 +2411,25 @@ msgstr "Rescatar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reiniciar"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Reiniciar a carreira"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Traxecto inverso."
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2703,41 +2486,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "Compañía STK"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Escocia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2747,12 +2524,10 @@ msgid "Select"
 msgstr "Escoller"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Escolle un modo de xogo:"
 
@@ -2762,36 +2537,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Escolle un kart:"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2806,91 +2575,49 @@ msgstr "Listos…"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nova carreira"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Tormenta de area"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Suburbios relucentes"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2900,7 +2627,6 @@ msgid "Size: %s"
 msgstr "Tamaño: %s."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2911,12 +2637,10 @@ msgstr "Derrapar"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Aparencia:"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Pico nevado"
 
@@ -2926,30 +2650,23 @@ msgid "Soccer"
 msgstr "Fútbol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Campo de fútbol"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Fútbol. Só para xogar entre varios usuarios. Empurra a bola co kart ata "
-"metela dentro da portería."
+msgstr "Fútbol. Só para xogar entre varios usuarios. Empurra a bola co kart ata metela dentro da portería."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Produciuse un erro ao intentar conectarse ao sitio web de complementos. "
-"Asegúrate de que estás conectado a internet e de que non tes unha devasa "
-"bloqueando SuperTuxKart."
+msgstr "Produciuse un erro ao intentar conectarse ao sitio web de complementos. Asegúrate de que estás conectado a internet e de que non tes unha devasa bloqueando SuperTuxKart."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2957,7 +2674,6 @@ msgstr "Non foi posíbel descargar o complemento."
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efectos de son"
 
@@ -2966,7 +2682,6 @@ msgstr "Efectos de son"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Estándar"
 
@@ -2979,11 +2694,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Comezar o campionato"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Comezar a carreira"
 
@@ -3003,12 +2717,10 @@ msgstr "Xirar á dereita"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Aventura"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3016,139 +2728,120 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Nas profundidades"
 
-# Adaptación baseada na banda deseñada en castelán «Superlópez».
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "Supertux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Complementos"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Axuda"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Configuración"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "A SuperTuxKart poden xogar varios xogadores no mesmo computador."
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart ten varios modos de xogo."
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Cambiador — Por un tempo, as caixas de agasallos transfórmanse en plátanos, "
-"e vice versa."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Cambiador — Por un tempo, as caixas de agasallos transfórmanse en plátanos, e vice versa."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Matamoscas — Extensión que se engade temporalmente ao kart, e que esmaga os "
-"karts que se achegan, ralentizándoos."
+msgstr "Matamoscas — Extensión que se engade temporalmente ao kart, e que esmaga os karts que se achegan, ralentizándoos."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Lingua do sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtro de texturas:"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"A tecla de «Derrapar» permite virar bruscamente en curvas pronunciadas, e "
-"acelerar ao final."
+msgstr "A tecla de «Derrapar» permite virar bruscamente en curvas pronunciadas, e acelerar ao final."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Estadio"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"O módulo de complementos está actualmente desactivado da pantalla de "
-"configuración."
+msgstr "O módulo de complementos está actualmente desactivado da pantalla de configuración."
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"O ficheiro das mellores puntuacións era vello de máis,\n"
-"e elimináronse todas as puntuacións."
+msgstr "O ficheiro das mellores puntuacións era vello de máis,\ne elimináronse todas as puntuacións."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3161,42 +2854,22 @@ msgstr "Competición simple"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Competición simple: non hai bonificacións, así que o único que importará "
-"será a mestría dos condutores!"
+msgstr "Competición simple: non hai bonificacións, así que o único que importará será a mestría dos condutores!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Para engadir un mando novo, abonda con que esteas conectado ao iniciar o "
-"xogo. Debería aparecer na lista.\n"
-"\n"
-"Para engadir unha configuración para o teclado, podes utilizar o botón que "
-"segue, pero ten en conta que en case todos os teclados hai un número máximo "
-"de teclas que se poden premer á vez ou certas teclas que non se poden premer "
-"á vez. Por iso non son a mellor escolla para xogar varias persoas.\n"
-"\n"
-"Por outra banda, podes conectar varios teclados ao computador. Pero ten en "
-"conta que aínda así cada xogador ten que usar teclas de seu."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Para engadir un mando novo, abonda con que esteas conectado ao iniciar o xogo. Debería aparecer na lista.\n\nPara engadir unha configuración para o teclado, podes utilizar o botón que segue, pero ten en conta que en case todos os teclados hai un número máximo de teclas que se poden premer á vez ou certas teclas que non se poden premer á vez. Por iso non son a mellor escolla para xogar varias persoas.\n\nPor outra banda, podes conectar varios teclados ao computador. Pero ten en conta que aínda así cada xogador ten que usar teclas de seu."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Para gañar podes axudarte de certas bonificacións:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Ida e volva á Lúa"
 
@@ -3215,7 +2888,7 @@ msgstr "%i mellores"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3229,19 +2902,17 @@ msgstr "Circuíto creado por %s."
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Circuítos"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineal"
 
@@ -3252,24 +2923,21 @@ msgstr "Volve intentalo"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Aprendizaxe"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Aprendizaxe: sala de escolla"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipo:"
 
@@ -3277,20 +2945,18 @@ msgstr "Tipo:"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Eliminar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3304,8 +2970,8 @@ msgid "Update"
 msgstr "Actualizar"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Actualizados"
 
@@ -3314,40 +2980,36 @@ msgid "Updated date"
 msgstr "Data de actualización"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Preme <%s> para usar o nitro que recolliches!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interface"
 
@@ -3356,19 +3018,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3377,13 +3037,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "contra"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3394,27 +3053,23 @@ msgstr "Versión: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronización vertical (hai que reiniciar)."
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume:"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3426,7 +3081,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "VAS EN SENTIDO CONTRARIO!"
 
@@ -3435,59 +3090,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Advertencia: non se recomenda empregar a tecla «Maiús», xa que ao premela a "
-"meirande parte das teclas deixan de funcionar, por ter estas distinto valor "
-"combinadas con «Maiús»."
+msgstr "Advertencia: non se recomenda empregar a tecla «Maiús», xa que ao premela a meirande parte das teclas deixan de funcionar, por ter estas distinto valor combinadas con «Maiús»."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efectos meteorolóxicos."
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efectos meteorolóxicos: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Que vos pasa, raparigos? Non atopades ao voso “gran� líder o ñu?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Unha vez configurados os dispositivos de entrada xa podedes xogar. Escollede "
-"a icona de «Varios xogadores» no menú principal. Na pantalla de escolla de "
-"kart, cada xogador poderá unirse á partida premendo o botón de «disparar» do "
-"seu mando ou teclado. Unha vez todos escollan un kart co que correr, "
-"poderase continuar. Hai que ten en conta que para este paso non pode "
-"empregarse o rato."
+msgstr "Unha vez configurados os dispositivos de entrada xa podedes xogar. Escollede a icona de «Varios xogadores» no menú principal. Na pantalla de escolla de kart, cada xogador poderá unirse á partida premendo o botón de «disparar» do seu mando ou teclado. Unha vez todos escollan un kart co que correr, poderase continuar. Hai que ten en conta que para este paso non pode empregarse o rato."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3495,42 +3136,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Si"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Estás listo para correr. Sorte!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Xogador actual:"
 
@@ -3540,37 +3175,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Superaches un desafío!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Superaches desafíos!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Completaches o campionato!"
 
@@ -3591,20 +3225,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Remataches a carreira!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Quedaches eliminado!"
 
@@ -3614,7 +3250,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3622,57 +3258,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Desbloqueaches o campionato «%0»."
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Desbloqueaches o circuíto «%0»."
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Gañaches a carreira!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"O ficheiro de configuración non estaba ben, así que eliminouse e vaise crear "
-"un novo."
+msgstr "O ficheiro de configuración non estaba ben, así que eliminouse e vaise crear un novo."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "O ficheiro de configuración estaba obsoleto, así que eliminouse e vaise crear un novo."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"O ficheiro de configuración estaba obsoleto, así que eliminouse e vaise "
-"crear un novo."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"O ficheiro de configuración dos dispositivos de entrada non é compatíbel con "
-"esta versión de SuperTuxKart."
+msgstr "O ficheiro de configuración dos dispositivos de entrada non é compatíbel con esta versión de SuperTuxKart."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3680,7 +3320,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Xardín da paz"
 
@@ -3691,7 +3330,6 @@ msgstr "[ningún]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3700,7 +3338,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "de"
@@ -3709,45 +3348,25 @@ msgstr "de"
 msgid "featured"
 msgstr "Destacados"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Estándar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Adrián Chaves Fernández https://launchpad.net/~gallaecio\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
-"  Trutxo64 https://launchpad.net/~celestino-freire"
+msgstr "Launchpad Contributions:\n  Adrián Chaves Fernández https://launchpad.net/~gallaecio\n  Auria https://launchpad.net/~auria-mg\n  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n  Trutxo64 https://launchpad.net/~celestino-freire"
diff --git a/data/po/he.po b/data/po/he.po
index a1b6a1a99..934d18db4 100644
--- a/data/po/he.po
+++ b/data/po/he.po
@@ -1,23 +1,22 @@
-# Hebrew translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Shai Shapira <shayshap@gmail.com>\n"
-"Language-Team: Hebrew <he@li.org>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/supertuxkart/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,22 @@ msgstr "   Y"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
+msgstr " �בל הפ�נקיסטי� הפתטיי� שלך לעול� ל� יוכלו להביס �ותי - מלך המכוניות!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "חבר %d מחובר כעת."
+msgstr[1] "%d חברי� מחוברי� כעת."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (מוגבל)"
@@ -58,7 +58,7 @@ msgstr "%s ק״ב"
 msgid "%s MB"
 msgstr "%s מ״ב"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s וג� %s מחוברי� עכשיו."
@@ -70,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s מ�ת %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s על ידי %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s מחובר עכשיו."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s מוכן"
@@ -97,25 +96,23 @@ msgstr "הדיוקן של %s"
 msgid "%s's server"
 msgstr "השרת של %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s וג� %s מקווני� כעת."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' נפסל."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(ריק)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(משחק רשת �ינו זמין עדיין)"
 
@@ -129,44 +126,34 @@ msgstr "* פריט �דו� פירושו התנגשות ע� התצורה הנו
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* ניתן לר�ות ולשנות �ת מקשי המשחק בתפריט �פשרויות"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* ברוב מצבי המשחק ה�לה �פשר לשחק ג� במצב גרנד פרי: במקו� לשחק במירוץ יחיד, "
-"משחקי� בכמה מירוצי� ברצף. ככל שתדורגו יותר גבוה, תקבלו יותר נקודות. בסוף, "
-"המתמודד שיגיע לניקוד הגבוהה ביותר זוכה בגביע."
+msgstr "* ברוב מצבי המשחק ה�לה �פשר לשחק ג� במצב גרנד פרי: במקו� לשחק במירוץ יחיד, משחקי� בכמה מירוצי� ברצף. ככל שתדורגו יותר גבוה, תקבלו יותר נקודות. בסוף, המתמודד שיגיע לניקוד הגבוהה ביותר זוכה בגביע."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* התחל מחדש �ת STK כדי להחיל הגדרות חדשות"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -197,13 +184,10 @@ msgstr "קרב שלוש פגיעות"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"קרב 3 מכות: רק במשחק מרובה משתתפי�. פגע ב�חרי� בעזרת כלי נשק עד �שר ה� "
-"מ�בדי� �ת חייה�."
+msgstr "קרב 3 מכות: רק במשחק מרובה משתתפי�. פגע ב�חרי� בעזרת כלי נשק עד �שר ה� מ�בדי� �ת חייה�."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -218,23 +202,20 @@ msgid "9 months"
 msgstr "9 חודשי�"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= שי�י� ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "מכוניות בשליטת מחשב"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "נטוש גרנד פרי"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "�ודות"
 
@@ -243,39 +224,35 @@ msgstr "�ודות"
 msgid "Accelerate"
 msgstr "ה�צה"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"ה�ץ ולחץ על המקש <%s> במהלך פניה כדי להחליק. החלקה למשך זמן קצר יכולה לעזור "
-"לך להסתובב מהר יותר כדי לקחת פניות חדות."
+msgstr "ה�ץ ולחץ על המקש <%s> במהלך פניה כדי להחליק. החלקה למשך זמן קצר יכולה לעזור לך להסתובב מהר יותר כדי לקחת פניות חדות."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "ה�ץ בעזרת <%s> ונווט ע� <%s> וע� <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "קבל"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "שחזור חשבון"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "הגדרות חשבון"
 
@@ -283,8 +260,7 @@ msgstr "הגדרות חשבון"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "הישגי�"
 
@@ -294,13 +270,11 @@ msgstr "פעולה"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "הוסף"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "הוסף חבר"
 
@@ -311,7 +285,6 @@ msgstr "הוספת תצורת מקלדת"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "הוספת שחקן"
 
@@ -322,32 +295,29 @@ msgstr "הוספת Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "הוספת התקן"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "הוסף משתמש"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "תוספי�"
 
@@ -357,49 +327,43 @@ msgstr "ש� תוסף"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "תוספי�"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "�דיומי"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "צינור מתקד� (�ורות, וכו׳)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "הכל"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "כל המסלולי�"
 
@@ -409,18 +373,20 @@ msgstr "הכל מותר, �ז תפוס נשקי� ותשתמש בה� בתבונ
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "הצג תמיד מסך התחברות"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "�טימות מקיפה"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "�טימות מקיפה : %s"
@@ -430,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "�ירעה שגי�ה במהלך שמירת גרנד פרי."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "עוגן – מ�ט מ�וד �ת המכונית שבמקו� הר�שון."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "דמויות מונפשות"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "דמויות מונפשות: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "תפ�ורה מונפשת"
 
@@ -456,24 +419,24 @@ msgstr "תפ�ורה מונפשת"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "תפ�ורה מונפשת: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "�נ�יזוטרופי x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "�נ�יזוטרופי x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "�נ�יזוטרופי x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "�נ�יזוטרופי x8"
 
@@ -483,31 +446,27 @@ msgstr "גרנד פרי �חר בש� זה כבר קיי�."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Anti-aliasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Anti-aliasing : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "החל"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "החל רזולוציה חדשה"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "�ויב ערמומי"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -520,49 +479,44 @@ msgstr "ה�� �תה בטוח כי ברצונך למחוק לצמיתות �ת
 msgid "Are you sure you want to remove '%s'?"
 msgstr "ה�� �תה בטוח כי ברצונך להסיר �ת '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "זירות"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
-msgstr ""
+msgstr "מסביב למגדלור"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "הקצה כלו�"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "הקצה למקש ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "בסוף העול�"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "שמע"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "הימנע מן בננות!"
 
@@ -584,79 +538,66 @@ msgstr "ציר %d %s"
 msgid "Axis %d inverted"
 msgstr "ציר %d הפוך"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "חזרה"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "חזרה למשחק"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "חזרה למירוץ"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "חזרה למבחר �תגרי�"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "חזרה לרשימת התקני�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "חזרה לתפריט"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "חזרה לתפריט"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "חובב בננות"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr "כדורסל - מקפץ �חר המוביל, ועשוי למעוך ול�ט מכוניות בדרך."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "הקרב על ה�י"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "ביגל"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "ביסטי"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "בהצלחה בפע� הב�ה!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "דו־קווי"
 
@@ -666,38 +607,33 @@ msgid "Black"
 msgstr "שחור"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
-msgstr ""
+msgstr "�חוזת הגבעה השחורה"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "פריחה"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "פריחה : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "קבוצה כחולה מנצחת"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "משק"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"כדור ב�ולינג – קופץ על קירות. �� תשתמש בו תוך מבט ל�חור, הו� יושלך ל�חור."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "כדור ב�ולינג – קופץ על קירות. �� תשתמש בו תוך מבט ל�חור, הו� יושלך ל�חור."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -705,69 +641,58 @@ msgid "Brake"
 msgstr "בלימה"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"גומי לעיסב - הגן על עצמך בעזרת מגן, �ו השתמש בזה כעת הסתכלות ל�חור כדי "
-"להותיר שלולית ורודה דביקה מ�חוריך."
+msgstr "גומי לעיסב - הגן על עצמך בעזרת מגן, �ו השתמש בזה כעת הסתכלות ל�חור כדי להותיר שלולית ורודה דביקה מ�חוריך."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "�בל �ני יצור הוגן, �ז �ני �עשה עמכ� עסקה."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"עוגה – מושלכת על היריב הקרוב ביותר, יעילה לטווחי� קצרי� �ו לקטעי� ישרי�."
+msgstr "עוגה – מושלכת על היריב הקרוב ביותר, יעילה לטווחי� קצרי� �ו לקטעי� ישרי�."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "ל� מסוגל לגשת לשרת stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "ביטול"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "בטל בקשה"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -775,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "ביטול\\חזרה"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "מערת X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "�תגר הושל�"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "�תגר נכשל"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "�תגרי�: חדר גביעי�"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "שנה"
 
@@ -802,62 +724,52 @@ msgstr "שנה"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "בחר מכונית"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "כריסטופר קולומבוס"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "לחץ כ�ן כדי להתחיל שיעור"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "סגור"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "מקדש קק�ו"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "�סוף לפחות 5 בננות במירוץ �חד."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "�סוף קופס�ות כחולות: הן יתנו לך כלי נשק וכוחות מדליקי� �חרי�"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"�סוף קופס�ות מתנה, ושגר �ת הנשק בעזרת <%s> כדי להעיף �ת ה�רגזי� הללו!"
+msgstr "�סוף קופס�ות מתנה, ושגר �ת הנשק בעזרת <%s> כדי להעיף �ת ה�רגזי� הללו!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "�סוף בקבוקי ניטרו (�נחנו נשתמש בה� ל�חר העקומה)"
 
@@ -867,16 +779,13 @@ msgstr "�סוף ניטרו!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"על ידי �יסוף מיכלי ניטרו, תוכל לה�יץ מתח שתרצה בלחיצה על המקש המת�י�. "
-"ב�פשרותך לר�ות �ת הרמה הנוכחית של ניטרו בפס שנמצ� בצד ימין של מסך המשחק."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "על ידי �יסוף מיכלי ניטרו, תוכל לה�יץ מתח שתרצה בלחיצה על המקש המת�י�. ב�פשרותך לר�ות �ת הרמה הנוכחית של ניטרו בפס שנמצ� בצד ימין של מסך המשחק."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "השל� �ת כל ה�תגרי� כדי לפתוח �ת הדלת הגדולה!"
 
@@ -889,11 +798,11 @@ msgstr "הישגי� מוגמרי� \"%s\"."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "�שר"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -901,7 +810,6 @@ msgstr "�שר רזולוציה תוך %i שניות"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "התחבר ל�ינטרנט"
 
@@ -909,105 +817,86 @@ msgstr "התחבר ל�ינטרנט"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"חבר wiimote למנהל Bluetooth, ו�ז לחץ על �ישור. הור�ות מפוטות בתוך "
-"supertuxkart.net/Wiimote"
+msgstr "חבר wiimote למנהל Bluetooth, ו�ז לחץ על �ישור. הור�ות מפוטות בתוך supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "�ין כוחות מדליקי�, כך שרק כישורי הנהיגה משני�!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "המשך"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "המשך גרנד פרי שמור"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "המשך."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "מקשי�"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "העתק"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "ל� מסוגל ליצור שחקן '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "ל� היתה �פשרות ל�תר שו� wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "צור"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "צור שרת"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "צור משתמש"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "צור חשבון מקוון"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "כעת יוצר שרת"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "תודות"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "סיסמה נוכחית"
 
@@ -1020,13 +909,12 @@ msgid "Currently not signed in"
 msgstr "ל� מחובר כעת"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "מות��"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "הגדרות מות�מות..."
 
@@ -1052,7 +940,6 @@ msgstr "�DPad מעלה"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "דחה"
 
@@ -1060,28 +947,26 @@ msgstr "דחה"
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "מחק"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "מחק תצורה"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "עומק שדה"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "עומק שדה : %s"
@@ -1094,24 +979,23 @@ msgstr "נטרל התקן"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "מנוטרל"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "הצג FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "ה�� �תה בטוח כי ברצונך לנטוש �ת הגרנד פרי?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "ה�� �תה בטוח כי ברצונך למחוק �ת השחקן '%s'?"
@@ -1120,8 +1004,8 @@ msgstr "ה�� �תה בטוח כי ברצונך למחוק �ת השחקן '%s'
 msgid "Do you want to save your changes?"
 msgstr "ה�� ברצונך לשמור �ת השינויי� שלך?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "�ל ת�יץ לפני צ�"
 
@@ -1132,27 +1016,24 @@ msgstr "למטה"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "סע �חורנית"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "�ורות דינ�מיי� : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "ערוך"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "ערוך גרנד פרי"
 
@@ -1163,7 +1044,6 @@ msgstr "ציד ביצי�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "חיפוש ביצי�: סייר במסלולי� ומצ� ביצי� חבויות."
 
@@ -1173,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "ביצי�: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "פיל"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "נפסל"
 
@@ -1186,24 +1065,22 @@ msgstr "נפסל"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "דו�״ל"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "על �ורך דו�״ל להיות בין 4 עד 50 תווי�!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "דו�״ל �ינו תקף!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "כתובות דו�״ל ל� תו�מות!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "�ימיול"
 
@@ -1215,27 +1092,24 @@ msgstr "הפעלת התקן"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "פעיל"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "מ�ופשרת לכול�"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "הקלד �ת ש� השחקן החדש"
 
@@ -1248,31 +1122,31 @@ msgstr "שגי�ה בהורדת חדשות: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "כול�:\nלחצו כעת על 'בחר' כדי להצטרף למשחק!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"כול�:\n"
-"לחצו כעת על 'בחר' כדי להצטרף למשחק!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "יצי�ה"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "יצי�ה מן המירוץ"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "צ� מהמשחק"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "מקצוען"
 
@@ -1280,12 +1154,12 @@ msgstr "מקצוען"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "סייר במסלולי� ומצ� �ת כל הביצי� הנסתרות"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1310,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "הקפה �חרונה!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "מצ� שרת"
 
@@ -1333,20 +1205,14 @@ msgstr "�ש"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"ר�שית, עליך להתקין כמה התקני קלט (מספר בקרי משחק �ו ג׳ויסטיקי� הו� הדרך "
-"הטובה ביותר לשחק ע� כמה �נשי�). המשך להגדרות קלט והגדר �ת הבקרי�. זה �פשרי "
-"ג� לשחק על מקלד(ו)ת, �ך כל שחקן יצטרך מערך מקשי� �חר, ויש לזכור שרוב המקלדות "
-"ל� מת�ימות למשחק מרובה משתתפי�, מכיוון שהן ל� תומכות בהקשת מספר גדול של "
-"מקשי� בו זמנית."
+msgstr "ר�שית, עליך להתקין כמה התקני קלט (מספר בקרי משחק �ו ג׳ויסטיקי� הו� הדרך הטובה ביותר לשחק ע� כמה �נשי�). המשך להגדרות קלט והגדר �ת הבקרי�. זה �פשרי ג� לשחק על מקלד(ו)ת, �ך כל שחקן יצטרך מערך מקשי� �חר, ויש לזכור שרוב המקלדות ל� מת�ימות למשחק מרובה משתתפי�, מכיוון שהן ל� תומכות בהקשת מספר גדול של מקשי� בו זמנית."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1359,24 +1225,22 @@ msgstr "עקבו �חר המוביל!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"עקוב �חר המוביל: התחרה עבור המקו� השני, מירוץ בו המכונית ה�חרונה תיפסל בכל "
-"פע� בו המונה מגיע ל�פס. זהירות : המשך לפני המוביל יסלק �ותך ג� כן!"
+msgstr "עקוב �חר המוביל: התחרה עבור המקו� השני, מירוץ בו המכונית ה�חרונה תיפסל בכל פע� בו המונה מגיע ל�פס. זהירות : המשך לפני המוביל יסלק �ותך ג� כן!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "מבצר המ�גמה"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "נמצ�ו %d wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1400,13 +1264,12 @@ msgstr "בקשת חברות נשלחה!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "חברי�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "מסך מל�"
 
@@ -1420,24 +1283,21 @@ msgstr "שער!"
 msgid "Game Keys"
 msgstr "מקשי משחק"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "מצבי משחק"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "טיפוס משחק (מגבלת שערי� / מגבלת זמן)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1451,51 +1311,45 @@ msgstr "כפתור הבקר %d"
 msgid "Gamepad hat %d"
 msgstr "מתג הבקר %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "הגדרות כלליות"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "נטוש מירוץ"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "גנו"
 
@@ -1505,63 +1359,55 @@ msgid "Go!"
 msgstr "צ�!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "נהג זהב"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "�י גר�ן פ�ר�דיזו"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "גרנד פרי"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "עורך גרנד פרי"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "עורך גרנד פרי"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "התקדמות גרנד פרי:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "רמת �פקטי� גרפיי�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "גרפיקה"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "הגדרות גרפיקה"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
-msgstr ""
+msgstr "בקעה ירוקה"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1576,12 +1422,10 @@ msgstr "�ורח %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "כניסת �ורח"
+msgid "Guest Log in"
+msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "�סיינדה"
 
@@ -1591,98 +1435,90 @@ msgstr "�סיינדה"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "עזרה"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "הקסלי"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "שי�י�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "פגע ב-10 מכוניות ע� כדור ב�ולינג."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"פגעו ב�חרי� בכלי הנשק עד שי�בדו �ת כל הפסילות. (רק במשחקי� מרובי-משתתפי�)"
+msgstr "פגעו ב�חרי� בכלי הנשק עד שי�בדו �ת כל הפסילות. (רק במשחקי� מרובי-משתתפי�)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "פגע ב�ותה מכונית 5 פעמי� במירוץ �חד."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "משתמשי� �נושיי� בלבד"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "�ני מסכי�/מסכימה ע� התנ�י� ה�מורי� �ני בן/בת 13 ומעלה. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
+msgstr "�� �ת� יכולי� להביס �ותי במירוצי�, �ני �שחרר �ת הברנש הזקן."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "�� תר�ה כפתור ע� מנעול כמו זה, יהי עליך להשלי� �תגר כדי לפתוח �ותו."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "מתעל� מן׳'%s', היה עליך להצטרף מוקד� יותר כדי לשחק!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "התקנה"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "בינוני"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "גישה ל�ינטרנט הינה מנוטרלת, �נ� �פשר �ותה בתוך ה�פשרויות"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "זהו תיקו"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "זה סודי"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "הצטרף"
 
@@ -1692,13 +1528,12 @@ msgstr "כעת מצטרף לשרת"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "מכוניות"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "שמור �ת רזולוציה זו"
 
@@ -1717,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "מקלדת %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "קונקי"
 
@@ -1726,7 +1560,7 @@ msgstr "קונקי"
 msgid "Lap"
 msgstr "הקפה"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "הקפה %i"
@@ -1788,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "כעת טוען"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "לובי"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "הגדרות לובי"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "ש� משתמש מקומי"
+msgid "Local Name"
+msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "נעול"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "נעול: השלימו �תגר כדי לקבל גישה ליותר!"
 
@@ -1839,11 +1669,51 @@ msgstr "נעול: השלימו �תגר כדי לקבל גישה ליותר!"
 msgid "Locked!"
 msgstr "נעול!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "כניסה"
 
@@ -1854,46 +1724,35 @@ msgstr "מבט �חורה"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "חפש עוד חברי�:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "מרתונ�י"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "מספר שחקני� מרבי"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "זמן מרבי (דקות)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "�ני בלבד"
 
@@ -1903,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "מקשי תפריט"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
+msgstr "מיני גולף"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "טשטוש תנועה"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "טשטוש תנועה: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "ציר עכבר %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1933,48 +1796,41 @@ msgstr "כפתור עכבר %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "הזז מטה"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "הזז מעלה"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "רב־משתתפי�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "רב־משתתפי�"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "מוזיקה"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "ש�"
 
@@ -1994,13 +1850,15 @@ msgstr "ש� �רוך מדי."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "ש� השרת"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "חדש"
 
@@ -2009,9 +1867,13 @@ msgstr "חדש"
 msgid "New Grand Prix '%s' now available"
 msgstr "גרנד פרי חדש '%s' זמין כעת"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "סיסמה חדשה"
 
@@ -2024,7 +1886,7 @@ msgstr "בקשה חדשה"
 msgid "New difficulty '%s' now available"
 msgstr "רמת קושי חדשה '%s' זמינה כעת"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "שי� חדש בזמן ההקפה"
 
@@ -2052,19 +1914,18 @@ msgstr "ניטרו"
 msgid "Nitro challenge"
 msgstr "�תגר ניטרו"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "ל�"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "נולוק"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "ל� זמין"
 
@@ -2074,22 +1935,19 @@ msgid "Normal Race"
 msgstr "מירוץ רגיל"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "נופש בצפון"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"שי� לב ש�� �תה מצליח להחליק למשך מספר שניות, �תה תקבל ה�צת בונוס כתגמול!"
+msgstr "שי� לב ש�� �תה מצליח להחליק למשך מספר שניות, �תה תקבל ה�צת בונוס כתגמול!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "מתחיל"
 
@@ -2100,46 +1958,41 @@ msgstr "מספר מכוניות בשליטת מחשב : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "מספר מכוניות בשליטת מחשב"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "מספ� שערי� לניצחון"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "מספר הקפות"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "מספר הקפות:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "�ישור"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "הל�ה לדרך הסלולה"
 
@@ -2147,60 +2000,59 @@ msgstr "הל�ה לדרך הסלולה"
 msgid "Offline"
 msgstr "ל� מקוון"
 
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
-msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
 msgstr ""
 
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+msgstr "�ה כן, �ת� מביני�, הו� בתוך הטירה שלי עכשיו ויוגש ל�רוחת ערב..."
+
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "מכרה ישן"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "כיתת החשבון של �וליבר"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "מקוון"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "רב משתתפי� מקוון"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "ש� משתמש מקוון"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "רק מנהל המשחק יכול לפעול בנקודה זו!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "�ופס! כ�שר �תה בצרות לחץ <%s> כדי להיחלץ"
@@ -2211,14 +2063,11 @@ msgstr "�ופס! כ�שר �תה בצרות לחץ <%s> כדי להיחלץ"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "�פשרויות"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "סיכו�"
 
@@ -2227,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "מצנח – מ�ט �ת כל המכוניות שלפניך."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "סיסמה"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "סיסמה :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "שינוי סיסמה"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "על �ורך סיסמה להיות בין 8 עד 30 תווי�!"
 
@@ -2263,8 +2107,8 @@ msgstr "על �ורך סיסמה להיות בין 8 עד 30 תווי�!"
 msgid "Password successfully changed."
 msgstr "סיסמה שונתה בהצלחה."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "סיסמ�ות ל� תו�מות."
 
@@ -2275,12 +2119,11 @@ msgstr "הקפ�ת משחק"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "מוקפ�"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "זמן עונשין!!"
 
@@ -2289,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "חצר הפינגוויני�"
 
@@ -2298,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "פידג'ין"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "הצג הכל"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "שחקני�"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "�נ� הזן ש� של גרנד פרי"
 
@@ -2337,6 +2180,10 @@ msgstr "�נ� הזן ש� של גרנד פרי"
 msgid "Please re-configure your key bindings."
 msgstr "�נ� הגדירו מחדש �ת המקשי�."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "�נ� המתן בזמן שתוספי� מתעדכני�"
@@ -2346,47 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "�נ� המתן בזמן שהתוספי� נטעני�"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"טובלן – השליכו קדימה כדי למשוך יריב �חורה, �ו השליכו �חורה כדי לעוור יריב."
+msgstr "טובלן – השליכו קדימה כדי למשוך יריב �חורה, �ו השליכו �חורה כדי לעוור יריב."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"לחץ על <%s> כדי להסתכל מ�חוריך, ושגר �ת הנשק בעזרת <%s> בעודך לוחץ על <%s> "
-"כדי לירות ל�חור!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "לחץ על <%s> כדי להסתכל מ�חוריך, ושגר �ת הנשק בעזרת <%s> בעודך לוחץ על <%s> כדי לירות ל�חור!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "הקש ESC לביטול"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "לחץ על מקש"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "לחץ על Enter �ו הקש פעמיי� על התקן כדי להגדיר �ותו"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "לחץ על Enter �ו הקש פעמיי� על שחקן כדי לערוך �ותו/�ותה"
 
@@ -2402,9 +2240,7 @@ msgstr "לחץ על �ש כדי להתחיל �ת ה�תגר"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"לחץ בו זמנית על הכפתורי� 1+2 שעל מכשיר ה-wiimote שלך כדי להפעיל מצב גילוי, "
-"�ח״כ לחץ על �ישור.הור�ות מפורטות בכתובת supertuxkart.net/Wiimote"
+msgstr "לחץ בו זמנית על הכפתורי� 1+2 שעל מכשיר ה-wiimote שלך כדי להפעיל מצב גילוי, �ח״כ לחץ על �ישור.הור�ות מפורטות בכתובת supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2422,7 +2258,6 @@ msgstr "כעת מעבד"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "דיוקן"
 
@@ -2431,7 +2266,6 @@ msgid "Progress"
 msgstr "התקדמות"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "פ�פי"
 
@@ -2443,25 +2277,21 @@ msgstr "דחוף �ת הכדור לכלוב הנגדע כדי להקיע שער
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "משחק מהיר"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "יצי�ה"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "צ� מן השרת"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "הגדרת מירוץ"
 
@@ -2482,8 +2312,8 @@ msgstr "גרנד פרי �קר�י"
 msgid "Random Kart"
 msgstr "מכונית �קר�ית"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "מסלול �קר�י"
 
@@ -2492,82 +2322,68 @@ msgid "Rank"
 msgstr "דירוג"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "דירוג >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "היכון!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "ב�מת ... סוד."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "קבוצה �דומה מנצחת"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "הירש�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr "מירוץ רגיל: הכל מותר, �ז תפוס נשקי� ועשה בה� שימוש נבון!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "טען שוב"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "זכור סיסמה"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "זכור מיקו� חלון"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "הסר"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "שנה ש�"
 
@@ -2593,35 +2409,31 @@ msgstr "הצלה"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "רזולוציה"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "התחלה מחדש"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "התחל מחדש מירוץ"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "הפוך"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "הפוך:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "הפוך"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2672,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
+msgstr "STK �נטרפרייז"
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "שמור"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "שמור גרנד פרי"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "סקוטלנד"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "חפש"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "כעת מחפש"
 
@@ -2716,12 +2522,10 @@ msgid "Select"
 msgstr "בחירה"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "בחר קושי"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "בחירת מצב משחק"
 
@@ -2731,36 +2535,30 @@ msgstr "בחר מסלול"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "בחר מכונית"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "יצירת שרת"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "מידע שרת"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "בחירת שרת"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "ש� שרת :"
 
@@ -2775,93 +2573,51 @@ msgstr "הכן!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "הגדר מירוץ חדש"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "צללי�"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "צללי�: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "חולות נודדי�"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "הפרברי� המבריקי�"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "התחבר"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "התחבר בתור �ורח"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "התנתק"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "התחבר בתור: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "כעת מתחבר"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "כעת מתחבר '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "כעת מתנתק"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "כעת מתנתק '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "מ�ז"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "שחקן בודד"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2869,7 +2625,6 @@ msgid "Size: %s"
 msgstr "גודל: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2880,12 +2635,10 @@ msgstr "החלקה"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "סקין"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "פסגה משולגת"
 
@@ -2895,29 +2648,23 @@ msgid "Soccer"
 msgstr "כדורגל"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
-msgstr ""
+msgstr "שדה כדורגל"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"כדורגל: רק במשחק מרובה משתתפי�. השתמש במכונית שלך כדי לדחוף �ת הכדור לתוך "
-"השער."
+msgstr "כדורגל: רק במשחק מרובה משתתפי�. השתמש במכונית שלך כדי לדחוף �ת הכדור לתוך השער."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"לצערנו, �ירעה שגי�ה בחיבור ל�תר התוספי�. �נ� וד� ש�תה מחובר ל�ינטרנט, וכי "
-"SuperTuxKart �ינו חסו� על ידי חומת �ש"
+msgstr "לצערנו, �ירעה שגי�ה בחיבור ל�תר התוספי�. �נ� וד� ש�תה מחובר ל�ינטרנט, וכי SuperTuxKart �ינו חסו� על ידי חומת �ש"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2925,7 +2672,6 @@ msgstr "לצערנו, הורדת התוסף נכשלה"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "�פקטי� קוליי�"
 
@@ -2934,7 +2680,6 @@ msgstr "�פקטי� קוליי�"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "רגיל"
 
@@ -2947,11 +2692,10 @@ msgstr "התחל"
 msgid "Start Grand Prix"
 msgstr "התחל גרנד פרי"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "התחל מירוץ"
 
@@ -2969,98 +2713,82 @@ msgstr "הטיה ימינה"
 msgid "Steer Right"
 msgstr "הטיה שמ�לה"
 
-# סיפורת
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "מצב עלילה"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "פגיעה!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "שלח"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "התת ימי"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "סופרט�קס"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "תוספי SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "עזרת SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "�פשרויות SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "�פשר לשחק ע� SuperTuxKart במצב מרובה משתתפי� על �ותו מחשב"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart תומך בכמה מצבי משחק"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "סוזן"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "מחליף – קופס�ות מתנה ובננות מתחלפות לזמן קצר."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "מחבט – מועך מכוניות סמוכות ומ�ט �ותן."
 
@@ -3069,32 +2797,37 @@ msgstr "מחבט – מועך מכוניות סמוכות ומ�ט �ותן."
 msgid "System Language"
 msgstr "שפת המערכת"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "תנ�י� והסכמה"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "סינון מרק�"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "מקש 'החלקה' מתיר לך להחליק בתוך פניות חדות ולקבל תנופה."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "ה�צטדיון"
 
@@ -3106,9 +2839,7 @@ msgstr "מודול תוספי� מבוטל כרגע במסך ה�פשרויות"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"קובץ השי�י� ישן מדי.\n"
-"כל השי�י� נמחקו."
+msgstr "קובץ השי�י� ישן מדי.\nכל השי�י� נמחקו."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3121,37 +2852,22 @@ msgstr "נגד השעון"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "נגד השעון: �ין כוחות מדליקי�, כך שרק כישורי הנהיגה משני�!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"להוספת בקר �ו ג׳ויסטיק חדש, פשוט התחל �ת SuperTuxKart כ�שר הו� מחובר והו� "
-"יופיע ברשימה.\n"
-"\n"
-"כדי להוסיף תצורת מקלדת, �פשר להשתמש בלחצן שלמטה. ע� ז�ת, �נ� שי� לב שרוב "
-"המקלדות תומכות בהקשה על מספר מוגבל של מקשי� בו זמנית, ולכן �ינן מת�ימות "
-"למשחק מרובה משתתפי�. (ב�פשרותך, ע� ז�ת, לחבר כמה מקלדות למחשב. זכור שג� "
-"במקרה זה כל �חד צריך מערך מקשי� שונה.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "להוספת בקר �ו ג׳ויסטיק חדש, פשוט התחל �ת SuperTuxKart כ�שר הו� מחובר והו� יופיע ברשימה.\n\nכדי להוסיף תצורת מקלדת, �פשר להשתמש בלחצן שלמטה. ע� ז�ת, �נ� שי� לב שרוב המקלדות תומכות בהקשה על מספר מוגבל של מקשי� בו זמנית, ולכן �ינן מת�ימות למשחק מרובה משתתפי�. (ב�פשרותך, ע� ז�ת, לחבר כמה מקלדות למחשב. זכור שג� במקרה זה כל �חד צריך מערך מקשי� שונה.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "כדי לעזור לך לנצח, יש כמה כוחות מדליקי� שתוכל ל�סוף:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "�ל הירח ובחזרה"
 
@@ -3170,7 +2886,7 @@ msgstr "%i הגדולי�"
 msgid "Track"
 msgstr "מסלול"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "מסלול %i/%i"
@@ -3184,19 +2900,17 @@ msgstr "מסלול מ�ת %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "מסלולי�"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "תלת־קווי"
 
@@ -3207,24 +2921,21 @@ msgstr "נסה שוב"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "מדריך"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "מדריך: חדר מבחר"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "ט�קס"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "טיפוס :"
 
@@ -3232,22 +2943,20 @@ msgstr "טיפוס :"
 msgid "Type: Grand Prix"
 msgstr "טיפוס: גרנד פרי"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "בטל התקנה"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "חסר רסן"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3259,8 +2968,8 @@ msgid "Update"
 msgstr "עדכן"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "מעודכני�"
 
@@ -3269,40 +2978,36 @@ msgid "Updated date"
 msgstr "ת�ריך עדכון"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "השתמש בניטרו ש�ספת על ידי לחיצה על <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "מידע משתמש"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "ממשק משתמש"
 
@@ -3311,19 +3016,17 @@ msgid "User defined"
 msgstr "מוגדר משתמש"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "חיפוש משתמש"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "ש� משתמש"
 
@@ -3332,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "נגד"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "כעת מ�מת מידע"
 
@@ -3349,27 +3051,23 @@ msgstr "גרסה: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "סנכרון �נכי (מחייב הפעלה מחדש)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "הצג"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "עצמת קול"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "הצבע"
 
@@ -3381,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "דרך שגויה!"
 
@@ -3390,57 +3088,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"�זהרה: 'Shift' �ינו מקש מומלץ. כ�שר הו� נלחץ, כל המקשי� הדו מצביי� יפסיקו "
-"לפעול."
+msgstr "�זהרה: 'Shift' �ינו מקש מומלץ. כ�שר הו� נלחץ, כל המקשי� הדו מצביי� יפסיקו לפעול."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "כלי נשק"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "�פקטי מזג �וויר"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "�פקטי מזג �וויר: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
+msgstr "מה הבעיה, פ�נקיסטי� קטנטני�? המנהיג גנו שלכ� נעדר?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"כ�שר התקני קלט הינ� מוגדרי�, �תה מוכן לשחק. בחר בצלמית 'מירוץ רב משתתפי�' "
-"בתפריט הר�שי. כ�שר מגיע הזמן לבחור מכונית, כל שחקן יכול ללחוץ על המקש '�ש' "
-"של הג׳ויסטיק �ו המקלדת שלו כדי להצטרף למשחק. כל שחקן יכול להשתמש ב�מצעי הקלט "
-"שלו כדי לבחור מכונית. המשחק ממשיך �חרי שכול� בחרו �ת המכונית שלה�. שי� לב "
-"ש�י �פשר להשתמש בעכבר לש� פעולה זו."
+msgstr "כ�שר התקני קלט הינ� מוגדרי�, �תה מוכן לשחק. בחר בצלמית 'מירוץ רב משתתפי�' בתפריט הר�שי. כ�שר מגיע הזמן לבחור מכונית, כל שחקן יכול ללחוץ על המקש '�ש' של הג׳ויסטיק �ו המקלדת שלו כדי להצטרף למשחק. כל שחקן יכול להשתמש ב�מצעי הקלט שלו כדי לבחור מכונית. המשחק ממשיך �חרי שכול� בחרו �ת המכונית שלה�. שי� לב ש�י �פשר להשתמש בעכבר לש� פעולה זו."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3448,42 +3134,36 @@ msgid "White"
 msgstr "לבן"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "ווילבר"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "סו"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "כן"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "עכשיו �תה מוכן להשתתף במירוץ. בהצלחה!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "�תה משחק בתור"
 
@@ -3493,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "השלמת �תגר!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "השלמת �תגרי�!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "השלמת �ת הגרנד פרי!"
 
@@ -3544,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr "השלמת �תגר בינוני! נקודות שזכית בשלב זה: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "סיימת �ת המירוץ!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "יש לך %d בקשות חברות חדשות!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "יש לך בקשת חברות חדשה!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "נפסלת!"
 
@@ -3567,48 +3248,49 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"�תה צריך עוד נקודות\n"
-"כדי להיכנס ל�תגר זה!\n"
-"בדוק �ת המפה המוקטנת\n"
-"ל�תגרי� זמיני�."
+msgstr "�תה צריך עוד נקודות\nכדי להיכנס ל�תגר זה!\nבדוק �ת המפה המוקטנת\nל�תגרי� זמיני�."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "עליך להזין סיסמה."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "פתחת גרנד פרי %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "פתחת �ת המסלול %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "ניצחת במירוץ!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3621,6 +3303,11 @@ msgid ""
 "created."
 msgstr "קובץ הגדרות שלך היה ישן מדי, כך שזה נמחק וקובץ חדש יווצר."
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "קובץ ההגדרות שהוזן �ינו תו�� �ת גרסה זו של STK."
@@ -3631,7 +3318,6 @@ msgid "Your profile"
 msgstr "הדיוקן שלך"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "גן זן"
 
@@ -3642,16 +3328,16 @@ msgstr "[�ין]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "פעולות"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "כול�"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "מ�ת"
@@ -3660,52 +3346,25 @@ msgstr "מ�ת"
 msgid "featured"
 msgstr "מובלט"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "גבוה"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "נמוך"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "רגיל"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Asael https://launchpad.net/~asaelr\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Ddorda https://launchpad.net/~ddorda\n"
-"  GenghisKhan https://launchpad.net/~genghiskhan\n"
-"  Jorge Mariano https://launchpad.net/~jmariano\n"
-"  Leo Juszkiewicz https://launchpad.net/~juszr\n"
-"  Reuma Mordechai https://launchpad.net/~reumamordechai\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Shai Shapira https://launchpad.net/~shayshap\n"
-"  Shimi Chen https://launchpad.net/~shimi-chen\n"
-"  Yaron https://launchpad.net/~sh-yaron"
+msgstr "Launchpad Contributions:\n  Asael https://launchpad.net/~asaelr\n  Auria https://launchpad.net/~auria-mg\n  Ddorda https://launchpad.net/~ddorda\n  GenghisKhan https://launchpad.net/~genghiskhan\n  Jorge Mariano https://launchpad.net/~jmariano\n  Leo Juszkiewicz https://launchpad.net/~juszr\n  Reuma Mordechai https://launchpad.net/~reumamordechai\n  STK-team https://launchpad.net/~stk\n  Shai Shapira https://launchpad.net/~shayshap\n  Shimi Chen https://launchpad.net/~shimi-chen\n  Yaron https://launchpad.net/~sh-yaron"
diff --git a/data/po/hi.po b/data/po/hi.po
index 50339a36c..13560984a 100644
--- a/data/po/hi.po
+++ b/data/po/hi.po
@@ -1,22 +1,22 @@
-# Hindi translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:02+0000\n"
-"Last-Translator: Akela <sdakela@gmail.com>\n"
-"Language-Team: Hindi <hi@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/supertuxkart/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s तैयार है"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' का पत�ता साफ़"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(खाली)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(नेटवर�क नही ख�ल रहा भैय�या )"
 
@@ -128,44 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "*बटनों को menu option में जाकर बदल/देख  लीजियेगा"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"*इन में से बह�त सारे खेल ग�रांड प�रिक�स में खेल सकते हो. �क रेस की बजाय सारी "
-"�क साथ खेलो समय उड़ाओ काम धंदा भूल जाओ मम�मी से जूते खाओ.जितने ज�यादा अंक "
-"पाओगे त�म उतने बड़े चू#@$!४ !!!!!"
+msgstr "*इन में से बह�त सारे खेल ग�रांड प�रिक�स में खेल सकते हो. �क रेस की बजाय सारी �क साथ खेलो समय उड़ाओ काम धंदा भूल जाओ मम�मी से जूते खाओ.जितने ज�यादा अंक पाओगे त�म उतने बड़े चू#@$!४ !!!!!"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr "3 मौत की जंग"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -215,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= MeritList(जिसमे त�म�हारा नं. कभी नही aaya) ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "ग�रांड प�रिक�स ख़त�म करो"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "इसके बारे में"
 
@@ -240,37 +224,35 @@ msgstr "इसके बारे में"
 msgid "Accelerate"
 msgstr "गेडा"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -278,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -289,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -306,7 +285,6 @@ msgstr "डालो Keyboard Configuration"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "खिलाड़ी जोड़ें"
 
@@ -317,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "रीमूत जोडें"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Add-Ons"
 
@@ -352,72 +327,66 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Addons"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "समस�त"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "सारे मैदान"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"सारे डाव पेच allowed तो जमालो अपना हत�यारों का जखीरा और बजादो माय�केलालों की "
-"!"
+msgstr "सारे डाव पेच allowed तो जमालो अपना हत�यारों का जखीरा और बजादो माय�केलालों की !"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -427,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animated किरदार : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -453,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animated Scenery : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -480,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "नयी Resolution भिड़ाओ"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -517,49 +479,44 @@ msgstr "पक�का Delete करनी है क�या यह Configura
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "खेल मैदान"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Assign to ESC key"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "अनंत से भी आगे"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "ऑडियो"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "केलों से बचीये"
 
@@ -581,79 +538,66 @@ msgstr "Axis %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "पीछे"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "वापिस दौड़ में"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Back to device list"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "वापस मेनू करने के लि�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "इस बार नही अगली बार सही!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -663,38 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"पत�थर का फ�ग�गा:दीवारों पर उछलेगा पीछे देख के फेकोगे पिछले वाले को उडा�गा"
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "पत�थर का फ�ग�गा:दीवारों पर उछलेगा पीछे देख के फेकोगे पिछले वाले को उडा�गा"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -702,7 +641,6 @@ msgid "Brake"
 msgstr "ब�रेक लगा��"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -710,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "रद�द"
 
@@ -769,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Cancel/Back"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -796,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "गड�डी च�नि�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "गिफ�ट: इन�हें लापकिये"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -860,16 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"मट�टी का तेल (Nitro) पीने से और तेज़ दौडियेगा.गेम स�क�रीन के कोने में मीटर "
-"पर बचा तेल दिखेगा!"
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "मट�टी का तेल (Nitro) पीने से और तेज़ दौडियेगा.गेम स�क�रीन के कोने में मीटर पर बचा तेल दिखेगा!"
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -882,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -894,7 +810,6 @@ msgstr "Confirm resolution within %i seconds"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -908,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "कोई भी Power Ups नही सभ त�म�हारे कौशल पर निर�भर है!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "नियंत�रण"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "क�रेडिट"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1011,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1043,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1051,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Delete Configuration"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1085,24 +979,23 @@ msgstr "बंध करें Device"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "बंध कर दिया"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "क�या त�म सच में खिलाड़ी '%s' को डिलीट करोगे?"
@@ -1111,8 +1004,8 @@ msgstr "क�या त�म सच में खिलाड़ी '%s' क
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Go से पहले गेडा  मत दीजिये!"
 
@@ -1123,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1154,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1164,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1177,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1206,27 +1092,24 @@ msgstr "Enable Device"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "सक�रिय किया"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "न� खिलाड़ी का नाम डालें"
 
@@ -1241,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Race ख़त�म करो"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "दिग�गज"
 
@@ -1269,12 +1154,12 @@ msgstr "दिग�गज"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1299,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "आखिरी चक�कर!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1322,13 +1205,12 @@ msgstr "फायर"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1343,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1351,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1382,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1402,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1433,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1487,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1558,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1573,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1599,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1673,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1698,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1707,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1769,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1820,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1835,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1863,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1884,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1914,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1975,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1990,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2005,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2033,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2055,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2080,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2127,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2191,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2207,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2243,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2255,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2269,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2278,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2317,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2326,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2397,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2406,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2418,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2457,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2467,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2568,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2647,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2691,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2706,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2750,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2844,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2855,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2870,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2896,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2905,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2918,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2942,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2955,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3039,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3089,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3131,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3145,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3168,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3193,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3220,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3230,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3272,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3293,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3310,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3342,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3353,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3402,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3447,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3498,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3521,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3529,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3571,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3581,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3592,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3601,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3610,44 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Akela https://launchpad.net/~sdakela\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  sid https://launchpad.net/~sidchat1"
+msgstr "Launchpad Contributions:\n  Akela https://launchpad.net/~sdakela\n  STK-team https://launchpad.net/~stk\n  sid https://launchpad.net/~sidchat1"
diff --git a/data/po/hr.po b/data/po/hr.po
index 4321133e0..f51c04018 100644
--- a/data/po/hr.po
+++ b/data/po/hr.po
@@ -1,24 +1,22 @@
-# Croatian translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# Ivan Putnik <iputnik@msn.com>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ivan Putnik <iputnik@msn.com>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: Ivan Putnik <iputnik@msn.com>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/supertuxkart/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -29,22 +27,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Ali vi bijedne ništarije me nikada nećete moći pobijediti - Kralja kartinga!"
+msgstr " Ali vi bijedne ništarije me nikada nećete moći pobijediti - Kralja kartinga!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s od %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s - %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s je spreman/na"
@@ -99,25 +97,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' je eliminiran/na."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Prazno)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(mrežna igra još uvijek nije dostupna)"
 
@@ -131,44 +127,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Trenutna tipka se može vidjeti / promijeniti u izborniku Opcije"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Većina ovih na�ina igranja (modova) mogu se igrati i kao Gran Pri: umjesto "
-"da vozite jednu utrku, vozite više zaredom. Što se bolje rangirate, više "
-"bodova dobijete. Na kraju, igra� s najviše bodova osvaja kup."
+msgstr "* Većina ovih na�ina igranja (modova) mogu se igrati i kao Gran Pri: umjesto da vozite jednu utrku, vozite više zaredom. Što se bolje rangirate, više bodova dobijete. Na kraju, igra� s najviše bodova osvaja kup."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -199,7 +185,6 @@ msgstr "Borba na 3 poraza"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -218,23 +203,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Najbolji rezultati ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Prekini Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "O igri"
 
@@ -243,37 +225,35 @@ msgstr "O igri"
 msgid "Accelerate"
 msgstr "Ubrzanje"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -281,8 +261,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -292,13 +271,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -309,7 +286,6 @@ msgstr "Dodaj konfiguraciju tipkovnice"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Dodaj igra�a"
 
@@ -320,32 +296,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Dodaj uređaj"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Dodaci"
 
@@ -355,71 +328,66 @@ msgstr "Naziv dodatka"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Dodaci"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adium"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Sve"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Sve staze"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Svi udarci dozvoljeni, zato uhvatite oružje i pametno ga upotrijebite!"
+msgstr "Svi udarci dozvoljeni, zato uhvatite oružje i pametno ga upotrijebite!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -429,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Sidro - zna�ajno usporava karting na prvom mjestu."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -455,24 +420,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -482,29 +447,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Primijeni novu rezoluciju"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -519,49 +480,44 @@ msgstr "Jeste li sigurni da želite trajno izbrisati ovu konfiguraciju?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arene"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Dodjeli tipku ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Na kraju svijeta"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Zvuk"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Izbjegavaj banane!"
 
@@ -583,79 +539,66 @@ msgstr "Osi %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Natrag"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Natrag na utrku"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Povratak na popis uređaja"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Povratak na izbornik"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Otok bitke"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Više sreće drugi put!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -665,39 +608,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Kugla za kuglanje - odbija se od zidove. Ukoliko gledate nazad, biće ba�ena "
-"unatrag."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Kugla za kuglanje - odbija se od zidove. Ukoliko gledate nazad, biće ba�ena unatrag."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -705,7 +642,6 @@ msgid "Brake"
 msgstr "Ko�nica"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -713,52 +649,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -772,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Odustani/Natrag"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Å pilja X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Izazovi: Soba trofeja"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -799,61 +725,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Odaberi karting"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Skupljajte plave kutije: one daju oružje i druga poboljšanja"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -863,17 +780,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Skupljanje nitra Vam omogućava da povećavate brzinu kad god poželite "
-"pritiskom na odgovarajuću tipku. Možete vidjeti trenutni nivo Vašeg nitra u "
-"spremniku na desnoj strani zaslona."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Skupljanje nitra Vam omogućava da povećavate brzinu kad god poželite pritiskom na odgovarajuću tipku. Možete vidjeti trenutni nivo Vašeg nitra u spremniku na desnoj strani zaslona."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -886,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -898,7 +811,6 @@ msgstr "Potvrdi rezoluciju u narednih %i sekundi"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -912,97 +824,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Ne sadrži poja�anja, tako da samo Vaše vještine vožnje vrijede!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Nastavi"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontrole"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Zasluge"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1015,13 +910,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1047,7 +941,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1055,28 +948,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Uklanjanje konfiguracije"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1089,24 +980,23 @@ msgstr "Onemogući uređaj"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Želite li zaista ukloniti igra�a '%s' ?"
@@ -1115,8 +1005,8 @@ msgstr "Želite li zaista ukloniti igra�a '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1127,27 +1017,24 @@ msgstr "Dolje"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1158,7 +1045,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1168,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Slon"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1181,24 +1066,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1210,27 +1093,24 @@ msgstr "Omogući uređaj"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Omogući"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Unesite ime novog igra�a"
 
@@ -1245,27 +1125,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Napustite utrku"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Stru�njak"
 
@@ -1273,12 +1155,12 @@ msgstr "Stru�njak"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1303,19 +1185,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Završni krug!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1326,22 +1206,14 @@ msgstr "Pucaj"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Prvo, potrebno vam je nekoliko \"ulaznih\" uređaja (posjedovanje više "
-"igra�ih palica i/ili džojstika je najbolji na�in da igrate s nekoliko "
-"ljudi). Idite na zaslon konfiguracije unosa i podesite igra�e palice. "
-"Također je moguće igrati i na tipkovnici / ama, međutim, svaki igra� će "
-"trebati druga�iji set tipki. Imajte na umu da većina tipkovnica nije pogodna "
-"za igranje više igra�a zato što ne podržavaju veliki broj istovremenog "
-"pritiskanja tipki."
+msgstr "Prvo, potrebno vam je nekoliko \"ulaznih\" uređaja (posjedovanje više igra�ih palica i/ili džojstika je najbolji na�in da igrate s nekoliko ljudi). Idite na zaslon konfiguracije unosa i podesite igra�e palice. Također je moguće igrati i na tipkovnici / ama, međutim, svaki igra� će trebati druga�iji set tipki. Imajte na umu da većina tipkovnica nije pogodna za igranje više igra�a zato što ne podržavaju veliki broj istovremenog pritiskanja tipki."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1354,7 +1226,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1362,14 +1233,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Tvrđava Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1393,13 +1266,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Cijeli zaslon"
 
@@ -1413,22 +1285,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Tipke igre"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Na�ini igre"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1444,51 +1313,45 @@ msgstr "Tipka igra�e palice %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Općenito"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1498,61 +1361,53 @@ msgid "Go!"
 msgstr "Kreni!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1569,12 +1424,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacijenda"
 
@@ -1584,22 +1437,18 @@ msgstr "Hacijenda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Pomoć"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexa (Hexley)"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Najbolji rezultati"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1607,78 +1456,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Pogodite druge oružjem dok ne izgube sve živote. (Samo u igrama s više "
-"igra�a)"
+msgstr "Pogodite druge oružjem dok ne izgube sve živote. (Samo u igrama s više igra�a)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Ukoliko vidite gumb sa katancem poput ovoga, morate dovršiti izazov da ga "
-"otklju�ate."
+msgstr "Ukoliko vidite gumb sa katancem poput ovoga, morate dovršiti izazov da ga otklju�ate."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignoriran '%s'. Trebao/la si se ranije priklju�iti da bi igrao/la!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalirati"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Srednja"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1688,13 +1530,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kartinzi"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Spremi ovu rezoluciju"
 
@@ -1713,7 +1554,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1722,7 +1562,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Krug"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Krug %i"
@@ -1784,63 +1624,98 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "U�itavanje"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Zaklju�ano : riješite aktivne izazove kako bi dobili pristup ostalim!"
+msgstr "Zaklju�ano : riješite aktivne izazove kako bi dobili pristup ostalim!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Zaklju�ano"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1851,27 +1726,18 @@ msgstr "Pogledaj natrag"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1879,18 +1745,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1900,29 +1764,33 @@ msgid "Menu Keys"
 msgstr "Tipke izbornika"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Osi miša %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1930,48 +1798,41 @@ msgstr "Tipka miša %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Glazba"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1991,13 +1852,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2006,9 +1869,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Novi Grand Prix '%s' je sada dostupan"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2021,7 +1888,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Nove razine '%s' su sada dostupne"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Novi najbrži krug"
 
@@ -2049,19 +1916,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2071,21 +1937,19 @@ msgid "Normal Race"
 msgstr "Normalna utrka"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Po�etnik"
 
@@ -2096,46 +1960,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Broj AI kartinga"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "U redu"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2143,60 +2002,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Stari rudnik"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliverov sat matematike"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Samo glavni igra� može djelovati u ovom trenutku!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2207,14 +2065,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Postavke"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2223,35 +2078,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2259,8 +2109,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2271,12 +2121,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pauza"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Kazneno vrijeme!"
 
@@ -2285,7 +2134,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinovo igralište"
 
@@ -2294,37 +2142,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pismonoša (Pidgin)"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Igraj sve"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Igra�i"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2333,6 +2182,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Molimo ponovo konfigurirajte tipke igre"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2342,44 +2195,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pritisni ESC za odustajanje"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Pritisni tipku"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Pritisni Enter ili duplo klikni na uređaj da bi ga konfigurirao"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Pritisni Enter ili duplo klikni na igra�a da ga/je izmijeniš"
 
@@ -2413,7 +2260,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2422,7 +2268,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Debeljuco (Puffy)"
 
@@ -2434,25 +2279,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Postavke utrke"
 
@@ -2473,8 +2314,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Nasumi�ni karting"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Nasumi�na staza"
 
@@ -2483,82 +2324,68 @@ msgid "Rank"
 msgstr "Mjesto"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Spreman!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Ukloni"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -2584,29 +2411,25 @@ msgstr "Spašavanje"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Ponovo pokreni"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Ponovo pokreni utrku"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2663,41 +2486,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Å kotska"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2707,12 +2524,10 @@ msgid "Select"
 msgstr "Odaberi"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Odaberi na�in/mod igranja"
 
@@ -2722,36 +2537,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2766,91 +2575,49 @@ msgstr "Postavi!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Postavke nove utrke"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Živi pijesak"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2860,7 +2627,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2871,12 +2637,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Maska"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Sniježni vrh"
 
@@ -2886,23 +2650,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2912,7 +2674,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Zvu�ni efekti"
 
@@ -2921,7 +2682,6 @@ msgstr "Zvu�ni efekti"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standardna"
 
@@ -2934,11 +2694,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Kreni Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Kreni utrku"
 
@@ -2958,12 +2717,10 @@ msgstr "Skreni desno"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2971,83 +2728,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Dodaci"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart Pomoć"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart Mogućnosti"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart se može igrati u na�inu/modu za više igra�a na istom ra�unalu"
+msgstr "SuperTuxKart se može igrati u na�inu/modu za više igra�a na istom ra�unalu"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart ima nekoliko na�ina igre"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3056,32 +2799,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Jezik operativnog sustava"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3093,9 +2841,7 @@ msgstr ""
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Datoteka sa najboljim rezultatima je previše stara,\n"
-"svi najbolji rezultati su obrisani."
+msgstr "Datoteka sa najboljim rezultatima je previše stara,\nsvi najbolji rezultati su obrisani."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3108,41 +2854,22 @@ msgstr "Vremenom ograni�ena utrka"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Vremenom ograni�ena utrka: Ne sadrži poja�anja, tako da samo Vaše vještine "
-"vožnje vrijede!"
+msgstr "Vremenom ograni�ena utrka: Ne sadrži poja�anja, tako da samo Vaše vještine vožnje vrijede!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Da biste dodali novu igra�u palicu/džojstik uređaj, jednostavno pokrenite "
-"SuperTuxKart s priklju�enim uređajem i on će se pojaviti na popisu.\n"
-"\n"
-"Za dodavanje konfiguracije tipkovnice, možete koristiti gumb ispod, ME�UTIM "
-"molimo obratite pozornost da većina tipkovnica podržava samo ograni�en broj "
-"istovremeno pritisnutih tipki, te su stoga nepodesive za igranje s više "
-"igra�a."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Da biste dodali novu igra�u palicu/džojstik uređaj, jednostavno pokrenite SuperTuxKart s priklju�enim uređajem i on će se pojaviti na popisu.\n\nZa dodavanje konfiguracije tipkovnice, možete koristiti gumb ispod, ME�UTIM molimo obratite pozornost da većina tipkovnica podržava samo ograni�en broj istovremeno pritisnutih tipki, te su stoga nepodesive za igranje s više igra�a."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Da bismo Vam pomogli pobijediti, postoje neka poja�anja koja možete "
-"skupljati:"
+msgstr "Da bismo Vam pomogli pobijediti, postoje neka poja�anja koja možete skupljati:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3161,7 +2888,7 @@ msgstr "Najboljih %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3175,19 +2902,17 @@ msgstr "Stazu napravio/la %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Staze"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3198,24 +2923,21 @@ msgstr "Pokušajte ponovo"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3223,20 +2945,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Uklanjanje"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3250,8 +2970,8 @@ msgid "Update"
 msgstr "Ažuriranje"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3260,40 +2980,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3302,19 +3018,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3323,13 +3037,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3340,27 +3053,23 @@ msgstr "Verzija: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Glasnoća"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3372,7 +3081,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "POGREÅ AN SMJER!"
 
@@ -3381,50 +3090,42 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Upozorenje, 'shift' nije preporu�ena tipka: kada je tipka 'shift' "
-"pritisnuta, sve tipke koje sadrže karakter koji je druk�iji kada se piše "
-"velikim slovima, prestat će funkcionirati."
+msgstr "Upozorenje, 'shift' nije preporu�ena tipka: kada je tipka 'shift' pritisnuta, sve tipke koje sadrže karakter koji je druk�iji kada se piše velikim slovima, prestat će funkcionirati."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Oružja"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3435,42 +3136,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Vilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Da"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3480,37 +3175,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Završili ste Grand Prix!"
 
@@ -3531,20 +3225,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Završili ste utrku!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Eliminirani ste!"
 
@@ -3554,7 +3251,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3562,51 +3259,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Pobijedili ste u utrci!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Vaša datoteka s postavkama je bila neispravna, te je obrisana i nova će biti "
-"napravljena."
+msgstr "Vaša datoteka s postavkama je bila neispravna, te je obrisana i nova će biti napravljena."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Vaša datoteka s postavkama je bila previše stara, te je obrisana i nova će biti napravljena."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Vaša datoteka s postavkama je bila previše stara, te je obrisana i nova će "
-"biti napravljena."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3618,7 +3321,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3629,7 +3331,6 @@ msgstr "[ništa]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3638,7 +3339,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "od"
@@ -3647,46 +3349,25 @@ msgstr "od"
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Davor Buday https://launchpad.net/~davor-buday-gmail\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  dboki89 https://launchpad.net/~dboki89\n"
-"  student4 https://launchpad.net/~iputnik-msn"
+msgstr "Launchpad Contributions:\n  Davor Buday https://launchpad.net/~davor-buday-gmail\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  dboki89 https://launchpad.net/~dboki89\n  student4 https://launchpad.net/~iputnik-msn"
diff --git a/data/po/hu.po b/data/po/hu.po
index 0ccba1f13..04d7e3d1f 100644
--- a/data/po/hu.po
+++ b/data/po/hu.po
@@ -1,23 +1,22 @@
-# Hungarian translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-07 14:55+0000\n"
-"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/supertuxkart/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,23 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" De ti szánalmas kis hitvány fráterek soha nem lesztek képesek legyőzni "
-"engem  -  A Gokartok Királya!"
+msgstr " De ti szánalmas kis hitvány fráterek soha nem lesztek képesek legyőzni engem  -  A Gokartok Királya!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, %s által"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s, %s által"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s kész"
@@ -99,25 +96,23 @@ msgstr "%s profilja"
 msgid "%s's server"
 msgstr "%s kiszolgálója"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "\"%s\" el lett távolítva."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Ãœres)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(a hálózati játék még nem elérhető)"
 
@@ -131,47 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* A jelenlegi billentyűparancsokat meg lehet nézni/változtatni a Beállítások "
-"menüpontban"
+msgstr "* A jelenlegi billentyűparancsokat meg lehet nézni/változtatni a Beállítások menüpontban"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Ezek közül a játékmódok közül a legtöbbet lehet Nagydíj stílusban is "
-"játszani: ahelyett, hogy egy futamot játszol le, többször versenyzel, "
-"sorban. Minél jobb helyezést érsz el, annál több pontot kapsz. A végén a "
-"legtöbb pontot elérő játékos nyeri a kupát."
+msgstr "* Ezek közül a játékmódok közül a legtöbbet lehet Nagydíj stílusban is játszani: ahelyett, hogy egy futamot játszol le, többször versenyzel, sorban. Minél jobb helyezést érsz el, annál több pontot kapsz. A végén a legtöbb pontot elérő játékos nyeri a kupát."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "…"
 
@@ -202,11 +184,10 @@ msgstr "3 Csapásos Csata"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
+msgstr "3-csapásos Csata: csak többjátékos üzemmódban használható. Addig találd el az ellenfeleidet, míg elveszítik életüket."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -221,23 +202,20 @@ msgid "9 months"
 msgstr "9 hónap"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Toplista ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Nagydíj megszakítása"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Névjegy"
 
@@ -246,37 +224,35 @@ msgstr "Névjegy"
 msgid "Accelerate"
 msgstr "Gyorsítás"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Elfogadás"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Fiókvisszaállítás"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Fiókbeállítások"
 
@@ -284,8 +260,7 @@ msgstr "Fiókbeállítások"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Eredmények"
 
@@ -295,13 +270,11 @@ msgstr "Művelet"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Barát hozzáadása"
 
@@ -312,7 +285,6 @@ msgstr "Új billentyűzetbeállítás hozzáadása"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Játékos hozzáadása"
 
@@ -323,32 +295,29 @@ msgstr "Wiimote hozzáadása"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Eszköz hozzáadása"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Felhasználó hozzáadása"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Bővítmények"
 
@@ -358,72 +327,66 @@ msgstr "Kiegészítő neve"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Bővítmények"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Összes"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Összes pálya"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Minden ütés engedélyezett, úgyhogy vedd fel a fegyvereket és használd fel "
-"Å‘ket okosan!"
+msgstr "Minden ütés engedélyezett, úgyhogy vedd fel a fegyvereket és használd fel őket okosan!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -433,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Horog - lelassítja a legelől haladó versenyzőt"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animált karakterek"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animált karakterek: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animált táj"
 
@@ -459,24 +419,24 @@ msgstr "Animált táj"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animált táj: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -486,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Élsimítás"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Élsimítás: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Alkalmaz"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Új felbontás alkalmazása"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -523,49 +479,44 @@ msgstr "Biztos, hogy véglegesen törölni akarod ezeket a beállításokat?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arénák"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Hozzárendelés az ESC billentyűhöz"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "A Világ Végén"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Hang"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Kerüld a banánokat!"
 
@@ -587,81 +538,66 @@ msgstr "%d %s tengely"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Vissza"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Vissza a játékba"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Vissza a versenybe"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Vissza az eszközlistához"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Vissza a menübe"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Vissza a menübe"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Kosárlabda - a vezető után pattan, szétlapít és lelassít más kocsikat az "
-"úton."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Kosárlabda - a vezető után pattan, szétlapít és lelassít más kocsikat az úton."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Csata-sziget"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Több szerencsét legközelebb!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineáris"
 
@@ -671,39 +607,33 @@ msgid "Black"
 msgstr "Fekete"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Sötét-domb Szálló"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Kék Csapat nyert"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowling labda - lepattan a falakról. Ha hátrafelé nézel, hátrafelé fog "
-"elgurulni."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowling labda - lepattan a falakról. Ha hátrafelé nézel, hátrafelé fog elgurulni."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -711,7 +641,6 @@ msgid "Brake"
 msgstr "Fék"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -719,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr "Torta - a rövid távokon és a hosszú egyeneseken a leghatékonyabb."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Nem elérhető a stkaddons szerver..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -778,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Mégse/Vissza"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "X Barlang"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Kihívás teljesítve"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Kihívás sikertelen"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Feladatok: Trófea terem"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Módosítás"
 
@@ -805,61 +724,52 @@ msgstr "Módosítás"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Válassz gokartot"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Kolumbusz Kristóf"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Kattints ide az útmutató pálya játszásához"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Bezárás"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Gyűjtsd a kék ládákat: fegyvereket és más extrákat kapsz érte"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -869,17 +779,13 @@ msgstr "Gyűjts nitrót!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"A nitrók összegyűjtése lehetővé teszi számodra a sebességfokozást, amikor "
-"csak akarod, a megfelelő billentyű lenyomásával. A jelenlegi nitrószintedet "
-"a játék képernyőjének jobb szélén lévő sávon láthatód."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "A nitrók összegyűjtése lehetővé teszi számodra a sebességfokozást, amikor csak akarod, a megfelelő billentyű lenyomásával. A jelenlegi nitrószintedet a játék képernyőjének jobb szélén lévő sávon láthatód."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -892,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -904,7 +810,6 @@ msgstr "Felbontás megerősítése %i másodpercen belül"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -916,100 +821,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Nem tartalmaz extrákat, úgyhogy csak a vezetési képességeid számítanak!"
+msgstr "Nem tartalmaz extrákat, úgyhogy csak a vezetési képességeid számítanak!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Folytatás"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Irányítás"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Nem sikerült érzékelni egy wiimote-ot sem :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Készítők"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1022,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Egyéni"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Egyéni beállítások..."
 
@@ -1054,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1062,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Konfiguráció törlése"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1096,24 +979,23 @@ msgstr "Eszköz letiltása"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Letiltva"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "FPS (képkockák/ másodperc) megjelenítése"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Biztosan meg szeretnéd szakítani a Grand Prix-et?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Biztos benne, hogy törli a '%s' játékost?"
@@ -1122,8 +1004,8 @@ msgstr "Biztos benne, hogy törli a '%s' játékost?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Ne gyorsuljon indulás előtt"
 
@@ -1134,27 +1016,24 @@ msgstr "Le"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1165,9 +1044,8 @@ msgstr "Tojás Vadászat"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
+msgstr "Tojás Vadászat: fedezd fel a pályákat, hogy megtaláld a rejtett tojásokat."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1175,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Tojások: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eltávolítva"
 
@@ -1188,24 +1065,22 @@ msgstr "Eltávolítva"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1217,27 +1092,24 @@ msgstr "Eszköz engedélyezése"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Engedélyezve"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Engedélyezve mindenkinek"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Gépeld be az új játékos nevét"
 
@@ -1250,44 +1122,44 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Bárki:\nNyomj \"kiválaszt\" gombot a csatlakozáshoz!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Bárki:\n"
-"Nyomj \"kiválaszt\" gombot a csatlakozáshoz!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Verseny elhagyása"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Nehéz"
 
 #: src/states_screens/race_setup_screen.cpp:252
 msgid "Explore tracks to find all hidden eggs"
-msgstr ""
+msgstr "Fedezd fel a pályákat, hogy megtaláld a rejtett tojásokat."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1312,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Utolsó kör!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1335,21 +1205,14 @@ msgstr "Tűz"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Először, szükséged lesz néhány bemeneti eszközre (néhányan gamepad-al vagy "
-"joystick-al tudnak a legjobban játszani). Menj a bemeneti eszközök "
-"konfigurációs menübe és állítsd be a gamepad-od. Persze billentyűzeten is "
-"nagyszerűen lehet játszani, habár egyes játékosok más billentyű "
-"beállításokat kedvelnek, és figyelj oda rá, hogy nem mindegyik billentyűzet "
-"támogatja a többjátékos használatot a nagy számú billentyű lenyomás miatt."
+msgstr "Először, szükséged lesz néhány bemeneti eszközre (néhányan gamepad-al vagy joystick-al tudnak a legjobban játszani). Menj a bemeneti eszközök konfigurációs menübe és állítsd be a gamepad-od. Persze billentyűzeten is nagyszerűen lehet játszani, habár egyes játékosok más billentyű beállításokat kedvelnek, és figyelj oda rá, hogy nem mindegyik billentyűzet támogatja a többjátékos használatot a nagy számú billentyű lenyomás miatt."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1362,7 +1225,6 @@ msgstr "Kövesd a vezért!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1370,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Magma Erőd"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d wiimote található"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1401,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
@@ -1421,22 +1283,19 @@ msgstr "GÓL!"
 msgid "Game Keys"
 msgstr "Játék billentyűk"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Játék módok"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1452,51 +1311,45 @@ msgstr "Játékpad billentyű %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "�ltalános"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Verseny elhagyása"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1506,61 +1359,53 @@ msgid "Go!"
 msgstr "Rajt!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Nagy Díj"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Nagy Díj állása:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafikai effektek szintje"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikai beállítások"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Zöld Völgy"
 
@@ -1577,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1592,22 +1435,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Súgó"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Dicsőségtábla"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1615,78 +1454,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Lődd a többieket fegyverekkel, amíg el ne veszítik az összes életüket. (Csak "
-"többjátékos játszmákban)"
+msgstr "Lődd a többieket fegyverekkel, amíg el ne veszítik az összes életüket. (Csak többjátékos játszmákban)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Csak emberi játékos"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Ha látsz egy gombot egy ehhez hasonló lakattal, teljesítened kell a "
-"feladatot, hogy kinyisd azt."
+msgstr "Ha látsz egy gombot egy ehhez hasonló lakattal, teljesítened kell a feladatot, hogy kinyisd azt."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s' figyelmen kívül hagyása, korábban kell csatlakoznod a játékhoz!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Telepít"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Haladó"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1696,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Gokartok"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Felbontás megtartása"
 
@@ -1721,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Billentyűzet %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1730,7 +1560,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Kör"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%i. Kör"
@@ -1792,63 +1622,98 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Betöltés"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Lezárva: teljesítsd az aktív feladatokat, hogy a többihez is hozzáférj!"
+msgstr "Lezárva: teljesítsd az aktív feladatokat, hogy a többihez is hozzáférj!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Lezárva!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1859,27 +1724,18 @@ msgstr "Hátrapillantás"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1887,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Csak én"
 
@@ -1908,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Menü billentyűk"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Egér tengely %d%s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1938,48 +1796,41 @@ msgstr "Egér gombok %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Többjátékos"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Többjátékos"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Zene"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1999,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2014,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Új Nagy Díj '%s' mostantól elérhető"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2029,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Új nehézségi fok '%s' mostantól elérhető"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Új leggyorsabb kör"
 
@@ -2057,19 +1914,18 @@ msgstr "Nitró"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Nincs"
 
@@ -2079,21 +1935,19 @@ msgid "Normal Race"
 msgstr "Sima verseny"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Northern Resort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Kezdő"
 
@@ -2104,46 +1958,41 @@ msgstr "PC vezérelt gokartok száma: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Számítógép által vezérelt gokartok száma"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "A megnyerendő célok száma"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Rendben"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "A Járatlan Út"
 
@@ -2151,60 +2000,59 @@ msgstr "A Járatlan Út"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Ó, igen, most már a kastélyomban van, és felszolgálva vacsorára..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Régi Bánya"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Olivér Matek Osztálya"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Csak a Játék Mester cselekedhet ezen a helyen!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Hupsz! Amikor bajba kerülsz, nyomd meg a %s-t a megmentéshez"
@@ -2215,14 +2063,11 @@ msgstr "Hupsz! Amikor bajba kerülsz, nyomd meg a %s-t a megmentéshez"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Beállítások"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2231,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2267,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2279,12 +2119,11 @@ msgstr "Szünet"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Szünet"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Büntető idő!"
 
@@ -2293,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvin Játszótér"
 
@@ -2302,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Mind lejátszása"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Játékosok"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2341,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Kérlek konfiguráld újra a billentyű beállításaid."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Kérlek, várj, amíg a kiegészítők frissítésre kerülnek"
@@ -2350,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Kérlek, várj, amíg a kiegészítők betöltenek"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Nyomj ESC billentyűt a kilépéshez"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Nyomj meg egy billentyűt"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Nyomj Entert vagy klikkelj duplán az eszközödön, hogy bekonfiguráld"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Nyomj Entert vagy klikkelj duplán a játékoson, hogy szerkeszd őt"
 
@@ -2421,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2430,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2442,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Verseny Beállítások"
 
@@ -2481,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Véletlenszerű Gokart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Véletlenszerű Pálya"
 
@@ -2491,82 +2322,68 @@ msgid "Rank"
 msgstr "Helyezés"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Kész!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Piros Csapat nyert"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Ablakpozíció megjegyzése"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Törlés"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "�tnevezés"
 
@@ -2592,29 +2409,25 @@ msgstr "Kimentés"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Újrakezdés"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Verseny újrakezdése"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Visszafele"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2671,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skócia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2715,12 +2522,10 @@ msgid "Select"
 msgstr "Kiválasztás"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Játék mód kiválasztása"
 
@@ -2730,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Gokart kiválasztása"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2774,91 +2573,49 @@ msgstr "Vigyázz!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Új verseny beállítása"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Futó Homok"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2868,7 +2625,6 @@ msgid "Size: %s"
 msgstr "Méret: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2879,12 +2635,10 @@ msgstr "Csúszás"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Megjelenés"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Havas Csúcs"
 
@@ -2894,28 +2648,23 @@ msgid "Soccer"
 msgstr "Foci"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Focipálya"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Sajnos egy hiba történt a kiegészítők oldalának elérése közben. Ellenőrizd, "
-"hogy csatlakozva vagy az internethez, és hogy nem-e a tűzfalad blokkolja az "
-"STK-t."
+msgstr "Sajnos egy hiba történt a kiegészítők oldalának elérése közben. Ellenőrizd, hogy csatlakozva vagy az internethez, és hogy nem-e a tűzfalad blokkolja az STK-t."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2923,7 +2672,6 @@ msgstr "Hupsz! A kiegészítő letöltése sikertelen"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Hangeffektusok"
 
@@ -2932,7 +2680,6 @@ msgstr "Hangeffektusok"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Szabványos"
 
@@ -2945,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Nagy Díj kezdése"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Verseny kezdése"
 
@@ -2969,12 +2715,10 @@ msgstr "Jobbra irányít"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Történet"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2982,83 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "A Tenger Mélyén"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Kiegészítők"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart Súgó"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart Beállítások"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"A SuperTuxKart-al többjátékos módban tudsz játszani ugyanazon a számítógépen"
+msgstr "A SuperTuxKart-al többjátékos módban tudsz játszani ugyanazon a számítógépen"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "A SuperTuxKart több játék mód funkciót tartalmaz"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "Kicserélő - az ajándékdobozokat rövid időre banánokká változtatja."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3067,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Rendszer nyelve"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Textúra-szűrő"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "A Stadion"
 
@@ -3104,9 +2839,7 @@ msgstr "Ez a kiegészítő modul jelenleg le van tiltva a beállítások képern
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"A ranglista fájl túl régi volt,\n"
-"az összes ranglista törölve lett."
+msgstr "A ranglista fájl túl régi volt,\naz összes ranglista törölve lett."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3119,41 +2852,22 @@ msgstr "Idő Próba"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Idő Próba: Nem tartalmaz extrákat, úgyhogy csak a vezetési képességeid "
-"számítanak!"
+msgstr "Idő Próba: Nem tartalmaz extrákat, úgyhogy csak a vezetési képességeid számítanak!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Ahhoz, hogy új Gamepad/Joysticke eszközt adj hozzá, egyszerűen csatlakoztasd "
-"és indítsd el a SpuerTuxKart-ot, és az eszköz megjelenik a listán.\n"
-"\n"
-"Ahhoz, hogy egy billentyűzet konfigurációt adj hozzá, a lenti gombot "
-"használd, HAB�R jegyezd meg, hogy a legtöbb billentyűzet csak bizonyos "
-"mennyiségű egyidejű billentyű lenyomást támogat és ezek alkalmatlanok a "
-"többjátékos játékmódhoz. (Habár egyszerre több billentyűzetet is "
-"csatlakoztathatsz a számítógéphez. Ebben az esetben mindenkinek más "
-"billentyű beállítás szükséges a helyes működéshez)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Ahhoz, hogy új Gamepad/Joysticke eszközt adj hozzá, egyszerűen csatlakoztasd és indítsd el a SpuerTuxKart-ot, és az eszköz megjelenik a listán.\n\nAhhoz, hogy egy billentyűzet konfigurációt adj hozzá, a lenti gombot használd, HAB�R jegyezd meg, hogy a legtöbb billentyűzet csak bizonyos mennyiségű egyidejű billentyű lenyomást támogat és ezek alkalmatlanok a többjátékos játékmódhoz. (Habár egyszerre több billentyűzetet is csatlakoztathatsz a számítógéphez. Ebben az esetben mindenkinek más billentyű beállítás szükséges a helyes működéshez)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Ahhoz, hogy könnyebben nyerj, sok extra cuccot tudsz gyűjteni :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "A Holdra és Vissza"
 
@@ -3172,7 +2886,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3186,19 +2900,17 @@ msgstr "Pálya készítője: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Pályák"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineáris"
 
@@ -3209,24 +2921,21 @@ msgstr "Próbáld újra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Bemutató"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Oktatójáték: Szóba választó"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Típus:"
 
@@ -3234,20 +2943,18 @@ msgstr "Típus:"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Eltávolítás"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3261,8 +2968,8 @@ msgid "Update"
 msgstr "Frissítés"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Frissítve"
 
@@ -3271,40 +2978,36 @@ msgid "Updated date"
 msgstr "Frissítési dátum"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Felhasználói felület"
 
@@ -3313,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3334,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "V5"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3351,27 +3051,23 @@ msgstr "Verzió: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Függőleges szinkron (újraindítás szükséges)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Hangerő"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Szavazás"
 
@@ -3383,7 +3079,7 @@ msgstr "Sikerses szavazás! Most már bezárhatod az ablakot."
 msgid "WEIGHT"
 msgstr "SÚLY"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ROSSZ IR�NY!"
 
@@ -3392,59 +3088,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Figyelem, a 'Shift' gomb nem ajánlott : amikor a shift le van nyomva, az "
-"összes karaktert tartalmazó billentyű, amik különböznek a nagy betűktől nem "
-"fognak működni."
+msgstr "Figyelem, a 'Shift' gomb nem ajánlott : amikor a shift le van nyomva, az összes karaktert tartalmazó billentyű, amik különböznek a nagy betűktől nem fognak működni."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Fegyverek"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Időjárási hatások"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Időjárás effektek: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Mi a baj, ti kis hippik? A hatalmas gnú vezetőtök hiányzik?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Amikor a bemeneti eszközök be lettek konfigurálva, készen állsz a játékra. "
-"Válaszd ki a 'többjátékos verseny' ikonját a főmenüben. Amikor gokartot kell "
-"választanod, minden játékos nyomja meg a 'tűz' gombot a gamepadon vagy a "
-"billentyűzeten, hogy beléphessen a játékba. A bemeneti eszközökkel lehet "
-"gokartot váltani. A játék folytatódni fog, ha mindenki kiválasztotta a saját "
-"gokartját. Megjegyzés: ebben a műveletben az egér nem használható."
+msgstr "Amikor a bemeneti eszközök be lettek konfigurálva, készen állsz a játékra. Válaszd ki a 'többjátékos verseny' ikonját a főmenüben. Amikor gokartot kell választanod, minden játékos nyomja meg a 'tűz' gombot a gamepadon vagy a billentyűzeten, hogy beléphessen a játékba. A bemeneti eszközökkel lehet gokartot váltani. A játék folytatódni fog, ha mindenki kiválasztotta a saját gokartját. Megjegyzés: ebben a műveletben az egér nem használható."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3452,42 +3134,36 @@ msgid "White"
 msgstr "Fehér"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Igen"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Most már készen állsz a versenyzésre. Sok szerencsét!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Bejelentkezve, mint"
 
@@ -3497,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Teljesítetted a kihívást!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Teljesítetted a kihívást!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Teljesítetted a Nagy Díjat!"
 
@@ -3548,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Befejezted a versenyt!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Meg lettél semmisítve!"
 
@@ -3571,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3579,56 +3256,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Meg kell adnod egy jelszót."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Nagy Díj feloldva: %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Pálya feloldva: %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Megnyerted a versenyt!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"A konfigurációs fájlod hibás volt, ezért az törölve lett és egy új lett "
-"készítve."
+msgstr "A konfigurációs fájlod hibás volt, ezért az törölve lett és egy új lett készítve."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "A konfigurációs fájlod régi volt, ezért az törölve lett és egy új lett készítve."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"A konfigurációs fájlod régi volt, ezért az törölve lett és egy új lett "
-"készítve."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"A bemeneti konfigurációs fájlod nem kompatibilis ezzel az STK verzióval."
+msgstr "A bemeneti konfigurációs fájlod nem kompatibilis ezzel az STK verzióval."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3636,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Garden"
 
@@ -3647,7 +3328,6 @@ msgstr "[nincs]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "műveletek"
 
@@ -3656,7 +3336,8 @@ msgstr "műveletek"
 msgid "all"
 msgstr "összes"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "szerző:"
@@ -3665,49 +3346,25 @@ msgstr "szerző:"
 msgid "featured"
 msgstr "ajánlott"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "magas"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "alacsony"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "alapjáték"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Balint https://launchpad.net/~lbekefi\n"
-"  Gyönki Bendegúz https://launchpad.net/~gyonkibendeguz\n"
-"  Jacob https://launchpad.net/~jacob11\n"
-"  Jf. Tasz https://launchpad.net/~jftatsz\n"
-"  Molditz György https://launchpad.net/~molditz\n"
-"  Papp Bence https://launchpad.net/~sclegnrbs\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Úr Balázs https://launchpad.net/~urbalazs"
+msgstr "Launchpad Contributions:\n  Balint https://launchpad.net/~lbekefi\n  Gyönki Bendegúz https://launchpad.net/~gyonkibendeguz\n  Jacob https://launchpad.net/~jacob11\n  Jf. Tasz https://launchpad.net/~jftatsz\n  Molditz György https://launchpad.net/~molditz\n  Papp Bence https://launchpad.net/~sclegnrbs\n  STK-team https://launchpad.net/~stk\n  Úr Balázs https://launchpad.net/~urbalazs"
diff --git a/data/po/hy.po b/data/po/hy.po
index 5109a5bed..7434d9f2c 100644
--- a/data/po/hy.po
+++ b/data/po/hy.po
@@ -1,22 +1,22 @@
-# Armenian translation for stk
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-02-09 15:33+0000\n"
-"Last-Translator: Aram Palyan <ararat.info@gmail.com>\n"
-"Language-Team: Armenian <hy@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/supertuxkart/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s Õ¨Õ½Õ¿ %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s - %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%sÕ¨ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Ô´Õ¡Õ¿Õ¡Ö€Õ¯)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr "9 Õ¡Õ´Õ«Õ½"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Ô³Ö€Õ¡Õ¶ ÕŠÖ€Õ«ÕµÕ« Õ´Õ¡Õ½Õ«Õ¶"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Õ„Õ¡Õ½Õ«Õ¶"
 
@@ -237,37 +224,35 @@ msgstr "Õ„Õ¡Õ½Õ«Õ¶"
 msgid "Accelerate"
 msgstr "Ô±Ö€Õ¡Õ£Õ¡Ö�Õ¶Õ¥Õ¬"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Ô±Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬ Ô½Õ¡Õ²Õ¡Ö�Õ¸Õ²"
 
@@ -314,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Ô±Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬ Õ½Õ¡Ö€Ö„"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +327,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Ô²Õ¸Õ¬Õ¸Ö€Õ¨"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Ô²Õ¸Õ¬Õ¸Ö€ Õ´Ö€Ö�Õ¸Ö‚Õ²Õ«Õ¶Õ¥Ö€Õ¨"
 
@@ -401,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ô½Õ¡Ö€Õ«Õ½Õ­ - Õ¤Õ¡Õ¶Õ¤Õ¡Õ²Õ¥Ö�Õ¶Õ¸Ö‚Õ´ Õ§ Õ¡Õ¼Õ¡Õ»Õ«Õ¶ Õ¿Õ¥Õ²Õ¸Ö‚Õ´ Õ£Õ¿Õ¶Õ¾Õ¸Õ²Õ« Õ¡Ö€Õ¡Õ£Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ô±Õ·Õ­Õ¡Ö€Õ°Õ« Õ®Õ¡ÕµÖ€Õ¸Ö‚Õ´"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Ô½Õ¸Ö‚Õ½Õ¡ÖƒÕ¥Õ›Ö„ Õ¢Õ¡Õ¶Õ¡Õ¶Õ¶Õ¥Ö€Õ«Ö�"
 
@@ -576,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "ÔµÕ¿"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Ô¿Õ¡ÕºÕ¸Ö‚ÕµÕ¿ Õ©Õ«Õ´Õ¨ Õ°Õ¡Õ²Õ©Õ¥Ö�Ö‰"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬"
 
@@ -763,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Õ“Õ¡Õ¯Õ¥Õ¬"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Õ€Õ¡Ö€Õ£Õ¡Õ¶Ö„Õ¶Õ¥Ö€"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Õ€Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ« Õ¬Õ¥Õ¦Õ¸Ö‚Õ¶"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2968,8 @@ msgid "Update"
 msgstr "Ô¹Õ¡Ö€Õ´Õ¡Ö�Õ¶Õ¥Õ¬"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Õ�Õ¡ÕµÕ¶"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Ô¶Õ¥Õ¶Ö„Õ¥Ö€"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "ÔµÕ²Õ¡Õ¶Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ§Ö†Õ¥Õ¯Õ¿Õ¶Õ¥Ö€"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "ÔµÕ²Õ¡Õ¶Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ§Ö†Õ¥Õ¯Õ¿Õ�  %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ô±ÕµÕ¸"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3328,6 @@ msgstr "[Õ¹Õ¯Õ¡]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "Õ¨Õ½Õ¿"
@@ -3602,42 +3346,25 @@ msgstr "Õ¨Õ½Õ¿"
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Õ½Õ¿Õ¡Õ¶Õ¤Õ¡Ö€Õ¿"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Aram Palyan https://launchpad.net/~ararat-info"
+msgstr "Launchpad Contributions:\n  Aram Palyan https://launchpad.net/~ararat-info"
diff --git a/data/po/id.po b/data/po/id.po
index e53d42814..c48bc6c2a 100644
--- a/data/po/id.po
+++ b/data/po/id.po
@@ -1,23 +1,22 @@
-# Indonesian translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:12+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Indonesian <id@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/supertuxkart/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,23 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Tapi Kau, makhluk kecil yang menyedihkan tidak akan pernah bisa "
-"mengalahkanku - sang Raja Karts!"
+msgstr " Tapi Kau, makhluk kecil yang menyedihkan tidak akan pernah bisa mengalahkanku - sang Raja Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s oleh %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s oleh %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s telah siap"
@@ -99,32 +95,29 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' telah tereliminasi."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Kosong)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(permainan jaringan belum tersedia)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Obyek yang berwarna biru berarti terdapat konflik dengan konfigurasi lain"
+msgstr "* Obyek yang berwarna biru berarti terdapat konflik dengan konfigurasi lain"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
@@ -132,46 +125,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Seting kendali keyboard dapat dilihat/dirubah di bagian menu Pilihan"
+msgstr "* Seting kendali keyboard dapat dilihat/dirubah di bagian menu Pilihan"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Sebagian besar mode permainan ini dapat juga dimainkan dengan gaya Grand "
-"Prix: Kamu tidak main balapan tunggal, melainkan memainkan beberapa balapan "
-"berurutan. Semakin baik peringkatmu, semakin banyak poin yang kamu dapatkan. "
-"Di saat akhir pemain dengan poin terbanyak memenangkan piala."
+msgstr "* Sebagian besar mode permainan ini dapat juga dimainkan dengan gaya Grand Prix: Kamu tidak main balapan tunggal, melainkan memainkan beberapa balapan berurutan. Semakin baik peringkatmu, semakin banyak poin yang kamu dapatkan. Di saat akhir pemain dengan poin terbanyak memenangkan piala."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -202,7 +183,6 @@ msgstr "Pertempuran 3 serangan"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -221,23 +201,20 @@ msgid "9 months"
 msgstr "9 bulan"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Highscores ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Batalkan Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Tentang program ini"
 
@@ -246,37 +223,35 @@ msgstr "Tentang program ini"
 msgid "Accelerate"
 msgstr "Tancap gas"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -284,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -295,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -312,7 +284,6 @@ msgstr "Tambah Konfigurasi Papan Ketik"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Tambah Pemain"
 
@@ -323,32 +294,29 @@ msgstr "Tambahkan Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Tambah Piranti"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Add-Ons"
 
@@ -358,72 +326,66 @@ msgstr "Nama Add-on"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Addons"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Semua"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Semua Lintasan"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Segala serangan diperbolehkan, jadi dapatkan senjata dan pergunakan sebaik "
-"mungkin!"
+msgstr "Segala serangan diperbolehkan, jadi dapatkan senjata dan pergunakan sebaik mungkin!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -433,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Jangkar - sangat menghambat kart pada posisi terdepan."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Karakter Bergerak"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animasi Karakter : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Pemandangan Bergerak"
 
@@ -459,24 +418,24 @@ msgstr "Pemandangan Bergerak"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animasi Pemandangan : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropic x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropic x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropic x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropic x8"
 
@@ -486,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Terapkan resolusi baru"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -523,49 +478,44 @@ msgstr "Apakah anda yakin ingin menghapus konfigurasi ini secara permanen?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arena"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Set dengan tombol ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Di Ujung Dunia"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Suara"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Hindari pisangnya!"
 
@@ -587,79 +537,66 @@ msgstr "Axis %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Kembali"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Kembali ke Permainan"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Lanjutkan Balapan"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Kembali ke daftar perangkat"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Kembali ke Menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Kembali ke menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Pulau Pertempuran"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Semoga beruntung lain waktu!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Dwilinear"
 
@@ -669,39 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Masion Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Tim Biru Menang"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Peternakan Sapi"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bola Bowling - memantul di dinding. Jika kamu menengok ke belakang, maka "
-"bola bowling akan dilempar ke belakang."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bola Bowling - memantul di dinding. Jika kamu menengok ke belakang, maka bola bowling akan dilempar ke belakang."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -709,7 +640,6 @@ msgid "Brake"
 msgstr "Rem"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -717,54 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kue - dilemparkan pada lawan terdekat, paling baik digunakan pada jarak "
-"pendek dan lintasan lurus dan panjang."
+msgstr "Kue - dilemparkan pada lawan terdekat, paling baik digunakan pada jarak pendek dan lintasan lurus dan panjang."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Tidak dapat mengakses server stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Batalkan"
 
@@ -778,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Batalkan/Kembali"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Lorong X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Tantangan Selesai"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Tantangan Gagal"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Tantangan : Ruang Piala"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -805,63 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Pilih Kart Anda"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klik disini untuk memutar tutorial"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Tutup"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Kumpulkan kotak biru : kotak biru akan memberimu senjata atau tambahan "
-"tenaga lainnya"
+msgstr "Kumpulkan kotak biru : kotak biru akan memberimu senjata atau tambahan tenaga lainnya"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Kumpulkan botol nitro (kita akan menggunakannya setelah tikungan)"
 
@@ -871,17 +778,13 @@ msgstr "Kumpulkan nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitro akan memberimu lonjakan kecepatan kapanpun yang kamu mau dengan "
-"menekan tombol yang sesuai. Kamu bisa melihat jumlah nitro yang kamu miliki "
-"pada sisi kanan layar permainan."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitro akan memberimu lonjakan kecepatan kapanpun yang kamu mau dengan menekan tombol yang sesuai. Kamu bisa melihat jumlah nitro yang kamu miliki pada sisi kanan layar permainan."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -894,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -906,7 +809,6 @@ msgstr "Konfirmasi resolusi dalam %i detik"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -918,100 +820,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tidak ada tambahan tenaga, jadi semua tergantung kemampuan menyetirmu!"
+msgstr "Tidak ada tambahan tenaga, jadi semua tergantung kemampuan menyetirmu!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Lanjut"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kendali"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Tidak dapat mendeteksi wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Para Kontributor"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1024,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Kustomisasi"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Pengaturan kustom"
 
@@ -1056,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1064,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Hapus Konfigurasi"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1098,24 +978,23 @@ msgstr "Nonaktifkan Piranti"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Tidak diaktifkan"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Tampilkan FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Apakah anda yakin untuk membatalkan Gand prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Apakah anda benar-benar ingin menghapus pemain '%s' ?"
@@ -1124,8 +1003,8 @@ msgstr "Apakah anda benar-benar ingin menghapus pemain '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Jangan tancap gas sebelum dimulai"
 
@@ -1136,27 +1015,24 @@ msgstr "Bawah"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1167,10 +1043,8 @@ msgstr "Berburu Telur"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"Berburu Telur: Eksplorasi jalur untuk menemukan semua telur tersembunyi."
+msgstr "Berburu Telur: Eksplorasi jalur untuk menemukan semua telur tersembunyi."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1178,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr "Telur: %d/ %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Dieliminasi"
 
@@ -1191,24 +1064,22 @@ msgstr "Dieliminasi"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1220,27 +1091,24 @@ msgstr "Aktifkan Piranti"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Diaktifkan"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Aktifkan semua"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Masukkan nama pemain yang baru"
 
@@ -1253,31 +1121,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Siapapun:\nTekan 'Select' sekarang untuk bergabung"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Siapapun:\n"
-"Tekan 'Select' sekarang untuk bergabung"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Keluar dari Balapan"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ahli"
 
@@ -1285,12 +1153,12 @@ msgstr "Ahli"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Eksplorasi jalur untuk menemukan semua telur tersembunyi"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1315,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Putaran terakhir!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1338,23 +1204,14 @@ msgstr "Tembak"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Pertama-tama, kamu akan membutuhkan beberapa piranti input (memiliki "
-"beberapa gamepad atau joystick adalah cara terbaik untuk bermain dengan "
-"beberapa orang). Buka layar konfigurasi input dan seting gamepad-nya. "
-"Permainan ini juga dapat dimainkan dengan papan ketik, hanya saja setiap "
-"pemain akan memerlukan kumpulan tombol yang berbeda, dan perlu diperhatikan "
-"bahwa kebanyakan papan ketik tidak cocok untuk permainan multiplayer karena "
-"kebanyakan papan ketik tidak mendukung beberapa input tombol secara "
-"bersamaan."
+msgstr "Pertama-tama, kamu akan membutuhkan beberapa piranti input (memiliki beberapa gamepad atau joystick adalah cara terbaik untuk bermain dengan beberapa orang). Buka layar konfigurasi input dan seting gamepad-nya. Permainan ini juga dapat dimainkan dengan papan ketik, hanya saja setiap pemain akan memerlukan kumpulan tombol yang berbeda, dan perlu diperhatikan bahwa kebanyakan papan ketik tidak cocok untuk permainan multiplayer karena kebanyakan papan ketik tidak mendukung beberapa input tombol secara bersamaan."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1367,25 +1224,21 @@ msgstr "Ikuti pemimpin!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Ikuti pemimpin: Kejar posisi kedua, sebagaimana kart terakhir akan "
-"didiskualifikasi setiap pengukur waktu mencapai nol. Hati-hati: berada di "
-"depan pemimpin juga akan membuat anda didiskualifikasi!"
+msgstr "Ikuti pemimpin: Kejar posisi kedua, sebagaimana kart terakhir akan didiskualifikasi setiap pengukur waktu mencapai nol. Hati-hati: berada di depan pemimpin juga akan membuat anda didiskualifikasi!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Benteng Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Wiimote %d terdeteksi"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1409,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Layar Penuh"
 
@@ -1429,22 +1281,19 @@ msgstr "GOAL!"
 msgid "Game Keys"
 msgstr "Tombol Permainan"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Mode Permainan"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1460,51 +1309,45 @@ msgstr "Tombol gamepad %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Umum"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Menyerah"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1514,61 +1357,53 @@ msgid "Go!"
 msgstr "Mulai!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Pencapaian Gran Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Tingkat Efek Grafis"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafis"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Pengaturan Grafis"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Lembah Hijau"
 
@@ -1585,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1600,22 +1433,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Panduan"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Highscores"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1623,79 +1452,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Serang yang lain dengan senjata hingga mereka kehabisan nyawa mereka. (Hanya "
-"dalam permainan multiplayer)"
+msgstr "Serang yang lain dengan senjata hingga mereka kehabisan nyawa mereka. (Hanya dalam permainan multiplayer)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Hanya pemain"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Kalau kau bisa mengalahkanku, Aku akan membebaskan si tua itu"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Jika kamu melihat tombol dengan gembok seperti ini, maka kamu harus "
-"menyelesaikan tantangan untuk membukanya."
+msgstr "Jika kamu melihat tombol dengan gembok seperti ini, maka kamu harus menyelesaikan tantangan untuk membukanya."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "Mengabaikan '%s', kamu seharusnya bergabung lebih awal untuk ikut bermain!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
-"Mengabaikan '%s', kamu seharusnya bergabung lebih awal untuk ikut bermain!"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instal"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Menengah"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Seri"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1705,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kart"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Tetap pada resolusi ini"
 
@@ -1730,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr "Papan Ketik %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1739,7 +1558,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Putaran"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Putaran ke-%i"
@@ -1801,64 +1620,98 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Sedang memuat"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Dikunci"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Dikunci : selesaikan tantangan yang masih aktif untuk mendapatkan akses "
-"lebih!"
+msgstr "Dikunci : selesaikan tantangan yang masih aktif untuk mendapatkan akses lebih!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Dikunci!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1869,27 +1722,18 @@ msgstr "Tengok ke Belakang"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1897,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Hanya saya"
 
@@ -1918,29 +1760,33 @@ msgid "Menu Keys"
 msgstr "Tombol Menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Axis mouse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1948,48 +1794,41 @@ msgstr "Tombol mouse %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multiplayer"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multiplayer"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musik"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2009,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2024,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Grand Prix baru '%s' sekarang tersedia"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2039,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Tingkat kesulitan baru '%s' sekarang tersedia"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Putaran tercepat yang baru"
 
@@ -2067,19 +1912,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Tidak ada"
 
@@ -2089,21 +1933,19 @@ msgid "Normal Race"
 msgstr "Balapan Biasa"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Area Wisata Utara"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Pemula"
 
@@ -2114,46 +1956,41 @@ msgstr "Jumlah kendaraan musuh : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Jumlah kart AI"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Setuju"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Terpencil"
 
@@ -2161,62 +1998,59 @@ msgstr "Terpencil"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Oh ya, lihat, dia di kastil saya sekarang dan akan disajikan untuk makan "
-"malam ..."
+msgstr "Oh ya, lihat, dia di kastil saya sekarang dan akan disajikan untuk makan malam ..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Tambang Tua"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Kelas Matematika Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Hanya Master Permainan yang boleh melakukan ini!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ups! Ketika anda dalam masalah, tekan <%s> untuk diselamatkan"
@@ -2227,14 +2061,11 @@ msgstr "Ups! Ketika anda dalam masalah, tekan <%s> untuk diselamatkan"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Pilihan"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2243,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Parasut - menghambat semua kart di depanmu."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2279,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2291,12 +2117,11 @@ msgstr "Tahan Permainan"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Ditahan"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Hukuman waktu!!"
 
@@ -2305,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Arena Bermain Pinguin"
 
@@ -2314,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Mainkan semuanya"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Pemain"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2353,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Mohon konfigurasi ulang setelan tombol."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Mohon tunggu selagi addons diperbaharui"
@@ -2362,52 +2191,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Mohon bersabar selagi add-ons dimuat"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Tongkat Penyedot - lemparkan ke depan untuk menarik lawan ke belakang, atau "
-"saat menengok ke belakang agar lawan tidak bisa melihat."
+msgstr "Tongkat Penyedot - lemparkan ke depan untuk menarik lawan ke belakang, atau saat menengok ke belakang agar lawan tidak bisa melihat."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Tekan ESC untuk membatalkan"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Tekan tombol pilihan anda"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Tekan enter atau double-click pada salah satu piranti untuk mengkonfigurasi "
-"piranti tersebut"
+msgstr "Tekan enter atau double-click pada salah satu piranti untuk mengkonfigurasi piranti tersebut"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Tekan enter atau double-click pada salah satu pemain untuk menyunting pemain "
-"tersebut"
+msgstr "Tekan enter atau double-click pada salah satu pemain untuk menyunting pemain tersebut"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2439,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2448,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2460,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Pilihan Balapan"
 
@@ -2499,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Pilih Kart dengan Acak"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Pilih Lintasan dengan Acak"
 
@@ -2509,84 +2320,68 @@ msgid "Rank"
 msgstr "Peringkat"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Rating >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Bersiap!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Tim Merah Menang"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Balapan Reguler: Semua serangan diijinkan, ambil semua senjata dan gunakan "
-"dengan bijak!"
+msgstr "Balapan Reguler: Semua serangan diijinkan, ambil semua senjata dan gunakan dengan bijak!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Ingat lokasi jendela"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Hapus"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Ubah Nama"
 
@@ -2612,29 +2407,25 @@ msgstr "Penyelamatan"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Mulai Ulang"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Mulai Ulang Balapan"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Dibalikkan"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2691,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skotlandia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2735,12 +2520,10 @@ msgid "Select"
 msgstr "Pilih"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Pilih mode Permainan"
 
@@ -2750,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Pilih kendaraan"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2794,91 +2571,49 @@ msgstr "Sedia!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Mulai Balapan Baru"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Padang Pasir"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Tepi Kota yang Berkilau"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2888,7 +2623,6 @@ msgid "Size: %s"
 msgstr "Ukuran: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2899,12 +2633,10 @@ msgstr "Ngepot"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tampilan"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Puncak Salju"
 
@@ -2914,28 +2646,23 @@ msgid "Soccer"
 msgstr "Sepak Bola"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Maaf, terjadi kesalahan saat mencoba menghubungi situs web add-ons. Pastikan "
-"anda terhubung ke internet dan pastikan SuperTuxKart tidak terhalang "
-"firewall."
+msgstr "Maaf, terjadi kesalahan saat mencoba menghubungi situs web add-ons. Pastikan anda terhubung ke internet dan pastikan SuperTuxKart tidak terhalang firewall."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2943,7 +2670,6 @@ msgstr "Maaf, pengunduhan add-on gagal"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efek Suara"
 
@@ -2952,7 +2678,6 @@ msgstr "Efek Suara"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standar"
 
@@ -2965,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Mulai Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Mulai Balapan"
 
@@ -2989,12 +2713,10 @@ msgstr "Belok Kanan"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Mode Cerita"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3002,122 +2724,108 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Dunia Bawah Laut"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Addons SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Panduan SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Pilihan SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart dapat dimainkan dalam mode multiplayer pada komputer yang sama"
+msgstr "SuperTuxKart dapat dimainkan dalam mode multiplayer pada komputer yang sama"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart menghadirkan beberapa mode permainan"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Penukar - Kado hadiah berubah menjadi pisang dan sebaliknya dalam waktu "
-"singkat."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Penukar - Kado hadiah berubah menjadi pisang dan sebaliknya dalam waktu singkat."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Pemukul - akan menggepengkan semua kart yang dekat, sehingga memperlambat "
-"mereka."
+msgstr "Pemukul - akan menggepengkan semua kart yang dekat, sehingga memperlambat mereka."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Bahasa yang Digunakan"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Penyaringan tekstur"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Tombol 'Ngepot' membuatmu ngepot di tikungan tajam dan mendapatkan boost"
+msgstr "Tombol 'Ngepot' membuatmu ngepot di tikungan tajam dan mendapatkan boost"
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Di Stadion"
 
@@ -3129,9 +2837,7 @@ msgstr "Modul add-ons sedang tidak diaktifkan dalam layar Pilihan"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Berkas highscore sudah terlalu lama.\n"
-"semua highscore telah dihapus."
+msgstr "Berkas highscore sudah terlalu lama.\nsemua highscore telah dihapus."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3144,44 +2850,22 @@ msgstr "Ujian Waktu"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Ujian Waktu: Tidak ada tambahan tenaga, jadi kemampuanmu menyetir adalah "
-"yang terpenting!"
+msgstr "Ujian Waktu: Tidak ada tambahan tenaga, jadi kemampuanmu menyetir adalah yang terpenting!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Untuk menambahkan piranti Gamepad/Joystick, cukup buka SuperTuxKart dengan "
-"Gamepad/Joystick terhubung dan Gamepad/Joystick akan nampak dalam daftar.\n"
-"\n"
-"Untuk menambahkan konfigurasi papan ketik, kamu bisa menggunakan tombol di "
-"bawah ini, NAMUN mohon diingat bahwa kebanyakan papan ketik hanya mendukung "
-"penekanan tombol secara bersamaan dalam jumlah yang terbatas sehingga kurang "
-"cocok untuk permainan multiplayer. (Namun demikian, kamu juga bisa "
-"menghubungkan lebih dari satu papan ketik ke komputer. Perlu diingat bahwa "
-"setiap pemain tetap memerlukan setelan tombol yang berbeda saat kamu "
-"melakukannya.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Untuk menambahkan piranti Gamepad/Joystick, cukup buka SuperTuxKart dengan Gamepad/Joystick terhubung dan Gamepad/Joystick akan nampak dalam daftar.\n\nUntuk menambahkan konfigurasi papan ketik, kamu bisa menggunakan tombol di bawah ini, NAMUN mohon diingat bahwa kebanyakan papan ketik hanya mendukung penekanan tombol secara bersamaan dalam jumlah yang terbatas sehingga kurang cocok untuk permainan multiplayer. (Namun demikian, kamu juga bisa menghubungkan lebih dari satu papan ketik ke komputer. Perlu diingat bahwa setiap pemain tetap memerlukan setelan tombol yang berbeda saat kamu melakukannya.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Untuk membantumu menang, ada beberapa tambahan tenaga/kemampuan yang bisa "
-"kamu peroleh :"
+msgstr "Untuk membantumu menang, ada beberapa tambahan tenaga/kemampuan yang bisa kamu peroleh :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Ke bulan dan kembali"
 
@@ -3200,7 +2884,7 @@ msgstr "%i besar"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3214,19 +2898,17 @@ msgstr "Lintasan oleh %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Lintasan"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinear"
 
@@ -3237,24 +2919,21 @@ msgstr "Coba lagi"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial : Ruang Pemilihan"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipe :"
 
@@ -3262,20 +2941,18 @@ msgstr "Tipe :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Uninstal"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3289,8 +2966,8 @@ msgid "Update"
 msgstr "Perbarui"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Dimutakhirkan"
 
@@ -3299,40 +2976,36 @@ msgid "Updated date"
 msgstr "Tanggal Perbaruan"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Gunakan nitro yang anda kumpulkan dengan menekan <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Antarmuka Pengguna"
 
@@ -3341,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3362,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3379,27 +3049,23 @@ msgstr "Versi: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertical Sync (memerlukan mulai ulang)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3411,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "SALAH JALAN!"
 
@@ -3420,60 +3086,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Peringatan, tombol 'Shift' tidak direkomendasikan : saat shift ditekan, "
-"semua tombol yang mengandung karakter yang berbeda dalam mode huruf-besar "
-"tidak dapat digunakan."
+msgstr "Peringatan, tombol 'Shift' tidak direkomendasikan : saat shift ditekan, semua tombol yang mengandung karakter yang berbeda dalam mode huruf-besar tidak dapat digunakan."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Senjata"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efek Cuaca"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efek Cuaca : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Ada apa, pecundang? Pemimpinmu GNU mu hilang?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Setelah semua piranti input terkonfigurasi, kamu bisa mulai bermain. Pilih "
-"ikon 'balapan multiplayer' di menu utama. Saat pemilihan kart, setiap pemain "
-"dapat menekan tombol 'tembak' pada gamepad atau papan ketik untuk bergabung "
-"dalam permainan. Setiap pemain dapat menggunakan piranti input untuk memilih "
-"kart mereka. Permainan berlanjut saat semua pemain telah memilih kart "
-"mereka. Perlu diingat bahwa mouse tidak dapat digunakan untuk melakukan hal "
-"tersebut."
+msgstr "Setelah semua piranti input terkonfigurasi, kamu bisa mulai bermain. Pilih ikon 'balapan multiplayer' di menu utama. Saat pemilihan kart, setiap pemain dapat menekan tombol 'tembak' pada gamepad atau papan ketik untuk bergabung dalam permainan. Setiap pemain dapat menggunakan piranti input untuk memilih kart mereka. Permainan berlanjut saat semua pemain telah memilih kart mereka. Perlu diingat bahwa mouse tidak dapat digunakan untuk melakukan hal tersebut."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3481,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ya"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Kini anda siap untuk balapan. Semoga beruntung!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Kamu bermain sebagai"
 
@@ -3526,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Kau menyelesaikan tantangan!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Kau menyelesaikan semua tantangan!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Anda menyelesaikan Grand Prix ini!"
 
@@ -3577,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Anda berhasil menyelesaikan balapan ini!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Anda telah tereliminasi!"
 
@@ -3600,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3608,51 +3253,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Anda membuka grand prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Anda membuka sirkuit %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Anda berhasil memenangkan balapan!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Berkas konfigurasi anda tidak beraturan, jadi berkas tersebut dihapus dan "
-"akan dibuat lagi yang baru."
+msgstr "Berkas konfigurasi anda tidak beraturan, jadi berkas tersebut dihapus dan akan dibuat lagi yang baru."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Berkas konfigurasi sudah terlalu lama, jadi berkas tersebut dihapus dan akan dibuat lagi yang baru."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Berkas konfigurasi sudah terlalu lama, jadi berkas tersebut dihapus dan akan "
-"dibuat lagi yang baru."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3664,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Taman Zen"
 
@@ -3675,7 +3325,6 @@ msgstr "[tidak ada]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3684,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "oleh"
@@ -3693,48 +3343,25 @@ msgstr "oleh"
 msgid "featured"
 msgstr "Terfavorit"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Standar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n"
-"  Aziz Rahmad https://launchpad.net/~azayrahmad\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Ega Zulfikar https://launchpad.net/~ega-bulb\n"
-"  Icho Y. Chandra https://launchpad.net/~project-zero\n"
-"  Muhammad Radifar https://launchpad.net/~m-radifar05\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n  Aziz Rahmad https://launchpad.net/~azayrahmad\n  Dawid Gan https://launchpad.net/~deveee\n  Ega Zulfikar https://launchpad.net/~ega-bulb\n  Icho Y. Chandra https://launchpad.net/~project-zero\n  Muhammad Radifar https://launchpad.net/~m-radifar05\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/is.po b/data/po/is.po
index fe84b30f9..b627fa709 100644
--- a/data/po/is.po
+++ b/data/po/is.po
@@ -1,22 +1,22 @@
-# Icelandic translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:02+0000\n"
-"Last-Translator: Olafur Skorrdal <Unknown>\n"
-"Language-Team: Icelandic <is@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/supertuxkart/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s eftir %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s eftir %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s er tilbúin/n"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' hefur verið dæmd/ur úr leik."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tómt)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(netspil er ekki enn mögulegt)"
 
@@ -128,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Hægt er að breyta/sjá lyklaborðsskipan í valmyndinni Stillingar"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr "3ja villu keppni"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Stigastaflan ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Hætta Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Um forritið"
 
@@ -237,37 +224,35 @@ msgstr "Um forritið"
 msgid "Accelerate"
 msgstr "Auka hraða"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr "Bæta við lýklaborðs stillingu"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Bæta við leikmanni"
 
@@ -314,32 +295,29 @@ msgstr "Bæta við Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Bæta við tæki"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Bætingar"
 
@@ -349,49 +327,43 @@ msgstr "Bæting nafn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Bætingar"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Allt"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Allar brautir"
 
@@ -401,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -576,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,44 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Benedikt Scheving-Thorsteinsson https://launchpad.net/~nammi-namm\n"
-"  Olafur Skorrdal https://launchpad.net/~skorrdal\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Benedikt Scheving-Thorsteinsson https://launchpad.net/~nammi-namm\n  Olafur Skorrdal https://launchpad.net/~skorrdal\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/it.po b/data/po/it.po
index 239e80354..a7d1fcffc 100644
--- a/data/po/it.po
+++ b/data/po/it.po
@@ -1,19 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.5\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: STK italian <pvinci26@hotmail.it>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/supertuxkart/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
-"X-Poedit-Language: Italian\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -24,23 +26,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Ma voi patetici piccoli mocciosi non sarete mai in grado di battere me - Il "
-"Re dei Kart!"
+msgstr " Ma voi patetici piccoli mocciosi non sarete mai in grado di battere me - Il Re dei Kart!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -56,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -68,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s di %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s di %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s è pronto"
@@ -95,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' è stato eliminato."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Vuoto)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(il gioco in rete non è ancora disponbile)"
 
@@ -127,46 +125,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Le associazioni dei tasti possono essere viste/cambiate nel menu Opzioni"
+msgstr "* Le associazioni dei tasti possono essere viste/cambiate nel menu Opzioni"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* La maggior parte di queste modalità può essere giocata in modalità Gran "
-"Premio: invece di giocare una singola gara, ne giochi tante di fila. Meglio "
-"ti posizioni, più punti ricevi. Alla fine, il giocatore con più punti vince "
-"la coppa."
+msgstr "* La maggior parte di queste modalità può essere giocata in modalità Gran Premio: invece di giocare una singola gara, ne giochi tante di fila. Meglio ti posizioni, più punti ricevi. Alla fine, il giocatore con più punti vince la coppa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -197,13 +183,10 @@ msgstr "Battaglia a 3 spari"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Sfida a 3 colpi: Solo in modalità a più giocatori. Colpisci gli avversari "
-"con le armi fino a quando perdono tutte le vite."
+msgstr "Sfida a 3 colpi: Solo in modalità a più giocatori. Colpisci gli avversari con le armi fino a quando perdono tutte le vite."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -218,23 +201,20 @@ msgid "9 months"
 msgstr "9 mesi"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Punteggi Migliori ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Abbandona Gran Premio"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Info"
 
@@ -243,39 +223,35 @@ msgstr "Info"
 msgid "Accelerate"
 msgstr "Accelerare"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Accelera e premi il tasto <%s> mentre giri per derapare. Una breve derapata "
-"ti permette di sterzare più velocemente, facendo curve più strette."
+msgstr "Accelera e premi il tasto <%s> mentre giri per derapare. Una breve derapata ti permette di sterzare più velocemente, facendo curve più strette."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Accelera con <%s> e sterza con <%s> e <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -283,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -294,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -311,7 +284,6 @@ msgstr "Aggiungi Configurazione della Tastiera"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Aggiungi Giocatore"
 
@@ -322,32 +294,29 @@ msgstr "Aggiunti Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Aggiungi un dispositivo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Add-Ons"
 
@@ -357,71 +326,66 @@ msgstr "Nome add-on"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Aggiungi"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Tutti"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Tutte le Piste"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Tutti i colpi consentiti, quindi prendi le armi e fanne un uso intelligente!"
+msgstr "Tutti i colpi consentiti, quindi prendi le armi e fanne un uso intelligente!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -431,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ancora - rallenta notevolmente il kart in prima posizione."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personaggi Animati"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personaggi Animati: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Paesaggio Animato"
 
@@ -457,24 +418,24 @@ msgstr "Paesaggio Animato"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Paesaggio Animato: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropo x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropo x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropo x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropo x8"
 
@@ -484,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Applica nuova risoluzione"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -521,49 +478,44 @@ msgstr "Sei sicuro di voler eliminare definitivamente questa configurazione?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arene"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Intorno al faro"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Assegna al tasto ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ai Confini del Mondo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Audio"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evita le banane!"
 
@@ -585,81 +537,66 @@ msgstr "Asse %d %s"
 msgid "Axis %d inverted"
 msgstr "Asse %d invertito"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Indietro"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Torna al Gioco"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Torna alla Gara"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Torna alla selezione delle sfide"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Torna alla lista dei dispositivi"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Torna al menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Torna al menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Pallone da Basket - rimbalza fino al leader e può schiacciare e rallentare i "
-"kart lungo la strada."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Pallone da Basket - rimbalza fino al leader e può schiacciare e rallentare i kart lungo la strada."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Battle Island"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Avrai miglior fortuna la prossima volta!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineare"
 
@@ -669,39 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Maniero della Collina Nera"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "La Squadra Blu Vince"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Recinto Bovini"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Palla da Bowling - rimbalza contro le pareti. Se stai guardando indietro, "
-"sarà gettata all'indietro."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Palla da Bowling - rimbalza contro le pareti. Se stai guardando indietro, sarà gettata all'indietro."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -709,64 +640,52 @@ msgid "Brake"
 msgstr "Freno"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Gomma da Masticare - proteggiti con uno scudo, o usala mentre guardi "
-"indietro per lasciare alle spalle una pozza rosa appiccicosa."
+msgstr "Gomma da Masticare - proteggiti con uno scudo, o usala mentre guardi indietro per lasciare alle spalle una pozza rosa appiccicosa."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Torta - lanciata al rivale più vicino, meglio su brevi distanze e lunghi "
-"rettilinei."
+msgstr "Torta - lanciata al rivale più vicino, meglio su brevi distanze e lunghi rettilinei."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Impossibile accedere al server stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -780,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Annulla/Indietro"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cava X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Sfida Completata"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Sfida Fallita"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Sfide: Sala Trofei"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -807,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Scegli un Kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Clicca qui per usare l'esercitazione."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Chiudi"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Raccogli scatole blu: ti daranno armi o altri potenziamenti"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "Raccogli i pacchi regalo e sparali con <%s>!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Raccogli bottiglie di nitro (le useremo dopo le curve)"
 
@@ -871,17 +778,13 @@ msgstr "Raccogli nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Raccogliere nitro ti permette di ottenere aumenti di velocità ogni volta che "
-"lo desideri, premendo il tasto appropriato. Puoi vedere il livello attuale "
-"di nitro nella barra a destra dello schermo di gioco."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Raccogliere nitro ti permette di ottenere aumenti di velocità ogni volta che lo desideri, premendo il tasto appropriato. Puoi vedere il livello attuale di nitro nella barra a destra dello schermo di gioco."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -894,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -906,7 +809,6 @@ msgstr "Conferma risoluzione entro %i secondi"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -914,106 +816,86 @@ msgstr ""
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Collega il wiimote al gestore Bluetooth, quindi premi OK. Le istruzioni "
-"dettagliate sono a supertuxkart.net/Wiimote"
+msgstr "Collega il wiimote al gestore Bluetooth, quindi premi OK. Le istruzioni dettagliate sono a supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Non contiene potenziamenti, quindi solo la tua abilità di guida conta!"
+msgstr "Non contiene potenziamenti, quindi solo la tua abilità di guida conta!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continua"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controlli"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Impossibile rilevare wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Crediti"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1026,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Impostazioni personalizzate..."
 
@@ -1058,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1066,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Elimina Configurazione"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1100,24 +978,23 @@ msgstr "Disabilita Dispositivo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Disabilitato"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Mostra FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Vuoi davvero abbandonare il Gran Premio?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Vuoi veramente cancellare il giocatore '%s' ?"
@@ -1126,8 +1003,8 @@ msgstr "Vuoi veramente cancellare il giocatore '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Non accelerare prima della partenza"
 
@@ -1138,27 +1015,24 @@ msgstr "Giù"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1169,10 +1043,8 @@ msgstr "Caccia alle Uova"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"Caccia alle uova: Esplora le piste per trovare tutte le uova nascoste."
+msgstr "Caccia alle uova: Esplora le piste per trovare tutte le uova nascoste."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1180,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr "Easter egg: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminato"
 
@@ -1193,24 +1064,22 @@ msgstr "Eliminato"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1222,27 +1091,24 @@ msgstr "Abilita Dispositivo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Abilitato"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Abilitato per tutti"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Inserisci il nome del nuovo giocatore"
 
@@ -1255,31 +1121,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Tutti:\nPremere 'Seleziona' adesso per partecipare al gioco!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Tutti:\n"
-"Premere 'Seleziona' adesso per partecipare al gioco!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Abbandona Gara"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Esperto"
 
@@ -1287,12 +1153,12 @@ msgstr "Esperto"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Esplora le piste per trovare tutte le uova nascoste"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1317,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Ultimo Giro!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1340,23 +1204,14 @@ msgstr "Fuoco"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Per prima cosa, sono necessarie varie periferiche di controllo (il modo "
-"migliore per giocare in più giocatori, è avere a disposizione vari gamepad o "
-"joystick). Per l'installazione dei gamepad è necessario andare alla "
-"schermata di configurazione dei controlli. E' anche possibile giocare con la "
-"tastiera, ma ogni giocatore avrà bisogno di una combinazione di tasti "
-"differenti, ed è importante ricordare, che la maggior parte delle tastiere "
-"non è adatta al gioco in multiplayer, perchè non registra un numero "
-"abbstanza elevato di pressione tasti contemporaneo."
+msgstr "Per prima cosa, sono necessarie varie periferiche di controllo (il modo migliore per giocare in più giocatori, è avere a disposizione vari gamepad o joystick). Per l'installazione dei gamepad è necessario andare alla schermata di configurazione dei controlli. E' anche possibile giocare con la tastiera, ma ogni giocatore avrà bisogno di una combinazione di tasti differenti, ed è importante ricordare, che la maggior parte delle tastiere non è adatta al gioco in multiplayer, perchè non registra un numero abbstanza elevato di pressione tasti contemporaneo."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1369,25 +1224,22 @@ msgstr "Segui il primo!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Segui il primo: Corri per il secondo posto, l'ultimo kart verrà squalificato "
-"ogni volta che il contatore raggiunge lo zero. Attento: anche superando il "
-"primo verrai squalificato!"
+msgstr "Segui il primo: Corri per il secondo posto, l'ultimo kart verrà squalificato ogni volta che il contatore raggiunge lo zero. Attento: anche superando il primo verrai squalificato!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Forte Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Trovato(i) %d wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1411,13 +1263,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
@@ -1431,22 +1282,19 @@ msgstr "RETE!"
 msgid "Game Keys"
 msgstr "Tasti di Gioco"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modalità di Gioco"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1462,51 +1310,45 @@ msgstr "Gamepad pulsante %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad levetta %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Generale"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Abbandona Gara"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1516,61 +1358,53 @@ msgid "Go!"
 msgstr "Via!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Gran Premio"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progressi Gran Premio:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Livello Effetti Grafici"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafica"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Impostazioni Grafiche"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Valle Verde"
 
@@ -1587,12 +1421,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Ranch"
 
@@ -1602,22 +1434,18 @@ msgstr "Ranch"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Aiuto"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Punteggi Migliori"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1625,78 +1453,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Colpisci gli altri con le armi finchè non perdono tutte le loro vite. (Solo "
-"in partite multigiocatore)"
+msgstr "Colpisci gli altri con le armi finchè non perdono tutte le loro vite. (Solo in partite multigiocatore)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Solo giocatori umani"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Se riesci a battermi in gara, libererò il vecchio strambo."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Se vedi un pulsante con un lucchetto come questo, devi completare una sfida "
-"per sbloccarlo."
+msgstr "Se vedi un pulsante con un lucchetto come questo, devi completare una sfida per sbloccarlo."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignoro '%s', devi entrare prima per giocare!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installa"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermedia"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "E' un disegno"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1706,13 +1527,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Tieni questa risoluzione"
 
@@ -1731,7 +1551,6 @@ msgid "Keyboard %i"
 msgstr "Tastiera %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1740,7 +1559,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Giro"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Giro %i"
@@ -1802,50 +1621,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Caricamento"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloccato: risolvi le sfide attive per ottenere accesso a di più!"
 
@@ -1853,11 +1668,51 @@ msgstr "Bloccato: risolvi le sfide attive per ottenere accesso a di più!"
 msgid "Locked!"
 msgstr "Bloccato!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1868,27 +1723,18 @@ msgstr "Guarda Dietro"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1896,18 +1742,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Solo Io"
 
@@ -1917,29 +1761,33 @@ msgid "Menu Keys"
 msgstr "Menu Tasti"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Mouse asse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1947,48 +1795,41 @@ msgstr "Mouse pulsante %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multigiocatore"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multigiocatore"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musica"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2008,13 +1849,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2023,9 +1866,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Nuovo Gran Premio '%s' ora disponibile"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2038,7 +1885,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Nuova difficoltà '%s' ora disponibile"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nuovo giro più veloce"
 
@@ -2066,19 +1913,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Sfida per il nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Nessuno"
 
@@ -2088,23 +1934,19 @@ msgid "Normal Race"
 msgstr "Gara Normale"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Resort del Nord"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Se riesci a derapare per molti secondi, riceverai un'accelerazione bonus "
-"come premio!"
+msgstr "Se riesci a derapare per molti secondi, riceverai un'accelerazione bonus come premio!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Principiante"
 
@@ -2115,46 +1957,41 @@ msgstr "Numero di AI Kart: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Numero di AI kart"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Numero di goal per vincere"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Percorsi poco frequentati"
 
@@ -2162,60 +1999,59 @@ msgstr "Percorsi poco frequentati"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Oh sì, vedi, è nel mio castello ora e sarà servito per cena ..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Vecchia Miniera"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Aula di Mate di Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Solo il Game Master può agire su questo punto!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oops! Quando sei nei guai, premi <%s> per essere salvato"
@@ -2226,14 +2062,11 @@ msgstr "Oops! Quando sei nei guai, premi <%s> per essere salvato"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opzioni"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2242,35 +2075,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paracadute - rallenta tutti i kart in una posizione migliore."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2278,8 +2106,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2290,12 +2118,11 @@ msgstr "Pausa"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pausa"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Partenza anticipata!!"
 
@@ -2304,7 +2131,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Parco Giochi Pinguino"
 
@@ -2313,37 +2139,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Riproduci tutti"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Giocatori"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2352,6 +2179,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Per favore ri-configura le associazioni dei tasti."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Attendi mentre gli addons vengono aggiornati"
@@ -2361,46 +2192,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Attendi mentre gli add-on si caricano"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Sturalavandini - lancialo avanti per agganciare un avversario, o tiralo "
-"mentre guardi indietro per far perdere la vista."
+msgstr "Sturalavandini - lancialo avanti per agganciare un avversario, o tiralo mentre guardi indietro per far perdere la vista."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Premi ESC per annullare"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Premi un tasto"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Premi invio o fai doppio click su un dispositivo per configurarlo"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Premi invio o fai doppio click su un giocatore per modificarlo"
 
@@ -2416,10 +2239,7 @@ msgstr "Premi 'fuoco' per iniziare la sfida"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Premi i bottoni 1+2 contemporaneamente sul wiimote per metterlo in modalità "
-"di ricerca, quindi clicca OK. Le istruzioni dettagliate sono a "
-"supertuxkart.net/Wiimote"
+msgstr "Premi i bottoni 1+2 contemporaneamente sul wiimote per metterlo in modalità di ricerca, quindi clicca OK. Le istruzioni dettagliate sono a supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2437,7 +2257,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2446,7 +2265,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2454,31 +2272,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Spingi la palla nella porta avversaria per segnare un goal. (Solo in giochi "
-"multiplayer)"
+msgstr "Spingi la palla nella porta avversaria per segnare un goal. (Solo in giochi multiplayer)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Esci"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Imposta Gara"
 
@@ -2499,8 +2311,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Kart Casuale"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Pista Casuale"
 
@@ -2509,84 +2321,68 @@ msgid "Rank"
 msgstr "Posizione"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Voto >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Pronti!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "La Squadra Rossa Vince"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Gara Normale: Tutti i colpi sono consentiti, quindi afferra le armi e fanne "
-"buon uso!"
+msgstr "Gara Normale: Tutti i colpi sono consentiti, quindi afferra le armi e fanne buon uso!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Ricorda la posizione della finestra"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Rimuovi"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -2612,29 +2408,25 @@ msgstr "Riposiziona"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Riavvia"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Ricomincia Gara"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Al contrario"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2691,41 +2483,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Scozia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2735,12 +2521,10 @@ msgid "Select"
 msgstr "Seleziona"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Seleziona una modalità di gioco"
 
@@ -2750,36 +2534,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Seleziona kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2794,91 +2572,49 @@ msgstr "Partenza!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Imposta Nuova Gara"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Sabbie Mobili"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Periferia Scintillante"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2888,7 +2624,6 @@ msgid "Size: %s"
 msgstr "Dimensione: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2899,12 +2634,10 @@ msgstr "Derapata"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Picco Nevoso"
 
@@ -2914,29 +2647,23 @@ msgid "Soccer"
 msgstr "Calcio"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Campo da calcio"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Calcio: Solo in modalità a più giocatori. Usa il kart per spingere la palla "
-"in rete."
+msgstr "Calcio: Solo in modalità a più giocatori. Usa il kart per spingere la palla in rete."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Si è verificato un errore contattando il sito degli add-on. Assicurati di "
-"essere connesso ad Internet e che SuperTuxKart non sia bloccato dal firewall"
+msgstr "Si è verificato un errore contattando il sito degli add-on. Assicurati di essere connesso ad Internet e che SuperTuxKart non sia bloccato dal firewall"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2944,7 +2671,6 @@ msgstr "Ci dispiace, il download dell'add-on è fallito"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Effetti Sonori"
 
@@ -2953,7 +2679,6 @@ msgstr "Effetti Sonori"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Predefinito"
 
@@ -2966,11 +2691,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Inizia Gran Premio"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Inizia Gara"
 
@@ -2990,12 +2714,10 @@ msgstr "Sterza a Destra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Modalità Storia"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3003,85 +2725,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Sottomarino"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Addons"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Aiuto SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opzioni SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart può essere giocato in modalità multiplayer su un unico computer"
+msgstr "SuperTuxKart può essere giocato in modalità multiplayer su un unico computer"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart offre diverse modalità di gioco"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Scambiatore - le scatole da regalo si trasformano in banane e viceversa per "
-"un breve periodo."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Scambiatore - le scatole da regalo si trasformano in banane e viceversa per un breve periodo."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Schiaccia mosche - schiaccia i kart vicini, rallentandoli."
 
@@ -3090,50 +2796,49 @@ msgstr "Schiaccia mosche - schiaccia i kart vicini, rallentandoli."
 msgid "System Language"
 msgstr "Lingua del Sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Texture filtering"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Il tasto 'slittamento' consente di slittare in curve strette e ottenere una "
-"spinta."
+msgstr "Il tasto 'slittamento' consente di slittare in curve strette e ottenere una spinta."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Lo Stadio"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"Il modulo degli add-on è attualmente disabilitato nella schermata delle "
-"Opzioni"
+msgstr "Il modulo degli add-on è attualmente disabilitato nella schermata delle Opzioni"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Il file dei punteggi migliori era troppo vecchio,\n"
-"tutti i punteggi sono stati cancellati."
+msgstr "Il file dei punteggi migliori era troppo vecchio,\ntutti i punteggi sono stati cancellati."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3146,40 +2851,22 @@ msgstr "Cronometro"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Cronometro: Non contiene potenziamenti, quindi solo la tua abilità di guida "
-"conta!"
+msgstr "Cronometro: Non contiene potenziamenti, quindi solo la tua abilità di guida conta!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Per aggiungere un nuovo Gamepad/Joystick, è sufficiente avviare SuperTuxKart "
-"con esso collegato e verrà visualizzato nell'elenco.\n"
-"Per aggiungere una configurazione della tastiera, puoi usare il pulsante "
-"sotto, COMUNQUE nota che il più delle tastiere supportano un numero limitato "
-"di tasti premuti contemporaneamente e sono inappropriate per partite "
-"multigiocatore. (Puoi, comunque, connettre più tastiere al pc. Ricorda che "
-"ognuno ha ancora bisogno di avere associazioni di tasti diverse.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Per aggiungere un nuovo Gamepad/Joystick, è sufficiente avviare SuperTuxKart con esso collegato e verrà visualizzato nell'elenco.\nPer aggiungere una configurazione della tastiera, puoi usare il pulsante sotto, COMUNQUE nota che il più delle tastiere supportano un numero limitato di tasti premuti contemporaneamente e sono inappropriate per partite multigiocatore. (Puoi, comunque, connettre più tastiere al pc. Ricorda che ognuno ha ancora bisogno di avere associazioni di tasti diverse.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Per aiutarti a vincere, ci sono alcuni potenziamenti che puoi raccogliere:"
+msgstr "Per aiutarti a vincere, ci sono alcuni potenziamenti che puoi raccogliere:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Andata e ritorno dalla luna"
 
@@ -3198,7 +2885,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3212,19 +2899,17 @@ msgstr "Pista di %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Giri"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineare"
 
@@ -3235,24 +2920,21 @@ msgstr "Riprova"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Esercitazione"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Esercitazione: Selezione Stanza"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipo :"
 
@@ -3260,20 +2942,18 @@ msgstr "Tipo :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Disinstalla"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3287,8 +2967,8 @@ msgid "Update"
 msgstr "Aggiornamenti"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Aggiornato"
 
@@ -3297,40 +2977,36 @@ msgid "Updated date"
 msgstr "Data aggiornamento"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Usa il nitro che hai raccolto premendo <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interfaccia Utente"
 
@@ -3339,19 +3015,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3360,13 +3034,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3377,27 +3050,23 @@ msgstr "Versione: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronismo Verticale (richiede riavvio)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3409,7 +3078,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "DIREZIONE ERRATA!"
 
@@ -3418,61 +3087,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Attenzione, 'Shift' non è un tasto raccomandato: quando shift è premuto, "
-"tutti i tasti che contengono un carattere che è diverso in maiuscolo "
-"smetteranno di funzionare."
+msgstr "Attenzione, 'Shift' non è un tasto raccomandato: quando shift è premuto, tutti i tasti che contengono un carattere che è diverso in maiuscolo smetteranno di funzionare."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armi"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Effetti Metereologici"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Effetti Meteo: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-"Cosa c'è che non va, piccoli hippy? Si è perso il vostro grande leader gnu?"
+msgstr "Cosa c'è che non va, piccoli hippy? Si è perso il vostro grande leader gnu?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Quando i dispositivi di input sono configurati, si è pronti per giocare. "
-"Selezionare l'icona 'gara multigiocatore' nel menu principale. Quando è il "
-"momento di scegliere un kart, ogni giocatore può premere il tasto 'fuoco' "
-"del suo gamepad o tastiera per partecipare al gioco. Ogni giocatore può "
-"usare il suo dispositivo di input per selezionare il proprio kart. Il gioco "
-"continua quando tutti hanno selezionato il loro kart. Si noti che il mouse "
-"non può essere utilizzato per questa operazione."
+msgstr "Quando i dispositivi di input sono configurati, si è pronti per giocare. Selezionare l'icona 'gara multigiocatore' nel menu principale. Quando è il momento di scegliere un kart, ogni giocatore può premere il tasto 'fuoco' del suo gamepad o tastiera per partecipare al gioco. Ogni giocatore può usare il suo dispositivo di input per selezionare il proprio kart. Il gioco continua quando tutti hanno selezionato il loro kart. Si noti che il mouse non può essere utilizzato per questa operazione."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3480,42 +3133,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Si"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Ora sei pronto per correre. Buona fortuna!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Stai giocando come"
 
@@ -3525,37 +3172,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Hai completato una sfida!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Hai completato delle sfide!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Hai completato il Gran Premio!"
 
@@ -3576,20 +3222,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Hai finito la gara!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Sei stato eliminato!"
 
@@ -3599,7 +3247,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3607,56 +3255,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Hai sbloccato il Gran Premio %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Hai sbloccato la pista %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Hai vinto la gara!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Il file di configurazione era difettoso, quindi è stato cancellato e uno "
-"nuovo sarà creato."
+msgstr "Il file di configurazione era difettoso, quindi è stato cancellato e uno nuovo sarà creato."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Il file di configurazione era troppo vecchio, quindi è stato cancellato e uno nuovo sarà creato."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Il file di configurazione era troppo vecchio, quindi è stato cancellato e "
-"uno nuovo sarà creato."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Il tuo file di configurazione non è compatibile con questa versione di STK."
+msgstr "Il tuo file di configurazione non è compatibile con questa versione di STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3664,7 +3317,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Giardino Zen"
 
@@ -3675,7 +3327,6 @@ msgstr "[nessuno]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3684,7 +3335,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "da"
@@ -3693,56 +3345,25 @@ msgstr "da"
 msgid "featured"
 msgstr "in primo piano"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Alessandro Aragione https://launchpad.net/~layn\n"
-"  Andrea Panontin https://launchpad.net/~any-97\n"
-"  Andrea Pivetta https://launchpad.net/~vanpivix\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Diego Pierotto https://launchpad.net/~gringo\n"
-"  Gigu https://launchpad.net/~pvinci26\n"
-"  Guido Barbi https://launchpad.net/~gbar\n"
-"  Massimiliano Caniparoli https://launchpad.net/~massic80\n"
-"  Max Perkins https://launchpad.net/~maxperkinstoki\n"
-"  Oibaf https://launchpad.net/~oibaf\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  grandefava https://launchpad.net/~grandefava\n"
-"  marco https://launchpad.net/~marco97pa\n"
-"  nicoelba https://launchpad.net/~nicoelba\n"
-"  t3ddy https://launchpad.net/~t3ddy1988"
+msgstr "Launchpad Contributions:\n  Alessandro Aragione https://launchpad.net/~layn\n  Andrea Panontin https://launchpad.net/~any-97\n  Andrea Pivetta https://launchpad.net/~vanpivix\n  Dawid Gan https://launchpad.net/~deveee\n  Diego Pierotto https://launchpad.net/~gringo\n  Gigu https://launchpad.net/~pvinci26\n  Guido Barbi https://launchpad.net/~gbar\n  Massimiliano Caniparoli https://launchpad.net/~massic80\n  Max Perkins https://launchpad.net/~maxperkinstoki\n  Oibaf https://launchpad.net/~oibaf\n  STK-team https://launchpad.net/~stk\n  grandefava https://launchpad.net/~grandefava\n  marco https://launchpad.net/~marco97pa\n  nicoelba https://launchpad.net/~nicoelba\n  t3ddy https://launchpad.net/~t3ddy1988"
diff --git a/data/po/ja.po b/data/po/ja.po
index 691c5842c..e2888a41d 100644
--- a/data/po/ja.po
+++ b/data/po/ja.po
@@ -1,20 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/supertuxkart/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: CANADA\n"
-"Language: \n"
-"X-Poedit-Language: French\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,21 +26,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr " �も���絶対�オレ����������…カート�王者����"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -55,7 +56,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -67,19 +68,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s by %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s by %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s is ready"
@@ -94,25 +94,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' �失格����。"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(��記録��り��ん)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(�ットワークプレイ�用��れ����ん)"
 
@@ -126,44 +124,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "※ キー�作設定��メニュー�「設定��ら確�/変更���るよ。"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"※ �れら���ん��グランプリ形��行�れ����も�コースを走ら���\n"
-"����ん。�コースを上��ゴール�る���イントを多�ゲット����。\n"
-"���最終レース終了時��通算�イント�最も高�プレイヤー��利者��。"
+msgstr "※ �れら���ん��グランプリ形��行�れ����も�コースを走ら���\n����ん。�コースを上��ゴール�る���イントを多�ゲット����。\n���最終レース終了時��通算�イント�最も高�プレイヤー��利者��。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -194,7 +182,6 @@ msgstr "3本�トル"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -213,23 +200,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= �イスコア ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "グランプリをや�る"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "作者����"
 
@@ -238,37 +222,35 @@ msgstr "作者����"
 msgid "Accelerate"
 msgstr "加速"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr "アクセルを����ら曲�る��� <%s> キーを押��ドリフト���。短�ドリフト�よ��早��鋭�カーブを曲�れ��。"
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -276,8 +258,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -287,13 +268,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -304,7 +283,6 @@ msgstr "キーコンフィグを追加�る"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "プレイヤーを追加�る"
 
@@ -315,32 +293,29 @@ msgstr "Wiiリモコンを追加"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "デ�イスを追加"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "アドオン"
 
@@ -350,49 +325,43 @@ msgstr "アドオン�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "アドオン"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "���"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "����コース"
 
@@ -402,18 +371,20 @@ msgstr "�ん�もアリ�武器を���上手�使�����"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -423,25 +394,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "イカリ - 先頭カート�スピード�ダウン�るよ。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "キャラクター�動�"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "キャラ�アニメーション : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "背景�アニメーション"
 
@@ -449,24 +417,24 @@ msgstr "背景�アニメーション"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "背景�アニメーション : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -476,29 +444,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "新��解�度を�用�る"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -513,49 +477,44 @@ msgstr "��コンフィグを本当�削除����?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "アリーナ"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Escキー�確定"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "At World's End"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "オーディオ"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "�ナナ���よ��"
 
@@ -577,79 +536,66 @@ msgstr "Axis %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "も�る"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "ゲームを�開"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "レース�開"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "デ�イスリスト�も�る"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "メニュー�も�る"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "メニュー�も�る"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr "�スケットボール - 一番��人を追�����進路上�他�カート���ら�����よ。"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Battle Island"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Better luck next time!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -659,36 +605,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Blackhill Mansion"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "ボーリング� - ����返る。も�後�を����場���後方���るよ"
 
 #. I18N: Key binding name
@@ -697,7 +639,6 @@ msgid "Brake"
 msgstr "ブレーキ"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -705,52 +646,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr "ケーキ - 直線コース����ん近�ライ�ル�車���れを���よ�。"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "STKアドオン サー�ー�アクセス����ん…"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -764,26 +698,23 @@ msgid "Cancel/Back"
 msgstr "キャンセル/も�る"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "�ャレンジ�功"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "�ャレンジ失敗"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "�ャレンジ : トロフィールーム"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -791,63 +722,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "カート�択"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "��をクリック���ュートリアルをプレイ�る"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "閉�る"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"��箱を集�よ�：中�武器や\n"
-"色ん�パワーアップ�入��るよ"
+msgstr "��箱を集�よ�：中�武器や\n色ん�パワーアップ�入��るよ"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -857,16 +777,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"ニトロを集�る�好��時�「ニトロ�キーを押��スピードアップ�るよ。\n"
-" 集��ニトロ���ゲーム画���端�ゲージ�表示�れるよ。"
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "ニトロを集�る�好��時�「ニトロ�キーを押��スピードアップ�るよ。\n 集��ニトロ���ゲーム画���端�ゲージ�表示�れるよ。"
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -879,11 +796,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -891,7 +808,6 @@ msgstr "%i 秒以内�解�度を�用��下��"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -905,97 +821,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "パワーアップアイテム�無��ら�キミ��作テクニック次第��"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "続�る"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "�作設定"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Wiiリモコン�見��り��ん"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "クレジット"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1008,13 +907,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "カスタム"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "カスタマイズ..."
 
@@ -1040,7 +938,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1048,28 +945,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "コンフィグを削除"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1082,24 +977,23 @@ msgstr "無効�デ�イス"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "無効"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "FPS 表示"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "�ん���グランプリを��ら����？"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "本当�プレイヤー� '%s' を削除���� ?"
@@ -1108,8 +1002,8 @@ msgstr "本当�プレイヤー� '%s' を削除���� ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "フライング�������ん"
 
@@ -1120,27 +1014,24 @@ msgstr "下"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1151,7 +1042,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1161,12 +1051,11 @@ msgid "Eggs: %d / %d"
 msgstr "���: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "失格"
 
@@ -1174,24 +1063,22 @@ msgstr "失格"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1203,27 +1090,24 @@ msgstr "有効�デ�イス"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "有効"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "全�有効化"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "新��プレイヤー�を入力��下��"
 
@@ -1238,29 +1122,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr "決定キーを押��ゲーム��加�よ��"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
-msgstr ""
-"レースを\n"
-"や�る"
+msgstr "レースを\nや�る"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "上級"
 
@@ -1268,12 +1152,12 @@ msgstr "上級"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1298,19 +1182,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "最後�一周�よ�"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1321,18 +1203,14 @@ msgstr "アイテム"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"複数人���場������入力デ�イス�必���。 (複数�ゲームパッド ���ジョイスティックを����る��ベスト) "
-"「入力設定�画�を開�ゲームパッド�設定を��下��。 ��1��キーボードを2人�使���も�能�����プレイヤー��作キー "
-"��複���よ�設定��下��。 も��も���ん��キーボード�「複数キー��時押�� をサ�ート����������方法���り��������ん。"
+msgstr "複数人���場������入力デ�イス�必���。 (複数�ゲームパッド ���ジョイスティックを����る��ベスト) 「入力設定�画�を開�ゲームパッド�設定を��下��。 ��1��キーボードを2人�使���も�能�����プレイヤー��作キー ��複���よ�設定��下��。 も��も���ん��キーボード�「複数キー��時押�� をサ�ート����������方法���り��������ん。"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1345,7 +1223,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1353,14 +1230,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Wiiリモコン %d を���"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1384,13 +1261,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "フルスクリーン"
 
@@ -1404,22 +1280,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "ゲーム�作"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "ゲームモード"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1435,51 +1308,45 @@ msgstr "ゲームパッド ボタン %d"
 msgid "Gamepad hat %d"
 msgstr "ゲームパッド �ット %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "基本設定"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "��ら�る"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1489,61 +1356,53 @@ msgid "Go!"
 msgstr "スタート�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "グランプリ"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "グランプリ��績 :"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "特殊効果レベル"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "グラフィックス"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "グラフィック設定"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Green Valley"
 
@@ -1560,12 +1419,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1575,22 +1432,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "ヘルプ"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "�イスコア"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1601,73 +1454,68 @@ msgid ""
 msgstr "武器を相手�発射��相手�HPを�ら��(マル�プレイヤー��)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "プレイヤー��(COM無�)"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "も������オレ����ら���ジジイ�自由���やるよ。"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"��カギ�付���るボタンを����ら��れ��ャレンジモード�\n"
-"�件を����開放����内容を�����������"
+msgstr "��カギ�付���るボタンを����ら��れ��ャレンジモード�\n�件を����開放����内容を�����������"
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s'�無視�����。 ��や��プレイ��加��下��!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "インストール"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "中級"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1677,13 +1525,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "カート"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "解�度を�用�る"
 
@@ -1702,7 +1549,6 @@ msgid "Keyboard %i"
 msgstr "キーボード %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1711,7 +1557,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "周"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "%i 周目"
@@ -1773,50 +1619,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "ロード中"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "未解�"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "未解� : も���ャレンジ��件を���る必���り��!"
 
@@ -1824,11 +1666,51 @@ msgstr "未解� : も���ャレンジ��件を���る必���
 msgid "Locked!"
 msgstr "未解����"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1839,27 +1721,18 @@ msgstr "後�を�る"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1867,18 +1740,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "自分��"
 
@@ -1888,29 +1759,33 @@ msgid "Menu Keys"
 msgstr "メニュー�作"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "マウス 軸 %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1918,48 +1793,41 @@ msgstr "マウス ボタン %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "�ん����"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "マル�プレイヤー"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "BGM"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1979,13 +1847,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1994,9 +1864,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "新��グランプリ '%s' �解��れ���"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2009,7 +1883,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "新��難易度 '%s' �解��れ���"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�最速ラップ��!!】"
 
@@ -2037,19 +1911,18 @@ msgstr "ニトロ"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "��"
 
@@ -2059,21 +1932,19 @@ msgid "Normal Race"
 msgstr "通常レース"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Northern Resort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "�級"
 
@@ -2084,46 +1955,41 @@ msgstr "COM�人数 : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "COM�人数"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Off the beaten track"
 
@@ -2131,60 +1997,59 @@ msgstr "Off the beaten track"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "�����������今オレ�城�閉�込�られ�るよ…"
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Old Mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliver's Math Class"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "���作�ゲームマスター��行���!!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2195,14 +2060,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "設定"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2211,35 +2073,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "パラシュート - 全��カート�スピード�ダウン�るよ。"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2247,8 +2104,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2259,12 +2116,11 @@ msgstr "�ーズ"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "�ーズ"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "�ペナルティタイム!!】"
 
@@ -2273,7 +2129,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Penguin Playground"
 
@@ -2282,37 +2137,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Play all"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "プレイヤー"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2321,6 +2177,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "キー�作設定を�設定��下��。"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "アドオン�更新�れる�����ら��待�下��"
@@ -2330,44 +2190,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "アドオン�ロード�れる�����ら��待�下��"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr "�ゅ��ん - ����射る�相手を引����り�後��射る�視界をジャマ��るよ。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Escキー�キャンセル"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "設定�るキーを押��下��"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "�択項目を Enter ���ダブルクリック�る�キー設定を行���"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "�択項目を Enter ���ダブルクリック�る�プレイヤー設定を行���"
 
@@ -2401,7 +2255,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2410,7 +2263,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2422,25 +2274,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "終了"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "レース�設定"
 
@@ -2461,8 +2309,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "カートをランダム�択"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "コースをランダム�択"
 
@@ -2471,82 +2319,68 @@ msgid "Rank"
 msgstr "順�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "�������"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "ウィンドウ��置を記憶��る"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "削除"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "��を変更"
 
@@ -2572,29 +2406,25 @@ msgstr "レスキュー"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "モニタ�解�度"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "�スタート"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "�スタート"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "リ�ース"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2651,41 +2481,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Scotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2695,12 +2519,10 @@ msgid "Select"
 msgstr "�択"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "ゲームモードを�択"
 
@@ -2710,36 +2532,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "カートを�択"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2754,91 +2570,49 @@ msgstr "よー��"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "レース�択"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Shifting Sands"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2848,7 +2622,6 @@ msgid "Size: %s"
 msgstr "サイズ: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2859,12 +2632,10 @@ msgstr "ドリフト"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "スキン"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snow Peak"
 
@@ -2874,26 +2645,23 @@ msgid "Soccer"
 msgstr "サッカー"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Soccer field"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"��ん���。アドオン�ウェブサイト�通信中�エラー�発生����。インター�ットを有効����ファイアウォール�ブロックを解除��下��。"
+msgstr "��ん���。アドオン�ウェブサイト�通信中�エラー�発生����。インター�ットを有効����ファイアウォール�ブロックを解除��下��。"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2901,7 +2669,6 @@ msgstr "アドオン�ダウンロード�失敗����。"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "効果音"
 
@@ -2910,7 +2677,6 @@ msgstr "効果音"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "デフォルト"
 
@@ -2923,11 +2689,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "グランプリを開始"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "レースを開始"
 
@@ -2947,12 +2712,10 @@ msgstr "��曲�る"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "ストーリー"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2960,82 +2723,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Subsea"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "アドオン"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "ヘルプ"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "オプション"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart �1��コンピュータ上����2人以上�����。"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart�ゲームモード"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "���� - ��ら��間「プレゼント�箱��「�ナナ��入れ��るよ。"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "�エ��� - 近���カートを������� 相手�スピードを ダウン��るよ。"
 
@@ -3044,32 +2794,37 @@ msgstr "�エ��� - 近���カートを������� 相手
 msgid "System Language"
 msgstr "システム�言語"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "テクス�ャフィルタリング"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "ドリフトボタンを使用�る��る��曲�れ�加速����"
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "The Stadium"
 
@@ -3081,9 +2836,7 @@ msgstr "アドオンモジュール��在オプション画��使用��
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"�イスコア�ファイル������\\n\n"
-"全�イスコア�削除�れ���"
+msgstr "�イスコア�ファイル������\\n\n全�イスコア�削除�れ���"
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3096,35 +2849,22 @@ msgstr "タイムトライアル"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "タイムトライアル：パワーアップアイテム�無��ら� �果�キミ��作テクニック次第��"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"新��ゲームパッド/ジョイスティックデ�イスを追加�る��� �れらを接続�����SuperTuxKartを起動��下��。 "
-"デ�イスリスト��れら�表示�れる��ょ�。\n"
-"\n"
-"キーボードコンフィグを追加�る���下��るボタンを利用������。1��キーボードを2人�使���も�能�����プレイヤー��作キー������よ�"
-"設定��下��。��ん��キーボード�「複数キー��時押�� をサ�ート�����注�)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "新��ゲームパッド/ジョイスティックデ�イスを追加�る��� �れらを接続�����SuperTuxKartを起動��下��。 デ�イスリスト��れら�表示�れる��ょ�。\n\nキーボードコンフィグを追加�る���下��るボタンを利用������。1��キーボードを2人�使���も�能�����プレイヤー��作キー������よ�設定��下��。��ん��キーボード�「複数キー��時押�� をサ�ート�����注�)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "�����パワーアップアイテムを集�よ�："
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "To the moon and back"
 
@@ -3143,7 +2883,7 @@ msgstr "上� %i 人"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3157,19 +2897,17 @@ msgstr "コース�作者: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "コース"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3180,24 +2918,21 @@ msgstr "も����"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "�ュートリアル"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial : Selection Room"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "タイプ :"
 
@@ -3205,20 +2940,18 @@ msgstr "タイプ :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "アンインストール"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3232,8 +2965,8 @@ msgid "Update"
 msgstr "更新�る"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3242,40 +2975,36 @@ msgid "Updated date"
 msgstr "更新日時"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "<%s> を押��ニトロを使���"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "インターフェース"
 
@@ -3284,19 +3013,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3305,13 +3032,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3322,27 +3048,23 @@ msgstr "�ージョン: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "垂直�期(��起動)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "音�"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3354,7 +3076,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "誤��方����"
 
@@ -3363,54 +3085,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"警告, 「Shift�キー���������ん : Shiftキー�押�れ�時�� 英大文字��異�る文字���入力�れる�� "
-"本��キー�作������る��れ��り��。"
+msgstr "警告, 「Shift�キー���������ん : Shiftキー�押�れ�時�� 英大文字��異�る文字���入力�れる�� 本��キー�作������る��れ��り��。"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "武器����"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "天候効果"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "天候効果 : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "����ん���Nolok？GNU先生�も���������？"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"入力デ�イス�設定�終���ら�プレイ�る準備�整���。 「�ん����� アイコンを�ん�下��。  �プレイヤー�カートを��ゲームパッド ��� "
-"キーボード�ら 「アイテム�キー を押���。全��プレイヤー� 決定��ら レース�開始���。注�：��決定�マウス��行���ん。"
+msgstr "入力デ�イス�設定�終���ら�プレイ�る準備�整���。 「�ん����� アイコンを�ん�下��。  �プレイヤー�カートを��ゲームパッド ��� キーボード�ら 「アイテム�キー を押���。全��プレイヤー� 決定��ら レース�開始���。注�：��決定�マウス��行���ん。"
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3418,42 +3131,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "��"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "使用中�プレイヤー :"
 
@@ -3463,37 +3170,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "�ャレンジを�������"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "�ャレンジを�������"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "グランプリを制覇�����"
 
@@ -3514,20 +3220,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "�ゴール����!!】"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "キミ�失格����!"
 
@@ -3537,7 +3244,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3545,36 +3252,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "グランプリ %0 を解�����"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "コース %0 を解�����"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "キミ�レース��利��!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3587,6 +3299,11 @@ msgid ""
 "created."
 msgstr "設定��コンフィグファイル������。削除��新��も�を作��下��。"
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "入力��コンフィグファイル����ージョン�STK�互����ん。"
@@ -3597,7 +3314,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Garden"
 
@@ -3608,7 +3324,6 @@ msgstr "[��]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3617,7 +3332,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "by"
@@ -3626,49 +3342,25 @@ msgstr "by"
 msgid "featured"
 msgstr "featured"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "スタンダード"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Tae-Wong SEO https://launchpad.net/~seotaewong40\n"
-"  Yuki Shira https://launchpad.net/~shirayuking\n"
-"  lindwurm (Hotaka Hitagi) https://launchpad.net/~lindwurm\n"
-"  tkbd https://launchpad.net/~arolf\n"
-"  xapantu https://launchpad.net/~xapantu"
+msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  Yuki Shira https://launchpad.net/~shirayuking\n  lindwurm https://launchpad.net/~lindwurm\n  tkbd https://launchpad.net/~arolf\n  xapantu https://launchpad.net/~xapantu"
diff --git a/data/po/jbo.po b/data/po/jbo.po
index b831af80c..8cb8c5a98 100644
--- a/data/po/jbo.po
+++ b/data/po/jbo.po
@@ -1,22 +1,23 @@
-# Lojban translation for stk
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Wuzzy <almikes@aol.com>, 2015
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-10-30 15:33+0000\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-15 18:15+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: Lojban <jbo@li.org>\n"
+"Language-Team: Lojban (http://www.transifex.com/projects/p/supertuxkart/language/jbo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: jbo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +28,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +59,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "la'o gy.%s.gy. fi'e la'o gy.%s.gy."
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
-msgstr ""
+msgstr "la'o gy.%s.gy. fi'e la'o gy.%s.gy."
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ".i %s bredi"
@@ -94,27 +95,25 @@ msgstr ""
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "lo samtcise'u po la'o gy.%s.gy."
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ".i la'o gy.%s.gy. pu se vimcu"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "no da"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +127,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,47 +141,42 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
-msgstr ""
+msgstr "lo pa masti"
 
 #: src/states_screens/addons_screen.cpp:50
 msgid "1 week"
-msgstr ""
+msgstr "lo pa jeftu"
 
 #: src/states_screens/addons_screen.cpp:56
 msgid "1 year"
-msgstr ""
+msgstr "lo pa nanca"
 
 #: src/states_screens/addons_screen.cpp:51
 msgid "2 weeks"
-msgstr ""
+msgstr "lo re jeftu"
 
 #: src/states_screens/addons_screen.cpp:57
 msgid "2 years"
-msgstr ""
+msgstr "lo re nanca"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:182
@@ -193,7 +185,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -201,34 +192,31 @@ msgstr ""
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
-msgstr ""
+msgstr "lo ci masti"
 
 #: src/states_screens/addons_screen.cpp:54
 msgid "6 months"
-msgstr ""
+msgstr "lo xa masti"
 
 #: src/states_screens/addons_screen.cpp:55
 msgid "9 months"
-msgstr ""
+msgstr "lo so masti"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "lo runmenli karce"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -237,37 +225,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +261,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,15 +271,13 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "jmina"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "jmina lo pendo"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -303,43 +286,39 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
-msgstr ""
+msgstr "jmina lo jivna"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:90
 msgid "Add Wiimote"
-msgstr ""
+msgstr "jmina lo me la'o gy.Wiimote.gy."
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
-msgstr ""
+msgstr "jmina lo cabra"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "jmina lo pilno"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +328,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
-msgstr ""
+msgstr "la adi,umis"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -401,18 +374,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "la amyndas"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +420,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +447,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +480,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ".i .e'u ko rivbi tu'a lo badna"
 
@@ -576,79 +539,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
+msgstr "la damba daplu"
 
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
-msgstr ""
+msgstr "la bistis"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +608,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ".i la blanu bende cu jinga"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +642,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +649,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +701,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +725,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ".i ko cuxna lo karce"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +780,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +811,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +824,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
-msgstr ""
+msgstr ".uinai pu na ganse tu'a lo me la'o gy.Wiimote.gy."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +910,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +941,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +948,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +980,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ".i xu do je'u djica lo nu vimcu lo jivna datnyvei pe la'o gy.%s.gy."
@@ -1103,8 +1005,8 @@ msgstr ".i xu do je'u djica lo nu vimcu lo jivna datnyvei pe la'o gy.%s.gy."
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,38 +1017,34 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
 msgid "Egg Hunt"
-msgstr ""
+msgstr "lo nu sovda sisku"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
-msgstr ""
+msgstr "la xapy'ypantos"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,26 +1066,24 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
-msgstr ""
+msgstr "la imiul"
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:98
@@ -1198,27 +1093,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1231,31 +1123,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr ".i doi ro da\nko ca da'ergau le cuxna batke ku tezu'e lo nu ba cmima lo jivna"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-".i doi ro da\n"
-"ko ca da'ergau le cuxna batke ku tezu'e lo nu ba cmima lo jivna"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1263,12 +1155,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1293,19 +1185,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1316,13 +1206,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1337,7 +1226,6 @@ msgstr ".i ko jersi le ralju"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1345,14 +1233,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1376,13 +1265,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "lo pendo"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1396,22 +1284,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1427,53 +1312,47 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
-msgstr ""
+msgstr "la gnus"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:68
@@ -1481,61 +1360,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1552,12 +1423,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1567,22 +1436,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
-msgstr ""
+msgstr "la xeksleis"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1593,71 +1458,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "mipri"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1667,13 +1529,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "lo karce"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1692,16 +1553,15 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
-msgstr ""
+msgstr "la konkis"
 
 #. I18N: Shown at the end of a race
 #: src/states_screens/race_gui_overworld.cpp:108
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1763,50 +1623,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1814,11 +1670,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1829,46 +1725,35 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "lo clabajykla pe'a"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1878,29 +1763,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1908,50 +1797,43 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
-msgstr ""
+msgstr "zgike"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "cmene"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
@@ -1969,13 +1851,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1984,9 +1868,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1999,7 +1887,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2027,21 +1915,20 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "na go'i"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
-msgstr ""
+msgstr "la nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
-msgstr ""
+msgstr "no da"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:176
@@ -2049,21 +1936,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2074,46 +1959,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2121,63 +2001,62 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
-msgstr ""
+msgstr "lo nu jivna kei jatna ku po'o cu se curmi lo nu zukte kei ca ku"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
-msgstr ""
+msgstr ".e'enaidai .i ca lo nu do se nabmi kei ko da'ergau %s tezu'e lo nu do se nurgau"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2185,14 +2064,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2201,35 +2077,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2237,8 +2108,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2249,12 +2120,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2263,7 +2133,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2272,37 +2141,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
-msgstr ""
+msgstr "la pidjin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
+msgstr "lo jivna"
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
 msgstr ""
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2311,6 +2181,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2320,44 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
-msgstr ""
+msgstr "ko da'ergau lo batke"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2391,7 +2259,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2400,9 +2267,8 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
-msgstr ""
+msgstr "la pafis"
 
 #: src/states_screens/race_setup_screen.cpp:240
 msgid ""
@@ -2412,25 +2278,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2451,8 +2313,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "lo cunso karce"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2461,82 +2323,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ".i la xunre bende cu jinga"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2562,29 +2410,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2641,41 +2485,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "la zaras sutras"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "la zaras makfas"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2685,12 +2523,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2700,36 +2536,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ".i ko cuxna lo karce"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2744,91 +2574,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2838,7 +2626,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2849,12 +2636,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2864,23 +2649,21 @@ msgid "Soccer"
 msgstr "lo bolci te jivna"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2890,7 +2673,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2899,7 +2681,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2912,11 +2693,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2936,12 +2716,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2949,82 +2727,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
-msgstr ""
+msgstr "la suzyn"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3033,32 +2798,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3083,30 +2853,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3125,7 +2887,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3139,19 +2901,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3162,24 +2922,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
-msgstr ""
+msgstr "la tuks"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3187,20 +2944,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3214,8 +2969,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3224,40 +2979,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3266,19 +3017,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3287,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "jivna"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3304,27 +3052,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3336,7 +3080,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3347,45 +3091,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3396,42 +3135,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
-msgstr ""
+msgstr "la uilbyr"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "la ksu'es"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "go'i"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3441,37 +3174,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
-msgstr ""
+msgstr "do pu mulgau lo pa nandu"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
-msgstr ""
+msgstr "do pu mulgau lo nandu"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3492,20 +3224,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3515,7 +3249,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3523,36 +3257,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3565,6 +3304,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3575,27 +3319,26 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
 #. I18N: Unbound key binding
 #: src/input/binding.cpp:90
 msgid "[none]"
-msgstr ""
+msgstr "no da"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "ro da"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "fi'e"
@@ -3604,43 +3347,25 @@ msgstr "fi'e"
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Willem Sonke https://launchpad.net/~willem-sonke\n"
-"  Wuzzy https://launchpad.net/~wuzzy"
+msgstr "Launchpad Contributions:\n  Willem Sonke https://launchpad.net/~willem-sonke\n  Wuzzy https://launchpad.net/~wuzzy"
diff --git a/data/po/ko.po b/data/po/ko.po
index bceea1b6c..e89b3f59b 100644
--- a/data/po/ko.po
+++ b/data/po/ko.po
@@ -1,22 +1,22 @@
-# Korean translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-13 10:04+0000\n"
-"Last-Translator: Dynamicwork <dynamicwork@dynamicwork.org>\n"
-"Language-Team: Korean <ko@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/supertuxkart/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s 제작�: %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s - %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s�(가) 준비가 �었습니다."
@@ -96,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s'�(가) 탈�했습니다."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(비어 있�)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(온�� 멀티플레�는 아� 지��지 않습니다.)"
 
@@ -128,13 +125,11 @@ msgstr "빨간색 항목� 현재 키 설정과 충�하는 항목입니다."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "현재 키보드 설정� [메뉴] - [설정]�서 나중� 변경할 수 있습니다."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* SuperTuxKart를 재시작해야 변경� 설정� �용�니다"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +183,6 @@ msgstr "배틀 모드"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +201,20 @@ msgid "9 months"
 msgstr "9개월"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= 최고 기� ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "그랑프리 취소"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "ì •ë³´"
 
@@ -237,37 +223,35 @@ msgstr "ì •ë³´"
 msgid "Accelerate"
 msgstr "가�"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr "선회하는 중� <%s>키를 눌러 드리프트를 할 수 있습니다."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "<%s> 키로 가�, <%s> 키와 <%s> 키로 선회합니다."
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "계정 설정"
 
@@ -275,8 +259,7 @@ msgstr "계정 설정"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "�전 과제"
 
@@ -286,13 +269,11 @@ msgstr "�작"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "추가"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "친구 추가"
 
@@ -303,7 +284,6 @@ msgstr "키보드 설정 추가"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "플레�어 추가"
 
@@ -314,32 +294,29 @@ msgstr "Wii 컨트롤러 추가"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "장치 추가"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "사용� 추가"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "부가 기능"
 
@@ -349,49 +326,43 @@ msgstr "�름"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "부가 기능"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "ì „ì²´"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "모든 트랙"
 
@@ -401,18 +372,20 @@ msgstr "아�템 ���서 여러 아�템� 얻� 수 있습니다."
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "그랑프리를 저장하는 중 오류가 발�했습니다."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "닻: �대편 카트� ��를 잠시 �안 늦춥니다."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "�릭터 애니메�션"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "�릭터 애니메�션: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "장면 애니메�션"
 
@@ -448,24 +418,24 @@ msgstr "장면 애니메�션"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "장면 애니메�션: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "�방성 x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "�방성 x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "�방성 x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "�방성 x8"
 
@@ -475,29 +445,25 @@ msgstr "같� �름� 그랑프리가 �미 존재합니다."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "안티앨리어싱"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "안티앨리어싱: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "�용"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "새 해�� �용"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +478,44 @@ msgstr "� 설정� 삭제하시겠습니까?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "'%s'�(를) 제거하시겠습니까?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "ESC 키로 설정하기"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "세�� ��서"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "오디오"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "바나나를 피하세요!"
 
@@ -576,79 +537,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "뒤로"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "게임 계�하기"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "게임 계�하기"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "장치 목�으로 �아가기"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "메뉴로 �아가기"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "메뉴로 �아가기"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr "�구공: 현재 1등 플레�어와 주변 플레�어들� 공격할 수 있습니다."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "다시 �전해 보세요!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +606,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "볼�공: 벽� 부딛히면 튕겨지며, 뒤를 보는 �태�서 �지면 뒤로 �질 수 있습니다."
 
 #. I18N: Key binding name
@@ -696,7 +640,6 @@ msgid "Brake"
 msgstr "브레��"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +647,45 @@ msgstr "�선껌: �대 플레�어� 공격� 1회 방어할 수 있습니
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr "케��: 가까운 �대 플레�어�게 발사하여 공격합니다."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "모드 서버� 연결하는 � 실패했습니다."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "취소"
 
@@ -763,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "취소/뒤로 가기"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "미션 완료"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "미션 실패"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "�전 모드 : 수� 실�"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "변경"
 
@@ -790,61 +723,52 @@ msgstr "변경"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "카트 선�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "튜토리얼 플레�"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "닫기"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "아�템 ��: 특수 아�템들� 들어 있습니다."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr "부스터: 가� 키를 누르고 있는 �안 ��를 올려�니다. 현재 부스터 게�지는 화면 오른쪽� 표시�어 있습니다."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "확�"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +809,6 @@ msgstr "현재 해��를 유지하려면 %i초 내� 확�� 눌러주세
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "�터넷 연결"
 
@@ -894,104 +816,86 @@ msgstr "�터넷 연결"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Wii 컨트롤러를 블루투스로 연결 후 확�� 눌러주세요. �세한 설정 방법� supertuxkart.net/Wiimote 를 참고해보세요."
+msgstr "Wii 컨트롤러를 블루투스로 연결 후 확�� 눌러주세요. �세한 설정 방법� supertuxkart.net/Wiimote 를 참고해보세요."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "특수 아�템 없� 운전 스킬로만 대결합니다."
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "계�"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "저장� 그랑프리 계�하기"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "계�"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "컨트롤"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "복사"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "플레�어 '%s'를 만들 수 없습니다."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "�지� Wii 컨트롤러가 없습니다. :("
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "만들기"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "새 서버 만들기"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "새 사용� 만들기"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "새 온�� 계정 만들기"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "새 서버 만들기"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "제작�"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "현재 암호"
 
@@ -1004,13 +908,12 @@ msgid "Currently not signed in"
 msgstr "현재 로그��어 있지 않습니다"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "사용� 설정"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "사용� 설정"
 
@@ -1036,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1044,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr "기본값"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "삭제"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "설정 삭제"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1078,24 +978,23 @@ msgstr "장치 비활성"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "없�"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "FPS 표시"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "그랑프리를 취소하시겠습니까?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "정� '%s\"� (를) 삭제하시겠습니까?"
@@ -1104,8 +1003,8 @@ msgstr "정� '%s\"� (를) 삭제하시겠습니까?"
 msgid "Do you want to save your changes?"
 msgstr "변경 사항� 저장하시겠습니까?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "잠시 �안 출발할 수 없습니다."
 
@@ -1116,27 +1015,24 @@ msgstr "아래"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "편집"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "그랑프리 편집"
 
@@ -1147,7 +1043,6 @@ msgstr "달걀 모으기"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "달걀 모으기: 트랙� 숨겨져 있는 모든 달걀� 찾으세요."
 
@@ -1157,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr "달걀 수: %d개 / %d개"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1170,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "�메�"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "�메� 주소는 4� �� 50� �하여야 합니다."
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "�메� 주소가 올바르지 않습니다."
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "�메� 주소가 �치하지 않습니다."
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1199,27 +1091,24 @@ msgstr "장치 활성화"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "활성화�"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "모�"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "새 플레�어� �름� 입력하세요"
 
@@ -1232,31 +1121,31 @@ msgstr "새 소�� 받는 중 오류가 발�했습니다: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "모��게: \n'선�'� 눌러 게임� 참여하세요."
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"모��게: \n"
-"'선�'� 눌러 게임� 참여하세요."
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "�"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "레�스 �기"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "어려움"
 
@@ -1264,12 +1153,12 @@ msgstr "어려움"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "트랙� 숨겨진 모든 달걀� 찾으세요"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1294,19 +1183,17 @@ msgid "Fetching servers"
 msgstr "서버 목� 가져오는 중"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr "암호 변경� 위해 계정� 만들 때 사용했� 사용� �름과 �메� 주소를 입력해 주세요."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "파�� 랩"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "서버 찾기"
 
@@ -1317,13 +1204,12 @@ msgstr "아�템 사용"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1338,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1346,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d개� Wii 컨트롤러를 찾았습니다."
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1377,13 +1262,12 @@ msgstr "친구 추가 요청� 보냈습니다."
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "친구"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "전체 화면"
 
@@ -1397,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "게임 키 설정"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "게임 모드"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1428,51 +1309,45 @@ msgstr "게임패드 버튼 %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "�반"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "부드러운 윤곽선"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "부드러운 윤곽선: %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1482,61 +1357,53 @@ msgid "Go!"
 msgstr "출발!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "그랑프리"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "그랑프리 설정"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "그랑프리 설정"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "그랑프리 진행 �황:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "그래픽 효과 레벨"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "그래픽"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "그래픽 설정"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1553,12 +1420,10 @@ msgstr "게스트 플레�어 %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "게스트 플레�어 로그�"
+msgid "Guest Log in"
+msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1568,22 +1433,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "�움�"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "최고 기�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1594,71 +1455,68 @@ msgid ""
 msgstr "특수 아�템� 사용하여 �대 플레�어� 체력� 소진시키세요. (멀티플레��서만 가능합니다.)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "사용� 플레�어만"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "약관� ��하며 13세 ��입니다. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "잠겨 있는 항목� �전 �전 과제를 완료하여 열 수 있습니다."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s'는 참여할 수 없습니다ㅜ 게임� 좀� �� 참여하셨여야 했어요!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "설치"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "보통"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "�터넷 연결� 비활성화�어 있습니다. 환경 설정�서 활성화시켜 주세요."
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "무승부"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "참가"
 
@@ -1668,13 +1526,12 @@ msgstr "서버� 연결 중"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "카트"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "� 해�� 유지"
 
@@ -1693,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr "키보드 %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1702,7 +1558,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1764,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "불러오는 중"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "초기화면"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "초기화면 설정"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "로컬 사용� �름"
+msgid "Local Name"
+msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "ìž ê¹€"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "잠김: 사용 가능한 �전 맵� �리어한 후 다시 시�해 보세요."
 
@@ -1815,11 +1667,51 @@ msgstr "잠김: 사용 가능한 �전 맵� �리어한 후 다시 시�해
 msgid "Locked!"
 msgstr "ìž ê¹€"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "로그�"
 
@@ -1830,27 +1722,18 @@ msgstr "후방 카메�"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "친구 찾기"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1858,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "최대 플레�어 수"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "제한 시간(분)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "나만"
 
@@ -1879,29 +1760,33 @@ msgid "Menu Keys"
 msgstr "메뉴 키"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1909,48 +1794,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "멀티플레�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "멀티플레�"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "배경�악"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "�름"
 
@@ -1970,13 +1848,15 @@ msgstr "�름� 너무 �니다."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "서버 �름"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "새로 만들기"
 
@@ -1985,9 +1865,13 @@ msgstr "새로 만들기"
 msgid "New Grand Prix '%s' now available"
 msgstr "새 그랑프리 '%s'를 사용할 수 있습니다."
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "새 암호"
 
@@ -2000,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "새 난�� '%s'를 사용할 수 있습니다."
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "최고 기�"
 
@@ -2028,19 +1912,18 @@ msgstr "부스터"
 msgid "Nitro challenge"
 msgstr "스피드전"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "없�"
 
@@ -2050,21 +1933,19 @@ msgid "Normal Race"
 msgstr "�반 모드"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "쉬움"
 
@@ -2075,46 +1956,41 @@ msgstr "AI 카트 수: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "AI 카트 수"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "확�"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2122,60 +1998,59 @@ msgstr ""
 msgid "Offline"
 msgstr "오프��"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "온��"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "온�� 멀티플레�"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "온�� 사용� �름"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "온�� 사용� �름� 3� �� 30� �하여야 합니다."
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "온�� 사용� �름� 숫�로 시작할 수 없습니다."
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "장�물� 갇힌 경우 <%s> 키로 빠져나올 수 있습니다."
@@ -2186,14 +2061,11 @@ msgstr "장�물� 갇힌 경우 <%s> 키로 빠져나올 수 있습니다."
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "환경 설정"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "개요"
 
@@ -2202,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "낙하산: 모든 �대편 카트들� ��를 늦춰�니다."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "암호"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "암호:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "암호 변경"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "암호는 8� �� 30� ���어야 합니다."
 
@@ -2238,8 +2105,8 @@ msgstr "암호는 8� �� 30� ���어야 합니다."
 msgid "Password successfully changed."
 msgstr "암호가 변경�었습니다."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "암호가 �치하지 않습니다."
 
@@ -2250,12 +2117,11 @@ msgstr "�시 정지"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "�시 정지"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "부정 출발 경고!"
 
@@ -2264,7 +2130,6 @@ msgid "Pending"
 msgstr "대기중"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2273,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2312,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "모드를 업��트하는 중입니다. 잠시만 기다려주세요.."
@@ -2321,44 +2191,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "모드를 불러오고 있습니다. 잠시만 기다려주세요.."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr "뚜러뻥: �대편 카트 뒤� 발사하여 ��를 높�거나, �대편 카트 앞�서 발사하여 시야를 가립니다."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "취소(ESC)"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "설정할 키 누르기"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "마우스 �블 �릭 �는 Enter를 눌러 장치를 설정합니다."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "마우스 �블 �릭 �는 Enter를 눌러 플레�어를 편집합니다."
 
@@ -2374,9 +2238,7 @@ msgstr "아�템 버튼으로 레�스를 시작합니다."
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Wii 컨트롤러를 검색 모드로 설정하고 확� 버튼� 눌러주세요. �세한 설정 방법� supertuxkart.net/Wiimote�서 보실 "
-"수 있습니다."
+msgstr "Wii 컨트롤러를 검색 모드로 설정하고 확� 버튼� 눌러주세요. �세한 설정 방법� supertuxkart.net/Wiimote�서 보실 수 있습니다."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2394,7 +2256,6 @@ msgstr "처리 중"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "프로파�"
 
@@ -2403,7 +2264,6 @@ msgid "Progress"
 msgstr "진행률"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2415,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "빠른 게임"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "�"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "서버 연결 �기"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "레�스 설정"
 
@@ -2454,8 +2310,8 @@ msgstr "랜� 그랑프리"
 msgid "Random Kart"
 msgstr "랜� 카트"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "랜� 트랙"
 
@@ -2464,82 +2320,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr "�반 모드: 아�템 ���서 여러 아�템� 얻� 수 있습니다."
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2565,29 +2407,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2644,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2688,12 +2520,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2703,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2747,91 +2571,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2841,7 +2623,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2852,12 +2633,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2867,23 +2646,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2893,7 +2670,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2902,7 +2678,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2915,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2939,12 +2713,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2952,82 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3036,32 +2795,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3086,30 +2850,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3128,7 +2884,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3142,19 +2898,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3165,24 +2919,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3190,20 +2941,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3217,8 +2966,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3227,40 +2976,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3269,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3290,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3307,27 +3049,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3339,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3350,45 +3088,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3399,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3444,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3495,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3518,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3526,36 +3253,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "경기�서 승리했어요!!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3568,6 +3300,11 @@ msgid ""
 "created."
 msgstr "설정 파�� 현재 버전과 호환�지 않습니다. 새 설정 파�� �성합니다."
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3578,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3589,7 +3325,6 @@ msgstr "[없�]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3598,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3607,44 +3343,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dynamicwork https://launchpad.net/~dynamicwork\n"
-"  JJ https://launchpad.net/~jjemin1\n"
-"  Tae-Wong SEO https://launchpad.net/~seotaewong40"
+msgstr "Launchpad Contributions:\n  Dynamicwork https://launchpad.net/~dynamicwork\n  JJ https://launchpad.net/~jjemin1\n  Tae-Wong SEO https://launchpad.net/~seotaewong40"
diff --git a/data/po/kw.po b/data/po/kw.po
index a368ea930..7a33b1859 100644
--- a/data/po/kw.po
+++ b/data/po/kw.po
@@ -1,22 +1,23 @@
-# Cornish translation for stk
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
+# Nicky Rowe <nickyrowe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-03-11 16:13+0000\n"
-"Last-Translator: kernow <Unknown>\n"
-"Language-Team: Cornish <kw@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Cornish (http://www.transifex.com/projects/p/supertuxkart/language/kw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n==3) ? 2 : 3;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,1537 +28,1411 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
+msgstr "Mes ny yllowgh hwi bobbys vyghan truedhek nevra ow fetha vy - Myghtern an Kertow!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Yma %d goweth warlinen lemmyn."
+msgstr[1] "Yma %d goweth warlinen lemmyn."
+msgstr[2] "Yma %d koweth warlinen lemmyn."
+msgstr[3] "Yma %d koweth warlinen lemmyn."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (handikappys)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
 #, c-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
 
 #: src/states_screens/dialogs/addons_loading.cpp:165
 #, c-format
 msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "Yma %s ha %s warlinen lemmyn."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
 #, c-format
 msgctxt "addons"
 msgid "%s by %s"
-msgstr ""
+msgstr "%s gans %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
-msgstr ""
+msgstr "%s gans %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "Yma %s warlinen lemmyn."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
-msgstr ""
+msgstr "Parys yw %s"
 
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Profil %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Servyer %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "Yma %s, %s ha %s warlinen lemmyn."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
-msgstr ""
+msgstr "'%s' re beu diles."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
-msgstr ""
+msgstr "(Gwag)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
-msgstr ""
+msgstr "(nyns yw gwari rosweyth kavadow hwath)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
+msgstr "* Tra las a styr mellyans gans restrans aral"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Tra rudh a styr mellyans y'n restrans a-lemmyn"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
+msgstr "* Y hyllir gweles/chanjya an kolmow a-lemmyn y'n rol Dewisyow"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
+msgstr "* Y hyllir gwari brassa rann an modhow gwari ma yn gis an Grand Prix ynwedh: yn le gwari unn resek, lies yn rew a warier. Dhe wella dha renk, dhe voy poyntys a gevydh. Wor'tiwedh, an gwarier ganso/gensi an moyha poyntys a wayn an hanaf."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Dastalleth STK rag gweytha an settyansow nowydh"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* An restrans dhe usya a vydh determys dre bynag alhwedhen 'Dewis' a vo gweskys rag junya an gwari."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
-msgstr ""
+msgstr "1 vis"
 
 #: src/states_screens/addons_screen.cpp:50
 msgid "1 week"
-msgstr ""
+msgstr "1 seythen"
 
 #: src/states_screens/addons_screen.cpp:56
 msgid "1 year"
-msgstr ""
+msgstr "1 vledhen"
 
 #: src/states_screens/addons_screen.cpp:51
 msgid "2 weeks"
-msgstr ""
+msgstr "2 seythen"
 
 #: src/states_screens/addons_screen.cpp:57
 msgid "2 years"
-msgstr ""
+msgstr "2 vledhen"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:182
 msgid "3 Strikes Battle"
-msgstr ""
+msgstr "Kas a 3 bomm"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
+msgstr "Kas a 3 bomm: Gwariow lieswarier hepken. Gwask an warioryon erel gans arvow bys may hollons aga bewnansow oll."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
-msgstr ""
+msgstr "3 mis"
 
 #: src/states_screens/addons_screen.cpp:54
 msgid "6 months"
-msgstr ""
+msgstr "6 mis"
 
 #: src/states_screens/addons_screen.cpp:55
 msgid "9 months"
-msgstr ""
+msgstr "9 mis"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
-msgstr ""
+msgstr "= Skoryow ughella ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Kertys AI"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
-msgstr ""
+msgstr "Astel an Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
-msgstr ""
+msgstr "A-dro"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:236
 msgid "Accelerate"
-msgstr ""
+msgstr "Uskishe"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
+msgstr "Uskisha ha gwask an alhwedhen <%s> yn unn dreylya rag skyddya. Skyddya pols a yll dha weres ow treylya moy uskis rag gul troyow lymm."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
-msgstr ""
+msgstr "Uskisha dre <%s> ha lew an kert dre <%s> ha <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Degemeres"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Daskavos akont"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Settyansow an akont"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Kowlwriansow"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Gwrians"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Keworra"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Keworra koweth"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
 msgid "Add Keyboard Configuration"
-msgstr ""
+msgstr "Keworra restrans bysowek"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
-msgstr ""
+msgstr "Keworra gwarier"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:90
 msgid "Add Wiimote"
-msgstr ""
+msgstr "Keworra Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
-msgstr ""
+msgstr "Keworra devis"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Keworra devnydhyer"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
-msgstr ""
+msgstr "Keworransow"
 
 #: src/states_screens/addons_screen.cpp:110
 msgid "Add-on name"
-msgstr ""
+msgstr "Hanow an keworrans"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
-msgstr ""
+msgstr "Keworransow"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
-msgstr ""
+msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Piblinen avonsys (golowow, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
-msgstr ""
+msgstr "Oll"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
-msgstr ""
+msgstr "Oll lerghow"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
+msgstr "Oll bommys yw alowys, ytho kuntel arvow ha gwra devnydh da anedha!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
+msgstr "Diskwedhes prest an skrin omgelmi"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Okludyans an kerghynnedh"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Okludyans an kerghynnedh : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Yth esa kammwrians owth assaya gwitha dha grand prix."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
-msgstr ""
+msgstr "Ankor - lenthe a wra an kert y'n le kensa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
-msgstr ""
+msgstr "Figurys bywhes"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
-msgstr ""
+msgstr "Figurys bywhes : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
-msgstr ""
+msgstr "Kerghynnedh bywhes"
 
 #. I18N: in graphical options
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
-msgstr ""
+msgstr "Kerghynnedh bywhes : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
-msgid "Anisotropic x2"
-msgstr ""
+msgstr "Anisotropek x16"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:78
-msgid "Anisotropic x4"
-msgstr ""
+msgid "Anisotropic x2"
+msgstr "Anisotropek x2"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr "Anisotropek x4"
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
-msgstr ""
+msgstr "Anisotropek x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Yma grand prix henwys yndelma seulabrys."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Gorth-aliasyans"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Gorth-aliasyans : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Gweytha"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
-msgstr ""
+msgstr "Gweytha an klerder nowydh"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Argheskar"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
+msgstr "Os sur bos hwans dhis dilea yn fast an restrans ma?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Os sur bos hwans dhis dilea '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
-msgstr ""
+msgstr "Plenys"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
-msgstr ""
+msgstr "A-dro dhe'n golowji"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Sevel orth kelmi"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
-msgstr ""
+msgstr "Kelmi orth an alhwedhen ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
-msgstr ""
+msgstr "Orth Penn an Bys"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
-msgstr ""
+msgstr "Son"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
-msgstr ""
+msgstr "Gohel an bananas!"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:284
 #, c-format
 msgid "Axis %d"
-msgstr ""
+msgstr "Aghel %d"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:272
 #, c-format
 msgid "Axis %d %s"
-msgstr ""
+msgstr "Aghel %d %s"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:279
 #, c-format
 msgid "Axis %d inverted"
-msgstr ""
+msgstr "Aghel %d trebuchyes"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
-msgstr ""
+msgstr "Dehweles"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
-msgstr ""
+msgstr "Dehweles dhe'n gwari"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
-msgstr ""
+msgstr "Dehweles dhe'n resek"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
-msgstr ""
+msgstr "Dehweles dhe'n dewis chalenjys"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
-msgstr ""
+msgstr "Dehweles dhe'n rol a dhevisow"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
-msgstr ""
+msgstr "Dehweles dhe'n rol"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
-msgstr ""
+msgstr "Dehweles dhe'n rol"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Sim"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Pel ganstel - aslamma a wra war-lergh an kensa kert, hag y hallsa gwaska ha lenthe kertys war an fordh."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
+msgstr "Enys an Gas"
 
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
-msgstr ""
+msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
-msgstr ""
+msgstr "Chons gwell an nessa!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
-msgstr ""
+msgstr "Dewlinyek"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Du"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
-msgstr ""
+msgstr "Mansyon an Vre Dhu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Bleujyowa"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Bleujyowa : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
-msgstr ""
+msgstr "An Lasyon a waynyas!"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
-msgstr ""
+msgstr "An Bowji"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Pel dewlel - aslamma a wra orth fosow. Mars esos ow mires war gamm, tewlys war-dhelergh vydh."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
 msgid "Brake"
-msgstr ""
+msgstr "Fronna"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
+msgstr "Glus hwethen - omwith dre skoos, po devnydh yn unn vires war gamm rag gasa pollen wynnrudh glusek war dha lergh."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Mes kroadur ewn ov, ytho gul bargen a wrav genes."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
+msgstr "Tesen - tewlys orth an nessa kert, gwella war dreghow hir ha kompes."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
-msgstr ""
+msgstr "Ny yllir drehedhes an servyer stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
-msgstr ""
+msgstr "Hedhi"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Hedhi an govyn"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
 msgid "Cancel/Back"
-msgstr ""
+msgstr "Hedhi / Dehweles"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
-msgstr ""
+msgstr "Kav X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
-msgstr ""
+msgstr "Chalenj kowlwrys"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
-msgstr ""
+msgstr "Chalenj fyllys"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
-msgstr ""
+msgstr "Chalenjys : Stevel an Hanafow"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Chanjya"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
-msgstr ""
+msgstr "Dewis kert"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Christoffel Columbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
-msgstr ""
+msgstr "Klyck omma rag gwari an dyskans"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
-msgstr ""
+msgstr "Degea"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Templa Koko"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Kuntel 5 banana dhe'n lyha yn unn resek."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
+msgstr "Kuntel kistennow glas : yma arvow po nerthellow erel ynna"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
+msgstr "Kuntel kistennow, ha tenn an arv dre <%s> rag distrui an kistyow ma!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
-msgstr ""
+msgstr "Kuntel botellow nitro (ni a wra devnydh anedha wosa an grommen)"
 
 #: src/states_screens/race_gui_base.cpp:648
 msgid "Collect nitro!"
-msgstr ""
+msgstr "Kuntel nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Kuntel nitro a'th has dhe gavos kenerthansow tooth byth pan vynni dre waska an alhwedhen wiw. Ty a yll gweles dha nivel a nitro y'n barr a-dhyghow dhe skrin an gwari."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Kowlwra keniver chalenj rag dialhwedha an daras bras!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Kowlwrians \"%s\" kowlwrys."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Afydhya"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
-msgstr ""
+msgstr "Afydh an klerder a-ji dhe %i sekond"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Junya gans an kesrosweyth"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
+msgstr "Jun dha wiimote gans an dyghtyer Bluetooth, ena klyck OK. Yma danvonadow manylys orth supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
+msgstr "Nyns eus nerthellow ynno, ytho ny vern tra vyth marnas dha sleyneth lewya!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
-msgstr ""
+msgstr "Pesya"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Pesya an GP gwithys"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Pesya."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
-msgstr ""
+msgstr "Kontrolyow"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Kopia"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Ny ylles gwruthyl an gwarier/wariores '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
-msgstr ""
+msgstr "Ny ylles helerghi wiimote vyth :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Gwruthyl"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Gwruthyl servyer"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Gwruthyl devnydhyer"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Ow kwruthyl an servyer"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
-msgstr ""
+msgstr "Gwrioryon"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Ger tremena a-lemmyn"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Drog yw an ger tremena a-lemmyn."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Nyns os omgelmys"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
-msgstr ""
+msgstr "Personelhes"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
-msgstr ""
+msgstr "Settyansow personelhes..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "DPad yn-nans"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "DPad kledh"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "DPad dyghow"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "DPad yn-bann"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Nagha"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Defowt"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Dilea"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
-msgstr ""
+msgstr "Dilea an restrans ma"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Downder an gwel"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Downder an gwel : %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
 #: src/states_screens/options_screen_input2.cpp:587
 msgid "Disable Device"
-msgstr ""
+msgstr "Diallosegi an devis"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
-msgstr ""
+msgstr "Diallosegys"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
-msgstr ""
+msgstr "Diskwedhes FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
-msgstr ""
+msgstr "Os sur bos hwans dhis astel an Grand Prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
-msgstr ""
+msgstr "Os sur bos hwans dhis dilea '%s'?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Eus hwans dhis gwitha dha janjyow?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
-msgstr ""
+msgstr "Na uskisha kens an dalleth!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:265
 msgid "Down"
-msgstr ""
+msgstr "Yn-nans"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Lewya yn dhelergh"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Golowys dynamek : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Chanjya"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Chanjya an Grand Prix ma"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
 msgid "Egg Hunt"
-msgstr ""
+msgstr "Helgh oyow"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
+msgstr "Helgh oyow: Eksplor lerghow rag diskudha keniver oy kudh"
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
 msgid "Eggs: %d / %d"
-msgstr ""
+msgstr "Oyow: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
-msgstr ""
+msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
-msgstr ""
+msgstr "Diles"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Ebost"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Res yw dhe'n ebost bos yntra 4 ha 50 lytheren yn hirder!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Drog yw an ebost!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Nyns yw an ebostow par!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
-msgstr ""
+msgstr "Emule"
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:98
 #: src/states_screens/options_screen_input2.cpp:588
 msgid "Enable Device"
-msgstr ""
+msgstr "Gallosegi an devis"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
-msgstr ""
+msgstr "Gallosegys"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
-msgstr ""
+msgstr "Gallosegys rag peub"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
-msgstr ""
+msgstr "Skrif hanow an gwarier/wariores nowydh"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Yth esa kammwrians owth iskarga an nowodhow: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
+msgstr "Pubonan:\nGweskewgh 'Dewis' lemmyn rag junya an gwari!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Akont warlinen byw"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Kwytya"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
-msgstr ""
+msgstr "Kwytya an resek"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Kwytya an gwari"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
-msgstr ""
+msgstr "Konnyk"
 
 #: src/states_screens/race_setup_screen.cpp:252
 msgid "Explore tracks to find all hidden eggs"
-msgstr ""
+msgstr "Eksplor lerghow rag diskudha keniver oy kudh"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d  - NiverPoli: %d Soled, %d Skeus - HirderGolow : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Ow kerghes an kowlwriansow"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Ow kerghes an gowetha"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Ow kerghes an diwettha raglev"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Ow kerghes an servyers"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Lenow an hanow usyer hag an drigva ebost res genes ow kovskrifa rag dassettya dha er tremena."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
-msgstr ""
+msgstr "Diwettha tro!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Kavos servyer"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
 msgid "Fire"
-msgstr ""
+msgstr "Tenna"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
+msgstr "Kens oll, yma odhom dhis a lies devis ynworra (lies gamepad po joystick yw an gwella fordh dhe wari gans moy pobel). Ke dhe'n skrin restrans ynworra ha fytt an gamepads. Y hyllir gwari dre vysowek/egi ynwedh, byttegyns yma odhom dhe bub gwarier a sett dyffrans a alhwedhennow, ha porth kov nag yw an brassa rann a vysowegi gwiw rag gwari lieswarier drefen na skoodhyons niver bras a waskow a'n alhwedhennow."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
 msgid "Follow the Leader"
-msgstr ""
+msgstr "Hol an Penn"
 
 #: src/states_screens/race_gui_base.cpp:650
 msgid "Follow the leader!"
-msgstr ""
+msgstr "Hol an penn!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
+msgstr "Hol an penn: Resek rag an nessa renk, drefen bos an diwettha kert diles pub termyn may trehedh an niverell orth mann. Bydh war: mos a-dherag an penn a'th kyv diles ynwedh!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
-msgstr ""
+msgstr "Dinas Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Diles re beu an koweth!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Degemerys re beu an govyn koweth!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Hedhys re beu an govyn koweth!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Neghys re beu an govyn koweth!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Danvenys re beu an govyn koweth!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Kowetha"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
-msgstr ""
+msgstr "Skrin leun"
 
 #. I18N: Shown when a goal is scored
 #: src/states_screens/race_gui_base.cpp:70
 msgid "GOAL!"
-msgstr ""
+msgstr "GOL!"
 
 #. I18N: Key binding section
 #: src/states_screens/options_screen_input2.cpp:144
 msgid "Game Keys"
-msgstr ""
+msgstr "Alhwedhennow an gwari"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
-msgstr ""
+msgstr "Modhow an gwari"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Eghen an gwari (Finweth golyow / termyn)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
 #, c-format
 msgid "Gamepad button %d"
-msgstr ""
+msgstr "Boton %d an gamepad"
 
 #. I18N: to appear in input configuration screen, for gamepad hats
 #: src/input/binding.cpp:260 src/input/binding.cpp:265
 #, c-format
 msgid "Gamepad hat %d"
-msgstr ""
+msgstr "Hatt %d an gamepad"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
-msgstr ""
+msgstr "Ollgemmyn"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
-msgstr ""
+msgstr "Hepkor an resek"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Golowheans ollvysel"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Golowheans ollvysel : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Golowi (linennow)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Golowi (linennow) : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
-msgstr ""
+msgstr "Gnu"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:68
 msgid "Go!"
-msgstr ""
+msgstr "Ke!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Lewyer/lewyores owr"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Enys Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
-msgstr ""
+msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Chanjyell Grand Prix"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Chanjyell Grand Prix"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
-msgstr ""
+msgstr "Avonsyans y'n Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
-msgstr ""
+msgstr "Nivel an effeythow grafegel"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
-msgstr ""
+msgstr "Grafegow"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
-msgstr ""
+msgstr "Settyansow grafegow"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
-msgstr ""
+msgstr "Nans Glas"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
 msgid "Guest"
-msgstr ""
+msgstr "Gwester/Gwestores"
 
 #. I18N: Name of further guest players, with a 1, 2, ... attached
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Gwester/Gwestores %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Omgelmi avel gwester/gwestores"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
-msgstr ""
+msgstr "Hacienda"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -1565,617 +1440,627 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
-msgstr ""
+msgstr "Gweres"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
-msgstr ""
+msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
-msgstr ""
+msgstr "Skoryow ughella"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Gweskel 10 kert gans pel dewlel."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
+msgstr "Gwask tus erel gans arvow bys may hollons oll a'ga bewnansow. (Yn gwariow lieswarier hepken)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Gwask an keth kert dhe'n lyha 5 termyn yn unn resek."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
-msgstr ""
+msgstr "Gwarioryon a dhenses hepken"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Unver ov gans an termynyow a-ugh hag yth ov 13 bloodh po kottha."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
+msgstr "Mar kyllydh ow fetha y'n resek, delivra an penn koth a wrav."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
+msgstr "Mar kwelydh boton warnodho alhwedh a'n par ma, y fydh res dhis kowlwul chalenj rag y dhialhwedha."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "Ow skonya aswon '%s', res o dhis junya moy a-varr rag gwari!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
-msgstr ""
+msgstr "Ynstallya"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
-msgstr ""
+msgstr "Nivel kres"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Diallosegys yw hedhas dhe'n kesrosweyth, gwra y allosegi y'n dewisyow"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
-msgstr ""
+msgstr "Kehaval"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Kevrinek yw"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Junya"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Ow junya gans an sevyer"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
-msgstr ""
+msgstr "Kertow"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
-msgstr ""
+msgstr "Gwitha an klerder ma"
 
 #. I18N: short definition for follow-the-leader game mode
 #: src/states_screens/race_setup_screen.cpp:222
 msgid "Keep up with the leader kart but don't overtake it!"
-msgstr ""
+msgstr "Kesstrif bys dhe'n penn, mes na bass!"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Kolm alhwedhen"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
 msgid "Keyboard %i"
-msgstr ""
+msgstr "Bysowek %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
-msgstr ""
+msgstr "Konqi"
 
 #. I18N: Shown at the end of a race
 #: src/states_screens/race_gui_overworld.cpp:108
 msgid "Lap"
-msgstr ""
+msgstr "Tro"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
-msgstr ""
+msgstr "Tro %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Troyow"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
 #, c-format
 msgid "Laps : %i"
-msgstr ""
+msgstr "Troyow : %i"
 
 #: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
 msgid "Leader"
-msgstr ""
+msgstr "Penn"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:268
 msgid "Left"
-msgstr ""
+msgstr "Kledh"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Bonkyell gledh"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Boton meus kledh"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Meus kledh yn-nans"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Meus kledh kledh"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Meus kledh dyghow"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Meus kledh yn-bann"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Tennell gledh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Gwelen wolow (dewynnow Duw)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Gwelen wolow (dewynnow Duw) : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
-msgstr ""
+msgstr "Ow karga"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Degemerva"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Settyansow an dhegemerva"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
-msgstr ""
+msgstr "Alhwedhys"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
+msgstr "Alhwedhys : Digolm chalenjys rag gwaynya hedhas dhe voy!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
-msgstr ""
+msgstr "Alhwedhys!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Omgelmi"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Omdenna"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Omgelmys avel: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Owth omgelmi"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Owth omgelmi '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Omgelmi avel gwester po gwestores a'th has dhe vos kevrennek a resegow warlinen, mes ny'th has dhe ragleva rag keworransow, na dhe guntel kowlwriansow hedre vi warlinen."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Owth omdenna"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Owth omdenna '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Omgelmi"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
 msgid "Look Back"
-msgstr ""
+msgstr "Mires war gamm"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Hwilas moy kowetha:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Gwra 5 skyddyow yn unn lapp."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Gwra resek ynno 5 lapp po moy."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Marathonyer"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Niver ughella a warioryon"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Termyn ughella (myn.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
-msgstr ""
+msgstr "My hepken"
 
 #. I18N: Key binding section
 #: src/states_screens/options_screen_input2.cpp:158
 msgid "Menu Keys"
-msgstr ""
+msgstr "Alhwedhennow rol"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Korr-golf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Helghyer/Helghyores a Voskitos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Fros gwaya"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Fros gwaya: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
-msgstr ""
+msgstr "Logosen, aghel %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
-msgstr ""
+msgstr "Logosen, boton %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Diyskynna"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Yskynna"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
-msgstr ""
+msgstr "Lieswarier"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
-msgstr ""
+msgstr "Lieswarier"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
-msgstr ""
+msgstr "Ilow"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Hanow"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Res yw dhe'n hanow bos yntra 4 ha 30 lytheren yn hirder!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Gwag yw an hanow."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Re hir yw an hanow."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
+msgstr "Hanow an servyer"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Nowydh"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
-msgstr ""
+msgstr "Grand Prix nowydh '%s' kavadow"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Akont warlinen nowydh"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Ger tremena nowydh"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Govyn nowydh"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
-msgstr ""
+msgstr "Kaletter nowydh '%s' kavadow"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
-msgstr ""
+msgstr "Tro uskissa nowydh"
 
 #: src/challenges/challenge_data.cpp:492
 #, c-format
 msgid "New game mode '%s' now available"
-msgstr ""
+msgstr "Modh gwari nowydh '%s' kavadow"
 
 #: src/challenges/challenge_data.cpp:516
 #, c-format
 msgid "New kart '%s' now available"
-msgstr ""
+msgstr "Kert nowydh '%s' kavadow"
 
 #: src/challenges/challenge_data.cpp:486
 #, c-format
 msgid "New track '%s' now available"
-msgstr ""
+msgstr "Lergh nowydh '%s' kavadow"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:245
 msgid "Nitro"
-msgstr ""
+msgstr "Nitro"
 
 #: src/states_screens/dialogs/select_challenge.cpp:147
 msgid "Nitro challenge"
-msgstr ""
+msgstr "Chalenj nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Na"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
-msgstr ""
+msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
-msgstr ""
+msgstr "Nagonan"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:176
 msgid "Normal Race"
-msgstr ""
+msgstr "Resek usadow"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
-msgstr ""
+msgstr "Resort an North"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
+msgstr "Mar teus ha skyddya lies sekond, y fydh res dhis kenerthyans bonus avel pewas!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
-msgstr ""
+msgstr "Dallether"
 
 #: src/states_screens/dialogs/select_challenge.cpp:68
 #, c-format
 msgid "Number of AI Karts : %i"
-msgstr ""
+msgstr "Niver a gertys AI : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
-msgstr ""
+msgstr "Niver a gertys AI"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
-msgstr ""
+msgstr "Niver a wolyow rag gwaynya"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Niver a droyow"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Niver a droyow:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
-msgstr ""
+msgstr "A-ves dhe'n lerghow usadow"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Dhywarlinen"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Akont dhywarlinen"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
+msgstr "Ogh, mir, yma ev y'm kastell lemmyn ha servys a vydh rag kon..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
-msgstr ""
+msgstr "An Bal Koth"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
-msgstr ""
+msgstr "Klass Awgrym Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Warlinen"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Lieswarier warlinen"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Hanow usyer warlinen"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Res yw dhe'n hanow usyer warlinen bos yntra 3 ha 30 lytheren yn hirder!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Ny yll an hanow usyer warlinen dalleth gans niver!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
-msgstr ""
+msgstr "Ny yll marnas Mester an Gwari aktya y'n pols ma!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
-msgstr ""
+msgstr "Oups! Pan esos yn kaletter, gwask <%s> dhe vos sawyes"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2183,1461 +2068,1310 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
-msgstr ""
+msgstr "Dewisyow"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Gorwolok"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "NERTH"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
-msgstr ""
+msgstr "Lammlen - lenthe a wra pub kert yn renk gwell."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Ger tremena"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Ger tremena :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Chanjya an ger tremena"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Res yw dhe'n ger tremena bos ynter 8 ha 30 lytheren yn hirder!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Ger tremena chanjys yn sewen."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Nyns yw an geryow tremena par!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
 msgid "Pause Game"
-msgstr ""
+msgstr "Powes an gwari"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
-msgstr ""
+msgstr "Powesys"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
-msgstr ""
+msgstr "Prys spal!!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Ow kortos"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
-msgstr ""
+msgstr "Garth an Pennow Gwynn"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Ow kul an sondyans"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
-msgstr ""
+msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
-msgstr ""
+msgstr "Gwari an oll"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Gwari pub lergh sodhogel unnweyth dhe'n lyha."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
+msgstr "Gwarioryon"
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
 msgstr ""
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Gwra entra hanow an grand prix"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
+msgstr "Gwra dasrestra dha golmow."
+
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
 msgstr ""
 
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
-msgstr ""
+msgstr "Gorta nowedhi an keworransow"
 
 #: src/states_screens/main_menu_screen.cpp:557
 msgid "Please wait while the add-ons are loading"
-msgstr ""
+msgstr "Gorta karga an nowedhansow"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
+msgstr "Plonjell - towl yn kompes rag tenna erbynner/erbynores war-dhelergh, po towl yn unn vires war gamm rag gul dhe onan anedha kelli aga golok."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Kenerthans Kerensa"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Gwask <%s> rag mires war gamm, ha tenn an arv dre <%s> yn unn waska <%s> rag tenna war-dhelergh!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
-msgstr ""
+msgstr "Gwask ESC rag hedhi"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
-msgstr ""
+msgstr "Gwask alhwedhen"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
+msgstr "Gwask entra po dobyl-klyck war dhevis rag y restra"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
+msgstr "Gwask entra po dobyl-klyck war warier rag y janjya/hy chanjya"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
-msgstr ""
+msgstr "Gwask tenna rag gwari an dyskans"
 
 #: src/states_screens/race_gui_overworld.cpp:532
 msgid "Press fire to start the challenge"
-msgstr ""
+msgstr "Gwask tenna rag dalleth an chalenj"
 
 #: src/input/wiimote_manager.cpp:390
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
+msgstr "Gwask an botonyow 1+2 yn kettermynyek war dha wiimote rag y worra y'n modh diskudha, ena klyck OK. Yma danvonadow manylys orth supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
 msgid "Problems installing the addon '%s'."
-msgstr ""
+msgstr "Yth esa kudyn owth installya an keworrans '%s'."
 
 #: src/states_screens/dialogs/addons_loading.cpp:394
 #, c-format
 msgid "Problems removing the addon '%s'."
-msgstr ""
+msgstr "Yth esa kudyn ow tilea an keworrans '%s'."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Owth argerdhes"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Avonsyans"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
-msgstr ""
+msgstr "Puffy"
 
 #: src/states_screens/race_setup_screen.cpp:240
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
+msgstr "Herdh an bel dhe'n kowel konter rag skorya golyow. (Gwariow lieswarier hepken)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Gwari uskis"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
-msgstr ""
+msgstr "Kwytya"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Kwytya an servyer."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
-msgstr ""
+msgstr "Fyttyans an resek"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Chonsus"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
-msgstr ""
+msgstr "Plen chonsus"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Grand Prix chonsus"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
-msgstr ""
+msgstr "Kert chonsus"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
-msgstr ""
+msgstr "Lergh chonsus"
 
 #: src/states_screens/race_gui_overworld.cpp:109
 msgid "Rank"
-msgstr ""
+msgstr "Renk"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
+msgstr "Kevradh >="
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
-msgstr ""
+msgstr "Ombareus!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Dhe wir ... kevrin."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
-msgstr ""
+msgstr "An Rudhyon a waynyas!"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Kovskrifa"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
+msgstr "Resek usadow: Oll bommys yw alowys, ytho kuntel arvow ha gwra devnydh da anedha!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Daskarga"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Perthi kov a'n ger tremena"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
-msgstr ""
+msgstr "Perthi kov a dyller an fenester"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
-msgid "Remove"
-msgstr ""
-
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Remove"
+msgstr "Dilea"
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
-msgstr ""
+msgstr "Dashenwel"
 
 #: src/states_screens/dialogs/select_challenge.cpp:64
 #, c-format
 msgid "Required Nitro Points : %i"
-msgstr ""
+msgstr "Poyntys nitro res: %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:53
 #, c-format
 msgid "Required Rank : %i"
-msgstr ""
+msgstr "Renk res : %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:58
 #, c-format
 msgid "Required Time : %i"
-msgstr ""
+msgstr "Termyn res : %i"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:254
 msgid "Rescue"
-msgstr ""
+msgstr "Sawya"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
-msgstr ""
+msgstr "Klerder"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
-msgstr ""
+msgstr "Dastalleth"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
-msgstr ""
+msgstr "Dastalleth an resek"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
-msgstr ""
+msgstr "Gorthtreylya"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Gorthtreylya:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Gorthtreylys"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
 msgid "Right"
-msgstr ""
+msgstr "Dyghow"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Bonkyell dhyghow"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Boton meus dyghow"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Meus dyghow yn-nans"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Meus dyghow kledh"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Meus dyghow dyghow"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Meus dyghow yn-bann"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Tennel dhyghow"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "TOOTH"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
+msgstr "STK Enterprise"
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Gwitha"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Gwitha an Grand Prix ma"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Hwilas"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Ow hwilas"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
 msgid "Select"
-msgstr ""
+msgstr "Dewis"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Dewis kaletter"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
-msgstr ""
+msgstr "Dewis modh gwari"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Dewis lergh"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
-msgstr ""
+msgstr "Dewis kert"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Danvon statystygyon kalesweyth dihanow"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Gwruthyl servyer"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Kedhlow an servyer"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Dewis servyer"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Hanow an servyer :"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Servyer gwrys yn sewen. Y junya lemmyn y hyllydh."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
 msgid "Set!"
-msgstr ""
+msgstr "Parys!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
-msgstr ""
+msgstr "Fyttya resek nowydh"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Skeusow"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Skeusow: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Skeusow: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
-msgstr ""
+msgstr "Tewes Gwaya"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
-msgstr ""
+msgstr "An Ranndrevow"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Omgelmi"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Omgelmi avel gwester po gwestores"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "A-dhia"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Unnwarier"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
 msgid "Size: %s"
-msgstr ""
+msgstr "Myns: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Mester an Skydd"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
 msgid "Skidding"
-msgstr ""
+msgstr "Skyddya"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
-msgstr ""
+msgstr "Kroghen"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
-msgstr ""
+msgstr "Menydh gans Ergh"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:186
 msgid "Soccer"
-msgstr ""
+msgstr "Pel-droos"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
-msgstr ""
+msgstr "Park pel-droos"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
+msgstr "Pel-droos: Gwariow lieswarier hepken. Gwra devnydh a'th kert rag herdhya an bel y'n gol."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
+msgstr "Diharesow, yth esa kammwrians ow kestava orth gwiasva an keworransow. Surha dha vos junyes dhe'n kesrosweyth ha check nag yw SuperTuxKart lettyes gans fos dan"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
-msgstr ""
+msgstr "Diharesow, iskarga an keworrans a fyllis"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
-msgstr ""
+msgstr "Effeythyow son"
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
-msgstr ""
+msgstr "Savonek"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Dalleth"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
-msgstr ""
+msgstr "Dalleth Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
-msgstr ""
+msgstr "Dalleth an resek"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Studh"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
 msgid "Steer Left"
-msgstr ""
+msgstr "Lewya dhe gledh"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:233
 msgid "Steer Right"
-msgstr ""
+msgstr "Lewya dhe dhyghow"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
-msgstr ""
+msgstr "Modh hwedhel"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Kowlwask!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Danvon"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
-msgstr ""
+msgstr "Yn-dann an Mor"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
-msgstr ""
+msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
-msgstr ""
+msgstr "Keworransow SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
-msgstr ""
+msgstr "Gweres SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
-msgstr ""
+msgstr "Dewisyow SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
+msgstr "Y hyllir gwari SuperTuxKart y'n modh lieswarier war an keth jynn-amontya"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
-msgstr ""
+msgstr "Yma lies modh gwari gans SuperTuxKart"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
-msgstr ""
+msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Keschanjyer - treusfurvys yw kistennow dhe vananas ha'n konter dres pols."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
+msgstr "Swattyell - kertys nes a vydh skwattyes, orth aga lenthe."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
+msgstr "Yeth an system"
+
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Dyght dha erbynoryon kepar ha moskitos! Der an swattyell, skwatt 5 anedha dhe'n lyha yn unn resek."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Termynyow hag unverheans"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Gwaskans gwiasedhow"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
-msgstr ""
+msgstr "Sidhlans gwiasedhow"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
+msgstr "An alhwedhen 'skyddya' a'th has dhe skyddya yn troyow lymm ha kavos kenerthans."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
-msgstr ""
+msgstr "An Sportva"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
+msgstr "Diallosegys yw unsys an keworransow a-lemmyn y'n skrin Dewisyow"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
+msgstr "Re goth o restren an skoryow ughella,\ndiles re beu oll an skoryow."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Res yw dhe'n niver ughella a warioryon bos ynter 2 ha 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
 msgid "Time Trial"
-msgstr ""
+msgstr "Erbynn an Klock"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
+msgstr "Erbynn an Klock: Nyns eus nerthellow ynno, ytho ny vern tra vyth marnas dha sleyneth lewya!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Rag keworra devis Gamepad/Joystick nowydh, dalleth SuperTuxKart pan yw an devis junyes hag omdhiskwedhes y'n rol y hwra.\n\nRag keworra restrans bysowek, y hyllydh usya an boton a-woles, BYTTEGYNS gwra notya na skoodh an brassa rann a vysowegi marnas niver byghan a waskansow a'n alhwedhennow, ha nyns yns gwiw rag gwariow lieswarier. (Y hyllydh, byttegyns, junya lies bysowek gans an jynn-amontya. Porth kov bos odhom dhe bubonan a golmow dyffrans y'n kas ma.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
+msgstr "Rag dha weres ow kwaynya, yma nebes kenerthansow dhe guntel:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
-msgstr ""
+msgstr "Dhe'n loor ha tre arta"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Hedhyw"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
 #, c-format
 msgid "Top %i"
-msgstr ""
+msgstr "Gwella %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Lergh"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Lergh %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
 #: src/states_screens/track_info_screen.cpp:107
 #, c-format
 msgid "Track by %s"
-msgstr ""
+msgstr "Lergh gans %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Bagas lerghow"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
-msgstr ""
+msgstr "Lerghow"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
-msgstr ""
+msgstr "Trilinyek"
 
 #: src/states_screens/dialogs/addons_loading.cpp:369
 #: src/states_screens/dialogs/addons_loading.cpp:406
 msgid "Try again"
-msgstr ""
+msgstr "Assaya arta"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
-msgstr ""
+msgstr "Dyskans"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
-msgstr ""
+msgstr "Dyskans : Stevel dhewis"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
-msgstr ""
+msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
-msgstr ""
+msgstr "Eghen :"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Eghen: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Ny yllir junya gans an servyer. Check dha junyans kesrosweyth po assay arta moy a-varr."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
-msgstr ""
+msgstr "Dilea"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Anhedhadow"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
 msgid "Up"
-msgstr ""
+msgstr "Yn-bann"
 
 #: src/states_screens/dialogs/addons_loading.cpp:96
 msgid "Update"
-msgstr ""
+msgstr "Nowedhi"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
-msgstr ""
+msgstr "Nowedhys"
 
 #: src/states_screens/addons_screen.cpp:111
 msgid "Updated date"
-msgstr ""
+msgstr "Dedhyans an nowedhi"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Gwra devnydh a 10 kenerthans po moy yn unn resek."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Usya gwiasedhow klerder ughel"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Gwra devnydh a'n botonyow kledh/dyghow rag dewis dha bara ha gwask tenna"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
-msgstr ""
+msgstr "Gwra devnydh a'n nitro kuntelys genes dre waska <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Kedhlow an devnydhyer"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
-msgstr ""
+msgstr "Ynterfas devnydhyer"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Res gans an devnydhyer"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Hwilas devnydhyer"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Hanow devnydhyer"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Drog yw an hanow devnydhyer hag/po an drigva ebost."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
-msgstr ""
+msgstr "erbynn"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Ow kwirya an kedhlow"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
 msgid "Version: %d"
-msgstr ""
+msgstr "Versyon: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
-msgstr ""
+msgstr "Kettermynegyans serth (res yw dastalleth)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Gweles"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
-msgstr ""
+msgstr "Nivel"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Ragleva"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "An raglev a sewenas! Degea an fenester a yllydh lemmyn."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "POOS"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
-msgstr ""
+msgstr "TU KAMM!"
 
 #: src/states_screens/options_screen_input2.cpp:479
 msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
+msgstr "Gwarnyans, nyns yw 'Shift' alhwedhen gomendys : pan vo shift gweskys yn-nans, ny ober keniver alhwedhen a omdhesedh orth lytheren a's teves versyon brassa dyffrans."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
-msgstr ""
+msgstr "Arvow"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
-msgstr ""
+msgstr "Effeythyow kewer"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
-msgstr ""
+msgstr "Effeythyow kewer : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
+msgstr "Pandr'a hwer, a fleghes vyghan? Gallas dhe goll agas hembrenkyas meur gnu?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
+msgstr "Pan vo an devisyow ynworra restrys, parys os dhe wari. Dewis an arwodhik 'resek lieswarier' y'n bennrol. Pan vo prys dewis kert, pub gwarier ha gwariores a yll gwaska alhwedhen 'tenna' aga gamepad po bysowek rag junya an gwari. Pub gwarier ha gwariores a yll usya aga devis ynworra rag dewis aga hert. An gwari a wra pesya pan wrug pubonen dewis aga hert. Noten: ny yllir usya an logosen rag hemma."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Gwynn"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
-msgstr ""
+msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Gwayn 5 resek yn rew."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Gwayn yn pub modh unwarier, erbynn 3 ferson aral dhe'n lyha."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
-msgstr ""
+msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
-msgstr ""
+msgstr "Ya"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
-msgstr ""
+msgstr "Parys os dhe resek lemmyn. Chons da!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
-msgstr ""
+msgstr "Yth esos ow kwari avel"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Ty a yll aswiwa dha renk kens dre glyckya an sterennow yn-danno."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Ny yllir iskarga keworransow heb hedhas dhe'n kesrosweyth. Mars eus hwans dhis iskarga keworransow, ke dhe'n dewisyow, dewis an tab 'Ynterfas devnydhyer' ha chanjya \"Junya gans an Kesrosweyth\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Ny yllir gwari warlinen heb hedhas dhe'n kesrosweyth. Mars eus hwans dhis gwari warlinen, ke dhe'n dewisyow, dewis an tab 'Ynterfas devnydhyer', ha chanjya \"Junya gans an Kesrosweyth\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Ty a yll gwari heb gwruthyl akont warlinen dre dhewis akont dhywarlinen, kyn na ylli junya gans kowetha, ragleva rag keworransow, etc. Gwra redya agan menegyans privetter orth http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
-msgstr ""
+msgstr "Ty a kowlwrug chalenj!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
-msgstr ""
+msgstr "Ty a kowlwrug chalenjys!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
-msgstr ""
+msgstr "Ty a kowlwrug an Grand Prix!"
 
 #: src/states_screens/feature_unlocked.cpp:208
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ty a kowlwrug an chalenj kales! Poyntys dendylys war an nivel ma: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ty a kowlwrug an chalenj es! Poyntys dendylys war an nivel ma: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ty a kowlwrug an chalenj nivel kres! Poyntys dendylys war an nivel ma: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
-msgstr ""
+msgstr "Ty a gorfennas an resek!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Yma govyn koweth nowydh dhis!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
-msgstr ""
+msgstr "Diles re beus!"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:195
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Ny raglevsys hwath rag an keworrans ma. Dewis dha renk preferys dre glyckya war an sterennow yn-danno."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Res yw dendyl moy poyntys\nkens gul an chalenj ma!\nCheck an mappa rag\nchalenjys kavadow."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Res yw entra ger tremena."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
-msgstr ""
+msgstr "Ty a dhialhwedhas grand prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
-msgstr ""
+msgstr "Ty a dhialhwedhas an lergh %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ebost a vydh danvenys dhis ynni danvonadow a-dro dhe dhassettya dha er tremena. Gwra perthi an termyn ha surhe ty dhe jeckya dha blegel spam."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ebost a vydh danvenys dhis ynni danvonadow a-dro dhe vywhe dha akont. Gwra perthi an termyn ha surhe ty dhe jeckya dha blegel spam."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
+msgstr "Ty a waynyas an resek!"
+
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
 msgstr ""
 
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
+msgstr "Drog o dha restrans, ytho diles a veu hag onan nowydh a vydh gwrys."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
+msgstr "Re goth o dha restrans, ytho diles a veu hag onan nowydh a vydh gwrys."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Re goth yw versyon dha lewyer. Gwra ynstallya an lewyoryon video diwettha."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
+msgstr "Nyns yw dha restrans ynworra kesplegadow gans an versyon ma a STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Dha brofil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
-msgstr ""
+msgstr "Lowarth Zen"
 
 #. I18N: Unbound key binding
 #: src/input/binding.cpp:90
 msgid "[none]"
-msgstr ""
+msgstr "[nagonan]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "gwriansow"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "oll"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
-msgstr ""
+msgstr "gans"
 
 #: src/states_screens/dialogs/addons_loading.cpp:139
 msgid "featured"
-msgstr ""
+msgstr "diskwedhys"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "ughel"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "isel"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
-msgstr ""
+msgstr "savonek"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  kernow https://launchpad.net/~kernow"
+msgstr "Launchpad Contributions:\n  STK-team https://launchpad.net/~stk\n  kernow https://launchpad.net/~kernow"
diff --git a/data/po/ky.po b/data/po/ky.po
index 514d4188f..cfbb4f590 100644
--- a/data/po/ky.po
+++ b/data/po/ky.po
@@ -1,23 +1,22 @@
-# Kirghiz translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Kirghiz <ky@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Kirgyz (http://www.transifex.com/projects/p/supertuxkart/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: ky\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -58,7 +57,7 @@ msgstr "%s Кбайт"
 msgid "%s MB"
 msgstr "%s Мбайт"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -70,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, автору %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "мыкты тегерек: %s, %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s да�р"
@@ -97,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' жоюлду."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Бош)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(тармактык оюн азырынча жеткиликтүү �ме�)"
 
@@ -129,13 +125,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -145,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -194,7 +183,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -213,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= �атыйжалар ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Гран-приден чыгуу"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Оюн жөнүндө"
 
@@ -238,37 +223,35 @@ msgstr "Оюн жөнүндө"
 msgid "Accelerate"
 msgstr "Газ"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -276,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -287,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -304,7 +284,6 @@ msgstr "Клавиатура ыра�тоолорун кошуу"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Оюнчуну кошуу"
 
@@ -315,32 +294,29 @@ msgstr "Wii контроллерин кошуу"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Түзүлүштү кошуу"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Кошумчалар"
 
@@ -350,49 +326,43 @@ msgstr "Кошумчанын аты"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Кошумчалар"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Баары"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Бардык тра��алар"
 
@@ -402,18 +372,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -423,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Якорь - биринчи өңүттөгү картты катуу ба�аңдатат."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "�нимаци�ланган пер�онаждар"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "�нимаци�ланган пер�онаждар: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "�нимаци�ланган декораци�"
 
@@ -449,24 +418,24 @@ msgstr "�нимаци�ланган декораци�"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "�нимаци�ланган декораци�: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -476,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Жаңы чечимди кабыл алуу"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -513,49 +478,44 @@ msgstr "Сиз чын �ле бул түзмөктү такырга өчүргү
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Майдандар"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "\"ESC\" клавиша�ына дайындоо"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Дүйнөнүн четинде"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Үн"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Банандардан буйтаңыз!"
 
@@ -577,79 +537,66 @@ msgstr "%d %s огу"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "�ртка"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Оюнга кайтуу"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Жарышка кайтуу"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Түзүлүштөр тизме�ине кайтуу"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Менюга кайтуу"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Менюга кайтуу"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Battle Island"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Эмики жолуга ийгилик!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -659,36 +606,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Blackhill Mansion"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -697,7 +640,6 @@ msgid "Brake"
 msgstr "Тормоз"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -705,52 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Stkaddons �ерверине кирүү мүмкүн �ме�..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Жокко чыгаруу"
 
@@ -764,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Жокко чыгаруу/�ртка"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Мелдеш өттү"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Мелдеш өтпөй калды"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Чемпионат: Олжо бөлмө�ү"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -791,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Картты тандаңыз"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Окутууну ойнотуу үчүн, бул жерди ба�ыңыз"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Жабуу"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -855,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -875,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -887,7 +809,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -901,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Улантуу"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Башкаруу"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Wii контроллерин табуу мүмкүн болбоду :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Иштетүүчүлөр"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1004,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Башка"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Колдонуучулук ыра�тоолор..."
 
@@ -1036,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1044,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Түзүлүштү өчүрүү"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1078,24 +978,23 @@ msgstr "Түзүлүштү өчүрүү"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Өчүрүлгөн"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "FPS'ти көр�өтүү"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "'%s' оюнчуну өчүргүңүз келеби?"
@@ -1104,8 +1003,8 @@ msgstr "'%s' оюнчуну өчүргүңүз келеби?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1116,27 +1015,24 @@ msgstr "Ылдый"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1147,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1157,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1170,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1199,27 +1091,24 @@ msgstr "Түзүлүштү туташтыруу"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Күйгүзүү"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Жаңы оюнчунун атын киргизиңиз"
 
@@ -1232,31 +1121,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Баарыңыз:\nОюнга кошулуу үчүн 'Select' кнопка�ын ба�ыңыз!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Баарыңыз:\n"
-"Оюнга кошулуу үчүн 'Select' кнопка�ын ба�ыңыз!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Жарыштан чыгуу"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Эк�перт"
 
@@ -1264,12 +1153,12 @@ msgstr "Эк�перт"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1294,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Финалдык тегерек!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1317,13 +1204,12 @@ msgstr "Ок атуу"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1338,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1346,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1377,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Толук �кран режими"
 
@@ -1397,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Оюн клавишалары"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Оюн режими"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1428,51 +1309,45 @@ msgstr "Джой�тик кнопка�ы %d"
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "�егизги"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1482,61 +1357,53 @@ msgid "Go!"
 msgstr "�лга!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Гран-при"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Графика �ффектеринин деңг��ли"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Графика"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Графиканын ыра�тоолору"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1553,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1568,22 +1433,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Жардам"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "�атыйжа"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1594,71 +1455,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Орнотуу"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Сүйүүчү"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1668,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Карттар"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Ушул чечимди калтыруу"
 
@@ -1693,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr "Клавиатура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1702,7 +1558,7 @@ msgstr ""
 msgid "Lap"
 msgstr "Тегерек"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Тегерек %i"
@@ -1764,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Жүктөлүүдө"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Жабык"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1815,11 +1667,51 @@ msgstr ""
 msgid "Locked!"
 msgstr "Камаланган!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1830,27 +1722,18 @@ msgstr "�ртты кароо"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1858,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Мен гана"
 
@@ -1879,29 +1760,33 @@ msgid "Menu Keys"
 msgstr "Меню клавишалары"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Чычкан огу %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1909,48 +1794,41 @@ msgstr "Чычкан кнопка�ы %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Көп кишилик"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Көп кишилик"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Музыка"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1970,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1985,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2000,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Жаңы тегерек рекорду"
 
@@ -2028,19 +1912,18 @@ msgstr "�итро"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Эчтеке"
 
@@ -2050,21 +1933,19 @@ msgid "Normal Race"
 msgstr "Жөнөкөй гонка"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Жаңы оюнчу"
 
@@ -2075,46 +1956,41 @@ msgstr "ЖИ карттарынын �аны: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "ЖИ карттарынын �аны"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2122,60 +1998,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliver'дин математика кла��ы"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2186,14 +2061,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Ыра�тоолор"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2202,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2238,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2250,12 +2117,11 @@ msgstr "Оюнду паузага коюу"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Пауза"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Штрафтык убакыт!!"
 
@@ -2264,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2273,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Баарын ойнотуу"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Оюнчулар"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2312,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2321,44 +2191,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Кошумчалар жүктөлгөнчө күтүп туруңуз"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Жокко чыгаруу үчүн \"ESC\"-ти ба�ыңыз"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Кнопканы ба�ыңыз"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2392,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2401,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2413,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Жарыштын ыра�тоолору"
 
@@ -2452,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Коку�тук карт"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Коку�тук тра��а"
 
@@ -2462,82 +2320,68 @@ msgid "Rank"
 msgstr "Орун"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Стартка!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Терезенин жайгашкан жерин ��ке �актоо"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Өчүрүү"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "�тын өзгөртүү"
 
@@ -2563,29 +2407,25 @@ msgstr "Тра��ага кайтуу"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Чечим"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Кайтадан баштоо"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Жарышты кайта жүргүзүү"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2642,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Шотланди�"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2686,12 +2520,10 @@ msgid "Select"
 msgstr "Тандоо"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Оюн режимин тандоо"
 
@@ -2701,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Картты тандоо"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2745,91 +2571,49 @@ msgstr "Дыкат!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Жаңы жарышты баштоо"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2839,7 +2623,6 @@ msgid "Size: %s"
 msgstr "Өлчөм: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2850,12 +2633,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Тема"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2865,23 +2646,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2891,7 +2670,6 @@ msgstr "Кечириңиз, кошумчаны жүктөп алуу оңуна
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Үн �ффекттери"
 
@@ -2900,7 +2678,6 @@ msgstr "Үн �ффекттери"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Стандарттуу"
 
@@ -2913,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Гран-прини баштоо"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Жарышты баштоо"
 
@@ -2937,12 +2713,10 @@ msgstr "Оңго буруу"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Тарых режими"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2950,82 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart'тын кошумчалары"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart жардамы"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart'тын ыра�тоолору"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3034,32 +2795,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Си�темалык тил"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3084,30 +2850,22 @@ msgstr "Убакытка жарышуу"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3126,7 +2884,7 @@ msgstr "Төбөл %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3140,19 +2898,17 @@ msgstr "Тра��анын автору %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Тра��алар"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3163,24 +2919,21 @@ msgstr "Кайта аракет кылып көрүңүз"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Үйрөтүү"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Үйрөтүү : Тандоо бөлмө�ү"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Түрү :"
 
@@ -3188,20 +2941,18 @@ msgstr "Түрү :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Өчүрүү"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3215,8 +2966,8 @@ msgid "Update"
 msgstr "Жаңылоо"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3225,40 +2976,36 @@ msgid "Updated date"
 msgstr "Жаңыланган күнү"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Интерфей�"
 
@@ -3267,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3288,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3305,27 +3049,23 @@ msgstr "Вер�и��ы: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Тик �инхрондоштуруу�у (кайтадан жүргүзүү керек)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Көлөмү"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3337,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ТУУР� ЭМЕС Б�ГЫТ!"
 
@@ -3348,45 +3088,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Курал"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "�ба ырайынын �ффекттери"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "�ба ырайынын �ффекттери: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3397,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ооба"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Сиз жарышууга да�р�ыз. Жолуңуз бол�ун!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Сиздин профилиңиз"
 
@@ -3442,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Сиз чемпионатты бүтүрдүңүз!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Сиз чемпионаттарды бүтүрдүңүз!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Сиз Гран-прини бүтүрдүңүз!"
 
@@ -3493,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Жарышты �из а�ктадыңыз!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3516,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3524,51 +3253,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Сиз жарышты уттуңуз!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Сиздин ыра�тоо файлыңыз бузук болгон үчүн, ал өчүрүлөт жана жаңы менен "
-"алмаштырылат."
+msgstr "Сиздин ыра�тоо файлыңыз бузук болгон үчүн, ал өчүрүлөт жана жаңы менен алмаштырылат."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Сиздин ыра�тоо файлыңыз ��кирип калган үчүн, ал өчүрүлгөн жана жаңы менен алмаштырылган."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Сиздин ыра�тоо файлыңыз ��кирип калган үчүн, ал өчүрүлгөн жана жаңы менен "
-"алмаштырылган."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3580,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Garden"
 
@@ -3591,7 +3325,6 @@ msgstr "[жок]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3600,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3609,44 +3343,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "�тандарттуу"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  chyngyz https://launchpad.net/~chyngyz"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  chyngyz https://launchpad.net/~chyngyz"
diff --git a/data/po/lt.po b/data/po/lt.po
index 30ee65b96..a58f73d1c 100644
--- a/data/po/lt.po
+++ b/data/po/lt.po
@@ -1,25 +1,23 @@
-# Lithuanian translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-# Algimantas Margevi�ius <margevicius.algimantas@gmail.com>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Algimantas Margevi�ius <margevicius.algimantas@gmail.com>, 2011
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:04+0000\n"
-"Last-Translator: Algimantas Margevi�ius <algimantas@margevicius.lt>\n"
-"Language-Team: Lietuvių <>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/supertuxkart/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -30,21 +28,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -72,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s sukūrė %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s įveikė %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s yra pasiruošęs"
@@ -99,25 +98,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "„%s“ buvo pašalintas."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(NÄ—ra)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(tinklo režimas kol kas neprieinamas)"
 
@@ -131,45 +128,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "Valdymo klavišus galite pamatyti bei pakeisti nustatymuose"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Dauguma šių žaidimų gali būti žaidžiami „Grand Prix“ stiliumi: vietoj "
-"vienų lenktynių, žaidi daug lenktynių iš eilės. Kuo geresnė tavo vieta, tuo "
-"daugiau gauni taškų. Pabaigoj, žaidėjas turintis daugiausia taškų laimi "
-"taurÄ™."
+msgstr "* Dauguma šių žaidimų gali būti žaidžiami „Grand Prix“ stiliumi: vietoj vienų lenktynių, žaidi daug lenktynių iš eilės. Kuo geresnė tavo vieta, tuo daugiau gauni taškų. Pabaigoj, žaidėjas turintis daugiausia taškų laimi taurę."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -200,7 +186,6 @@ msgstr "Trijų smūgių kova"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -219,23 +204,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Geriausi rezultatai ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Nutraukti �empionatą"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Apie"
 
@@ -244,37 +226,35 @@ msgstr "Apie"
 msgid "Accelerate"
 msgstr "Greitinimas"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Pagreitinsite paspaudÄ™ <%s>, o vairuosite su <%s> ir <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -282,8 +262,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -293,13 +272,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -310,7 +287,6 @@ msgstr "Pridėti klavišų nustatymus kitam žaidėjui"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Pridėti žaidėją"
 
@@ -321,32 +297,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Pridėti valdymo įrenginį"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Papildymai"
 
@@ -356,72 +329,66 @@ msgstr "Papildinio pavadinimas"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Papildymai"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Viskas"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Visos trasos"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Leidžiama viskas, taigi - rinkite ginklus bei kitus gerus dalykėlius ir juos "
-"naudokite tinkamai!"
+msgstr "Leidžiama viskas, taigi - rinkite ginklus bei kitus gerus dalykėlius ir juos naudokite tinkamai!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -431,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Inkaras - smarkiai sulėtina pirmaujantį kartą."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animuoti veikÄ—jai"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animuoti personažai: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -457,24 +421,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animuotas peizažas : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -484,29 +448,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Pritaikyt pasirinktą raišką"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -521,49 +481,44 @@ msgstr "Ar esate įsitikinę jog norite ištrinti konfigūraciją visam laikui?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenos"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Aplink švyturį"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Susieti ESC klavišą"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Pasaulio pakrašty"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Garsas"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Apvažiuok bananus!"
 
@@ -585,79 +540,66 @@ msgstr "AÅ¡is %d %s"
 msgid "Axis %d inverted"
 msgstr "AÅ¡is %d apversta"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Grįžti"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Grįžti į lenktynes"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Grįžti į žaidimą"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Grįžti į užduo�ių pasirinkimą"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Grįžti į įrenginių sąrašą"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Grįžti į meniu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Grįžti į meniu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Kovų sala"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Biglis"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Baisuoklis"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "SÄ—kmÄ—s lenktyniaujant kitÄ… kart!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -667,38 +609,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Boulingo kamuolys - atšoka nuo sienų. Jei žiūrėsite atgal, bus metamas atgal."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Boulingo kamuolys - atšoka nuo sienų. Jei žiūrėsite atgal, bus metamas atgal."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -706,7 +643,6 @@ msgid "Brake"
 msgstr "Stabdymas"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -714,54 +650,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Pyragėlis - metamas į artimiausią priešininką, geriausiai tinka trumpiem "
-"atstumams bei ilgom tiesiosioms."
+msgstr "Pyragėlis - metamas į artimiausią priešininką, geriausiai tinka trumpiem atstumams bei ilgom tiesiosioms."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Nepavyko prisijungti prie „stkaddons“ serverio..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -775,26 +702,23 @@ msgid "Cancel/Back"
 msgstr "Atsisakyti/Grįžti"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Ola X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Užduotis įvykdyta"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Neįvykdėte užduoties"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Užduotys: trofėjų kambarys"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -802,61 +726,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Pasirinkite automobilį"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Spauskite �ia norėdami išmokti žaisti"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Užverti"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Rink mėlynas dėžes: jos suteiks ginklų ar kitų dalykų"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Rinkite ypatingo „nitro“ kuro butelius (juos panaudosite už posūkio)"
 
@@ -866,17 +781,13 @@ msgstr "Rinkite „nitro“ kurą!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Jei rinksi „Nitro“ kurą - paspaudęs atitinkamą klavišą, galėsi trumpam "
-"panaudoti grei�io persvarą. Dešinėj ekrano pusėj esan�ioj juostoj gali "
-"matyti dabartinį savo „Nitro“ kuro kiekį."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Jei rinksi „Nitro“ kurą - paspaudęs atitinkamą klavišą, galėsi trumpam panaudoti grei�io persvarą. Dešinėj ekrano pusėj esan�ioj juostoj gali matyti dabartinį savo „Nitro“ kuro kiekį."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -889,11 +800,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -901,7 +812,6 @@ msgstr "Patvirtinkite naują raišką (ankstesnė raiška atsistatys po %i sek.)
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -915,97 +825,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Nėra smagių dalykėlių, viską lems vairavimo įgūdžiai!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Tęsti"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Valdymas"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "PadÄ—kos"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1018,13 +911,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Parinkti"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Derinti nustatymus..."
 
@@ -1050,7 +942,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1058,28 +949,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Pašalinti valdymo nustatymus"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1092,24 +981,23 @@ msgstr "Išjungti įrenginį"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "IÅ¡jungta"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Rodyti kadrų skai�ių (FPS)"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ar tikrai norite ištrinti žaidėją „%s“?"
@@ -1118,8 +1006,8 @@ msgstr "Ar tikrai norite ištrinti žaidėją „%s“?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Nepradėkite važiuoti prieš lenktynių startą"
 
@@ -1130,27 +1018,24 @@ msgstr "Žemyn (rodyklė)"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1161,7 +1046,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1171,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Dramblys"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1184,24 +1067,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Mulas"
 
@@ -1213,27 +1094,24 @@ msgstr "Įjungti įrenginį"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Įjungta"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Įrašykite naujo žaidėjo vardą"
 
@@ -1248,27 +1126,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Baigti lenktynes"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ekspertas"
 
@@ -1276,12 +1156,12 @@ msgstr "Ekspertas"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1306,19 +1186,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Paskutinis ratas!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1329,21 +1207,14 @@ msgstr "Å audymas"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Pirmiausia, jums reikės kelių įvesties įrenginių (geriausia žaisti keliese "
-"yra turint kelis „gamepads“ ar vairalazdes). Eikite į įvesties konfigūravimo "
-"ekraną ir nustatykite „gamepads“. Taipogi yra galimybė žaisti su keliomis "
-"klaviatūromis, bet kiekvienam žaidėjui reikės skirtingų klavišų rinkinių. "
-"Turėkit omeny jog dauguma klaviatūrų netinka žaisti keliese, nes jos "
-"nesusitvarko su daug klavišų paspaudimų vienu metu."
+msgstr "Pirmiausia, jums reikės kelių įvesties įrenginių (geriausia žaisti keliese yra turint kelis „gamepads“ ar vairalazdes). Eikite į įvesties konfigūravimo ekraną ir nustatykite „gamepads“. Taipogi yra galimybė žaisti su keliomis klaviatūromis, bet kiekvienam žaidėjui reikės skirtingų klavišų rinkinių. Turėkit omeny jog dauguma klaviatūrų netinka žaisti keliese, nes jos nesusitvarko su daug klavišų paspaudimų vienu metu."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1356,7 +1227,6 @@ msgstr "Sekite pirmaujantį lyderį!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1364,14 +1234,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Magmos fortas"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1395,13 +1267,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Visame ekrane"
 
@@ -1415,22 +1286,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Valdymo klavišai"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Žaidimo režimai"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1446,51 +1314,45 @@ msgstr "Gamepad klavišas %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad kepurÄ— %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Bendri"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Pasitraukti iš lenktynių"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1500,61 +1362,53 @@ msgid "Go!"
 msgstr "Pirmyn!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "ÄŒempionatai (Grand Prix)"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "ÄŒempionato eiga:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafinių efektų lygis"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Vaizdas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Vaizdo nustatymai"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1571,12 +1425,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1586,22 +1438,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Pagalba"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Geriausi rezultatai"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1609,78 +1457,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Skriausk kitus, su savo ginklais tol kol jie neteks visų savo gyvybių. (Tik "
-"žaidimuose keliese)"
+msgstr "Skriausk kitus, su savo ginklais tol kol jie neteks visų savo gyvybių. (Tik žaidimuose keliese)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Jei matai mygtuką su užraktu kaip šis, norint atrakinti tau reikia įveikti "
-"užduotį."
+msgstr "Jei matai mygtuką su užraktu kaip šis, norint atrakinti tau reikia įveikti užduotį."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Nepaisant „%s“, tau reikia anks�iau prisijungti prie žaidimo!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Įdiegti"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Vidutiniokas"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1690,13 +1531,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kartai"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Palikti naują raišką"
 
@@ -1715,7 +1555,6 @@ msgid "Keyboard %i"
 msgstr "Klaviatūra %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1724,7 +1563,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Ratas"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Ratas %i"
@@ -1786,64 +1625,98 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Įkeliama"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Užrakinta: įvykdykite aktyvias užduotis (iššūkius) ir gausite daugiau "
-"galimybių!"
+msgstr "Užrakinta: įvykdykite aktyvias užduotis (iššūkius) ir gausite daugiau galimybių!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Užrakintas!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1854,27 +1727,18 @@ msgstr "Žiūrėjimas atgal"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1882,18 +1746,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Tik mano"
 
@@ -1903,29 +1765,33 @@ msgid "Menu Keys"
 msgstr "Meniu klavišai"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Pelės ašis %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1933,48 +1799,41 @@ msgstr "PelÄ—s mygtukas %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Žaisti keliese"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Žaidimas keliems"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Muzika"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1994,13 +1853,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2009,9 +1870,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Galėsite žaisti naują �empionatą (Grand Prix) „%s“"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2024,7 +1889,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Prieinamas naujas sunkumo lygis „%s“"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Naujas grei�iausias ratas"
 
@@ -2052,19 +1917,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Užduotis „Nitro kuras“"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Nieko"
 
@@ -2074,21 +1938,19 @@ msgid "Normal Race"
 msgstr "Paprastos lenktynÄ—s"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Northern Resort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Naujokas"
 
@@ -2099,46 +1961,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Kompiuterinių žaidėjų:"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Gerai"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2146,65 +2003,62 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Sena kasykla"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliverio matematikos pamoka"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Čia veikti gali tik žaidimo meistrai!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
-msgstr ""
-"Oi! Jei atsidūrėte neišvažiuojamoje vietoje - spauskite <%s> ir būsite "
-"išgelbėtas"
+msgstr "Oi! Jei atsidūrėte neišvažiuojamoje vietoje - spauskite <%s> ir būsite išgelbėtas"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2212,14 +2066,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Nustatymai"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2228,36 +2079,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
-msgstr ""
-"Parašiutas - sulėtina visus kartus esan�ius geresnėje pozicijoj nei tu."
+msgstr "Parašiutas - sulėtina visus kartus esan�ius geresnėje pozicijoj nei tu."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2265,8 +2110,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2277,12 +2122,11 @@ msgstr "Sustabdyti žaidimą"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pristabdyta"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Baudos sekundÄ—s!!!"
 
@@ -2291,7 +2135,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinų žaidimų aikštelė"
 
@@ -2300,37 +2143,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Balandis"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Žaisti viską"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Žaidėjai"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2339,6 +2183,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Prašome iš naujo sukonfigūruoti klavišų susiejimus."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Palaukite kol papildiniai bus atnaujinti"
@@ -2348,47 +2196,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Palaukite kol papildiniai įkraunami"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Naras - metamas į priekį, siekiant truktelti priešininką atgal, arba "
-"metamas, žiūrint atgal, norint apakinti priešininką."
+msgstr "Naras - metamas į priekį, siekiant truktelti priešininką atgal, arba metamas, žiūrint atgal, norint apakinti priešininką."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Atsisakysite paspaudę klavišą „Esc“"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Paspauskite klavišą"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Norint konfigūruoti, paspauskite „Enter“ arba dukart su pele ant įrenginio"
+msgstr "Norint konfigūruoti, paspauskite „Enter“ arba dukart su pele ant įrenginio"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Nustatymams keisti paspauskite Enter arba dukart spustelÄ—kite pele"
 
@@ -2422,7 +2261,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2431,7 +2269,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2443,25 +2280,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Lenktynių nustatymai"
 
@@ -2482,8 +2315,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Atsitiktinis kartas"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "AtsitiktinÄ— trasa"
 
@@ -2492,82 +2325,68 @@ msgid "Rank"
 msgstr "Vieta"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Pasiruošt!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Įsiminti lango vietą"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Pašalinti"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Pervadinti"
 
@@ -2593,29 +2412,25 @@ msgstr "IÅ¡gelbÄ—jimas"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Raiška"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Pradėti iš naujo"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Pradėti iš naujo"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2672,41 +2487,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Å kotija"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2716,12 +2525,10 @@ msgid "Select"
 msgstr "Pasirinkti"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Pasirinkite žaidimo būdą (režimą)"
 
@@ -2731,36 +2538,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2775,91 +2576,49 @@ msgstr "DÄ—mÄ—sio!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Naujos lenktynÄ—s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Dykumos smėliai"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2869,7 +2628,6 @@ msgid "Size: %s"
 msgstr "Dydis: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2880,12 +2638,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "IÅ¡vaizdos tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snow Peak"
 
@@ -2895,27 +2651,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Deja, jungiantis prie papildinių svetainės kilo klaida. Įsitikinkite jog jūs "
-"prisijungę prie interneto ir „SuperTuxKart“ neblokuojamas ugniasienės"
+msgstr "Deja, jungiantis prie papildinių svetainės kilo klaida. Įsitikinkite jog jūs prisijungę prie interneto ir „SuperTuxKart“ neblokuojamas ugniasienės"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2923,7 +2675,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Garso efektai"
 
@@ -2932,7 +2683,6 @@ msgstr "Garso efektai"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standartiniai"
 
@@ -2945,11 +2695,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Pradėti �empionatą"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "PradÄ—ti lenktynes"
 
@@ -2969,12 +2718,10 @@ msgstr "Sukimas dešinėn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2982,85 +2729,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Subsea"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart papildiniai"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart žinynas"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart nustatymai"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart gali žaisti keli žmonės vienu metu naudodamiesi vienu "
-"kompiuteriu"
+msgstr "SuperTuxKart gali žaisti keli žmonės vienu metu naudodamiesi vienu kompiuteriu"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart lenktynėse yra keli žaidimo būdai (režimai)"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Keitiklis - trumpam laikui dovanos pakei�iamos bananais ir atvirkš�iai."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Keitiklis - trumpam laikui dovanos pakei�iamos bananais ir atvirkš�iai."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Tauškutis - sudaužys šalia esan�ius kartus, taip sulėtindamas juos."
 
@@ -3069,32 +2800,37 @@ msgstr "Tauškutis - sudaužys šalia esan�ius kartus, taip sulėtindamas juos.
 msgid "System Language"
 msgstr "Sistemos kalba"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadionas"
 
@@ -3106,9 +2842,7 @@ msgstr "Šiuo metu papildinių modulis yra išjungtas, pasirink�ių ekrane"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Geriausių rezultatų failas buvo per senas.\n"
-"visi rezultatai buvo ištrinti."
+msgstr "Geriausių rezultatų failas buvo per senas.\nvisi rezultatai buvo ištrinti."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3121,40 +2855,22 @@ msgstr "Tikros lenktynÄ—s"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tikros lenktynės: nėra gerų dalykėlių, rezultatą lemia tik vairavimo "
-"įgūdžiai!"
+msgstr "Tikros lenktynės: nėra gerų dalykėlių, rezultatą lemia tik vairavimo įgūdžiai!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Norint pridėti naują Gamepad/Joystick įrenginį, papras�iausiai paleiskite "
-"„SuperTuxKart“ su prijungtu įrenginiu ir jis rodomas sąraše.\n"
-"\n"
-"Norint pridėti klaviatūros konfigūraciją, gali naudotis mygtuku apa�ioje, "
-"BET dauguma klaviatūrų supranta tik ribotą klavišų paspaudimų skai�ių, vienu "
-"metu ir tai netinka žaidžiant keliems žaidėjams. (Nepaisant to, tu gali "
-"prijungti kelias klaviatūras prie kompiuterio. Nepamiršk jog kiekvienai "
-"klaviatūrai reikės atskirų mygtukų rinkinių.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Norint pridėti naują Gamepad/Joystick įrenginį, papras�iausiai paleiskite „SuperTuxKart“ su prijungtu įrenginiu ir jis rodomas sąraše.\n\nNorint pridėti klaviatūros konfigūraciją, gali naudotis mygtuku apa�ioje, BET dauguma klaviatūrų supranta tik ribotą klavišų paspaudimų skai�ių, vienu metu ir tai netinka žaidžiant keliems žaidėjams. (Nepaisant to, tu gali prijungti kelias klaviatūras prie kompiuterio. Nepamiršk jog kiekvienai klaviatūrai reikės atskirų mygtukų rinkinių.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Kad padÄ—ti jums laimÄ—ti yra keli geri dalykai kuriuos gali rasti :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3173,7 +2889,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3187,19 +2903,17 @@ msgstr "Trasą sukūrė %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Trasos"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3210,24 +2924,21 @@ msgstr "Bandyti dar kartÄ…"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Pamokos"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Pamokos: Pasirinkimų kambarys"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Pingvinas Tuksas"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3235,20 +2946,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Pašalinti"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3262,8 +2971,8 @@ msgid "Update"
 msgstr "Atnaujinti"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3272,40 +2981,36 @@ msgid "Updated date"
 msgstr "Atnaujinimo data"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Panaudokite surinktą „nitro“ kurą paspausdami <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Naudotojo sÄ…saja"
 
@@ -3314,19 +3019,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3335,13 +3038,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3352,27 +3054,23 @@ msgstr "Versija: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertikali sinchronizacija (reikia paleisti iš naujo)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Garsumas"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3384,7 +3082,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "NETEISINGA VAŽIAVIMO KRYPTIS!"
 
@@ -3393,58 +3091,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Įspėjimas: nenaudokite „Shift“ klavišo - kai jis yra paspaustas, tuomet "
-"pasikei�ia visų raidžių, skai�ių ir specialių ženklų klavišų kodai."
+msgstr "Įspėjimas: nenaudokite „Shift“ klavišo - kai jis yra paspaustas, tuomet pasikei�ia visų raidžių, skai�ių ir specialių ženklų klavišų kodai."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Ginklai"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Lietus, sniegas ir pan.: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Kai įvesties įrenginiai nustatyti, tu pasiruošęs žaisti. Pagrindiniame meniu "
-"pasirink „kelių žaidėjo režimo“ piktogramą. Tada reikės pasirinkti kartą, "
-"kiekvienas žaidėjas gali paspausti „šauti“ klavišą, jų klaviatūrose ar "
-"„gamepad“ ir prisijungti prie žaidimo. Kiekvienas žaidėjas, naudodamasis "
-"savo įvesties įrenginiu, gali pasirinkti savo kartą. Žaidimas tęsis kai visi "
-"pasirinks savo kartÄ…. Å iam veiksmui atlikti pele naudotis negalima."
+msgstr "Kai įvesties įrenginiai nustatyti, tu pasiruošęs žaisti. Pagrindiniame meniu pasirink „kelių žaidėjo režimo“ piktogramą. Tada reikės pasirinkti kartą, kiekvienas žaidėjas gali paspausti „šauti“ klavišą, jų klaviatūrose ar „gamepad“ ir prisijungti prie žaidimo. Kiekvienas žaidėjas, naudodamasis savo įvesties įrenginiu, gali pasirinkti savo kartą. Žaidimas tęsis kai visi pasirinks savo kartą. Šiam veiksmui atlikti pele naudotis negalima."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3452,42 +3137,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Taip"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Jūs jau pasiruošęs lenktynėms. Sėkmės!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3497,37 +3176,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Jūs įvykdėte užduotį!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Jūs įvykdėte užduotis!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Jūs baigėte �empionatą (Grand Prix)!"
 
@@ -3548,20 +3226,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "JÅ«s baigÄ—te lenktynes!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Jūs buvote pašalintas!"
 
@@ -3571,7 +3252,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3579,36 +3260,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "JÅ«s laimÄ—jote lenktynes!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3619,13 +3305,16 @@ msgstr "Jūsų konfigūracija sugadinta, ji buvo ištrinta, bus sukurta nauja."
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Jūsų konfigūracija buvo per sena, ji buvo ištrinta, bus sukurta nauja."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Jūsų konfigūracija buvo per sena, ji buvo ištrinta, bus sukurta nauja."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Jūsų įvesties konfigūracijos failas nesuderinamas su šia STK versija."
+msgstr "Jūsų įvesties konfigūracijos failas nesuderinamas su šia STK versija."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3633,7 +3322,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Garden"
 
@@ -3644,7 +3332,6 @@ msgstr "[nÄ—ra]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3653,7 +3340,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "atliekama"
@@ -3662,44 +3350,25 @@ msgstr "atliekama"
 msgid "featured"
 msgstr "atliko"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standartinis"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Algimantas Margevi�ius https://launchpad.net/~gymka\n"
-"  Mantas Kriau�iūnas https://launchpad.net/~mantas\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Algimantas Margevi�ius https://launchpad.net/~gymka\n  Mantas Kriau�iūnas https://launchpad.net/~mantas\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/nb.po b/data/po/nb.po
index 4f77da68c..17fb3dbb4 100644
--- a/data/po/nb.po
+++ b/data/po/nb.po
@@ -1,20 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: STK norwegian team\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/supertuxkart/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: NORWAY\n"
-"Language: \n"
-"X-Poedit-Language: Norwegian Bokmal\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,21 +26,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -55,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -67,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s er klar"
@@ -94,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' er blitt eliminert."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tom)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(nettverksspill er foreløpig ikke tilgjengelig)"
 
@@ -126,45 +125,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Nåværende tastaturoppsett kan ses/endres i 'Innstillinger'-menyen"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"De fleste spillmoduser kan også spilles som Grand Prix; i stedet for å kjøre "
-"et enkelt løp, spiller du flere på rad. Jo bedre plassering du har, jo mer "
-"poeng får du. Til slutt er det spilleren med flest poeng som vinner "
-"turneringen."
+msgstr "De fleste spillmoduser kan også spilles som Grand Prix; i stedet for å kjøre et enkelt løp, spiller du flere på rad. Jo bedre plassering du har, jo mer poeng får du. Til slutt er det spilleren med flest poeng som vinner turneringen."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -195,7 +183,6 @@ msgstr "3 Strikes Battle"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -214,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Beste tider ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Avbryt Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Om"
 
@@ -239,37 +223,35 @@ msgstr "Om"
 msgid "Accelerate"
 msgstr "Akselerer"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -277,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -288,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -305,7 +284,6 @@ msgstr "Legg til tastaturkonfigurasjon"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Legg til spiller"
 
@@ -316,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Legg til enhet"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Utvidelser"
 
@@ -351,49 +326,43 @@ msgstr "Navn på utvidelse"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Utvidelser"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alle"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alle baner"
 
@@ -403,18 +372,20 @@ msgstr "Alle metoder tillatt, så plukk opp våpen og bruk dem godt!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -424,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Anker - sakker den forreste føreren ned betraktelig."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animerte kjøretøy : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -450,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animerte omgivelser : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -477,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Bruk oppløsning"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -514,49 +478,44 @@ msgstr "Er du sikker på at du vil slette denne konfigurasjonen permanent?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenaer"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Bruk ESC-knapp som"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "At World's End"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Lyd"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Unngå bananer!"
 
@@ -578,79 +537,66 @@ msgstr "Akse %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Tilbake"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Fortsett løp"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Tilbake til enhetsliste"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Tilbake til menyen"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Battle Island"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Bedre lykke neste gang!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -660,39 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingball - spretter på veggene. Når du ser bakover, vil den bli skutt "
-"baklengs."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingball - spretter på veggene. Når du ser bakover, vil den bli skutt baklengs."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -700,7 +640,6 @@ msgid "Brake"
 msgstr "Brems/Revers"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -708,54 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kake - kastes på den nærmeste rivalen, og er best på korte avstander og "
-"rettstrekninger."
+msgstr "Kake - kastes på den nærmeste rivalen, og er best på korte avstander og rettstrekninger."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Kan ikke aksessere stkaddons-server..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -769,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Avbryt/Tilbake"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Utfordringer : Troférom"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -796,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Velg kjøretøy"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Samle blå bokser: de vil gi deg våpen eller andre fordeler"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -860,17 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Innsamling av nitro gjør at du kan få høyere hastighet når du ønsker ved å "
-"trykke den aktuelle tasten. Du kan se hvor mye nitro du har i måleren til "
-"høyre i spillet."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Innsamling av nitro gjør at du kan få høyere hastighet når du ønsker ved å trykke den aktuelle tasten. Du kan se hvor mye nitro du har i måleren til høyre i spillet."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -883,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -895,7 +809,6 @@ msgstr "Bekreft oppløsning innen %i sekunder"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -909,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Inneholder ingen bonuser, så bare gode kjøreegenskaper nytter!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Fortsett"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontroller"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Bidragsytere"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1012,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1044,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1052,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Slett konfigurasjon"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1086,24 +978,23 @@ msgstr "Deaktiver enhet"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Vis FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Vil du virkelig slette spiller '%s'?"
@@ -1112,8 +1003,8 @@ msgstr "Vil du virkelig slette spiller '%s'?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Ikke akselerer før 'Kjør' vises"
 
@@ -1124,27 +1015,24 @@ msgstr "Pil ned"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1155,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1165,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "ElePHPant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1178,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1207,27 +1091,24 @@ msgstr "Aktiver enhet"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Aktivert"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Skriv inn den nye spillerens navn"
 
@@ -1242,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Avslutt løp"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ekspert"
 
@@ -1270,12 +1153,12 @@ msgstr "Ekspert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1300,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Siste runde!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1323,21 +1204,14 @@ msgstr "Skyt"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Du trenger flere inndataenheter (å ha flere håndholdte spillkontrollere er "
-"den beste måten å spille med flere på). Gå til konfigurasjonsmenyen for "
-"inndataenheter og sett opp spillkontrollerne. Det er også mulig å spille på "
-"tastatur(er), men da må hver spiller bruke forskjellige taster. Dessuten er "
-"de fleste tastaturer ikke egnet for flerspillermodus fordi de ikke støtter "
-"at mange taster trykkes samtidig."
+msgstr "Du trenger flere inndataenheter (å ha flere håndholdte spillkontrollere er den beste måten å spille med flere på). Gå til konfigurasjonsmenyen for inndataenheter og sett opp spillkontrollerne. Det er også mulig å spille på tastatur(er), men da må hver spiller bruke forskjellige taster. Dessuten er de fleste tastaturer ikke egnet for flerspillermodus fordi de ikke støtter at mange taster trykkes samtidig."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1350,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1358,14 +1231,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1389,13 +1263,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
@@ -1409,22 +1282,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Spilltaster"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spillmoduser"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1440,51 +1310,45 @@ msgstr "Spillkontroll-knapp %d"
 msgid "Gamepad hat %d"
 msgstr "Styrespak for spillkontroll %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Generelt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "GNU"
 
@@ -1494,61 +1358,53 @@ msgid "Go!"
 msgstr "Kjør!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivå av grafiske effekter"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafikk"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1565,12 +1421,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1580,22 +1434,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hjelp"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Beste tider"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1603,78 +1453,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Treff de andre spillerne med kaker eller bowlingkuler inntil de ikke har "
-"noen liv igjen. (Bare i flerspillermodus)"
+msgstr "Treff de andre spillerne med kaker eller bowlingkuler inntil de ikke har noen liv igjen. (Bare i flerspillermodus)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Hvis du ser en knapp med en lås som denne, er du nødt til å fullføre en "
-"utfordring for å låse den opp."
+msgstr "Hvis du ser en knapp med en lås som denne, er du nødt til å fullføre en utfordring for å låse den opp."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorerer '%s', du må slutte deg til tidligere for å spille!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installér"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Viderekommen"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1684,13 +1527,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kjøretøy"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Behold denne oppløsningen"
 
@@ -1709,7 +1551,6 @@ msgid "Keyboard %i"
 msgstr "Tastatur %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1718,7 +1559,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Runde"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Runde %i"
@@ -1780,50 +1621,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Laster"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "LÃ¥st"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Låst: Fullfør aktive utfordringer for å få tilgang til mer!"
 
@@ -1831,11 +1668,51 @@ msgstr "Låst: Fullfør aktive utfordringer for å få tilgang til mer!"
 msgid "Locked!"
 msgstr "LÃ¥st!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1846,27 +1723,18 @@ msgstr "Se bakover"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1874,18 +1742,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Bare meg"
 
@@ -1895,29 +1761,33 @@ msgid "Menu Keys"
 msgstr "Menytaster"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Museakse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1925,48 +1795,41 @@ msgstr "Museknapp %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Flerspiller"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Flerspiller"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musikk"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1986,13 +1849,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2001,9 +1866,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Ny Grand Prix '%s' er nå tilgjengelig"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2016,7 +1885,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Ny vanskelighetsgrad '%s' er nå tilgjengelig"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Ny raskeste runde"
 
@@ -2044,19 +1913,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ingen"
 
@@ -2066,21 +1934,19 @@ msgid "Normal Race"
 msgstr "Vanlig løp"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Northern Resort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nybegynner"
 
@@ -2091,46 +1957,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Antall datastyrte kjøretøy"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2138,60 +1999,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Old Mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliver's Math Class"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Bare spillets grunnlegger kan gjøre noe nå!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2202,14 +2062,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Innstillinger"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2218,35 +2075,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Fallskjerm - sakker ned alle med bedre rangering."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2254,8 +2106,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2266,12 +2118,11 @@ msgstr "Pause spillet"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pause"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Straffetid!!"
 
@@ -2280,7 +2131,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Penguin Playground"
 
@@ -2289,37 +2139,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Spill alle"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spillere"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2328,6 +2179,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Vennligst rekonfigurer dine taster."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Vennligst vent mens utvidelser blir oppdatert"
@@ -2337,49 +2192,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Vennligst vent mens utvidelsene laster"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Sugekopp - kast fremover for å dra deg fremover, eller kast mens du ser "
-"bakover for å blinde en annen."
+msgstr "Sugekopp - kast fremover for å dra deg fremover, eller kast mens du ser bakover for å blinde en annen."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Trykk ESC for å avbryte"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Trykk en tast"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Trykk ENTER eller dobbeltklikk på en enhet for å konfigurere den"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Trykk ENTER eller dobbeltklikk på en spiller for å redigere ham/henne"
+msgstr "Trykk ENTER eller dobbeltklikk på en spiller for å redigere ham/henne"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2411,7 +2257,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2420,7 +2265,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2432,25 +2276,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Sett opp løp"
 
@@ -2471,8 +2311,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Tilfeldig kjøretøy"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Tilfeldig bane"
 
@@ -2481,82 +2321,68 @@ msgid "Rank"
 msgstr "Rangering"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Klar!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Fjern"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Endre navn"
 
@@ -2582,29 +2408,25 @@ msgstr "Redd"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Start på nytt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Start løpet på nytt"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2661,41 +2483,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Scotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2705,12 +2521,10 @@ msgid "Select"
 msgstr "Velg"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Velg spillmodus"
 
@@ -2720,36 +2534,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2764,91 +2572,49 @@ msgstr "Ferdig!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Sett opp nytt løp"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Shifting Sands"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2858,7 +2624,6 @@ msgid "Size: %s"
 msgstr "Størrelse: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2869,12 +2634,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snow Peak"
 
@@ -2884,28 +2647,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Beklager, det skjedde en feil mens hjemmesiden til utvidelsene ble "
-"kontaktet. Forsikre deg om at du er koblet til Internett og at SuperTuxKart "
-"ikke er blokkert av en brannmur"
+msgstr "Beklager, det skjedde en feil mens hjemmesiden til utvidelsene ble kontaktet. Forsikre deg om at du er koblet til Internett og at SuperTuxKart ikke er blokkert av en brannmur"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2913,7 +2671,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Lydeffekter"
 
@@ -2922,7 +2679,6 @@ msgstr "Lydeffekter"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
@@ -2935,11 +2691,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Start Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Start løp"
 
@@ -2959,12 +2714,10 @@ msgstr "Sving til høyre"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2972,82 +2725,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Subsea"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart-utvidelser"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Hjelp til SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Innstillinger i SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart kan spilles i flerspillermodus på samme datamaskin"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart inneholder flere spillmoduser"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "Bytteboks - gavepakker blir til bananer og motsatt for en kort tid."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Smekker - vil skvise kjøretøy i nærheten, noe som sakker dem ned."
 
@@ -3056,32 +2796,37 @@ msgstr "Smekker - vil skvise kjøretøy i nærheten, noe som sakker dem ned."
 msgid "System Language"
 msgstr "Systemspråk"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "The Stadium"
 
@@ -3093,9 +2838,7 @@ msgstr "Utvidelser er avslått i instillingene."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Filen med beste tider var utdatert;\n"
-"alle tider har blitt fjernet."
+msgstr "Filen med beste tider var utdatert;\nalle tider har blitt fjernet."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3108,39 +2851,22 @@ msgstr "'Time Trial'"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"'Time Trial': Inneholder ingen bonuser, så bare gode kjøreegenskaper gjelder!"
+msgstr "'Time Trial': Inneholder ingen bonuser, så bare gode kjøreegenskaper gjelder!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"For å legge til en gamepad/joystick må du starte SuperTuxKart mens den er "
-"tilkoblet, og den vil dukke opp i listen.\n"
-"\n"
-"Du kan legge til en tastaturkonfigurasjon ved å bruke knappen nedenfor. MEN "
-"vær oppmerksom på at de fleste tastaturer bare har støtte for et visst "
-"antall samtidige tastetrykk og er derfor ikke brukbare for spilling med "
-"flere spillere. (Du kan imidlertid bruke flere tastaturer til datamaskinen. "
-"Husk at alle trenger forskjellige tastekombinasjoner i et slikt tilfelle.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "For å legge til en gamepad/joystick må du starte SuperTuxKart mens den er tilkoblet, og den vil dukke opp i listen.\n\nDu kan legge til en tastaturkonfigurasjon ved å bruke knappen nedenfor. MEN vær oppmerksom på at de fleste tastaturer bare har støtte for et visst antall samtidige tastetrykk og er derfor ikke brukbare for spilling med flere spillere. (Du kan imidlertid bruke flere tastaturer til datamaskinen. Husk at alle trenger forskjellige tastekombinasjoner i et slikt tilfelle.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "For å hjelpe deg å vinne, kan du plukke opp noen av disse bonusene:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3159,7 +2885,7 @@ msgstr "Topp %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3173,19 +2899,17 @@ msgstr "Banen er lagd av %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Baner"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3196,24 +2920,21 @@ msgstr "Prøv igjen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3221,20 +2942,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Avinstallér"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3248,8 +2967,8 @@ msgid "Update"
 msgstr "Oppdater"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3258,40 +2977,36 @@ msgid "Updated date"
 msgstr "Sist endret"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Brukergrensesnitt"
 
@@ -3300,19 +3015,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3321,13 +3034,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3338,27 +3050,23 @@ msgstr "Versjon: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertikal synkronisering (krever omstart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volum"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3370,7 +3078,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "FEIL VEI!"
 
@@ -3379,57 +3087,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Advarsel: 'Shift' er ikke en anbefalt tast, fordi når den er i bruk vil alle "
-"taster som har alternative tegn slutte å fungere (eksempel: tall-tastene)."
+msgstr "Advarsel: 'Shift' er ikke en anbefalt tast, fordi når den er i bruk vil alle taster som har alternative tegn slutte å fungere (eksempel: tall-tastene)."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "VÃ¥pen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Vær : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Når inndataenhetene er konfigurert, er det klart til å spille. Velg "
-"'Flerspiller' i hovedmenyen. Når det er tid for å velge kjøretøy, kan alle "
-"spillere trykke på 'Skyt'-knappen på sin enhet for å bli med i spillet. "
-"Deretter bruker hver spiller sin enhet for å velge kart. Spillet går videre "
-"når alle har gjort sitt valg. Merk at datamusen ikke kan benyttes til dette."
+msgstr "Når inndataenhetene er konfigurert, er det klart til å spille. Velg 'Flerspiller' i hovedmenyen. Når det er tid for å velge kjøretøy, kan alle spillere trykke på 'Skyt'-knappen på sin enhet for å bli med i spillet. Deretter bruker hver spiller sin enhet for å velge kart. Spillet går videre når alle har gjort sitt valg. Merk at datamusen ikke kan benyttes til dette."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3437,42 +3133,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3482,37 +3172,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Du fullførte en Grand Prix!"
 
@@ -3533,20 +3222,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Du fullførte løpet!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Du er blitt eliminert!"
 
@@ -3556,7 +3247,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3564,55 +3255,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Du vant løpet!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Din konfigurasjonsfil var ødelagt, så den ble slettet og en ny vil bli laget."
+msgstr "Din konfigurasjonsfil var ødelagt, så den ble slettet og en ny vil bli laget."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Din konfigurasjonsfil var for gammel, så den vil bli slettet og erstattes med en ny."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Din konfigurasjonsfil var for gammel, så den vil bli slettet og erstattes "
-"med en ny."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Din inndata-konfigurasjonsfil er ikke kompatibel med denne versjonen av STK."
+msgstr "Din inndata-konfigurasjonsfil er ikke kompatibel med denne versjonen av STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3620,7 +3317,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Garden"
 
@@ -3631,7 +3327,6 @@ msgstr "[ingen]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3640,7 +3335,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "av"
@@ -3649,47 +3345,25 @@ msgstr "av"
 msgid "featured"
 msgstr "utvalgt"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Eigil Iversen https://launchpad.net/~eig-iv\n"
-"  Magne Djupvik https://launchpad.net/~magnedj\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Tore Bergebakken https://launchpad.net/~toreb\n"
-"  Øyvind Larsen Nygård https://launchpad.net/~oyvind-l-nygard"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Eigil Iversen https://launchpad.net/~eig-iv\n  Magne Djupvik https://launchpad.net/~magnedj\n  STK-team https://launchpad.net/~stk\n  Tore Bergebakken https://launchpad.net/~toreb\n  oyvindln https://launchpad.net/~oyvindln"
diff --git a/data/po/nl.po b/data/po/nl.po
index a2cf39063..a8efb6297 100644
--- a/data/po/nl.po
+++ b/data/po/nl.po
@@ -1,18 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Frans van Rijn <asciimonster@yahoo.co.uk>, 2015
+# Ward Muylaert <ward.muylaert@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-19 21:22+0000\n"
-"Last-Translator: Asciimonster <asciimonster@yahoo.co.uk>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-16 19:13+0000\n"
+"Last-Translator: Frans van Rijn <asciimonster@yahoo.co.uk>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/supertuxkart/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"Language: \n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -23,23 +28,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Maar kleine sufferds zoals jullie kunnen mij, de Koning van de Karts, nooit "
-"verslaan!"
+msgstr " Maar kleine sufferds zoals jullie kunnen mij, de Koning van de Karts, nooit verslaan!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] "%d vriend is nu online."
 msgstr[1] "%d vrienden zijn nu online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (met handicap)"
@@ -55,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s en %s zijn nu online."
@@ -67,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s door %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s door %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s is nu online."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s is klaar"
@@ -94,25 +97,23 @@ msgstr "profiel van %s"
 msgid "%s's server"
 msgstr "server van %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s en %s zijn nu online"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s is uitgeschakeld."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Leeg)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(netwerkspel is nog niet beschikbaar)"
 
@@ -126,47 +127,34 @@ msgstr "* Een rood item betekent een conflict in de huidige configuratie"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Bekijk en/of wijzig de huidige toetsinstellingen in het Instellingen-menu"
+msgstr "* Bekijk en/of wijzig de huidige toetsinstellingen in het Instellingen-menu"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* De meeste speltypen kunnen ook als Grand Prix gespeeld worden: je speelt "
-"dan een aantal wedstrijden achter elkaar. Hoe hoger je eindigt, hoe meer "
-"punten je verzamelt. De speler met de meeste punten wint de beker."
+msgstr "* De meeste speltypen kunnen ook als Grand Prix gespeeld worden: je speelt dan een aantal wedstrijden achter elkaar. Hoe hoger je eindigt, hoe meer punten je verzamelt. De speler met de meeste punten wint de beker."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Herstart STK om nieuwe instellingen te accepteren"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Bij het starten van het spel wordt de configuratie bepaald door welke "
-"'selectknop' je gebruikt."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Bij het starten van het spel wordt de configuratie bepaald door welke 'selectknop' je gebruikt."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -197,13 +185,10 @@ msgstr "Veldslag"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Veldslag: Alleen voor meerdere spelers.  Elke keer dat je je tegenstander "
-"raak met een wapen verliest hij een leven. Ieder heeft drie levens."
+msgstr "Veldslag: Alleen voor meerdere spelers.  Elke keer dat je je tegenstander raak met een wapen verliest hij een leven. Ieder heeft drie levens."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -218,23 +203,20 @@ msgid "9 months"
 msgstr "9 maanden"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Topscores ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Alle karts"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Grand Prix stoppen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Over"
 
@@ -243,39 +225,35 @@ msgstr "Over"
 msgid "Accelerate"
 msgstr "Versnellen"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Versnel en druk tijdens het draaien de <%s> toets om te slippen. Dit helpt "
-"om sneller en korter door de bocht te gaan."
+msgstr "Versnel en druk tijdens het draaien de <%s> toets om te slippen. Dit helpt om sneller en korter door de bocht te gaan."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Versnel met <%s> en stuur met <%s> en <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Accepteren"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Account herstellen"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Accountinstellingen"
 
@@ -283,8 +261,7 @@ msgstr "Accountinstellingen"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Prestaties"
 
@@ -294,13 +271,11 @@ msgstr "Actie"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Toevoegen"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Vriend toevoegen"
 
@@ -311,7 +286,6 @@ msgstr "Toetsenbordconfiguratie toevoegen"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Speler toevoegen"
 
@@ -322,32 +296,29 @@ msgstr "Wiimote toevoegen"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Apparaat toevoegen"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Extra's"
 
@@ -357,49 +328,43 @@ msgstr "Add-on naam"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Uitbreidingen"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Geavanceerde pijplijn (lights etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alle"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alle parcours"
 
@@ -409,18 +374,20 @@ msgstr "Bruut geweld is toegestaan, dus grijp die wapens en zet ze slim in!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Altijd inlogscherm tonen"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Ambient Occlusion"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Ambient occlusion: %s"
@@ -430,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Er is een fout opgetreden bij het opslaan van de grand prix"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Anker - Remt kart vooraan sterk af"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Karakter-animaties"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animaties van karts: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Landschap-animaties"
 
@@ -456,24 +420,24 @@ msgstr "Landschap-animaties"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animaties van achtergrond: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotropisch x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotropisch x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotropisch x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropisch x8"
 
@@ -483,29 +447,25 @@ msgstr "Er bestaat een andere grand prix met dezelfde naam."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Anti-aliasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Anti-aliasing: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Toepassen"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Pas nieuwe resolutie toe"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Aartsvijand"
 
@@ -520,49 +480,44 @@ msgstr "Weet u zeker dat u deze configuratie permanent wilt verwijderen?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Weet je zeker dat je '%s' wilt verwijderen?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arena's"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Rondom de vuurtoren"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Niets toewijzen"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "De ESC toets gebruiken"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Het einde van de wereld"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Geluid"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Vermijd bananen!"
 
@@ -584,81 +539,66 @@ msgstr "As %d %s"
 msgid "Axis %d inverted"
 msgstr "As %d omgekeerd"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Terug"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Terug naar het spel"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Terug naar de wedstrijd"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Terug naar de uitdagingen"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Terug naar apparaten"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Terug naar het menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Terug naar het hoofdmenu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Liefhebber van bananen"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basketbal - stuitert de leider van de baan en vertraagt geraakte karts "
-"onderweg."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basketbal - stuitert de leider van de baan en vertraagt geraakte karts onderweg."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Oorlogseiland"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Volgende keer beter!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilineair"
 
@@ -668,39 +608,33 @@ msgid "Black"
 msgstr "Zwart"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Huize Griezelstein"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Bloom"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Bloom: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Team blauw heeft gewonnen"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "De Boerderij"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingbal - Stuitert tegen wanden. Als je achterom kijkt, wordt hij naar "
-"achteren gegooid."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingbal - Stuitert tegen wanden. Als je achterom kijkt, wordt hij naar achteren gegooid."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -708,64 +642,52 @@ msgid "Brake"
 msgstr "Remmen"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Kauwgom - bescherm jezelf met een schild, of gebruik het terwijl je achterom "
-"kijkt om een kleverige plakboel achter te laten."
+msgstr "Kauwgom - bescherm jezelf met een schild, of gebruik het terwijl je achterom kijkt om een kleverige plakboel achter te laten."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr "Maar ik ben een eerlijk wezen, dus doe ik jou een voorstel."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Taart - Wordt naar de kart gegooid die het dichtste bij je is. Goed voor "
-"nabij en rechte stukken."
+msgstr "Taart - Wordt naar de kart gegooid die het dichtste bij je is. Goed voor nabij en rechte stukken."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Stkaddons-server kon niet bereikt worden..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -779,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Annuleer/terug"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Grot X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Uitdaging gehaald"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Uitdaging gefaald"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Uitdagingen: Trofeekast"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Wijzigen"
 
@@ -806,61 +725,52 @@ msgstr "Wijzigen"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Kies een kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Christoffel Columbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Klik hier om de tutorial te starten"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Sluiten"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr "De cacaotempel"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Verzamel ten minste 5 bananen in één race"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Verzamel blauwe dozen: Deze bevatten wapens en powerups"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "Verzamel cadeaus en schiet met <%s> de dozen uit de weg!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Verzamel flessen lachgas (we gebruiken ze na de bocht)"
 
@@ -870,17 +780,13 @@ msgstr "Verzamel lachgas!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Lachgas is niet om te lachen. Verzamel lachgas en je kan extra snelheid "
-"krijgen wanneer jij dat wilt. Je lachgasmeter, tijdens het spel rechts in "
-"beeld, geeft aan hoeveel je nog over hebt."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Lachgas is niet om te lachen. Verzamel lachgas en je kan extra snelheid krijgen wanneer jij dat wilt. Je lachgasmeter, tijdens het spel rechts in beeld, geeft aan hoeveel je nog over hebt."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "De grote deur gaat pas open nadat alle uitdagingen voltooid zijn!"
 
@@ -893,11 +799,11 @@ msgstr "Uitdaging \"%s\" voltooid."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -905,7 +811,6 @@ msgstr "Bevestig de resolutie binnen %i seconden"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Verbinding maken met het internet"
 
@@ -913,105 +818,86 @@ msgstr "Verbinding maken met het internet"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Verbind de wiimote met de Bluetooth manager en klik op Ok. Voor uitgebreide "
-"instructies zie supertkuxkart.net/Wiimote."
+msgstr "Verbind de wiimote met de Bluetooth manager en klik op Ok. Voor uitgebreide instructies zie supertkuxkart.net/Wiimote."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Er zijn geen bonus-items, dus alles hangt van je stuurmanskunst af!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Doorgaan"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Doorgaan met opgeslagen GP"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Doorgaan"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Besturing"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Speler '%s' kon niet worden aangemaakt."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Kon geen Wiimote vinden :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Aanmaken"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Maak server aan"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Gebruiker aanmaken"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Online account aanmaken"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Sever aanmaken"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Auteurs"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Huidig ​​wachtwoord"
 
@@ -1024,13 +910,12 @@ msgid "Currently not signed in"
 msgstr "Niet ingelogd"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Aangepast"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Aangepaste instellingen..."
 
@@ -1056,7 +941,6 @@ msgstr "D-pad omhoog"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Afwijzen"
 
@@ -1064,28 +948,26 @@ msgstr "Afwijzen"
 msgid "Default"
 msgstr "Standaardwaarde"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Configuratie verwijderen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Depth of Field"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Depth of field: %s"
@@ -1098,24 +980,23 @@ msgstr "apparaat uitschakelen"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Toon ververssnelheid"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Wil je echt stoppen met de Grand Prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Weet u zeker dat speler '%s' verwijderd moet worden?"
@@ -1124,8 +1005,8 @@ msgstr "Weet u zeker dat speler '%s' verwijderd moet worden?"
 msgid "Do you want to save your changes?"
 msgstr "Wil je je wijzigingen opslaan?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Geen gas geven voor het startsein!"
 
@@ -1136,27 +1017,24 @@ msgstr "Omlaag"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Andersom rijden"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Dynamic ligths: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Bewerken"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Grand Prix bewerken"
 
@@ -1167,7 +1045,6 @@ msgstr "Eieren zoeken"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Eieren zoeken: Zoek en vind alle verstopte eieren."
 
@@ -1177,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Eieren: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Geëlimineerd"
 
@@ -1190,24 +1066,22 @@ msgstr "Geëlimineerd"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "E-mail"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "E-mailadres moet tussen de 4 en 50 tekens lang zijn!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "E-mailadres is ongeldig!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "E-mailadressen komen niet overeen!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "eMule"
 
@@ -1219,27 +1093,24 @@ msgstr "apparaat inschakelen"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr "Gebruikers met handicaps toestaan"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Allemaal geactiveerd"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Voer de naam van de speler in"
 
@@ -1252,31 +1123,31 @@ msgstr "Fout bij het downloaden van nieuws: '%s'"
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Iedereen:\n"
-"Druk nu op 'Selecteren' om aan dit spel mee te doen!"
+msgstr "Iedereen:\nDruk nu op 'Selecteren' om aan dit spel mee te doen!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Bestaande online account"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Afsluiten"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Verlaat wedstrijd"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Het spel afsluiten"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1284,12 +1155,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Zoek en vind alle verstopte eieren"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1314,21 +1185,17 @@ msgid "Fetching servers"
 msgstr "Servers ophalen"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Vul de gebruikersnaam en e-mailadres, die je gebruikt hebt bij het "
-"registreren, in on het wachtwoord te resetten."
+msgstr "Vul de gebruikersnaam en e-mailadres, die je gebruikt hebt bij het registreren, in on het wachtwoord te resetten."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Laatste ronde!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Vind server"
 
@@ -1339,20 +1206,14 @@ msgstr "Vuren"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Meerdere spelers spelen het beste met hun eigen gamepad of joystick. Ga naar "
-"het invoer-configuratiescherm en definieer de verschillende invoerapparaten. "
-"Het is niet verstandig om twee of meer spelers hetzelfde toetsenbord te "
-"laten gebruiken, omdat de meeste toetsenborden maximaal 2 of 3 "
-"toetsaanslagen tegelijk aankunnen."
+msgstr "Meerdere spelers spelen het beste met hun eigen gamepad of joystick. Ga naar het invoer-configuratiescherm en definieer de verschillende invoerapparaten. Het is niet verstandig om twee of meer spelers hetzelfde toetsenbord te laten gebruiken, omdat de meeste toetsenborden maximaal 2 of 3 toetsaanslagen tegelijk aankunnen."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1365,25 +1226,22 @@ msgstr "Zwaan kleef aan!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Zwaan-kleef-aan: Volg de leider, maar niet als laatste! Wanneer de klok op "
-"nul staat wordt de laatste kart geëlimineerd. Let op: Als je vóór de leider "
-"rijdt wordt je ook geëlimineerd."
+msgstr "Zwaan-kleef-aan: Volg de leider, maar niet als laatste! Wanneer de klok op nul staat wordt de laatste kart geëlimineerd. Let op: Als je vóór de leider rijdt wordt je ook geëlimineerd."
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d Wiimote(s) gevonden"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "%d Wiimote gevonden"
+msgstr[1] "%d Wiimotes gevonden"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1391,7 +1249,7 @@ msgstr "Vriend verwijderd!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr "Verzoek om vreinden te worden geaccepteerd!"
+msgstr "Verzoek om vrienden te worden is geaccepteerd!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
@@ -1407,13 +1265,12 @@ msgstr "Verzoek om vrienden te worden is verstuurd!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Vrienden"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Volledig scherm"
 
@@ -1427,22 +1284,19 @@ msgstr "DOELPUNT!"
 msgid "Game Keys"
 msgstr "Besturing"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spelvormen"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Speltype (Doelpuntenlimiet / Tijdslimiet)"
 
@@ -1458,51 +1312,45 @@ msgstr "Gamepad knop %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hoed %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Algemeen"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Race opgeven"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Global illumination"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Global illumination: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Glow (randen)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Glow (randen): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1512,61 +1360,53 @@ msgid "Go!"
 msgstr "Start!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "Goudduiker"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr "Gran Paradiso-eiland"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Grand Prix Editor"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Grand Prix editor"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Voortgang van de Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Detail van de grafische effecten"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Beeld"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafische instellingen"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Groene Vallei"
 
@@ -1583,12 +1423,10 @@ msgstr "Gast %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Gast inloggen"
+msgid "Guest Log in"
+msgstr "Als gast aanmelden"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Spaanse Villa"
 
@@ -1598,22 +1436,18 @@ msgstr "Spaanse Villa"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hulp"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Topscores"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Raak 10 karts met een bowlingbal."
 
@@ -1621,78 +1455,71 @@ msgstr "Raak 10 karts met een bowlingbal."
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Alleen voor meerdere spelers. Raak de tegenstanders met je wapens om te "
-"winnen."
+msgstr "Alleen voor meerdere spelers. Raak de tegenstanders met je wapens om te winnen."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Raak dezelfde kart in één race minimaal 5 keer"
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Uit voor computerspelers"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
-"Ik stem in met bovenstaande voorwaarden en ik ben ouder dan 13 jaar. "
+msgstr "Ik stem in met bovenstaande voorwaarden en ik ben ouder dan 13 jaar. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Als je me kunt verslaan, dan laat ik die oude mopperpot vrij."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "Vervolledig uitdagingen om hangsloten te openen."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s' aan het negeren, je had eerder moeten komen om te spelen!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Image-based lighting"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installeren"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Gemiddeld"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
-"Internettoegang is uitgeschakeld, gelieve deze in de opties te activeren."
+msgstr "Internettoegang is uitgeschakeld, gelieve deze in de opties te activeren."
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Het is gelijkspel"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr "Geheim"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Deelnemen"
 
@@ -1702,13 +1529,12 @@ msgstr "Op server deelnemen"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Deze resolutie behouden"
 
@@ -1727,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Toetsenbord %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1736,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Ronde"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Ronde %i"
@@ -1798,50 +1623,46 @@ msgstr "Linker trigger"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Light shaft (God rays)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Light shaft (God rays) : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Laden"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Lobby"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Lobbyinstellingen"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Lokale gebruikersnaam"
+msgid "Local Name"
+msgstr "Lokale naam"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Op slot: Te openen door uitdagingen te winnen"
 
@@ -1849,11 +1670,51 @@ msgstr "Op slot: Te openen door uitdagingen te winnen"
 msgid "Locked!"
 msgstr "Vergrendeld"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Aanmelden"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Afmelden"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Aangemeld als: %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Je wordt aangemeld"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Je wordt aangemeld als '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Je als gast aanmelden staat je toe om aan online races deel te nemen, maar je kan niet op uitbreidingen stemmen of online prestaties behalen."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Je wordt afgemeld"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "'%s' wordt afgemeld"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Aanmelden"
 
@@ -1864,27 +1725,18 @@ msgstr "Achteruit kijken"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Zoek naar meer vrienden"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr "Luna"
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Drift 5 keer in één ronde."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Doe een race met meer dan 5 ronden."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Marathonloper"
 
@@ -1892,18 +1744,16 @@ msgstr "Marathonloper"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Maximaal aantal spelers"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Maximumtijd (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Alleen voor mij"
 
@@ -1913,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr "Midgetgolf"
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Muggenjager"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Bewegingsvervaging"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Bewegingsvervaging: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "muis as %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1943,48 +1797,41 @@ msgstr "muisknop %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Omlaag verplaatsen"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Omhoog verplaatsen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Meerdere spelers"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Meerdere spelers"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Muziek"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Naam"
 
@@ -2004,13 +1851,15 @@ msgstr "Naam is te lang."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Servernaam"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "De vijver van Nessie"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Nieuw"
 
@@ -2019,9 +1868,13 @@ msgstr "Nieuw"
 msgid "New Grand Prix '%s' now available"
 msgstr "Grand Prix '%s' nu beschikbaar"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nieuwe online account"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nieuw wachtwoord"
 
@@ -2034,7 +1887,7 @@ msgstr "Nieuw verzoek"
 msgid "New difficulty '%s' now available"
 msgstr "Nieuwe moeilijkheidsgraad '%s' is nu beschikbaar"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nieuwe snelste ronde"
 
@@ -2062,19 +1915,18 @@ msgstr "Lachgas"
 msgid "Nitro challenge"
 msgstr "Lachgas uitdaging"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "Nee"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Geen"
 
@@ -2084,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Normale Race"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Noordelijk Oord"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Als het lukt om gedurende enkele seconden te slippen, dan krijg je extra "
-"snelheid als bonus!"
+msgstr "Als het lukt om gedurende enkele seconden te slippen, dan krijg je extra snelheid als bonus!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Beginner"
 
@@ -2111,46 +1959,41 @@ msgstr "Aantal computerspelers: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Aantal karts"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Benodigde doelpunten"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Aantal ronden"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Aantal ronden:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Buiten de gebaande paden"
 
@@ -2158,61 +2001,59 @@ msgstr "Buiten de gebaande paden"
 msgid "Offline"
 msgstr "Offline"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Offline account"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Oh ja, die zit nu in mijn kasteel en wordt opgediend voor het diner..."
+msgstr "Oh ja, die zit nu in mijn kasteel en wordt opgediend voor het diner..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "De Oude Mijn"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliviers Wiskundeklas"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Online"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Online met meerdere spelers"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Online gebruikersnaam"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "Online gebruikersnaam moet tussen de 3 en 30 tekens lang zijn!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Online gebruikersnaam mag niet met een cijfer beginnen!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Alleen de Master van de Game mag nu iets doen op dit moment!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oeps! Bij problemen druk <%s>"
@@ -2223,14 +2064,11 @@ msgstr "Oeps! Bij problemen druk <%s>"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opties"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Overzicht"
 
@@ -2239,35 +2077,30 @@ msgid "POWER"
 msgstr "VERMOGEN"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Parachute - Vertraagd alle karts voor je."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Wachtwoord:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Wachtwoord wijzigen"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Wachtwoord moet tussen de 8 en 30 tekens lang zijn!"
 
@@ -2275,8 +2108,8 @@ msgstr "Wachtwoord moet tussen de 8 en 30 tekens lang zijn!"
 msgid "Password successfully changed."
 msgstr "Wachtwoord is succesvol gewijzigd."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "De wachtwoorden komen niet overeen!"
 
@@ -2287,12 +2120,11 @@ msgstr "Pauzeer spel"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Gepauzeerd"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Straftijd!!"
 
@@ -2301,7 +2133,6 @@ msgid "Pending"
 msgstr "In afwachting"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Speeltuin voor pinguïns"
 
@@ -2310,37 +2141,38 @@ msgid "Performing vote"
 msgstr "Stem uitgeven"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Speel allemaal"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr "Speel elke officieel circuit minimaal 1 keer."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spelers"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Spelers kunnen een extra moeilijkheidsgraad (handicaps) instellen in het kartselectiescherm."
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Geef de naam van de grand prix op"
 
@@ -2349,6 +2181,10 @@ msgstr "Geef de naam van de grand prix op"
 msgid "Please re-configure your key bindings."
 msgstr "Herconfigureer de toetsencombinaties"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Lees de product- en licentievoorwaarden"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Wacht tot de add-ons zijn bijgewerkt"
@@ -2358,48 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Wacht terwijl de add-ons worden geladen"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Gootsteenontstopper - gooi vooruit om je aan hem op te trekken of achteruit "
-"om zijn zicht te benemen."
+msgstr "Gootsteenontstopper - gooi vooruit om je aan hem op te trekken of achteruit om zijn zicht te benemen."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr "Powerup liefde"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Gebruik <%s> om achterom te kijken, druk de vuurknop <%s> tegelijk met <%s> "
-"in om naar achteren te vuren!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Gebruik <%s> om achterom te kijken, druk de vuurknop <%s> tegelijk met <%s> in om naar achteren te vuren!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Druk op <ESC> om te annuleren"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Druk op een toets"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Druk enter of dubbel klik op een apparaat om het te configureren"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Druk op Enter of dubbelklik op een speler voor aanpassingen"
 
@@ -2415,10 +2241,7 @@ msgstr "Druk op de vuurknop om de uitdaging te starten"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Druk knoppen 1 en 2 op de wiimote tegelijk in om discovery mode te "
-"activeren, en klik daarna op Ok. Voor uitgebreide instructies zie "
-"supertuxkart.net/Wiimote"
+msgstr "Druk knoppen 1 en 2 op de wiimote tegelijk in om discovery mode te activeren, en klik daarna op Ok. Voor uitgebreide instructies zie supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2436,7 +2259,6 @@ msgstr "Verwerken"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Profiel"
 
@@ -2445,7 +2267,6 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2453,31 +2274,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Duw de bal in het doel aan de overkant om te scoren. (Alleen beschikbaar met "
-"meerdere spelers)"
+msgstr "Duw de bal in het doel aan de overkant om te scoren. (Alleen beschikbaar met meerdere spelers)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Snel spelen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Einde"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Verlaat de server."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Wedstrijdregels"
 
@@ -2498,8 +2313,8 @@ msgstr "Willekeurige Grand Prix"
 msgid "Random Kart"
 msgstr "Willekeurige Kart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Willekeurig circuit"
 
@@ -2508,83 +2323,68 @@ msgid "Rank"
 msgstr "Rang"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Waardering >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr "Huize Ravenbridge"
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Op uw plaatsen!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr "Het is... een geheim."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Team rood heeft gewonnen"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Registreren"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Standaardrace: Geweld is toegestaan, dus pak wapens en gebruik ze verstandig!"
+msgstr "Standaardrace: Geweld is toegestaan, dus pak wapens en gebruik ze verstandig!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Herladen"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Vensterpositie onthouden"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Verwijder"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -2610,29 +2410,25 @@ msgstr "Herstellen"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Wedstrijd herstarten"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Herstart wedstrijd"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Andersom"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Andersom:"
 
@@ -2689,41 +2485,35 @@ msgstr "Rechter trigger"
 msgid "SPEED"
 msgstr "SNELHEID"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara de racer"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr "Sara de magiër"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Opslaan"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Grand Prix opslaan"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Schotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Zoeken"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Bezig met zoeken"
 
@@ -2733,12 +2523,10 @@ msgid "Select"
 msgstr "Selecteer"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Kies moeilijkheidsgraad"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Kies speltype"
 
@@ -2748,36 +2536,30 @@ msgstr "Kies een parcours"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Selecteer kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Verzend anonieme HW-statistieken"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Server aanmaken"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Serverinformatie"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Serverselectie"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Servernaam:"
 
@@ -2792,93 +2574,49 @@ msgstr "Klaar?"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nieuwe wedstrijd"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Schaduwen"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Schaduwen: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Schaduwen: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Vloek van de Farao"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Fonkelende Voorstad"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Inloggen"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Als gast inloggen"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Uitloggen"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Ingelogd als: %s"
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Bezig met inloggen"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Inloggen als '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Als ja als gast ingelogd bent mag je aan online races meedoen, maar stemmen "
-"op add-ons mag niet en prestaties worden niet bijgehouden."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Uitloggen"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Uitloggen als '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Sinds"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Enkele speler"
 
@@ -2888,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Grootte: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr "Glijpartij"
 
@@ -2899,12 +2636,10 @@ msgstr "Slippen"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Thema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Sneeuwpiek"
 
@@ -2914,30 +2649,23 @@ msgid "Soccer"
 msgstr "Voetbal"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Voetbalveld"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Voetbal: Alleen voor meerdere spelers. Gebruik je kart om de bal in het doel "
-"te duwen."
+msgstr "Voetbal: Alleen voor meerdere spelers. Gebruik je kart om de bal in het doel te duwen."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Sorry, de verbinding met de add-on website is mislukt. Controleer uw "
-"internetverbinding en controleer dat SuperTuxKart niet door een firewall "
-"wordt geblokkeerd."
+msgstr "Sorry, de verbinding met de add-on website is mislukt. Controleer uw internetverbinding en controleer dat SuperTuxKart niet door een firewall wordt geblokkeerd."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2945,7 +2673,6 @@ msgstr "Sorry, de add-on kon niet worden gedownload"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Geluidseffecten"
 
@@ -2954,7 +2681,6 @@ msgstr "Geluidseffecten"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standaard"
 
@@ -2967,11 +2693,10 @@ msgstr "Start"
 msgid "Start Grand Prix"
 msgstr "Start Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Start wedstrijd"
 
@@ -2991,12 +2716,10 @@ msgstr "Stuur rechts"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Verhaalmodus"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr "Strike!"
 
@@ -3004,143 +2727,120 @@ msgstr "Strike!"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Verstuur"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Onder de Zee"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Downloads"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart Hulp"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart-instellingen"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart kan door meerdere spelers op dezelfde computer gespeeld worden"
+msgstr "SuperTuxKart kan door meerdere spelers op dezelfde computer gespeeld worden"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart heeft meerdere speltypen"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
-"SuperTuxKart moet verbinding met het internet maken om add-ons te downloaden "
-"en je te waarschuwen over updates. Wij verzamelen ook geanonimiseerde "
-"gegevens over hardwareprestaties t.b.v. productverbetering. Wil je deze "
-"optie activeren? (Om deze instelling later te wijzigen, ga naar opties, kies "
-"tabblad 'gebruikersinterface' en wijzig opties \"verbinden met het "
-"internet\" en \"verstuur anonieme HW-statistieken\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart moet verbinding met het internet maken om add-ons te downloaden en je te waarschuwen over updates. Wij verzamelen ook geanonimiseerde gegevens over hardwareprestaties t.b.v. productverbetering. Lees onze privacyverklaring op http://privacy.supertuxkart.net. Wil je deze optie activeren? (Om deze instelling later te wijzigen, ga naar opties, kies tabblad 'gebruikersinterface' en wijzig opties \"verbinden met het internet\" en \"verstuur anonieme HW-statistieken\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Wisselaar - Voor een beperkte tijd worden cadeaus omgezet in bananen en "
-"omgekeerd."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Wisselaar - Voor een beperkte tijd worden cadeaus omgezet in bananen en omgekeerd."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Vliegenmepper - Plet karts naast je, waardoor ze langzamer gaan rijden."
+msgstr "Vliegenmepper - Plet karts naast je, waardoor ze langzamer gaan rijden."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Taal van Besturingssysteem"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Behandel je tegenstanders als vliegen! Mep, gebruik makend van de vliegenmepper, in één race 5 tegenstanders op hun hoofd."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "De tempel"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Gebruiksvoorwaarden"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Texture compression"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Texturen filteren"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Met de \"slippen\"-knop kun je scherpe bochten maken en een snelheidsbonus "
-"krijgen."
+msgstr "Met de \"slippen\"-knop kun je scherpe bochten maken en een snelheidsbonus krijgen."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Het Stadion"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"De add-on-module is op het moment uitgeschakeld in het Instellingen-scherm"
+msgstr "De add-on-module is op het moment uitgeschakeld in het Instellingen-scherm"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Het recordbestand was te oud,\n"
-"de records zijn verwijderd."
+msgstr "Het recordbestand was te oud,\nde records zijn verwijderd."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3153,40 +2853,22 @@ msgstr "Tegen de klok"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tegen de klok: Er zijn geen bonus items, dus alles hangt van je "
-"stuurmanskunst af!"
+msgstr "Tegen de klok: Er zijn geen bonus items, dus alles hangt van je stuurmanskunst af!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Plug je Gamepad/Joystick in de computer, zet hem aan (indien nodig), en "
-"start SuperTuxKart. De Gamepad/Joystick staat dan in deze lijst.\n"
-"\n"
-"Onderstaande knop voegt een toetsenbordconfiguratie toe, maar LET OP: \n"
-"De meeste toetsenborden kunnen maar een beperkt aantal toetsaanslagen per "
-"keer verwerken, wat spelen onmogelijk maakt. Je kan meerdere toetsenborden "
-"aan 1 computer verbinden, maar de twee spelers moeten nog steeds "
-"verschillende toetscombinaties gebruiken."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Plug je Gamepad/Joystick in de computer, zet hem aan (indien nodig), en start SuperTuxKart. De Gamepad/Joystick staat dan in deze lijst.\n\nOnderstaande knop voegt een toetsenbordconfiguratie toe, maar LET OP: \nDe meeste toetsenborden kunnen maar een beperkt aantal toetsaanslagen per keer verwerken, wat spelen onmogelijk maakt. Je kan meerdere toetsenborden aan 1 computer verbinden, maar de twee spelers moeten nog steeds verschillende toetscombinaties gebruiken."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Om je te helpen, kun je deze dingen verzamelen en gebruiken:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Naar de maan en terug"
 
@@ -3205,7 +2887,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr "Circuit"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Circuit %i/%i"
@@ -3219,19 +2901,17 @@ msgstr "Parcours door %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Circuitgroep"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Parcours"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilineair"
 
@@ -3242,24 +2922,21 @@ msgstr "Opnieuw proberen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Klaslokaal: Selectie"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Type :"
 
@@ -3267,22 +2944,18 @@ msgstr "Type :"
 msgid "Type: Grand Prix"
 msgstr "Type: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"Verbinding maken met de server is mislukt. Controleer je internetverbinding "
-"of probeer later nog eens."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Verbinding maken met de server is mislukt. Controleer je internetverbinding of probeer later nog eens."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Deïnstalleren"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr "Onstuitbaar"
 
@@ -3296,8 +2969,8 @@ msgid "Update"
 msgstr "Bijwerken"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Bijgewerkt"
 
@@ -3306,40 +2979,36 @@ msgid "Updated date"
 msgstr "Bijgewerkt op"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr "Gebruik 10 of meer powerups in een race."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Gebruik texturen met hoge resolutie"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr "Kies een team met links/rechts en druk daarna op de vuurknop"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Gebruik het verzamelde lachgas door <%s> in te drukken!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Gebruikersinformatie"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Gebruikersinterface"
 
@@ -3348,19 +3017,17 @@ msgid "User defined"
 msgstr "Aangepast"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Gebruikers zoeken"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -3369,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr "Gebruikersnaam en/of e-mailadres is ongeldig"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "tegen"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Informatie valideren"
 
@@ -3386,27 +3052,23 @@ msgstr "Versie: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Verticale synchronisatie"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Bekijk"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Stem"
 
@@ -3418,7 +3080,7 @@ msgstr "Je hebt gestemd! Sluit nu dit scherm"
 msgid "WEIGHT"
 msgstr "GEWICHT"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "VERKEERDE RICHTING!"
 
@@ -3427,59 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Let Op: 'Shift' is een slechte toets om te gebruiken. Wanner shift ingedrukt "
-"is, werken andere toetsen niet meer omdat hoofd- en kleine letters "
-"verschillend worden behandeld."
+msgstr "Let Op: 'Shift' is een slechte toets om te gebruiken. Wanner shift ingedrukt is, werken andere toetsen niet meer omdat hoofd- en kleine letters verschillend worden behandeld."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Wapens"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Weereffecten"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Weerseffecten: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-"Wat is er aan de hand, kleine hippies? Is jullie grote gnoe-leider kwijt?"
+msgstr "Wat is er aan de hand, kleine hippies? Is jullie grote gnoe-leider kwijt?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Nadat alle controllers gedefinieerd zijn, kan het spel beginnen. Kies de "
-"optie \"meerdere spelers\" in het hoofdmenu. Bij het kiezen van een kart kan "
-"iedereen de vuurknop indrukken (die op hun eigen controller) om mee te doen. "
-"Het spel start als iedereen een kart heeft gekozen. Let op: De muis mag "
-"hiervoor niet gebruikt worden."
+msgstr "Nadat alle controllers gedefinieerd zijn, kan het spel beginnen. Kies de optie \"meerdere spelers\" in het hoofdmenu. Bij het kiezen van een kart kan iedereen de vuurknop indrukken (die op hun eigen controller) om mee te doen. Het spel start als iedereen een kart heeft gekozen. Let op: De muis mag hiervoor niet gebruikt worden."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3487,43 +3135,36 @@ msgid "White"
 msgstr "Wit"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr "Win 5 races op een rij."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
-"Win in alle spelmodussen voor één persoon, met minimaal 3 tegenstanders."
+msgstr "Win in alle spelmodussen voor één persoon, met minimaal 3 tegenstanders."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR951"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Je bent nu klaar om te racen. Veel succes!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Je speelt als"
 
@@ -3533,46 +3174,36 @@ msgstr "Je kan je stem aanpassen door op de sterren beneden te klikken."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
-"Zonder internettoegang kunnen geen add-ons worden gedownload. Ga, als je add-"
-"ons wilt downloaden, naar opties, selecteer de tab 'Gebruikersinterface' en "
-"selecteer de optie 'Verbinden met het internet'."
+msgstr "Zonder internettoegang kunnen geen add-ons worden gedownload. Ga, als je add-ons wilt downloaden, naar opties, selecteer de tab 'Gebruikersinterface' en selecteer de optie 'Verbinden met het internet'."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
-"Zonder internettoegang kun je niet online spelen. Ga, als je online wilt "
-"spelen, naar opties, selecteer de tab 'Gebruikersinterface' en selecteer de "
-"optie 'Verbinden met het internet'."
+msgstr "Zonder internettoegang kun je niet online spelen. Ga, als je online wilt spelen, naar opties, selecteer de tab 'Gebruikersinterface' en selecteer de optie 'Verbinden met het internet'."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
-"Je kunt online spelen zonder een account aan te maken door de online box uit "
-"te vinken, maar daardoor kun je geen contact maken met vrienden, op add-ons "
-"stemmen, etc. Lees onze privacyverklaring op http://privacy.supertuxkart.net"
+msgstr "Je kan spelen zonder een online account te creëren door \"offline account\" te selecteren. Besef dat je dan niet met vrienden kan verbinden, op uitbreidingen stemmen, enz. Ons privacy beleid kan je terugvinden op http://privacy.supertuxkart.net (Engels)."
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Je hebt een uitdaging volbracht!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Je hebt uitdagingen volbracht!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Je hebt de Grand Prix voltooid!"
 
@@ -3580,38 +3211,35 @@ msgstr "Je hebt de Grand Prix voltooid!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Je hebt een moeilijke uitdaging afgerond! Punten verzameld op dit niveau: "
-"%i/%i"
+msgstr "Je hebt een moeilijke uitdaging afgerond! Punten verzameld op dit niveau: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Je hebt een makkelijke uitdaging afgerond! Punten verzameld op dit niveau: "
-"%i/%i"
+msgstr "Je hebt een makkelijke uitdaging afgerond! Punten verzameld op dit niveau: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Je hebt een normale uitdaging afgerond! Punten verzameld op dit niveau: %i/%i"
+msgstr "Je hebt een normale uitdaging afgerond! Punten verzameld op dit niveau: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Race afgelopen!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Je hebt %i nieuwe vriendverzoeken!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Je hebt %d nieuw vriendverzoek!"
+msgstr[1] "Je hebt %d nieuwe vriendverzoeken!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Je hebt een nieuw vriendverzoek!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Je bent uitgeschakeld!"
 
@@ -3619,76 +3247,71 @@ msgstr "Je bent uitgeschakeld!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Je hebt nog niet op deze add-on gestemd. Selecteer hierbeneden het aantal "
-"sterren te selecteren dat je wilt geven"
+msgstr "Je hebt nog niet op deze add-on gestemd. Selecteer hierbeneden het aantal sterren te selecteren dat je wilt geven"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Je hebt meer punten nodig \n"
-"om deze uitdaging te starten! \n"
-"Bekijk de kleine kaart voor \n"
-"beschikbare uitdagingen."
+msgstr "Je hebt meer punten nodig \nom deze uitdaging te starten! \nBekijk de kleine kaart voor \nbeschikbare uitdagingen."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Je moet een wachtwoord invoeren."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Je hebt Grand Prix %0 ontgrendeld"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Je hebt circuit %0 ontgrendeld"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Je krijgt een e-mail met verdere instructies m.b.t. het resetten van je "
-"wachtwoord. Dit kan enige tijd duren. Controleer ook de spammap."
+msgstr "Je krijgt een e-mail met verdere instructies m.b.t. het resetten van je wachtwoord. Dit kan enige tijd duren. Controleer ook de spammap."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Je krijgt een e-mail met verdere instructies m.b.t. het activeren van het "
-"account. Dit kan enige tijd duren. Controleer ook de spammap."
+msgstr "Je krijgt een e-mail met verdere instructies m.b.t. het activeren van het account. Dit kan enige tijd duren. Controleer ook de spammap."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Je hebt de race gewonnen!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Je OpenGL-versie is waarschijnlijk te oud. Indien mogelijk, installeer een update voor uw video-driver. SuperTuxKart vereist OpenGL 3.1 of hoger."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Je configuratie bestand was misvormd, dus het was verwijderd en er zal een "
-"nieuwe worden gemaakt."
+msgstr "Je configuratie bestand was misvormd, dus het was verwijderd en er zal een nieuwe worden gemaakt."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Je configuratiebestand was te oud, dus het was verwijderd en een nieuwe zal "
-"worden aangemaakt."
+msgstr "Je configuratiebestand was te oud, dus het was verwijderd en een nieuwe zal worden aangemaakt."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Je video driver versie is te oud. Installeer meer recente video drivers."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Je invoer configuratiebestand is niet verenigbaar met deze versie van STK ."
+msgstr "Je invoer configuratiebestand is niet verenigbaar met deze versie van STK ."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3696,7 +3319,6 @@ msgid "Your profile"
 msgstr "Jouw profiel"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Meditatietuin"
 
@@ -3707,7 +3329,6 @@ msgstr "[geen]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "acties"
 
@@ -3716,7 +3337,8 @@ msgstr "acties"
 msgid "all"
 msgstr "alles"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "door"
@@ -3725,56 +3347,25 @@ msgstr "door"
 msgid "featured"
 msgstr "aanbevolen"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr "oogst"
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "hoog"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "laag"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "Newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr "Sara de racer"
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Standaard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Amy Smile Kerkhof https://launchpad.net/~amy\n"
-"  Asciimonster https://launchpad.net/~asciimonster-myrealbox\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Foppe Benedictus https://launchpad.net/~foppe-benedictus\n"
-"  Guus https://launchpad.net/~guus-verbeek\n"
-"  Kaj-Ivar https://launchpad.net/~kaj-ivar\n"
-"  Koen_VL https://launchpad.net/~koenvl\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Vistaus https://launchpad.net/~vistaus\n"
-"  Ward Muylaert https://launchpad.net/~ward-muylaert\n"
-"  Willem Sonke https://launchpad.net/~willem-sonke\n"
-"  Wim Champagne https://launchpad.net/~fng-deactivatedaccount-"
-"deactivatedaccount\n"
-"  plutgamer https://launchpad.net/~plutgamer\n"
-"  toams https://launchpad.net/~toams"
+msgstr "Launchpad Contributions:\n  Amy Smile Kerkhof https://launchpad.net/~amy\n  Asciimonster https://launchpad.net/~asciimonster-myrealbox\n  Dawid Gan https://launchpad.net/~deveee\n  Foppe Benedictus https://launchpad.net/~foppe-benedictus\n  Guus https://launchpad.net/~guus-verbeek\n  Heimen Stoffels https://launchpad.net/~vistaus\n  Kaj-Ivar https://launchpad.net/~kaj-ivar\n  Koen_VL https://launchpad.net/~koenvl\n  STK-team https://launchpad.net/~stk\n  Ward Muylaert https://launchpad.net/~ward-muylaert\n  Willem Sonke https://launchpad.net/~willem-sonke\n  Wim Champagne https://launchpad.net/~fng-deactivatedaccount-deactivatedaccount\n  plutgamer https://launchpad.net/~plutgamer\n  toams https://launchpad.net/~toams"
diff --git a/data/po/nn.po b/data/po/nn.po
index fece0915b..7cf1b26a3 100644
--- a/data/po/nn.po
+++ b/data/po/nn.po
@@ -1,24 +1,22 @@
-# Norwegian Nynorsk translation for stk
-# Copyright © 2011 Karl Ove Hufthammer
-# This file is distributed under the same license as the stk package.
-#
-#
-# Karl Ove Hufthammer <karl@huftis.org>, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Karl Ove Hufthammer <karl@huftis.org>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/supertuxkart/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -29,39 +27,38 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr " Men de patetiske små naut slår aldri meg – køyrekongen!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
 
-# Har sjekka at det er snakk om 1024 byte.
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
 #, c-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-# Har sjekka at det er snakk om 1024² byte.
 #: src/states_screens/dialogs/addons_loading.cpp:165
 #, c-format
 msgid "%s MB"
 msgstr "%s MiB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -73,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s by %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s er klar"
@@ -100,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s er no ute av spelet."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tom)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(nettverksspel er ikkje mogleg enno)"
 
@@ -132,45 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Du kan sjå og endra gjeldande tasteoppsett i «Oppsett»-menyen."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Du kan òg spela dei fleste spelvariantane i turnering. I staden for å "
-"køyra eitt løp, køyrer du då fleire på rad. Jo betre plassering du har i eit "
-"løp, desto meir poeng får du. Spelaren som sit att med flest poeng til slutt "
-"vinn turneringa."
+msgstr "* Du kan òg spela dei fleste spelvariantane i turnering. I staden for å køyra eitt løp, køyrer du då fleire på rad. Jo betre plassering du har i eit løp, desto meir poeng får du. Spelaren som sit att med flest poeng til slutt vinn turneringa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -201,7 +184,6 @@ msgstr "Tre liv"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -220,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Rekordar ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Avbryt turneringa"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Om"
 
@@ -245,39 +224,35 @@ msgstr "Om"
 msgid "Accelerate"
 msgstr "Akselerer"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Akselerer og trykk <%s> men du svingar for å skrensa. Om du skrensar litt, "
-"kan du klara å ta krappare svingar."
+msgstr "Akselerer og trykk <%s> men du svingar for å skrensa. Om du skrensar litt, kan du klara å ta krappare svingar."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Akselerer med <%s> og styr med <%s> og <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -285,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -296,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -313,7 +285,6 @@ msgstr "Legg til tasteoppsett"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Legg til spelar"
 
@@ -324,32 +295,29 @@ msgstr "Legg til Wii-kontroll"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Legg til eining"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Tillegg"
 
@@ -359,49 +327,43 @@ msgstr "Namn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Tillegg"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alle"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alle banene"
 
@@ -411,18 +373,20 @@ msgstr "Alt er lov, så plukk opp våpen og gjer god nytte av dei!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -432,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Anker: Sakkar kraftig farten til bilen som ligg på førsteplass."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animerte figurar"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animerte køyretøy: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animerte landskap"
 
@@ -458,24 +419,24 @@ msgstr "Animerte landskap"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animerte omgjevnader: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -485,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Bruk ny oppløysing"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -522,49 +479,44 @@ msgstr "Er du sikker på at du vil sletta dette oppsettet?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenaer"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Bruk Escape-knappen"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Ved verdas ende"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Lyd"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Unngå bananer!"
 
@@ -586,81 +538,66 @@ msgstr "Akse %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Tilbake"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Tilbake til spelet"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Tilbake til løpet"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Tilbake til einingslista"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Tilbake til menyen"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Tilbake til menyen"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basketball: Sprett etter personen som leiar, og kan knusa og saktna andre "
-"køyretøy på vegen."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basketball: Sprett etter personen som leiar, og kan knusa og saktna andre køyretøy på vegen."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Kampøya"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Betre lukke neste gong!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -670,39 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Svartås herregard"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Herlege høyballar"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingball: Sprett når han treff autovernet. Sjå bakover for å hiva han ut "
-"bak deg."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingball: Sprett når han treff autovernet. Sjå bakover for å hiva han ut bak deg."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -710,7 +641,6 @@ msgid "Brake"
 msgstr "Brems"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -718,54 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kake: Vert hiven mot den næraste motstandaren. Verkar best på korte "
-"avstandar eller på lange, rette vegstrekningar."
+msgstr "Kake: Vert hiven mot den næraste motstandaren. Verkar best på korte avstandar eller på lange, rette vegstrekningar."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Får ikkje tilgang til stkaddons-tenaren …"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -779,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Avbryt/tilbake"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Hole X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Klarte utfordringa"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Klarte ikkje utfordringa"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Utfordringar - troférom"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -806,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Vel køyretøy"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Trykk her for ei innføring i spelet"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Lukk"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Samla blå boksar. Dei gjev deg våpen og andre fordelar."
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "Plukk opp gåver, og trykk så <%s> for å bruka dei!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Plukk opp nitroflasker (me skal bruka dei etter svingen)"
 
@@ -870,16 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitroar gjev deg høgare fart når du trykkjer på nitrotasten. Du kan sjå kor "
-"mykje nitro du har att i nitromålaren til høgre på skjermen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitroar gjev deg høgare fart når du trykkjer på nitrotasten. Du kan sjå kor mykje nitro du har att i nitromålaren til høgre på skjermen."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -892,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -904,7 +810,6 @@ msgstr "Stadfest oppløysing innan %i sekund"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -918,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Inneheld ingen bonusar, så berre køyreteknikken din har noko å seia!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Hald fram"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontrollar"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Fann ikkje nokon Wii-kontroll"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Bidragsytarar"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1021,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Tilpassa"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Eigne innstillingar"
 
@@ -1053,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1061,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Slett oppsett"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1095,24 +979,23 @@ msgstr "Slå av eining"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Av"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Vis biletrate"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Er du sikker på at du vil avbryta turneringa?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Er du sikker på at du vil sletta spelaren «%s»?"
@@ -1121,8 +1004,8 @@ msgstr "Er du sikker på at du vil sletta spelaren «%s»?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Ikkje køyr før startsignalet går!"
 
@@ -1133,27 +1016,24 @@ msgstr "Pil ned"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1164,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1174,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "Egg: %d/%d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "ElePHPant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Ute"
 
@@ -1187,24 +1065,22 @@ msgstr "Ute"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1216,27 +1092,24 @@ msgstr "Bruk eining"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "PÃ¥"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "PÃ¥ for alle"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Skriv inn namnet på spelaren"
 
@@ -1249,31 +1122,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Alle:\nTrykk «Vel» for å verta med i spelet!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Alle:\n"
-"Trykk «Vel» for å verta med i spelet!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Avslutt løpet"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ekspert"
 
@@ -1281,12 +1154,12 @@ msgstr "Ekspert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1311,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Siste runde!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1334,20 +1205,14 @@ msgstr "Skyt"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"De treng fleire styreeiningar (det beste er å ha fleire handhaldne "
-"spelkontrollarar eller styrespakar). GÃ¥ til oppsettmenyen for styreeiningar "
-"og set opp einingane. De kan òg spela på (eitt eller fleire) tastatur, men "
-"kvar spelar må ha sine eigne tastar, og mange tastatur støttar ikkje at ein "
-"held inne mange tastar samtidig."
+msgstr "De treng fleire styreeiningar (det beste er å ha fleire handhaldne spelkontrollarar eller styrespakar). Gå til oppsettmenyen for styreeiningar og set opp einingane. De kan òg spela på (eitt eller fleire) tastatur, men kvar spelar må ha sine eigne tastar, og mange tastatur støttar ikkje at ein held inne mange tastar samtidig."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1360,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1368,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Fann %d Wii-kontroll(ar)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1399,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
@@ -1419,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Speltastar"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spelmodus"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1450,51 +1311,45 @@ msgstr "Spelkontroll-knapp %d"
 msgid "Gamepad hat %d"
 msgstr "Styrespak %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Generelt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Gje opp"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "GNU"
 
@@ -1504,61 +1359,53 @@ msgid "Go!"
 msgstr "Køyr!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Turnering"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Turneringsframgang"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafiske effektar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafikk"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafikkoppsett"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Min barndoms dal"
 
@@ -1575,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Haciendaen"
 
@@ -1590,22 +1435,18 @@ msgstr "Haciendaen"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hjelp"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Rekordar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1613,80 +1454,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Treff dei andre med våpen til dei ikkje har nokon liv igjen (berre i "
-"fleirspelarmodus)"
+msgstr "Treff dei andre med våpen til dei ikkje har nokon liv igjen (berre i fleirspelarmodus)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Berre menneske"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
-"Viss du kan slå meg i kapplaup, skal eg sleppa den gamle sulliken fri."
+msgstr "Viss du kan slå meg i kapplaup, skal eg sleppa den gamle sulliken fri."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Viss du ser ein knapp med ein lås som denne, må du fullføra ei utfordring "
-"for å låsa han opp."
+msgstr "Viss du ser ein knapp med ein lås som denne, må du fullføra ei utfordring for å låsa han opp."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "«%s» kom ikkje med. Du må melda deg på tidlegare om du vil verta med!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
-"«%s» kom ikkje med. Du må melda deg på tidlegare om du vil verta med!"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installer"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Vidarekommen"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1696,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Køyretøy"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Behald oppløysinga"
 
@@ -1721,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr "Tastatur %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1730,7 +1560,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Runde"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Runde %i"
@@ -1792,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Lastar"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "LÃ¥st"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Låst: Fullfør utfordringar for å få tilgang til meir!"
 
@@ -1843,11 +1669,51 @@ msgstr "Låst: Fullfør utfordringar for å få tilgang til meir!"
 msgid "Locked!"
 msgstr "LÃ¥st!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1858,27 +1724,18 @@ msgstr "Sjå bakover"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1886,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Berre meg"
 
@@ -1907,29 +1762,33 @@ msgid "Menu Keys"
 msgstr "Menytastar"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Museakse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1937,48 +1796,41 @@ msgstr "Museknapp %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Fleirspelar"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Fleirspelar"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musikk"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1998,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2013,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Den nye turneringa «%s» er no tilgjengeleg"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2028,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Den nye vanskegraden «%s» er no tilgjengeleg"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Ny runderekord"
 
@@ -2056,19 +1914,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ingen"
 
@@ -2078,23 +1935,19 @@ msgid "Normal Race"
 msgstr "Vanleg løp"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Høgfjellshotell"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Viss du klarar å skrensa i fleire sekund, får du ein fartsbonus som lønn for "
-"strevet!"
+msgstr "Viss du klarar å skrensa i fleire sekund, får du ein fartsbonus som lønn for strevet!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nybegynnar"
 
@@ -2105,46 +1958,41 @@ msgstr "Talet på datamotstandardar: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Talet på datamotstandarar"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Talet på mål å vinna"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Utanfor allfarveg"
 
@@ -2152,61 +2000,59 @@ msgstr "Utanfor allfarveg"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"Du skjønar, han er i slottet mitt no, og vert servert til kveldsmat …"
+msgstr "Du skjønar, han er i slottet mitt no, og vert servert til kveldsmat …"
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Den gamle gruva"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Olivers mattetime"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Berre spelleiaren kan gjera noko no!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oi sann! Når du får problem, kan du trykkja <%s> for å verta redda"
@@ -2217,14 +2063,11 @@ msgstr "Oi sann! Når du får problem, kan du trykkja <%s> for å verta redda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Oppsett"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2233,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Fallskjerm: Sakkar farten til alle framfor deg."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2269,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2281,12 +2119,11 @@ msgstr "Pause"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pause"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Straffetid!"
 
@@ -2295,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinkampen"
 
@@ -2304,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Spel alle"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spelarar"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2343,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Set opp tastane på nytt."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Vent mens tillegga vert oppdaterte"
@@ -2352,46 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Vent mens tillegga vert lasta inn"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Sugekopp: Skyt framover for å dra ein motstandar bakover, eller skyt mens du "
-"ser bakover for å sperra utsikta."
+msgstr "Sugekopp: Skyt framover for å dra ein motstandar bakover, eller skyt mens du ser bakover for å sperra utsikta."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Trykk «Escape» for å avbryta"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Trykk ein tast"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Trykk «Enter» eller dobbeltklikk på ei eining for å setja ho opp"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Trykk «Enter» eller dobbeltklikk på ein spelar for å redigera han"
 
@@ -2425,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2434,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2442,30 +2273,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Få ballen til motsett mål for å skåra poeng (berre i fleirspelarspel)."
+msgstr "Få ballen til motsett mål for å skåra poeng (berre i fleirspelarspel)."
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Set opp løp"
 
@@ -2486,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Tilfeldig køyretøy"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Tilfeldig bane"
 
@@ -2496,82 +2322,68 @@ msgid "Rank"
 msgstr "Plass"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Klar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Hugs vindaugsplasseringa"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Fjern"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Endra namn"
 
@@ -2597,29 +2409,25 @@ msgstr "Redd"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Oppløysing"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Start på nytt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Start løpet på nytt"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Baklengs"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2676,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skottland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2720,12 +2522,10 @@ msgid "Select"
 msgstr "Vel"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Vel spelmodus"
 
@@ -2735,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Vel køyretøy"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2779,91 +2573,49 @@ msgstr "Ferdig"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Set opp nytt løp"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Solfylte sanddyner"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Blendande byliv"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2873,7 +2625,6 @@ msgid "Size: %s"
 msgstr "Storleik: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2884,12 +2635,10 @@ msgstr "Sladding"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snødekte svingar"
 
@@ -2899,28 +2648,23 @@ msgid "Soccer"
 msgstr "Fotball"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Fotballbane"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Klarte ikkje kontakta nettstaden som har speltillegga. Sjå til at du er "
-"kopla til Internett, og at ein brannmur ikkje hindrar SuperTuxKart å få "
-"kontakt med nettet."
+msgstr "Klarte ikkje kontakta nettstaden som har speltillegga. Sjå til at du er kopla til Internett, og at ein brannmur ikkje hindrar SuperTuxKart å få kontakt med nettet."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2928,7 +2672,6 @@ msgstr "Klarte ikkje last ned tillegget"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Lydeffektar"
 
@@ -2937,7 +2680,6 @@ msgstr "Lydeffektar"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
@@ -2950,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Start turnering"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Start løp"
 
@@ -2974,12 +2715,10 @@ msgstr "Sving til høgre"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Forteljingsmodus"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2987,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Undersjøisk"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart-tillegg"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart-hjelp"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart-oppsett"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "Fleire kan spela SuperTuxKart samtidig på same datamaskin"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart har fleire spelmodusar"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "Forvandling: Gjer om gåver til bananer og omvendt ei kort stund."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Flogesmekke: Skvips bilar i nærleiken, som sakkar farten deira."
 
@@ -3071,33 +2797,37 @@ msgstr "Flogesmekke: Skvips bilar i nærleiken, som sakkar farten deira."
 msgid "System Language"
 msgstr "Systemspråk"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Teksturfiltrering"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Med sladdetasten kan du sladda i krappe svingar for å komma raskare gjennom."
+msgstr "Med sladdetasten kan du sladda i krappe svingar for å komma raskare gjennom."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadionet"
 
@@ -3109,9 +2839,7 @@ msgstr "Tillegg-modulen er slått av i «Oppsett»-menyen"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Rekordfila var for gammal, og\n"
-"alle rekordane vart derfor fjerna."
+msgstr "Rekordfila var for gammal, og\nalle rekordane vart derfor fjerna."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3124,39 +2852,22 @@ msgstr "Tidsløp"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tidsløp: Inneheld ingen bonusar, så berre køyreteknikken din har noko å seia!"
+msgstr "Tidsløp: Inneheld ingen bonusar, så berre køyreteknikken din har noko å seia!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Viss du vil leggja til ein ny spelkontroll/styrespak, treng du berre starta "
-"spelet når han er kopla til.\n"
-"\n"
-"Du kan leggja til eit tasteoppsett med knappen nedanfor. Men merk at dei "
-"fleste tastatura berre støttar at du held inne eit visst tal på tastar "
-"samtidig, og vil derfor fungera dårleg for fleire spelarar. Du kan òg kopla "
-"fleire tastatur til datamaskina, men hugs at alle spelarane likevel må bruka "
-"ulike tastar."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Viss du vil leggja til ein ny spelkontroll/styrespak, treng du berre starta spelet når han er kopla til.\n\nDu kan leggja til eit tasteoppsett med knappen nedanfor. Men merk at dei fleste tastatura berre støttar at du held inne eit visst tal på tastar samtidig, og vil derfor fungera dårleg for fleire spelarar. Du kan òg kopla fleire tastatur til datamaskina, men hugs at alle spelarane likevel må bruka ulike tastar."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "For å hjelpa deg å vinna, kan du plukka opp bonusgjenstandar:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Til månen og tilbake"
 
@@ -3175,7 +2886,7 @@ msgstr "%i beste"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3189,19 +2900,17 @@ msgstr "Bana er laga av %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Baner"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3212,24 +2921,21 @@ msgstr "Prøv på nytt"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Opplæringsbane"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Opplæring: valrommet"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Type:"
 
@@ -3237,20 +2943,18 @@ msgstr "Type:"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Avinstaller"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3264,8 +2968,8 @@ msgid "Update"
 msgstr "Oppdater"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3274,40 +2978,36 @@ msgid "Updated date"
 msgstr "Oppdatert"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Trykk <%s> for å bruka nitroflaska!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Grensesnitt"
 
@@ -3316,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3337,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "mot"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3354,27 +3051,23 @@ msgstr "Versjon: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertikal synkronisering (krev omstart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Lydstyrke"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3386,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "FEIL VEG!"
 
@@ -3395,57 +3088,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Åtvaring: Du bør ikkje bruka tasten «Shift», sidan alle tastar som endrar "
-"teikn når du held inne «Shift» då vil slutta å fungera skikkeleg."
+msgstr "Åtvaring: Du bør ikkje bruka tasten «Shift», sidan alle tastar som endrar teikn når du held inne «Shift» då vil slutta å fungera skikkeleg."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "VÃ¥pen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Vêreffektar"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Vêreffektar: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Kva er gale, små hippiar?  Saknar de den store gnu-leiaren dykkar?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Når de har sett opp styreeiningane, er de klar til å spela. Vel «Fleire "
-"spelarar» frå hovudmenyen. Når de skal velja køyretøy, kan kvar spelar "
-"trykkja på «Skyt»-knappen på si styreeining for å slutta seg til spelet. "
-"Spelet held så fram når alle spelarane har valt eit køyretøy. Merk at de "
-"ikkje kan bruka musa her."
+msgstr "Når de har sett opp styreeiningane, er de klar til å spela. Vel «Fleire spelarar» frå hovudmenyen. Når de skal velja køyretøy, kan kvar spelar trykkja på «Skyt»-knappen på si styreeining for å slutta seg til spelet. Spelet held så fram når alle spelarane har valt eit køyretøy. Merk at de ikkje kan bruka musa her."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3453,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Du er no klar til å køyra. Lykke til!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Du spelar som"
 
@@ -3498,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Du klarte ei utfordring!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Du klarte utfordringar!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Du fullførte turneringa!"
 
@@ -3549,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Du fullførte løpet!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Du er no ute av løpet!"
 
@@ -3572,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3580,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Du låste opp turneringa %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Du låste opp bana %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Du vann løpet!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3622,6 +3303,11 @@ msgid ""
 "created."
 msgstr "Oppsettfila var for gammal, og vart derfor sletta."
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "Spelkontrollfila er ikkje kompatibel med denne versjonen av spelet."
@@ -3632,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen-hagen"
 
@@ -3643,7 +3328,6 @@ msgstr "[ingen]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3652,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "av"
@@ -3661,43 +3346,25 @@ msgstr "av"
 msgid "featured"
 msgstr "Anbefalt"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "Vanleg"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Alexander Mackinnon Jansen https://launchpad.net/~alexander-jansen\n"
-"  Karl Ove Hufthammer https://launchpad.net/~huftis"
+msgstr "Launchpad Contributions:\n  Alexander Mackinnon Jansen https://launchpad.net/~alexander-jansen\n  Karl Ove Hufthammer https://launchpad.net/~huftis"
diff --git a/data/po/os.po b/data/po/os.po
index 395ba4d48..f0e55437f 100644
--- a/data/po/os.po
+++ b/data/po/os.po
@@ -1,22 +1,22 @@
-# Ossetian translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:05+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Ossetian <os@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/supertuxkart/language/os/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s цӕттӕ у"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(�фтид)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Рекордтӕ ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Хъазты тыххӕй"
 
@@ -237,37 +224,35 @@ msgstr "Хъазты тыххӕй"
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Хъазӕджы бафтауын"
 
@@ -314,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Гарз бафтауын"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "�ддонтӕ"
 
@@ -349,49 +327,43 @@ msgstr "�ддоны ном"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "�ддонтӕ"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Иууылдӕр"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Фӕндӕгтӕ иууылдӕр"
 
@@ -401,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�ренатӕ"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Зӕл"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Банантӕй дӕхи хиз!"
 
@@ -576,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Фӕ�тӕмӕ"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Фӕ�тӕмӕ рей�мӕ"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Фӕ�тӕмӕ гӕрзтӕм"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Фӕ�тӕмӕ менюмӕ"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Иннӕ хатт дын атулдзӕн!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "�ыууадзын"
 
@@ -763,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "�ыууадзын/Фӕ�тӕмӕ"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,43 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Xwybylty Soslan https://launchpad.net/~soslan"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Xwybylty Soslan https://launchpad.net/~soslan"
diff --git a/data/po/pl.po b/data/po/pl.po
index dfcf4d861..8914af06c 100644
--- a/data/po/pl.po
+++ b/data/po/pl.po
@@ -1,20 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dawid Gan <deveee@gmail.com>, 2015
+# Patryk Wychowaniec <patryk1303@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7 PL\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-03 14:44+0000\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-16 08:40+0000\n"
 "Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Patryk Wychowaniec <patryk1303@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/supertuxkart/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: POLAND\n"
-"X-Poedit-Language: Polish\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,14 +28,13 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr " Ale wy, żałośni głupcy nigdy nie pokonacie mnie - Króla Gokartów!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
@@ -40,7 +42,9 @@ msgstr[0] "%d przyjaciel jest dostępny"
 msgstr[1] "%d przyjaciół jest dostępnych"
 msgstr[2] "%d przyjaciół jest dostępnych"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (z utrudnieniem)"
@@ -56,7 +60,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s i %s są dostępni"
@@ -68,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, autor: %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
-msgstr "%s przez %s"
+msgstr "%s, autor: %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s jest dostępny"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s jest gotowy"
@@ -95,32 +98,29 @@ msgstr "Profil %s"
 msgid "%s's server"
 msgstr "Serwer %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s i %s są dostępni"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' został wyeliminowany."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Pusty)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(gra sieciowa jeszcze niedostępna)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"Niebieski obiekt może być przyczyną konfilików pomiędzy konfiguracjami."
+msgstr "Niebieski obiekt może być przyczyną konfilików pomiędzy konfiguracjami."
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
@@ -128,47 +128,34 @@ msgstr "* Czerwone pole oznacza konflikt w aktualnych ustawieniach"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Ustawienia klawiszy można przejrzeć/zedytować w opcjach"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Większość z tych trybów gry można zagrać w trybie Grand Prix - zamiast "
-"grać jeden wyścig, można kilka pod rząd. Im wyżej w rankingu, tym więcej "
-"punktów dostaniesz. Na końcu, gracz z największą ilością punktów wygrywa "
-"puchar."
+msgstr "* Większość z tych trybów gry można zagrać w trybie Grand Prix - zamiast grać jeden wyścig, można kilka pod rząd. Im wyżej w rankingu, tym więcej punktów dostaniesz. Na końcu, gracz z największą ilością punktów wygrywa puchar."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Uruchom ponownie grę aby wprowadzić zmiany"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Naciśnięcie klawisza 'Wybierz' podczas dołączania się do gry ustala której "
-"konfiguracji użyć"
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Naciśnięcie klawisza 'Wybierz' podczas dołączania się do gry ustala której konfiguracji użyć"
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -199,13 +186,10 @@ msgstr "Walka 3 Walnięć"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Walka 3 Walnięć: dostępna tylko w trybie dla wielu graczy. Wal innych, "
-"używając do tego broni aż do utraty ich żyć."
+msgstr "Walka 3 Walnięć: dostępna tylko w trybie dla wielu graczy. Wal innych, używając do tego broni aż do utraty ich żyć."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +204,20 @@ msgid "9 months"
 msgstr "9 miesięcy"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "== Najlepsze wyniki =="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Przeciwnicy"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Zakończ Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "O grze"
 
@@ -245,39 +226,35 @@ msgstr "O grze"
 msgid "Accelerate"
 msgstr "Przyspieszacz"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Przyspiesz i podczas skręcania wciśnij <%s> aby się ślizgać. Chwilowe "
-"ślizganie może pomóc Ci szybciej się obrócić, aby pokonać ostre zakręty."
+msgstr "Przyspiesz i podczas skręcania wciśnij <%s> aby się ślizgać. Chwilowe ślizganie może pomóc Ci szybciej się obrócić, aby pokonać ostre zakręty."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Przyspiesz używając <%s> i skręcaj za pomocą <%s> i <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Akceptuj"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Odzyskiwanie konta"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Ustawienia konta"
 
@@ -285,8 +262,7 @@ msgstr "Ustawienia konta"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Osiągnięcia"
 
@@ -296,13 +272,11 @@ msgstr "Akcja"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Dodaj"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Dodaj Przyjaciela"
 
@@ -313,7 +287,6 @@ msgstr "Dodaj konfiguracjÄ™ klawiatury"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Dodaj gracza"
 
@@ -324,32 +297,29 @@ msgstr "Dodaj konsolÄ™ Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Dodaj urzÄ…dzenie"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Dodatki"
 
@@ -359,49 +329,43 @@ msgstr "Nazwa dodatku"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Dodatki"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Efekty graficzne"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Wszystko"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Wszystkie trasy"
 
@@ -411,18 +375,20 @@ msgstr "Wszystkie ciosy dozwolone, więc weź broń i zrób z niej użytek!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Zawsze pokazuj ekran logowania"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Cieniowanie powierzchni"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Cieniowanie powierzchni: %s"
@@ -432,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Wystąpił błąd podczas próby zapisu Grand Prix"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Kowadło - spowalnia gracza na pierwszej pozycji."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animowane postacie"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animowane postacie: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animowana sceneria"
 
@@ -458,24 +421,24 @@ msgstr "Animowana sceneria"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animowana sceneria: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anizotropowy x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anizotropowy x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anizotropowy x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anizotropowy x8"
 
@@ -485,29 +448,25 @@ msgstr "Istnieje już inne Grand Prix o takiej nazwie"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Wygładzanie krawędzi"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Wygładzanie krawędzi: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Zastosuj"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Potwierdź nową rozdzielczość"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr "Mistrz ZÅ‚a"
 
@@ -522,49 +481,44 @@ msgstr "Czy na pewno chcesz na stałe usunąć tą konfigurację?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Czy jesteś pewny, że chcesz usunąć '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Areny"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Dookoła Latarni Morskiej"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Nie przydzielaj"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Przypisz do ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Na Końcu Świata"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Dźwięk"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Unikaj bananów!"
 
@@ -586,81 +540,66 @@ msgstr "OÅ› %d %s"
 msgid "Axis %d inverted"
 msgstr "Oś %d odwrócona"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Powrót"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Powrót do gry"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Powrót do wyścigu"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Powrót do wyboru wyzwania"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Powrót do listy urządzeń"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Powrót do menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Powrót do menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr "Miłośnik Banaów"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Piłka do koszykówki - odbija się w kierunku lidera, może zmiażdżyć i "
-"spowolnić gokarty znajdujące się na jej drodze."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Piłka do koszykówki - odbija się w kierunku lidera, może zmiażdżyć i spowolnić gokarty znajdujące się na jej drodze."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Wojenna Wyspa"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Pies"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Powodzenia następnym razem!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Dwuliniowy"
 
@@ -670,39 +609,33 @@ msgid "Black"
 msgstr "Czarny"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Dwór na Czarnym Wzgórzu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Poświata"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Poświata: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Wygrywa drużyna niebieska"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Podwórze Bydła"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Kula do kręgli - odbija się od ścian. Jeśli partzysz w tył, kula zostanie "
-"puszczona za ciebie."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Kula do kręgli - odbija się od ścian. Jeśli partzysz w tył, kula zostanie puszczona za ciebie."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -710,64 +643,52 @@ msgid "Brake"
 msgstr "Hamulec"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Guma do żucia - ochroń się osłoną lub użyj patrząc wstecz, aby zostawić "
-"lepką różową kałużę za sobą."
+msgstr "Guma do żucia - ochroń się osłoną lub użyj patrząc wstecz, aby zostawić lepką różową kałużę za sobą."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr "Ale jestem uczciwym stworem, więc proponuję zakład."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Tort - rzucany w najbliższego rywala, doskonały w krótkim zasięgu i długich "
-"prostych."
+msgstr "Tort - rzucany w najbliższego rywala, doskonały w krótkim zasięgu i długich prostych."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Nie można dostać się do serwera stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -781,26 +702,23 @@ msgid "Cancel/Back"
 msgstr "Anuluj/Powróć"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Jaskinia X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Wyzwanie ukończone"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Wyzwanie nie powiodło się"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Wyzwania: pokój nagród"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Zmień"
 
@@ -808,62 +726,52 @@ msgstr "Zmień"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Wybierz pojazd"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr "Krzysztof Kolumb"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Kliknij tutaj aby zacząć samouczek"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Zamknij"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr "Czekoladowa Kraina"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr "Zbierz co najmniej 5 bananów w jednym wyścigu"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Zbieraj niebieskie skrzynki: dadzÄ… ci bronie lub inne bonusy"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Zbierz prezenty i wystrzel broń używając <%s> aby pozbyć się tych skrzyni!"
+msgstr "Zbierz prezenty i wystrzel broń używając <%s> aby pozbyć się tych skrzyni!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Zbierz butelki z nitro (użyjemy ich za zakrętem)"
 
@@ -873,17 +781,13 @@ msgstr "Zbieraj nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Zbieranie nitro pozwala Ci przyspieszyć, gdy naciśniesz odpowiedni do tego "
-"klawisz. Możesz zobaczyć swój obecny stan nitro na pasku po prawej stronie "
-"ekranu."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Zbieranie nitro pozwala Ci przyspieszyć, gdy naciśniesz odpowiedni do tego klawisz. Możesz zobaczyć swój obecny stan nitro na pasku po prawej stronie ekranu."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Ukończ wszystkie wyzwania, aby otworzyć bramę!"
 
@@ -896,11 +800,11 @@ msgstr "Ukończone osiągnięcie \"%s\"."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -908,7 +812,6 @@ msgstr "Potwierdź rozdzielczość w ciągu %d sekund"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Połącz się z siecią"
 
@@ -916,106 +819,86 @@ msgstr "Połącz się z siecią"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Podłącz swoją konsolę wiimote do menedżera bluetooth, a następnie kliknij "
-"OK. Bardziej szczegółowe instrukcje na supertuxkart.net/Wiimote"
+msgstr "Podłącz swoją konsolę wiimote do menedżera bluetooth, a następnie kliknij OK. Bardziej szczegółowe instrukcje na supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Nie zawiera bonusów, więc możesz przetestować swoje umiejętności kierowcy!"
+msgstr "Nie zawiera bonusów, więc możesz przetestować swoje umiejętności kierowcy!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Kontynuuj"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Kontynuuj"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Kontynuuj"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Sterowanie"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Nie można utworzyć gracza '%s'"
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Nie można wykryć konsoli Wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Utwórz"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Utwórz serwer"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Utwórz użytkownika"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Utwórz konto online"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Tworzenie serwera"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Autorzy"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Aktualne hasło"
 
@@ -1028,13 +911,12 @@ msgid "Currently not signed in"
 msgstr "Aktualnie niezalogowany"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Niestandardowe"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Zaawansowane..."
 
@@ -1060,7 +942,6 @@ msgstr "Góra"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Odmów"
 
@@ -1068,28 +949,26 @@ msgstr "Odmów"
 msgid "Default"
 msgstr "Domyślny"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Usuń"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Usuń konfigurację"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Głębia ostrości"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Głębia ostrości: %s"
@@ -1102,24 +981,23 @@ msgstr "Wyłącz urządzenie"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Wyłączone"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Wyświetlaj FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Czy na pewno chcesz opuścić Grand Prix?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Czy na prawdę chcesz usunąć gracza: %s?"
@@ -1128,8 +1006,8 @@ msgstr "Czy na prawdę chcesz usunąć gracza: %s?"
 msgid "Do you want to save your changes?"
 msgstr "Czy chcesz zachować zmiany?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Nie przyspieszaj przed startem"
 
@@ -1140,27 +1018,24 @@ msgstr "Dół"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Przeciwny kierunek"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Dynamiczne oświetlenie: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Edytuj"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Edytuj Grand Prix"
 
@@ -1171,7 +1046,6 @@ msgstr "Polowanie Na Pisanki"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Polowanie Na Pisanki: Znajdź wszystkie ukryte jajka"
 
@@ -1181,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr "Pisanki: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Słoń"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Odpada"
 
@@ -1194,24 +1067,22 @@ msgstr "Odpada"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "E-mail"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "Adres e-mail musi zawierać od 4 do 50 znaków!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "Adres e-mail jest nieprawidłowy!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Pola e-mail nie zgadzajÄ… siÄ™!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1223,27 +1094,24 @@ msgstr "WÅ‚Ä…cz urzÄ…dzenie"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr "WÅ‚Ä…cz utrudnienia dla graczy"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "WÅ‚Ä…czone"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Dla wszystkich"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Wpisz imiÄ™ nowego gracza"
 
@@ -1258,27 +1126,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr "Naciśnij 'Wybierz' aby dołączyć do gry!"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "IstniejÄ…ce konto online"
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Wyjście"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Wyjście z wyścigu"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Wyjdź z gry"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ekspert"
 
@@ -1286,12 +1156,12 @@ msgstr "Ekspert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Znajdź wszystkie ukryte jajka"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1316,21 +1186,17 @@ msgid "Fetching servers"
 msgstr "Pobieranie serwerów"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Wpisz nazwę użytkownika i adres e-mail podany przy rejestracji w celu "
-"zresetowania hasła."
+msgstr "Wpisz nazwę użytkownika i adres e-mail podany przy rejestracji w celu zresetowania hasła."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Ostatnie okrążenie!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Znajdź serwer"
 
@@ -1341,21 +1207,14 @@ msgstr "Ognia"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Po pierwsze, potrzebujesz kilku różnych urządzeń kontrolujących (najlepszym "
-"rozwiązaniem do gry w kilka osób jest posiadanie większej ilości gamepadów "
-"i/lub dżojstików). Idź do konfiguracji sterowania i zmień ustawienia "
-"kontrolerów. Jest też możliwość grania na klawiaturze/klawiaturach, jednakże "
-"każdy gracz potrzebuje innych klawiszy. Trzeba mieć także na uwadze to, że "
-"większość klawiatur nie obsługuje dużej ilości wciśniętych klawiszy na raz."
+msgstr "Po pierwsze, potrzebujesz kilku różnych urządzeń kontrolujących (najlepszym rozwiązaniem do gry w kilka osób jest posiadanie większej ilości gamepadów i/lub dżojstików). Idź do konfiguracji sterowania i zmień ustawienia kontrolerów. Jest też możliwość grania na klawiaturze/klawiaturach, jednakże każdy gracz potrzebuje innych klawiszy. Trzeba mieć także na uwadze to, że większość klawiatur nie obsługuje dużej ilości wciśniętych klawiszy na raz."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1368,25 +1227,23 @@ msgstr "Śledź Lidera!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Śledź Lidera: bądź na drugim miejscu. Ostatni gracz zostanie "
-"zdyskwalifikowany, kiedy czas osiągnie 0. UWAGA: jazda przed liderem też "
-"eleminuje!"
+msgstr "Śledź Lidera: bądź na drugim miejscu. Ostatni gracz zostanie zdyskwalifikowany, kiedy czas osiągnie 0. UWAGA: jazda przed liderem też eleminuje!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Znaleziono %d Wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "Znaleziono %d Wiimote"
+msgstr[1] "Znaleziono %d Wiimote"
+msgstr[2] "Znaleziono %d Wiimote"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1410,13 +1267,12 @@ msgstr "Zaproszenie wysane!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Przyjaciele"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
@@ -1430,22 +1286,19 @@ msgstr "BRAMKA!"
 msgid "Game Keys"
 msgstr "Klawisze gry"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Style gry"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Typ gry (Limit bramek / Limit czasu)"
 
@@ -1461,51 +1314,45 @@ msgstr "Przycisk gamepada %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad kierunek %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Ogólne"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Przerwij wyścig"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Oświetlenie globalne"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Oświetlenie globalne: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Poświata (kontury)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Poświata (kontury): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1515,61 +1362,53 @@ msgid "Go!"
 msgstr "START!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr "ZÅ‚oty Kierowca"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr "Rajska Wyspa"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Edytor Grand Prix"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Edytor Grand Prix"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Postęp Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Poziom efektów graficznych"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Ustawienia grafiki"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Zielona Dolina"
 
@@ -1586,12 +1425,10 @@ msgstr "Gość %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr "Zaloguj jako Gość"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1601,22 +1438,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Pomoc"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Najlepsze wyniki"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr "Uderz 10 przeciwników kulami do kręgli"
 
@@ -1627,73 +1460,68 @@ msgid ""
 msgstr "Wal innych graczy aż do utraty ich żyć!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr "Uderz tego samego przeciwnika co najmniej 5 razy w jednym wyścigu"
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Tylko dla graczy"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Zgadzam się z powyższymi warunkami i mam ukończone 13 lat. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Jeśli pokonasz mnie w wyścigu, uwolnię starego dziwaka."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Jeśli widzisz taki przycisk jak obok, musisz ukończyć wyzwanie, aby to "
-"odblokować."
+msgstr "Jeśli widzisz taki przycisk jak obok, musisz ukończyć wyzwanie, aby to odblokować."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorowanie '%s', powinieneś/powinnaś dołączyć wcześniej go gry!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Oświetlenie w oparciu o obrazy"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalacja"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Åšredniak"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "Dostęp do sieci jest nieaktywny, włącz go w ustawieniach"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Remis"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr "Sekret"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Dołącz"
 
@@ -1703,13 +1531,12 @@ msgstr "Dołączanie do serwera"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Gokarty"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Pozostań przy tej rozdzielczości"
 
@@ -1728,7 +1555,6 @@ msgid "Keyboard %i"
 msgstr "Klawiatura %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1737,7 +1563,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Okrążenie"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Okrążenie nr %i"
@@ -1799,50 +1625,46 @@ msgstr "Lewy spust"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Promienie światła"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Promienie światła: %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "�adowanie"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Pokoje"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Pokoje - Ustawienia"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr "Lokalna nazwa"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Zablokowane"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Zablokowane: ukończ aktywne wyzwania, aby otrzymać więcej!"
 
@@ -1850,11 +1672,51 @@ msgstr "Zablokowane: ukończ aktywne wyzwania, aby otrzymać więcej!"
 msgid "Locked!"
 msgstr "Zablokowane!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Zaloguj siÄ™"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Wyloguj siÄ™"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Zalogowano jako: %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Logowanie"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Logowanie '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Zalogowanie się jako Gosć daje możliwość uczestniczenia w wyścigach online, jednak nie pozwala oceniać dodatków lub zdobywać osiągnięć gdy jesteś online."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Wylogowywanie"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Wylogowywanie '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Logowanie"
 
@@ -1865,27 +1727,18 @@ msgstr "Spojrzenie w tył"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Szukaj więcej przyjaciół"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr "Luna"
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr "Użyj poślizgu 5 razy w jednym okrążeniu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr "Ukończ wyścig z co najmniej 5 okrążeniami"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr "Maratończyk"
 
@@ -1893,18 +1746,16 @@ msgstr "Maratończyk"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Maksymalna liczba graczy"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Maksymalny czas (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Tylko gracz"
 
@@ -1914,29 +1765,33 @@ msgid "Menu Keys"
 msgstr "Klawisze menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr "Minigolf"
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "�owca Komarów"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Rozmycie ruchu"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Rozmycie ruchu: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "OÅ› myszy %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1944,48 +1799,41 @@ msgstr "Przycisk myszy %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Przesuń w dół"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Przesuń w górę"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Wielu graczy"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Wielu graczy"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Muzyka"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Nazwa"
 
@@ -2005,13 +1853,15 @@ msgstr "Nazwa jest zbyt długa."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Nazwa serwera"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Staw Nessiego"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Nowe"
 
@@ -2020,9 +1870,13 @@ msgstr "Nowe"
 msgid "New Grand Prix '%s' now available"
 msgstr "Nowe Grand Prix '%s' już dostępne"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nowe konto online"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nowe hasło"
 
@@ -2035,7 +1889,7 @@ msgstr "Nowe zaproszenie"
 msgid "New difficulty '%s' now available"
 msgstr "Nowy poziom tudności '%s' już dostępny"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Najszybsze okrążenie!"
 
@@ -2063,19 +1917,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Zbieranie nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "Nie"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Żaden"
 
@@ -2085,23 +1938,19 @@ msgid "Normal Race"
 msgstr "Zwykły wyścig"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Północny Kurort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Zauważ, że jeśli uda Ci się ślizgać przez kilka sekund, otrzymasz bonusowe "
-"przyspieszenie jako nagrodÄ™!"
+msgstr "Zauważ, że jeśli uda Ci się ślizgać przez kilka sekund, otrzymasz bonusowe przyspieszenie jako nagrodę!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nowicjusz"
 
@@ -2112,46 +1961,41 @@ msgstr "Liczba przeciwników : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Liczba przeciwników"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Liczba bramek, aby wygrać"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Liczba okrążeń"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Liczba okrążeń:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Na Odludziu"
 
@@ -2159,61 +2003,59 @@ msgstr "Na Odludziu"
 msgid "Offline"
 msgstr "Niedostępny"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Konto offline"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"O tak, spójrz, jest teraz w moim zamku i zostanie podany na kolację..."
+msgstr "O tak, spójrz, jest teraz w moim zamku i zostanie podany na kolację..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Stara Kopalnia"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Klasa Matematyczna Olivera"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Online"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Wielu graczy online"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Nazwa online"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "Nazwa użytkownika online musi zawierać od 3 do 30 znaków!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Nazwa użytkownika online nie może zaczynać się liczbą!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Tylko Mistrz Gry może działać w tym miejscu!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ups! Mamy kłopoty, wciśnij <%s> aby zawołać pomoc"
@@ -2224,14 +2066,11 @@ msgstr "Ups! Mamy kłopoty, wciśnij <%s> aby zawołać pomoc"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opcje"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "PrzeglÄ…d"
 
@@ -2240,35 +2079,30 @@ msgid "POWER"
 msgstr "MOC"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Spadochron - spowalnia wszystkie gokarty na lepszych pozycjach"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Hasło"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Hasło:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Hasło musi zawierać od 8 do 30 znaków!"
 
@@ -2276,8 +2110,8 @@ msgstr "Hasło musi zawierać od 8 do 30 znaków!"
 msgid "Password successfully changed."
 msgstr "Hasło zostało zmienione."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Hasła się nie zgadzają!"
 
@@ -2288,12 +2122,11 @@ msgstr "Pauza"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pauza"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Kara!!"
 
@@ -2302,7 +2135,6 @@ msgid "Pending"
 msgstr "Oczekiwanie"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Plac Zabaw Pingwinów"
 
@@ -2311,37 +2143,38 @@ msgid "Performing vote"
 msgstr "Dokonywanie oceny"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Zagraj we wszystko"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr "Zagraj co najmniej raz na każdej oficjalnej trasie"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Gracze"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Gracze mogą wybrać profile z utrudnieniami w ekranie wybierania gokartów"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Wpisz nazwÄ™ Grand Prix"
 
@@ -2350,6 +2183,10 @@ msgstr "Wpisz nazwÄ™ Grand Prix"
 msgid "Please re-configure your key bindings."
 msgstr "Ustaw sterowanie jeszcze raz."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Przeczytaj regulamin"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Proszę czekać, dodatki się aktualizują"
@@ -2359,49 +2196,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Proszę czekać, dodatki są ładowane."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Przepychaczka - rzuć do przodu, by złapać przeciwnika lub rzuć do tyłu, by "
-"przeciwnik stracił widoczność."
+msgstr "Przepychaczka - rzuć do przodu, by złapać przeciwnika lub rzuć do tyłu, by przeciwnik stracił widoczność."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr "Miłośnik Bonusów"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Wciśnij <%s> aby spojrzeć w tył, a następnie wciśnij <%s> ciągle trzymając "
-"<%s>, aby strzelić za siebie!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Wciśnij <%s> aby spojrzeć w tył, a następnie wciśnij <%s> ciągle trzymając <%s>, aby strzelić za siebie!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Naciśnij ESC, aby anulować"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Naciśnij klawisz"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Naciśnij enter lub kliknij dwukrotnie na urządzeniu, aby je skonfigurować"
+msgstr "Naciśnij enter lub kliknij dwukrotnie na urządzeniu, aby je skonfigurować"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Naciśnij enter lub kliknij dwa razy na graczu, aby go edytować"
 
@@ -2417,10 +2243,7 @@ msgstr "Naciśnij 'Ognia', aby rozpocząć wyzwanie"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Wciśnij jednocześnie klawisze 1 i 2 na swoim wiimote, aby ustawić go w tryb "
-"wykrywania, a następnie kliknij OK. Bardziej szczegółowe instrukcje na "
-"supertuxkart.net/Wiimote"
+msgstr "Wciśnij jednocześnie klawisze 1 i 2 na swoim wiimote, aby ustawić go w tryb wykrywania, a następnie kliknij OK. Bardziej szczegółowe instrukcje na supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2438,7 +2261,6 @@ msgstr "Przetwarzanie"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Profil"
 
@@ -2447,7 +2269,6 @@ msgid "Progress"
 msgstr "Postęp"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Rozdymka"
 
@@ -2455,30 +2276,25 @@ msgstr "Rozdymka"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Przesuń piłkę do bramki przeciwnika aby zdobyć gola (Tylko dla wielu graczy)"
+msgstr "Przesuń piłkę do bramki przeciwnika aby zdobyć gola (Tylko dla wielu graczy)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Szybka gra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Wyjście"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Opuść serwer"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Ustawienia wyścigu"
 
@@ -2499,8 +2315,8 @@ msgstr "Losowe Grand Prix"
 msgid "Random Kart"
 msgstr "Przypadkowy kart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Przypadkowa trasa"
 
@@ -2509,84 +2325,68 @@ msgid "Rank"
 msgstr "Miejsce"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Ocena >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr "Dwór na Wzgórzu Kruka"
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Gotowy!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr "NaprawdÄ™... sekret"
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Wygrywa drużyna czerwona"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Zarejestruj siÄ™"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Normalny wyścig: wszystkie chwyty dozwolone, więc łap za broń i zrób z niej "
-"użytek!"
+msgstr "Normalny wyścig: wszystkie chwyty dozwolone, więc łap za broń i zrób z niej użytek!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Odśwież"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Zapamiętaj hasło"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Zapamiętaj położenie okna"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Usuń"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -2612,29 +2412,25 @@ msgstr "Ratunek"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Ponowny start"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Powtórz wyscig"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Przeciwny kierunek"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Przeciwny kierunek:"
 
@@ -2691,41 +2487,35 @@ msgstr "Prawy spust"
 msgid "SPEED"
 msgstr "PRĘDKOŚĆ"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "Na Statku Kosmicznym"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara Wyścigówka"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr "Sara Czarodziejka"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Zapisz"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Zapisz Grand Prix"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Szkocja"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Szukaj"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
@@ -2735,12 +2525,10 @@ msgid "Select"
 msgstr "Wybierz"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Wybierz poziom trudności"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Wybierz tryb gry"
 
@@ -2750,36 +2538,30 @@ msgstr "Wybierz trasÄ™"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Wybierz pojazd"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Wysyłaj anonimowe dane o sprzęcie"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Tworzenie serwera"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Informacje o serwerze"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Wybór serwera"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Nazwa serwera:"
 
@@ -2794,93 +2576,49 @@ msgstr "Do startu!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nowy wyścig"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Cienie"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Cienie: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Cienie: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Zmienne Piaski"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Słoneczne Przedmieścia"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Zaloguj siÄ™"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Zalogój się jako gość"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Wyloguj siÄ™"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Zalogowany jako: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Logowanie"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Logowanie '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Zalogowanie się jako Gosć daje możliwość uczestniczenia w wyścigach online, "
-"jednak nie pozwala oceniać dodatków lub zdobywać osiągnięć gdy jesteś online."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Wylogowywanie"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Wylogowywanie '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Od"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Jeden gracz"
 
@@ -2890,7 +2628,6 @@ msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr "Åšlizgacz"
 
@@ -2901,12 +2638,10 @@ msgstr "Poślizg"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Skórka"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Śnieżny Szczyt"
 
@@ -2916,29 +2651,23 @@ msgid "Soccer"
 msgstr "Piłka Nożna"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Boisko"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Piłka Nożna: dostępna tylko w trybie dla wielu graczy. Użyj swojego gokarta, "
-"aby wepchnąć piłkę do branki."
+msgstr "Piłka Nożna: dostępna tylko w trybie dla wielu graczy. Użyj swojego gokarta, aby wepchnąć piłkę do branki."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Przepraszamy, nie można się połączyć z serwerem dodatków. Sprawdź czy jesteś "
-"podłączony do internetu i czy Twój firewall nie blokuje SuperTuxKart."
+msgstr "Przepraszamy, nie można się połączyć z serwerem dodatków. Sprawdź czy jesteś podłączony do internetu i czy Twój firewall nie blokuje SuperTuxKart."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2946,7 +2675,6 @@ msgstr "Pobieranie nie powiodło się"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efekty dźwiękowe"
 
@@ -2955,7 +2683,6 @@ msgstr "Efekty dźwiękowe"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standardowe"
 
@@ -2968,11 +2695,10 @@ msgstr "Start"
 msgid "Start Grand Prix"
 msgstr "Zacznij Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Zacznij wyścig"
 
@@ -2992,12 +2718,10 @@ msgstr "Skręt w prawo"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Historia"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr "Ognia!"
 
@@ -3005,89 +2729,69 @@ msgstr "Ognia!"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Wyślij"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Morze Podziemne"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart - dodatki"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Pomoc gry SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opcje gry SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "W SuperTuxKart można grać w trybie wielu graczy na jednym komputerze"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart oferuje kilka trybów gry"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
-"SuperTuxKart może łączyć się z serwerem w celu pobrania dodatków oraz "
-"powiadamiania o aktualizacjach. Zbieramy również anonimowe statystyki, które "
-"pomagają w rozwoju gry. Czy chcesz włączyć tą opcję? (Aby zmienić to "
-"ustawienie później, edytuj pola \"Połącz się z siecią\" oraz \"Wysyłaj "
-"anonimowe dane o sprzęcie\" w zakładce \"Interfejs użytkownika\"."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart może łączyć się z serwerem w celu pobrania dodatków oraz powiadamiania o aktualizacjach. Zbieramy również anonimowe statystyki, które pomagają w rozwoju gry. Zapoznaj się z naszą polityką prywatności na http://privacy.supertuxkart.net. Czy chcesz włączyć tą opcję? Aby zmienić to ustawienie później, edytuj pola \"Połącz się z siecią\" oraz \"Wysyłaj anonimowe dane o sprzęcie\" w zakładce \"Interfejs użytkownika\"."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Podmieniacz - prezenty zostają zamienione w bananany i na odwrót przez "
-"krótki czas."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Podmieniacz - prezenty zostają zamienione w bananany i na odwrót przez krótki czas."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Packa - spowalnia gokarty"
 
@@ -3096,34 +2800,37 @@ msgstr "Packa - spowalnia gokarty"
 msgid "System Language"
 msgstr "Język Systemu"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Wyobraź sobie, że Twoi przeciwnicy to komary. Używając packi, spłaszcz w wyścigu co najmniej 5 z nich."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "ÅšwiÄ…tynia"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Regulamin"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Kompresja tekstur"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtr tekstury"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Klawisz ślizgania umożliwia poślizg na ostrych zakrętach i otrzymanie "
-"przyspieszenia."
+msgstr "Klawisz ślizgania umożliwia poślizg na ostrych zakrętach i otrzymanie przyspieszenia."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3135,9 +2842,7 @@ msgstr "Dodatki są aktualnie wyłączone w opcjach."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Plik wyników jest za stary.\n"
-"Obecne wyniki zostaną usunięte."
+msgstr "Plik wyników jest za stary.\nObecne wyniki zostaną usunięte."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3150,40 +2855,22 @@ msgstr "Czasówka"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Czasówka: nie zawiera bonusów, więc możesz przetestować swoje umiejętności "
-"kierowcy!"
+msgstr "Czasówka: nie zawiera bonusów, więc możesz przetestować swoje umiejętności kierowcy!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Aby dodać nowy dżojstik/gamepad, po prostu uruchom SuperTuxKart z "
-"podłączonym urządzeniem, a pojawi się na liście.\n"
-"\n"
-"Aby dodać ustawienia klawiatury, użyj przycisku poniżej, JEDNAKŻE "
-"zapamiętaj, że większość klawiatur obsługuje tylko limitowaną ilość "
-"wciśniętych klawiszy, więc nie nadaje się do gier dla wielu graczy. (Możesz "
-"jednak podłączyć kilka klawiatur. Pamiętaj, że wtedy każdy musi mieć inne "
-"ustawienia klawiszy)."
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Aby dodać nowy dżojstik/gamepad, po prostu uruchom SuperTuxKart z podłączonym urządzeniem, a pojawi się na liście.\n\nAby dodać ustawienia klawiatury, użyj przycisku poniżej, JEDNAKŻE zapamiętaj, że większość klawiatur obsługuje tylko limitowaną ilość wciśniętych klawiszy, więc nie nadaje się do gier dla wielu graczy. (Możesz jednak podłączyć kilka klawiatur. Pamiętaj, że wtedy każdy musi mieć inne ustawienia klawiszy)."
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "W wyścigu pomogą ci bonusy do zbierania:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Na Księżyc i z Powrotem"
 
@@ -3202,7 +2889,7 @@ msgstr "Top %i"
 msgid "Track"
 msgstr "Trasa"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Trasa %i/%i"
@@ -3216,19 +2903,17 @@ msgstr "Autor trasy: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Grupa"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Trasy"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trójliniowy"
 
@@ -3239,24 +2924,21 @@ msgstr "Spróbuj ponownie"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Samouczek"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Samouczek: Pomieszczenie Wyboru"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Typ :"
 
@@ -3264,22 +2946,18 @@ msgstr "Typ :"
 msgid "Type: Grand Prix"
 msgstr "Typ: Grand Prix"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"Nie można połączyć się z serwerem. Sprawdź połączenie z siecią lub spróbuj "
-"ponownie później."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Nie można połączyć się z serwerem. Sprawdź połączenie z siecią lub spróbuj ponownie później."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Odinstaluj"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr "Niepowstrzymany"
 
@@ -3293,8 +2971,8 @@ msgid "Update"
 msgstr "Aktualizacja"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Uaktualnione"
 
@@ -3303,41 +2981,36 @@ msgid "Updated date"
 msgstr "Data aktualizacji"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr "Użyj co najmniej 10 bonusów w wyścigu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr "Użyj tekstur wysokiej rozdzielczości"
+msgstr "Tekstury wysokiej rozdzielczości"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
-"Użyj klawiszy lewo/prawo do wybrania swojej drużyny i wciśnij 'Ognia'"
+msgstr "Użyj klawiszy lewo/prawo do wybrania swojej drużyny i wciśnij 'Ognia'"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Użyj zebranego nitro naciskając <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Informacje o użytkowniku"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interfejs użytkownika"
 
@@ -3346,19 +3019,17 @@ msgid "User defined"
 msgstr "Użytkownika"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Szukaj użytkownika"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
@@ -3367,13 +3038,12 @@ msgid "Username and/or email address invalid."
 msgstr "Nazwa użytkownika lub adres e-mail jest niepoprawny."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "vs"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Sprawdzanie poprawności danych"
 
@@ -3384,27 +3054,23 @@ msgstr "Wersja: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Synchronizacja pionowa (wymaga restartu)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "PodglÄ…d"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Głośność"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Oceń"
 
@@ -3416,7 +3082,7 @@ msgstr "Głosowanie powiodło się. Możesz teraz zamknąć okno."
 msgid "WEIGHT"
 msgstr "WAGA"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "Z�A DROGA!"
 
@@ -3425,58 +3091,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Uwaga! Klawisz 'Shift' nie jest zalecany. Kiedy Shift jest wciśnięty, "
-"wszystkie klawisze, które zawierają inny znak górny, przestaną działać."
+msgstr "Uwaga! Klawisz 'Shift' nie jest zalecany. Kiedy Shift jest wciśnięty, wszystkie klawisze, które zawierają inny znak górny, przestaną działać."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Bronie"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efekty pogodowe"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efekty pogodowe: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Co się stało, mali hipisi? Wasz wielki przywódca Gnu zniknął?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Jeżeli urządzenia zostały skonfigurowane, jesteś gotowy do gry. Wybierz "
-"ikonę \"Wielu graczy\" w menu głównym. Nadeszła pora na wybór gokartu, aby "
-"dołączyć do gry każdy gracz powinien nacisnąć klawisz \"ognia\" na "
-"gamepadzie lub klawiaturze. Gracze mogą używać dowolnego urządzenia do "
-"wyboru własnego gokartu. Gra będzie kontynuowana, kiedy wszyscy wybiorą "
-"swoje gokarty. Mysz nie może być używana podczas tej operacji."
+msgstr "Jeżeli urządzenia zostały skonfigurowane, jesteś gotowy do gry. Wybierz ikonę \"Wielu graczy\" w menu głównym. Nadeszła pora na wybór gokartu, aby dołączyć do gry każdy gracz powinien nacisnąć klawisz \"ognia\" na gamepadzie lub klawiaturze. Gracze mogą używać dowolnego urządzenia do wyboru własnego gokartu. Gra będzie kontynuowana, kiedy wszyscy wybiorą swoje gokarty. Mysz nie może być używana podczas tej operacji."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3484,42 +3137,36 @@ msgid "White"
 msgstr "Biały"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr "Wygraj 5 pojedynczych wyścigów z rzędu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr "Wygraj we wszystkich jednoosobowych trybach gry z 3 przeciwnikami"
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Tak"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Jesteś gotowy do wyścigu. Powodzenia!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Grasz jako"
 
@@ -3529,47 +3176,36 @@ msgstr "Możesz zmienić swoją poprzednią ocenę klikając na gwiazdki poniże
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
-"Nie możesz pobierać dodatków bez dostępu do sieci. Jeśli chcesz pobierać "
-"dodatki, zaznacz pole \"Połącz się z siecią\" w ustawieniach w zakładce "
-"\"Interfejs użytkownika\"."
+msgstr "Nie możesz pobierać dodatków bez dostępu do sieci. Jeśli chcesz pobierać dodatki, zaznacz pole \"Połącz się z siecią\" w ustawieniach w zakładce \"Interfejs użytkownika\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
-"Nie możesz grać online bez dostępu do sieci. Jeśli chcesz grać online, "
-"zaznacz pole \"Połącz się z siecią\" w ustawieniach w zakładce \"Interfejs "
-"użytkownika\"."
+msgstr "Nie możesz grać online bez dostępu do sieci. Jeśli chcesz grać online, zaznacz pole \"Połącz się z siecią\" w ustawieniach w zakładce \"Interfejs użytkownika\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
-"Możesz grać bez tworzenia konta online jeśli wyłączysz tą opcję. Jednak w "
-"takim przypadku nie będziesz mógł łączyć się ze znajomymi, oceniać dodatków "
-"itd. Proszę, zapoznaj się z naszą polityką prywatności na "
-"http://privacy.supertuxkart.net"
+msgstr "Możesz grać bez tworzenia konta online jeśli wybierzesz konto offline. Jednak w takim przypadku nie będziesz mógł łączyć się ze znajomymi, oceniać dodatków itd. Zapoznaj się z naszą polityką prywatności na http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Ukończono wyzwanie!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Ukończono wyzwania!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Ukończono Grand Prix!"
 
@@ -3590,20 +3226,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr "Ukończyłeś średnie wyzwanie! Zdobyte punkty: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Ukończyłeś wyścig!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Otrzymałeś %d nowych zaproszeń!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Otrzymałeś %d nowe zaproszenie!"
+msgstr[1] "Otrzymałeś %d nowe zaproszenia!"
+msgstr[2] "Otrzymałeś %d nowych zaproszeń!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Otrzymałeś nowe zaproszenie!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Zostałeś wyeliminowany!"
 
@@ -3611,57 +3250,51 @@ msgstr "Zostałeś wyeliminowany!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Nie oceniałeś jeszcze tego dodatku. Możesz to zrobić klikając na gwiazdki "
-"poniżej."
+msgstr "Nie oceniałeś jeszcze tego dodatku. Możesz to zrobić klikając na gwiazdki poniżej."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Potrzebujesz więcej \n"
-"punktów aby rozpocząć\n"
-"to wyzwanie. Zobacz\n"
-"dostępne wyzwania\n"
-"na mapie."
+msgstr "Potrzebujesz więcej \npunktów aby rozpocząć\nto wyzwanie. Zobacz\ndostępne wyzwania\nna mapie."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Odblokowałeś Grand Prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Odblokowałeś trasę %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Otrzymasz e-mail z dalszymi instrukcjami jak zresetować swoje hasło. Bądź "
-"cierpliwy i sprawdź czy wiadomość nie znalazła się w spamie."
+msgstr "Otrzymasz e-mail z dalszymi instrukcjami jak zresetować swoje hasło. Bądź cierpliwy i sprawdź czy wiadomość nie znalazła się w spamie."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Otrzymasz e-mail z dalszymi instrukcjami jak aktywować konto. Bądź cierpliwy "
-"i sprawdź czy wiadomość nie znalazła się w spamie."
+msgstr "Otrzymasz e-mail z dalszymi instrukcjami jak aktywować konto. Bądź cierpliwy i sprawdź czy wiadomość nie znalazła się w spamie."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Wygrałeś wyścig!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Wersja sterownika OpenGL wygląda na przstarzałą. Sprawdź czy istnieje aktualizacja sterownika dla Twojej karty graficznej. SuperTuxKart wymaga co najmniej OpenGL 3.1."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3674,6 +3307,11 @@ msgid ""
 "created."
 msgstr "Plik konfiguracyjny za stary. Usuwanie i tworzenie nowego."
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "Twój sterownik karty graficznej jest przestarzały. Zainstaluj najnowszą wersję."
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "Twój wejściowy plik konfiguracyjny nie jest zgodny z tą wersją STK."
@@ -3684,7 +3322,6 @@ msgid "Your profile"
 msgstr "Twój profil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Ogród Zen"
 
@@ -3695,7 +3332,6 @@ msgstr "[nic]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "akcje"
 
@@ -3704,7 +3340,8 @@ msgstr "akcje"
 msgid "all"
 msgstr "wszystko"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "przez"
@@ -3713,49 +3350,25 @@ msgstr "przez"
 msgid "featured"
 msgstr "zalecane"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr "Farma"
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "wysokie"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "niskie"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr "Newton"
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr "Sara Wyścigówka"
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standardowe"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Bill https://launchpad.net/~cges30901\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Kuba Polankowski https://launchpad.net/~tux4-b\n"
-"  Kuba Polankowski https://launchpad.net/~tux4-wp\n"
-"  Patryk Wychowaniec https://launchpad.net/~p98\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Twojwujaszek https://launchpad.net/~twojwujaszek-gmail"
+msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Bill https://launchpad.net/~cges30901\n  Dawid Gan https://launchpad.net/~deveee\n  Kuba Polankowski https://launchpad.net/~tux4-b\n  Kuba Polankowski https://launchpad.net/~tux4-wp\n  Patryk Wychowaniec https://launchpad.net/~p98\n  STK-team https://launchpad.net/~stk\n  Twojwujaszek https://launchpad.net/~twojwujaszek-gmail"
diff --git a/data/po/pt.po b/data/po/pt.po
index b36f670df..ea362eb65 100644
--- a/data/po/pt.po
+++ b/data/po/pt.po
@@ -1,52 +1,52 @@
-# Portuguese translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Bruno Ramalhete <bram.512@gmail.com>, 2015
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:06+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/supertuxkart/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
 #. N (or nothing) otherwise
 #: src/utils/translation.cpp:262
 msgid "   Is this a RTL language?"
-msgstr "   N"
+msgstr "N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Mas as suas ações patéticas nunca me conseguirão vencer - Rei dos Karts!"
+msgstr " Mas as suas ações patéticas nunca me conseguirão vencer - Rei dos Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d amigo está na rede."
+msgstr[1] "%d amigos estão na rede."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (em desvantagem)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -59,10 +59,10 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s e %s estão agora na rede."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -71,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s de %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s está na rede."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s está pronto."
@@ -91,32 +90,30 @@ msgstr "%s está pronto."
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Perfil de %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Servidor de %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s e %s estão agora em rede."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s foi eliminado."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Vazio)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(por agora, o jogo em rede não está disponível)"
 
@@ -126,51 +123,40 @@ msgstr "* Um item azul significa um conflito com outra configuração."
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Um item vermelho significa um conflito na sua configuração."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Os atalhos de teclado podem ser vistos/alterados nas Opções."
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Grande parte destes modos também podem ser jogados como Grande Prémio. Em "
-"vez de fazer uma corrida, joga diversas de seguida. Quanto melhor for a sua "
-"posição, mais pontos ganha. No fim, o jogador que tiver mais pontos ganha a "
-"taça."
+msgstr "* Grande parte destes modos também podem ser jogados como Grande Prémio. Em vez de fazer uma corrida, joga diversas de seguida. Quanto melhor for a sua posição, mais pontos ganha. No fim, o jogador que tiver mais pontos ganha a taça."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Reinicie o STK para aplicar as alterações."
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Qual configuração para usar será inferida com a tecla 'Seleccionar' que for premida ao juntar ao jogo."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -199,13 +185,10 @@ msgstr "Batalha 3 ataques"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Batalha 3 ataques: Só para multijogador. Atinja os outros jogadores até que "
-"percam todas as vida."
+msgstr "Batalha 3 ataques: Só para multijogador. Atinja os outros jogadores até que percam todas as vida."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +203,20 @@ msgid "9 months"
 msgstr "9 meses"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Recordes ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Todos os karts"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Abortar grande prémio"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Sobre"
 
@@ -245,66 +225,59 @@ msgstr "Sobre"
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Acelere e prima a tecla <%s> numa curva para derrapar. A derrapagem curta "
-"pode ajudar nas curvas apertadas."
+msgstr "Acelere e prima a tecla <%s> numa curva para derrapar. A derrapagem curta pode ajudar nas curvas apertadas."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Acelere com <%s> e vire com <%s> e <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Aceitar"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Recuperação de conta"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Definições da conta"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Proezas"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Ação"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Adicionar"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Adicionar amigo"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -313,7 +286,6 @@ msgstr "Adicionar configuração de teclado"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Adicionar jogador"
 
@@ -324,32 +296,29 @@ msgstr "Adicionar Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Adicionar dispositivo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Adicionar utilizador"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Extras"
 
@@ -359,49 +328,43 @@ msgstr "Nome do extra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Extras"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Condutas avançadas (luzes, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Todas"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Todas as corridas"
 
@@ -411,46 +374,45 @@ msgstr "Apanhe as armas e faça bom uso pois todos os golpes são permitidos."
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
+msgstr "Mostrar sempre ecrã de sessão"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Oclusão de Ambiente"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Oclusão de Ambiente : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Ocorreu um erro ao tentar gravar o seu grande prémio."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Âncora - diminui a velocidade do primeiro classificado."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personagens animadas"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personagens animados : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Cenário animado"
 
@@ -458,58 +420,54 @@ msgstr "Cenário animado"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Cenário animado: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Aniso-trópico x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Aniso-trópico x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Aniso-trópico x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Aniso-trópico x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Já existe um grande prémio com este nome."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Anti-aliasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Anti-aliasing : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplicar resolução"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Arquiinimigo"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -520,51 +478,46 @@ msgstr "Tem a certeza que quer eliminar permanentemente esta configuração?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Tem a certeza que quer remover %s?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenas"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "À Volta do Farol"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Atribuir nada"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Atribuir à tecla ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "No fim do mundo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "�udio"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evite as bananas!"
 
@@ -586,123 +539,102 @@ msgstr "Eixo %d %s"
 msgid "Axis %d inverted"
 msgstr "Eixo %d invertido"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Voltar"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Voltar ao jogo"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Voltar à corrida"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Voltar à seleção de desafios"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Voltar à lista de dispositivos"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Voltar ao menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Voltar ao menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Amante de bananas"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Bola de basquete - saltita atrás do líder e pode esmagar ou atrasar os "
-"adversários."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Bola de basquete - saltita atrás do líder e pode esmagar ou atrasar os adversários."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Ilha da batalha"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Melhor sorte para a próxima!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinear"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Preto"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mansão Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Resplandecer"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Resplandecer : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "A equipa azul ganhou"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Curral dos bovinos"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bola de bowling - ressalta nas paredes. Se estiver a olhar para trás, será "
-"atirada para trás."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bola de bowling - ressalta nas paredes. Se estiver a olhar para trás, será atirada para trás."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -710,70 +642,58 @@ msgid "Brake"
 msgstr "Travão"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Pastilha elástica - proteja-se com um escudo ou utilize-a ao olhar para trás "
-"de modo a deixar uma poça atrás de si."
+msgstr "Pastilha elástica - proteja-se com um escudo ou utilize-a ao olhar para trás de modo a deixar uma poça atrás de si."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Mas como sou uma criatura justa, proponho um acordo."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Bolo - é atirado ao rival mais próximo. Deve ser utilizado para pequenas "
-"distâncias e em reta."
+msgstr "Bolo - é atirado ao rival mais próximo. Deve ser utilizado para pequenas distâncias e em reta."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Não foi possível aceder ao servidor..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Cancelar pedido"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -781,90 +701,76 @@ msgid "Cancel/Back"
 msgstr "Cancelar/Voltar"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Cave X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Desafio terminado"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Desafio não terminado"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Desafios: Sala de troféus"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Alterar"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Escolha o kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Cristóvão Colombo"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Clique aqui para jogar o tutorial"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Fechar"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Templo do Cacau"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Apanhar um mínimo de 5 bananas por corrida."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Caixas azuis: disponibilizam armas e outros benefícios"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Recolha as caixas de prémios e dispare a arma com <%s> para destruir as "
-"caixas."
+msgstr "Recolha as caixas de prémios e dispare a arma com <%s> para destruir as caixas."
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Recolher nitro (será utilizado após uma curva)"
 
@@ -874,34 +780,30 @@ msgstr "Obter nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"A recolha de nitro permite-lhe obter velocidades estonteantes sempre que "
-"pressionar a tecla apropriada. Pode ver o nível de nitro na barra à direita "
-"do ecrã de jogo."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "A recolha de nitro permite-lhe obter velocidades estonteantes sempre que pressionar a tecla apropriada. Pode ver o nível de nitro na barra à direita do ecrã de jogo."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Complete todos os desafios para abrir a porta grande!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Proeza concluída \"%s\"."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmação"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -909,190 +811,166 @@ msgstr "Confirmar resolução em %i segundos"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Ligar à Internet"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Ligue o seu wiimote ao gestor Bluetooth e clique em OK. Pode encontrar mais "
-"informações em supertuxkart.net/Wiimote."
+msgstr "Ligue o seu wiimote ao gestor Bluetooth e clique em OK. Pode encontrar mais informações em supertuxkart.net/Wiimote."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Aqui só interessam as suas capacidades de condução."
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuar"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Continuar grande prémio gravado"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Continuar"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controlos"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Não conseguiu criar jogador '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Não foi possível detetar o wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Criar servidor"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Criar utilizador"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "A criar servidor"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Créditos"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Senha atual"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Senha atual incorreta."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Sessão não iniciada"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Definições personalizadas..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "DPad baixo"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "DPad esquerda"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "DPad direita"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "DPad cima"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Recusar"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Padrão"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Apagar"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Eliminar configuração"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "Campo de visão"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Campo de visão : %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1102,34 +980,33 @@ msgstr "Desativar dispositivo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Inativo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Mostrar FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Quer mesmo sair deste grande prémio?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Qeer mesmo eliminar o jogador %s?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Deseja guardar as suas alterações?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Não acelere antes da partida"
 
@@ -1140,29 +1017,26 @@ msgstr "Baixo"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Conduzir ao contrário"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Luzes dinâmicas: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Editar grande prémio"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1171,7 +1045,6 @@ msgstr "Caça aos ovos"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Caça aos ovos: Explore as pistas para encontrar os ovos."
 
@@ -1181,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Ovos: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefante"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminado"
 
@@ -1194,24 +1066,22 @@ msgstr "Eliminado"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Email tem de ser entre 4 e 50 caracteres apenas!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "O Email é inválido!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Os Emails não combinam!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1223,64 +1093,61 @@ msgstr "Ativar dispositivo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Ativo"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Ativas para tudo"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Escreva o nome do novo jogador"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Erro a descarregar notícias: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"Todos:\n"
-"Primam \"Selecionar\" para entrar no jogo!"
+msgstr "Todos:\nPrimam \"Selecionar\" para entrar no jogo!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Conta Online Existente"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Sair"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Sair da corrida"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Sair do jogo"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Perito"
 
@@ -1288,51 +1155,49 @@ msgstr "Perito"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explore as pistas para encontrar os ovos."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d - ContarPolígonos: %d Sólidos, %d Sombras - DistLuz : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Localizar proezas"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Localizar amigos"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Localizar último voto"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Localizar servidores"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Preencher o nome de utilizador e o endereço de email que forneceste para poder reiniciar a tua palavra-passe."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Volta final!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Localizar servidor"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1341,20 +1206,14 @@ msgstr "Disparar"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Precisa de diversos dispositivos (ter diversos comandos ou joysticks é a "
-"melhor forma para multi-jogadores). Aceda às definições e configure os "
-"comandos. Também podem jogar no teclado, mas neste caso, cada jogador terá "
-"que usar diversas teclas e esta não é a melhor forma de jogar, uma vez que "
-"os teclados  não possuem suporte a muitos jogadores."
+msgstr "Precisa de diversos dispositivos (ter diversos comandos ou joysticks é a melhor forma para multi-jogadores). Aceda às definições e configure os comandos. Também podem jogar no teclado, mas neste caso, cada jogador terá que usar diversas teclas e esta não é a melhor forma de jogar, uma vez que os teclados  não possuem suporte a muitos jogadores."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1367,55 +1226,51 @@ msgstr "Seguir o líder!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Seguir o líder: Dispute o segundo lugar, porque o último carro será "
-"desqualificado sempre que o cronómetro atinja o valor zero. Atenção: não "
-"deve ultrapassar o líder, ou também será eliminado."
+msgstr "Seguir o líder: Dispute o segundo lugar, porque o último carro será desqualificado sempre que o cronómetro atinja o valor zero. Atenção: não deve ultrapassar o líder, ou também será eliminado."
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Forte Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Encontrado(s) %d wiimote(s)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Amigo removido!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Pedido de amizade aceite!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Pedido de amizade cancelado!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Pedido de amizade recusado!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Pedido de amizade enviado!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Amigos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Ecrã completo"
 
@@ -1429,24 +1284,21 @@ msgstr "Golo!"
 msgid "Game Keys"
 msgstr "Teclas de jogo"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modos de jogo"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Tipo de jogo (objetivo/tempo)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1460,51 +1312,45 @@ msgstr "Botão %d do comando"
 msgid "Gamepad hat %d"
 msgstr "Hat %d do comando"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Geral"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Desistir da corrida"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Iluminação global"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Iluminação global: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Brilho (esboços)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Brilho (esboços) : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1514,61 +1360,53 @@ msgid "Go!"
 msgstr "Partida!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Condutor de Ouro"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Ilha Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grande prémio"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Editor de grande prémio"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Editor de grande prémio"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Evolução do grande prémio:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nível de efeitos gráficos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Gráficos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Definições gráficas"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Vale verde"
 
@@ -1581,16 +1419,14 @@ msgstr "Convidado"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Convidado %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "Entrar Convidado"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Fazenda"
 
@@ -1600,117 +1436,105 @@ msgstr "Fazenda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Ajuda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Recordes"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Atingir 10 karts com uma bola de bowling."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Atinja os jogadores com as armas até que percam as vidas. (Só para jogos "
-"multi-jogador)"
+msgstr "Atinja os jogadores com as armas até que percam as vidas. (Só para jogos multi-jogador)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Atingir o mesmo kart pelo menos 5 vezes numa corrida."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Só jogadores humanos"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Concordo com os termos apresentados e tenho mais de 13 anos. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Se me conseguir vencer na corrida, eu liberto-o."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Se vir um botão com um cadeado destes, é porque tem que completar uma "
-"corrida para o desbloquear."
+msgstr "Se vir um botão com um cadeado destes, é porque tem que completar uma corrida para o desbloquear."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorar %s. Tinha que entrar no jogo mais cedo!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalar"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermédio"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "O acesso à Internet está desativado, por favor ative-o nas opções"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "É um empate"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "É segredo"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Entrar"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "A entrar no servidor"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Manter esta resolução"
 
@@ -1721,7 +1545,7 @@ msgstr "Fique perto do líder mas não o ultrapasse."
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Associação de tecla"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1729,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Teclado %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1738,14 +1561,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Volta"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Volta %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Voltas"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1765,85 +1588,81 @@ msgstr "Esquerda"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Pára-choque esquerdo"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Botão de polegar esquerdo"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Polegar esquerdo inferior"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Esquerda do polegar esquerdo"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Esquerda do polegar direito"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Polegar esquerdo superior"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Gatilho esquerdo"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Eixo de luz (raios de Deus)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Eixo de luz (raios de Deus) : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "A carregar"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "�trio"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Opções do átrio."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloqueado: tem que jogar os desafios para lhes poder aceder!"
 
@@ -1851,13 +1670,53 @@ msgstr "Bloqueado: tem que jogar os desafios para lhes poder aceder!"
 msgid "Locked!"
 msgstr "Bloqueado!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Entrar"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Sair"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Sessão iniciada como: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "A entrar"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Iniciar sessão '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Iniciar sessão como convidado permite participar em corridas online, mas não te permite votar pelos addons, ou colecionar quaisquer proezas enquanto estiveres online."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Terminar sessão"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Terminar sessão '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Entrar"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1866,46 +1725,35 @@ msgstr "Olhar para trás"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "Verificar mais amigos:"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Fazer 5 derrapagens numa única etapa."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Fazer uma corrida com 5 etapas ou mais."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratonista"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Num. máximo de jogadores"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Tempo máximo (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "O meu"
 
@@ -1915,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Teclas do menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolfe"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Mosquito Caçador"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Desfoque de Movimento"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Desfoque de Movimento: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Eixo do rato %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1945,98 +1797,97 @@ msgstr "Botão %d do rato"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Mover para baixo"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Mover para cima"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Multi-jogador"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multi-jogador"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Música"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "O nome tem de ser entre 4 e 30 caracteres apenas!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "O Nome está vazio."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "O Nome é demasiado comprido."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
+msgstr "Nome do servidor"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "O grande prémio %s já está disponível."
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nova Conta Online"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "Nova Palavra-passe"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Novo Requerimento"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "O nível de dificuldade %s já está disponível."
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nova volta mais rápida"
 
@@ -2064,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Desafio de nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Nenhuma"
 
@@ -2086,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Corrida simples"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Estância do norte"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Tenha em atenção que se derrapar durante diversos segundos, receberá um "
-"prémio como recompensa."
+msgstr "Tenha em atenção que se derrapar durante diversos segundos, receberá um prémio como recompensa."
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Principiante"
 
@@ -2113,107 +1959,101 @@ msgstr "Inteligência artificial: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Inteligência artificial"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Número de golos necessários"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Número de etapas"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Número de etapas:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Aceitar"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Off the beaten"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Conta Offline"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Sim, ele está no meu castelo e servir-me-á para sempre..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Mina antiga"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Aula de matemática do Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Multijogador Online"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "Nome de utilizador Online"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Nome de utilizador online tem de ser entre 3 e 30 caracteres apenas!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Nome de utilizador online não pode começar com um número!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Neste momento, só o mestre de jogos pode atuar!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Oops! Se estiver em apuros, clique <%s> para ser salvo"
@@ -2224,62 +2064,54 @@ msgstr "Oops! Se estiver em apuros, clique <%s> para ser salvo"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opções"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Visão global"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "ENERGIA"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paraquedas - atrasa todo os karts melhor classificados."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Palavra-passe"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Palavra-passe :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Alterar Palavra-passe"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "A palavra-passe tem de ter entre 8 e 30 caracteres apenas!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Palavra-passe alterada com sucesso."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "As palavras-passe não coincidem!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2288,68 +2120,71 @@ msgstr "Pausa no jogo"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Em pausa"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Penalidade!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Pendente"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Parque dos pinguins"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Realizar voto"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Jogar tudo"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Jogar cada pista oficial pelo menos uma vez."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jogadores"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Por favor insere o nome do grande prémio"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Configure novamente os atalhos de teclado."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Aguarde pela atualização dos extras..."
@@ -2359,46 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Aguarde o carregamento dos extras..."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Ventosa - acerte no corredor à sua frente para o fazer recuar ou no que está "
-"atrás para o afastar."
+msgstr "Ventosa - acerte no corredor à sua frente para o fazer recuar ou no que está atrás para o afastar."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Powerup Amor"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Pressiona <%s> para olhar para trás, e dispara a arma com <%s> enquanto pressionas <%s> para disparar para trás!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Prima ESC para cancelar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Prima uma tecla"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Prima Enter ou clique duas vezes num dispositivo para o configurar."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Prima Enter ou clique duas vezes num jogador para o editar."
 
@@ -2414,10 +2241,7 @@ msgstr "Prima \"Disparar\" para iniciar o desafio."
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Prima em simultâneo os botões 1 +2 do seu wiimote para ativar o modo de "
-"descoberta e clique em OK. Pode encontrar mais instruções em "
-"supertuxkart.net/Wiimote."
+msgstr "Prima em simultâneo os botões 1 +2 do seu wiimote para ativar o modo de descoberta e clique em OK. Pode encontrar mais instruções em supertuxkart.net/Wiimote."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2431,20 +2255,18 @@ msgstr "Ocorreu um erro ao remover %s."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "A processar"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Perfil"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Progresso"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2452,37 +2274,31 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Empurre a bola para a jaula do adversário para marcar golos. (Só no modo "
-"multi-jogador)"
+msgstr "Empurre a bola para a jaula do adversário para marcar golos. (Só no modo multi-jogador)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Jogo Rápido"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Sair"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Sair do servidor."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Configuração de corridas"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Aleatório"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2490,15 +2306,15 @@ msgstr "Arena aleatória"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Grande Prémio Aleatório"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Kart aleatório"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Corrida aleatória"
 
@@ -2507,83 +2323,68 @@ msgid "Rank"
 msgstr "Posição"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Avaliação >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Aos seus lugares!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Realmente ... um segredo."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "A equipa vermelha ganhou"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Registo"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Corrida normal: Todas as armas são permitidas. Apanhe-as e utilize-as!"
+msgstr "Corrida normal: Todas as armas são permitidas. Apanhe-as e utilize-as!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Recarregar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Lembrar palavra-passe"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Memorizar local da janela"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Remover"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Mudar nome"
 
@@ -2609,35 +2410,31 @@ msgstr "Salvar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reiniciar"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Reiniciar corrida"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Inverter"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Reverter:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Revertido"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2647,84 +2444,78 @@ msgstr "Direita"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Pára-choque direito"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Botão de polegar direito"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Polegar direito inferior"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Direita do polegar esquerdo"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Direita do polegar direito"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Polegar direito superior"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Gatilho direito"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "VELOCIDADE"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
+msgstr "Empresa STK"
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Guardar o Grande Prémio"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Escócia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Procurar"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "A procurar"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2732,57 +2523,49 @@ msgid "Select"
 msgstr "Selecionar"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Seleciona uma dificuldade"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Escolha o modo de jogo"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Seleciona uma pista"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Escolha o kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Enviar estatísticas HW anónimas"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Criação de Servidor"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Info do Servidor"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Selecção de Servidor"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "Nome do Servidor :"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Servidor criado com sucesso. Podes agora entrar."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2791,93 +2574,51 @@ msgstr "Preparar!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Configurar nova corrida"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "Sombras"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Sombras: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Sombras: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Areias movediças"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Subúrbios"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Iniciar sessão"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Iniciar sessão como Convidado"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Desde"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Único Jogador"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2885,9 +2626,8 @@ msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Skid-row"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2896,12 +2636,10 @@ msgstr "Derrapar"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Neve"
 
@@ -2911,27 +2649,23 @@ msgid "Soccer"
 msgstr "Futebol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Campo de futebol"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr "Futebol: Só para multijogador. Utilize o seu kart para marcar golos."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Ocorreu um erro na ligação ao sítio de extras. Certifique-se que tem a "
-"ligação ativa e que o SuperTuxKart não está a ser bloqueado pela firewall."
+msgstr "Ocorreu um erro na ligação ao sítio de extras. Certifique-se que tem a ligação ativa e que o SuperTuxKart não está a ser bloqueado pela firewall."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2939,7 +2673,6 @@ msgstr "Ocorreu um erro ao transferir o extra."
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efeitos sonoros"
 
@@ -2948,30 +2681,28 @@ msgstr "Efeitos sonoros"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Padrão"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Iniciar"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Iniciar grande prémio"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Iniciar corrida"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2985,97 +2716,80 @@ msgstr "Virar à direita"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Modo de história"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Atacar!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Submeter"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "No mar"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Extras do SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Ajuda do SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opções do SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"O SuperTuxKart pode ser jogado por várias pessoas no mesmo computador."
+msgstr "O SuperTuxKart pode ser jogado por várias pessoas no mesmo computador."
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "O SuperTuxKart tem vários modos de jogo."
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Susana"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Alternador - as caixas são transformadas em bananas e as bananas em caixa."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Alternador - as caixas são transformadas em bananas e as bananas em caixa."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Mata moscas - esmaga os karts nas suas proximidades."
 
@@ -3084,34 +2798,37 @@ msgstr "Mata moscas - esmaga os karts nas suas proximidades."
 msgid "System Language"
 msgstr "Idioma do sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Toma os teus oponentes por mosquitos. Com o mata-moscas, esmaga pelo menos 5 deles numa corrida."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Termos de Acordo"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Compressão de Texturas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtro de texturas"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"A tecla \"Derrapar\" permite derrapar em curvas apertadas e ganhar "
-"aceleração."
+msgstr "A tecla \"Derrapar\" permite derrapar em curvas apertadas e ganhar aceleração."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Estádio"
 
@@ -3123,13 +2840,11 @@ msgstr "O módulo de extras está inativo no ecrã de opções."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"O ficheiro de recordes era antigo.\n"
-"Todos os recordes foram apagados."
+msgstr "O ficheiro de recordes era antigo.\nTodos os recordes foram apagados."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "O número máximo de jogadores tem de ser entre 2 e 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3138,48 +2853,29 @@ msgstr "Corrida contra o tempo"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Corrida contra o tempo: não existem armas pois só as capacidades de condução "
-"interessam."
+msgstr "Corrida contra o tempo: não existem armas pois só as capacidades de condução interessam."
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Para adicionar um comando/joystick, inicia o SuperTuxKart e, em princípio, "
-"este aparecerá na lista.\n"
-"\n"
-"Para adicionar uma configuração de teclado, pode usar o botão abaixo. A "
-"maioria dos teclados apenas suportam um número limitado de teclas "
-"pressionadas simultaneamente e é inadequado para um jogo com vários "
-"jogadores. (Uma sugestão: ligue vários teclados ao computador e lembre-se de "
-"que todos os jogadores precisam de combinações de teclas diferente, neste "
-"caso.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Para adicionar um comando/joystick, inicia o SuperTuxKart e, em princípio, este aparecerá na lista.\n\nPara adicionar uma configuração de teclado, pode usar o botão abaixo. A maioria dos teclados apenas suportam um número limitado de teclas pressionadas simultaneamente e é inadequado para um jogo com vários jogadores. (Uma sugestão: ligue vários teclados ao computador e lembre-se de que todos os jogadores precisam de combinações de teclas diferente, neste caso.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Para o ajudar a ganhar, há algumas armas que pode usar:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Ira à Lua e voltar"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3189,12 +2885,12 @@ msgstr "Os primeiros %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Pista"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Pista %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3205,19 +2901,17 @@ msgstr "Corrida de %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Grupo de Pistas"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Corridas"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinear"
 
@@ -3228,47 +2922,42 @@ msgstr "Tentar novamente"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Manual: Seleção de salas"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipo:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Tipo: Grande Prémio"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Falha ao ligar ao servidor. Verifica a tua ligação à internet e tenta de novo."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Desinstalar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Imparável"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3280,8 +2969,8 @@ msgid "Update"
 msgstr "Atualizar"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Atualizado"
 
@@ -3290,78 +2979,71 @@ msgid "Updated date"
 msgstr "Data atualizada"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Usar 10 ou mais powerups numa corrida."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Usar texturas de alta definição"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Usar esquerda/direita para escolher a tua equipa e pressiona disparar"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Utilize o nitro recolhido premindo <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Info do Utilizador"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interface do utilizador"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Utilizador definido"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Procurar Utilizador"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Nome de Utilizador"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Nome de Utilizador e/ou endereço de email inválido."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Validar info"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3370,39 +3052,35 @@ msgstr "Versão: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronização vertical (tem que reiniciar)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Ver"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Votar"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Voto sucedido! Podes agora fechar a janela."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "PESO"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "SENTIDO CONTR�RIO!"
 
@@ -3411,141 +3089,121 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Não deve utilizar Shift como tecla: se a pressionar, todas as teclas cujo "
-"carácter seja diferente em maiúscula não funcionará."
+msgstr "Não deve utilizar Shift como tecla: se a pressionar, todas as teclas cujo carácter seja diferente em maiúscula não funcionará."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efeitos meteorológicos"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efeitos meteorológicos: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "O que é que se passa? O seu líder desapareceu?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Assim que configurar os dispositivos, pode jogar. Escolha uma corrida multi-"
-"jogador no menu principal. Para escolher um veículo, cada jogador tem que "
-"pressionar a tecla \"Disparar\" do comando, joystick ou teclado para entrar "
-"no jogo. Cada jogador pode usar o seu dispositivo para escolher o veículo. O "
-"jogo começará assim que todos os jogadores escolherem o veículo. Para esta "
-"operação, não pode utilizar o rato."
+msgstr "Assim que configurar os dispositivos, pode jogar. Escolha uma corrida multi-jogador no menu principal. Para escolher um veículo, cada jogador tem que pressionar a tecla \"Disparar\" do comando, joystick ou teclado para entrar no jogo. Cada jogador pode usar o seu dispositivo para escolher o veículo. O jogo começará assim que todos os jogadores escolherem o veículo. Para esta operação, não pode utilizar o rato."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Branco"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Vence 5 corridas únicas numa linha."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Vence em todos os modos de jogador único, contra pelo menos 3 oponentes."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Sim"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Está pronto para corret. Boa sorte."
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Está a jogar como"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Tu podes adaptar a tua classificação anterior clicando nas estrelas abaixo."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Não podes descarregar addons sem acesso à Internet. Se quiseres descarregar addons, vai a opções, seleciona o separador 'Interface de Utilizador', e edita \"Ligar à Internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Não podes jogar online sem acesso à Internet. Se quiseres jogar online, vai a opções, seleciona o separador 'Interface de Utilizador', e edita \"Ligar à Internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Tu podes jogar sem criar uma conta online selecionando uma conta offline. Mas assim não poderás conectar com amigos, votar por addons, etc. Por favor lê o nosso acordo de privacidade em http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Terminou o desafio!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Terminou os desafios!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Terminou o grande prémio!"
 
@@ -3553,33 +3211,35 @@ msgstr "Terminou o grande prémio!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Completaste o desafio difícil! Pontos ganhos neste nível: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Completaste o desafio fácil! Pontos ganhos neste nível: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Completaste o desafio intermédio! Pontos ganhos neste nível: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Terminou a corrida!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Tens um novo pedido de amizade!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Foi eliminado!"
 
@@ -3587,74 +3247,78 @@ msgstr "Foi eliminado!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Ainda não votaste por este addon. Seleciona a sua devida classificação clicando nas estrelas abaixo."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Precisas de mais pontos\npara entrar neste desafio!\nVerifica o minimapa para\ndisponíveis desafios."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Precisas de introduzir a palavra-passe."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Desbloquou o grande prémio %0!"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Desbloqueou a corrida %0!"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Tu irás receber um email com informações detalhadas em como reiniciar a palavra-passe. Por favor tem paciência e lembra-te de verificar a pasta de spam."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Tu irás receber um email com informações detalhadas acerca da ativação da conta. Por favor tem paciência e lembra-te de verificar a pasta de spam."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Ganhou a corrida!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"O ficheiro de configurações está danificado e vai ser eliminado. De seguida, "
-"um novo será criado."
+msgstr "O ficheiro de configurações está danificado e vai ser eliminado. De seguida, um novo será criado."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"O ficheiro de configurações é antigo e vai ser eliminado. De seguida, um "
-"novo será criado."
+msgstr "O ficheiro de configurações é antigo e vai ser eliminado. De seguida, um novo será criado."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "A versão do teu corredor é antiga, Por favor instala os últimos controladores de vídeo."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"O ficheiro de configuração não é compatível com esta versão do SuperTuxKart."
+msgstr "O ficheiro de configuração não é compatível com esta versão do SuperTuxKart."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "O teu perfil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Jardim Zen"
 
@@ -3665,16 +3329,16 @@ msgstr "[nenhuma]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "ações"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "tudo"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "de"
@@ -3683,50 +3347,25 @@ msgstr "de"
 msgid "featured"
 msgstr "especial"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "alto"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "baixo"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "padrão"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Douglas Moura https://launchpad.net/~araujodemoura\n"
-"  Evandro P. Alves https://launchpad.net/~evandro-pa\n"
-"  Fátima de Menezes Dantas https://launchpad.net/~fatima-menezes19\n"
-"  João Frade / 100 NOME https://launchpad.net/~100nome-portugal\n"
-"  Ricardo Conde https://launchpad.net/~turotulco\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Sérgio Marques https://launchpad.net/~sergio+marques"
+msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee\n  Bruno Ramalhete  https://launchpad.net/~bram-512\n  Douglas Moura https://launchpad.net/~araujodemoura\n  Evandro P. Alves https://launchpad.net/~evandro-pa\n  Fátima de Menezes Dantas https://launchpad.net/~fatima-menezes19\n  João Frade / 100 NOME https://launchpad.net/~100nome-portugal\n  Ricardo Conde https://launchpad.net/~turotulco\n  STK-team https://launchpad.net/~stk\n  Sérgio Marques https://launchpad.net/~sergio+marques"
diff --git a/data/po/pt_BR.po b/data/po/pt_BR.po
index 8f19e1f8a..bcb042e45 100644
--- a/data/po/pt_BR.po
+++ b/data/po/pt_BR.po
@@ -1,47 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# flaviozavan <flaviozavan@gmail.com>, 2015
+# Laete Meireles <laetemn@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.5\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Mateus Ferreira Silva <mtsferreirasilva@gmail.com>\n"
-"Language-Team: Flávio Zavan <flavio@nebososo.com>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-16 01:31+0000\n"
+"Last-Translator: flaviozavan <flaviozavan@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/supertuxkart/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: BRAZIL\n"
-"Language: \n"
-"X-Poedit-Language: Portuguese\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
 #. N (or nothing) otherwise
 #: src/utils/translation.cpp:262
 msgid "   Is this a RTL language?"
-msgstr "   N"
+msgstr " Essa é uma linguagem RTL?"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Mas você, pequeno patético imbecil, nunca será capaz de me derrotar - Rei "
-"dos Karts!"
+msgstr " Mas você, pequeno patético imbecil, nunca será capaz de me derrotar - Rei dos Karts!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d amigo está online neste momento."
+msgstr[1] "%d amigos estão online neste momento."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (com desvantagem)"
@@ -57,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s e %s estão agora conectados."
@@ -69,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s por %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s está conectado."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s está pronto"
@@ -96,25 +97,23 @@ msgstr "Perfil de %s"
 msgid "%s's server"
 msgstr "Servidor de %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s e %s estão agora conectados."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' foi eliminado."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Vazio)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(jogos em rede ainda não estão disponíveis)"
 
@@ -128,47 +127,34 @@ msgstr "* Um item vermelho indica conflito na configuração atual"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* As teclas podem ser vistas/alteradas no menu Opções"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* A maior parte destes modos também podem ser jogados em um campeonato: ao "
-"invés de apenas uma corrida, você joga várias seguidas. Quanto melhor a sua "
-"colocação, mais pontos você ganha. Ganha quem tiver a maior pontuação no "
-"final."
+msgstr "* A maior parte destes modos também podem ser jogados em um campeonato: ao invés de apenas uma corrida, você joga várias seguidas. Quanto melhor a sua colocação, mais pontos você ganha. Ganha quem tiver a maior pontuação no final."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Reinicie o STK para aplicar as novas configurações"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* A configuração utilizada será inferida dependendo de qual botão "
-"\"Selecionar\" for pressionado para entrar no jogo."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* A configuração utilizada será inferida dependendo de qual botão \"Selecionar\" for pressionado para entrar no jogo."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -199,13 +185,10 @@ msgstr "Batalha de 3 Vidas"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Batalha de 3 vidas: Apenas no modo Multijogador. Acerte os outros com as "
-"armas até perderem suas vidas."
+msgstr "Batalha de 3 vidas: Apenas no modo Multijogador. Acerte os outros com as armas até perderem suas vidas."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +203,20 @@ msgid "9 months"
 msgstr "9 meses"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Melhores Pontuações ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Karts do computador"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Abortar Campeonato"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Sobre"
 
@@ -245,39 +225,35 @@ msgstr "Sobre"
 msgid "Accelerate"
 msgstr "Acelerar"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Acelere e aperte a tecla <%s> numa curva para derrapar. Uma curta derrapagem "
-"pode ajudar nas curvas apertadas."
+msgstr "Acelere e aperte a tecla <%s> numa curva para derrapar. Uma curta derrapagem pode ajudar nas curvas apertadas."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Acelere com <%s> e vire com <%s> e <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Aceitar"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Recuperação da Conta"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Configurações da Conta"
 
@@ -285,8 +261,7 @@ msgstr "Configurações da Conta"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "Conquistas"
 
@@ -296,13 +271,11 @@ msgstr "Ação"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Adicionar"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Adicionar Amigo"
 
@@ -313,7 +286,6 @@ msgstr "Adicionar Configuração de Teclado"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Adicionar Jogador"
 
@@ -324,32 +296,29 @@ msgstr "Adicionar Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Adicionar dispositivo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Adicionar usuário"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Complementos"
 
@@ -359,71 +328,66 @@ msgstr "Nome do complemento"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Complementos"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Pipeline avançado (luzes, etc.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Todas"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Todas as pistas"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Todos os tipos de golpe permitidos, aproveite suas armas para tirar vantagem!"
+msgstr "Todos os tipos de golpe permitidos, aproveite suas armas para tirar vantagem!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Sempre mostrar a tela de login"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Oclusão Ambiente (AO)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Oclusão ambiente (AO): %s"
@@ -433,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Um erro ocorreu ao tentar salvar o seu campeonato"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Âncora - atrasa bastante o kart na primeira posição."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Personagens Animados"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personagens Animados : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Cenário Animado"
 
@@ -459,24 +420,24 @@ msgstr "Cenário Animado"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Cenário Animado : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Anisotrópico x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Anisotrópico x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Anisotrópico x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotrópico x8"
 
@@ -486,31 +447,27 @@ msgstr "Já existe outro campeonato com este nome."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Anti-aliasing"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Anti-aliasing : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Aplicar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aplicar nova resolução"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Aqui-Inimigo"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -523,49 +480,44 @@ msgstr "Você tem certeza que quer remover permanentemente esta configuração?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Tem certeza que deseja remover \"%s\"?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenas"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
-msgstr ""
+msgstr "Ao redor do farol"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "Não mapear"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Atribuir à tecla ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "No Fim do Mundo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "�udio"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evite as bananas!"
 
@@ -587,81 +539,66 @@ msgstr "Eixo %d %s"
 msgid "Axis %d inverted"
 msgstr "Eixo %d invertido"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Voltar"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Voltar ao jogo"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Voltar à corrida"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Voltar à seleção de desafios"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Voltar à lista de dispositivos"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Voltar ao menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Voltar ao menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Amante de Banana"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Bola de basquete - Quica atrás do líder, além de esmagar e retardar os "
-"outros adversários"
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Bola de basquete - Quica atrás do líder, além de esmagar e retardar os outros adversários"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Ilha da Batalha"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Animal"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Melhor sorte na próxima vez!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Bilinear"
 
@@ -671,39 +608,33 @@ msgid "Black"
 msgstr "Preto"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Mansão Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Bloom"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Bloom : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Time Azul Venceu"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Celeiro dos Bois"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bola de Boliche - ricocheteia nas paredes. Se você estiver olhando pra trás, "
-"é nesta direção que ela vai ser atirada."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bola de Boliche - ricocheteia nas paredes. Se você estiver olhando pra trás, é nesta direção que ela vai ser atirada."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -711,70 +642,58 @@ msgid "Brake"
 msgstr "Freiar"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Chiclete - Proteja-se com um escudo ou use olhando para trás para deixar uma "
-"poça rosa pegajosa."
+msgstr "Chiclete - Proteja-se com um escudo ou use olhando para trás para deixar uma poça rosa pegajosa."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Mas como sou uma criatura justa, faremos um acordo"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Bolo - jogado no rival mais próximo, melhor em distâncias curtas e longas "
-"retas."
+msgstr "Bolo - jogado no rival mais próximo, melhor em distâncias curtas e longas retas."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Não foi possível acessar o servidor stkaddons"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Cancelar Requisição"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -782,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Cancelar/Voltar"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Caverna X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Desafio completo"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Desafio Fracassado"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Desafios: Sala de Troféus"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Alterar"
 
@@ -809,62 +725,52 @@ msgstr "Alterar"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Escolha um Kart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Christoffel Columbus"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Clique aqui para jogar o tutorial"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Fechar"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Templo de Cacau"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Colete no mínimo 5 bananas em uma corrida."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Pegue as caixas azuis: elas lhe darão armas ou outros poderes"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Colete os presentes e dispare a arma com <%s> para destruir estas caixas."
+msgstr "Colete os presentes e dispare a arma com <%s> para destruir estas caixas."
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Colete os cilindros de nitro (nós os usaremos após a curva)"
 
@@ -874,17 +780,13 @@ msgstr "Colete o nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Pegar nitro permite que você aumente a velocidade sempre que desejar ao "
-"pressionar a tecla apropriada. Você pode ver o seu nível atual de nitro na "
-"barra à direita da tela do jogo."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Pegar nitro permite que você aumente a velocidade sempre que desejar ao pressionar a tecla apropriada. Você pode ver o seu nível atual de nitro na barra à direita da tela do jogo."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Complete todos os desafios para abrir a grande porta!"
 
@@ -897,11 +799,11 @@ msgstr "Conquista \"%s\" completa."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Confirmar"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -909,7 +811,6 @@ msgstr "Confirme a resolução em até %i segundos"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Conectar à Internet"
 
@@ -917,106 +818,86 @@ msgstr "Conectar à Internet"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Conecte o seu wiimote ao gerenciador Bluetooth e clique OK.Instruções "
-"detalhadas em supertuxkart.net/Wiimote"
+msgstr "Conecte o seu wiimote ao gerenciador Bluetooth e clique OK.Instruções detalhadas em supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Sem poderes especiais, a vitória só depende de sua habilidade na direção!"
+msgstr "Sem poderes especiais, a vitória só depende de sua habilidade na direção!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuar"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Continuar campeonato salvo"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Continuar."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controles"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "Falha ao criar o jogador \"%s\"."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Não foi possível detectar nenhum wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Criar"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Criar Servidor"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Criar Usuário"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Criar conta online"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Criando servidor"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Créditos"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Senha Atual"
 
@@ -1029,13 +910,12 @@ msgid "Currently not signed in"
 msgstr "Não conectado neste momento"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizado"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Configurações personalizadas..."
 
@@ -1061,7 +941,6 @@ msgstr "Digital para cima"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Recusar"
 
@@ -1069,28 +948,26 @@ msgstr "Recusar"
 msgid "Default"
 msgstr "Padrão"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Excluir"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Remover Configuração"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Profundidade de campo (DoF)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Produndidade de campo (DoF): %s"
@@ -1103,24 +980,23 @@ msgstr "Desabilitar Dispositivo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Desativado"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Mostrar FPS"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Quer mesmo desistir do campeonato?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Você realmente quer exlcuir o jogador '%s' ?"
@@ -1129,8 +1005,8 @@ msgstr "Você realmente quer exlcuir o jogador '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr "Deseja salvar as alterações?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Não acelere antes do já"
 
@@ -1141,27 +1017,24 @@ msgstr "Para baixo"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Dirigir ao contrário"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Luzes dinâmicas: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Editar"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Editar campeonato"
 
@@ -1172,10 +1045,8 @@ msgstr "Caça aos ovos"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-"Caça aos ovos: Explore as pistas para encontrar todos os ovos escondidos."
+msgstr "Caça aos ovos: Explore as pistas para encontrar todos os ovos escondidos."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1183,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Ovos: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Eliminado"
 
@@ -1196,24 +1066,22 @@ msgstr "Eliminado"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Email"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "O email deve ter entre 4 e 50 caracteres!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "Email inválido!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Os emails não coincidem."
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1225,27 +1093,24 @@ msgstr "Habilitar Dispositivo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Ativar desvantagens por jogador"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Ativado"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Habilitado para todos"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Digite o nome do novo jogador"
 
@@ -1260,27 +1125,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr "Todos:"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Conta Online Existente"
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Sair"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Sair da corrida"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Sair do jogo"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Experiente"
 
@@ -1288,12 +1155,12 @@ msgstr "Experiente"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Explore as pistas para encontrar todos os ovos escondidos."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "FPS: %d/%d/%d - %d KTris"
@@ -1318,21 +1185,17 @@ msgid "Fetching servers"
 msgstr "Baixando lista de servidores"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Complete com o nome de usuário e email utilizados na hora do cadastro para "
-"poder resetar sua senha/"
+msgstr "Complete com o nome de usuário e email utilizados na hora do cadastro para poder resetar sua senha/"
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Última volta!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Procurar Servidor"
 
@@ -1343,22 +1206,14 @@ msgstr "Atirar"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Primeiramente, você precisa de vários dispositivos de entrada (para jogar "
-"com várias pessoas, o ideal é usar controles ou manches). Vá à tela de "
-"configurações de entrada para configurar os controles. Também é possível "
-"jogar usando teclados, porém a mesma tecla não pode ser usada por mais de um "
-"jogador.  E lembre-se que a maioria dos teclados não é apropriada para mais "
-"de um jogador, por não suportarem pressionamento simultâneo de um grande "
-"número de teclas."
+msgstr "Primeiramente, você precisa de vários dispositivos de entrada (para jogar com várias pessoas, o ideal é usar controles ou manches). Vá à tela de configurações de entrada para configurar os controles. Também é possível jogar usando teclados, porém a mesma tecla não pode ser usada por mais de um jogador.  E lembre-se que a maioria dos teclados não é apropriada para mais de um jogador, por não suportarem pressionamento simultâneo de um grande número de teclas."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1371,25 +1226,22 @@ msgstr "Siga o líder!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Siga o líder: Mantenha-se em segundo lugar, o último colocado será "
-"desqualificado toda vez que o contador zerar. Cuidado: Todos a frente do "
-"líder também serão eliminados."
+msgstr "Siga o líder: Mantenha-se em segundo lugar, o último colocado será desqualificado toda vez que o contador zerar. Cuidado: Todos a frente do líder também serão eliminados."
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Forte Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Encontrado %d wiimote(s)"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "%d wiimote encontrado"
+msgstr[1] "%d wiimotes encontrados"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1413,13 +1265,12 @@ msgstr "Pedido de amizade enviado!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Amigos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
@@ -1433,22 +1284,19 @@ msgstr "GOL!"
 msgid "Game Keys"
 msgstr "Teclas de Jogo"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Modos de Jogo"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Tipo de jogo (Limite de gols / Limite de tempo)"
 
@@ -1464,51 +1312,45 @@ msgstr "Botão %d do Controle"
 msgid "Gamepad hat %d"
 msgstr "Direcional digital %d do Controle"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Geral"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Desistir da corrida"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Iluminação global"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Iluminação global: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Aura"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Aura: %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1518,63 +1360,55 @@ msgid "Go!"
 msgstr "Já!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Coletor de ouro"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Ilha Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Campeonato"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Editor de Campeonatos"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Editor de campeonatos"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Progresso no Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nível dos efeitos gráficos"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Gráficos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Configurações Gráficas"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
-msgstr ""
+msgstr "Vale Verde"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1589,12 +1423,10 @@ msgstr "Convidado %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Login de Convidado"
+msgid "Guest Log in"
+msgstr "Entrar Como Convidado"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1604,102 +1436,90 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Ajuda"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Melhores Pontuações"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Acerte 10 karts com uma bola de boliche."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Use armas para acertar os outros até que eles percam todas as vidas. (Apenas "
-"para mais de um jogador)"
+msgstr "Use armas para acertar os outros até que eles percam todas as vidas. (Apenas para mais de um jogador)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Acerte o mesmo kart pelo menos 5 vezes em uma corrida."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Jogadores humanos somente"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Eu aceito os termos acima e tenho 13 anos ou mais. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
+msgstr "Se você conseguir me vencer em uma corrida, liberarei o velhaco."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Se você vir um botão com um cadeado como este, você precisa completar um "
-"desafio para desbloqueá-lo."
+msgstr "Se você vir um botão com um cadeado como este, você precisa completar um desafio para desbloqueá-lo."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorando '%s', você precisa entrar antes para jogar!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "Iluminação bseado em imagem"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Instalar"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermediário"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
-"O acesso à internet está desabilitado, por favor habilite-o nas opções"
+msgstr "O acesso à internet está desabilitado, por favor habilite-o nas opções"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "É um empate"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "É um segundo"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Entrar"
 
@@ -1709,13 +1529,12 @@ msgstr "Entrar no servidor"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Karts"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Manter esta resolução"
 
@@ -1734,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Teclado %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1743,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Volta"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Volta %i"
@@ -1805,50 +1623,46 @@ msgstr "Gatilho esquerdo"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Raios crepusculares"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Raios crepusculares: %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Carregando"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Lobby"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "Configurações do Lobby"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Nome de Usuário Local"
+msgid "Local Name"
+msgstr "Nome Local"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bloqueado : ganhe os desafios ativos para ter acesso a mais!"
 
@@ -1856,11 +1670,51 @@ msgstr "Bloqueado : ganhe os desafios ativos para ter acesso a mais!"
 msgid "Locked!"
 msgstr "Bloqueado!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Entrar"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Sair"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Dentro como: %s"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Entrando"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Entrando '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Entrar como convidado permite a participação em corridas online, entretando, não permite a votação em addons ou a obtenção de conquistas enquanto online."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Saindo"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Saindo '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Login"
 
@@ -1871,46 +1725,35 @@ msgstr "Olhar para trás"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Procurar por mais amigos:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Faça 5 derrapadas em uma única volta."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Faça uma corrida com 5 ou mais voltas."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratonista"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Número máximo de jogadores"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Tempo máximo (em minutos)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Somente Eu"
 
@@ -1920,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Teclas do Menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolf"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Caçador de Mosquito"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Motion blur"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Motion blur: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Eixo do Mouse %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1950,48 +1797,41 @@ msgstr "Botão %d do Mouse"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Descer"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Subir"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Vários jogadores"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Multi-jogador"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Música"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Nome"
 
@@ -2011,13 +1851,15 @@ msgstr "O nome é comprido de mais"
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Nome do servidor"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Lago do Nessie"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "Novo"
 
@@ -2026,9 +1868,13 @@ msgstr "Novo"
 msgid "New Grand Prix '%s' now available"
 msgstr "Novo Campeonato: '%s' está disponível"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "Nova conta online"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "Nova Senha"
 
@@ -2041,7 +1887,7 @@ msgstr "Nova Requisição"
 msgid "New difficulty '%s' now available"
 msgstr "Nova dificuldade: '%s' está disponível"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nova volta mais rápida"
 
@@ -2069,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Desafio de nitro"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "Não"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Nenhum"
 
@@ -2091,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Corrida Normal"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Refúgio do Norte"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Note que se você conseguir derrapar durante vários segundos, você receberá "
-"um bônus de velocidade."
+msgstr "Note que se você conseguir derrapar durante vários segundos, você receberá um bônus de velocidade."
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Amador"
 
@@ -2118,46 +1959,41 @@ msgstr "Número de Karts IA: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Quantidade de Karts do Computador"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Número de gols para vencer"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Número de voltas"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Número de voltas:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Fora do caminho comum"
 
@@ -2165,60 +2001,59 @@ msgstr "Fora do caminho comum"
 msgid "Offline"
 msgstr "Desconectado"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "Conta Offline"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
+msgstr "A sim, veja, ele está no meu castelo agora e será servido no jantar"
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Mina Velha"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Aula de Matemática do Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "Conectado"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Modo Multijogador Online"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Nome de Usuário Online"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "O nome de usuário online deve ter entre 3 e 30 caracteres!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "O nome de usuários online não pode começar com um número!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Apenas o Mestre do Jogo pode agir neste momento!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ops! Se estiver em apuros, clique <%s> para ser salvo"
@@ -2229,51 +2064,43 @@ msgstr "Ops! Se estiver em apuros, clique <%s> para ser salvo"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Opções"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Visão Geral"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "FORÇA"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paraquedas - reduz a velocidade dos karts em posições à frente"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Senha"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Senha:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Alterar Senha"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "A senha deve ter entre 8 e 30 caracteres!"
 
@@ -2281,8 +2108,8 @@ msgstr "A senha deve ter entre 8 e 30 caracteres!"
 msgid "Password successfully changed."
 msgstr "Senha alterada com sucesso."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "As senhas não coincidem!"
 
@@ -2293,12 +2120,11 @@ msgstr "Pausar o Jogo"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pausado"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Penalidade de Tempo!"
 
@@ -2307,7 +2133,6 @@ msgid "Pending"
 msgstr "Pendente"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Playground dos Penguins"
 
@@ -2316,37 +2141,38 @@ msgid "Performing vote"
 msgstr "Realizando votação"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Jogar todas"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Jogue todas as pistas oficiais pelo menos uma vez."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jogadores"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Os jogadores podem selecionar perfis com desvantagens (mais difíceis) na tela de seleção de kart"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Entre com o nome do campeonato"
 
@@ -2355,6 +2181,10 @@ msgstr "Entre com o nome do campeonato"
 msgid "Please re-configure your key bindings."
 msgstr "Por favor, reconfigure os atalhos do teclado."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Por favor leia os termos e condições"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Aguarde enquanto os complementos são atualizados"
@@ -2364,49 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Aguarde enquanto os complementos estão sendo carregados"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Desentupidor - jogue para frente para puxar um adversário para trás, ou "
-"jogue olhando para trás para fazer um perder de visão."
+msgstr "Desentupidor - jogue para frente para puxar um adversário para trás, ou jogue olhando para trás para fazer um perder de visão."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Amor aos Poderes"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Pressione <%s> para olhar para trás, e dispare sua arma com <%s> enquanto "
-"segura <%s> para disparar para trás."
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Pressione <%s> para olhar para trás, e dispare sua arma com <%s> enquanto segura <%s> para disparar para trás."
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pressione ESC para cancelar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Pressione uma tecla"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Pressione Enter ou clique duas vezes em um dispositivo para configurá-lo"
+msgstr "Pressione Enter ou clique duas vezes em um dispositivo para configurá-lo"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Pressione Enter ou clique duas vezes em um jogador para editá-lo"
 
@@ -2422,10 +2241,7 @@ msgstr "Pressione Atirar para iniciar o desafio"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Pressione os botões 1+2 simultaneamente em seu wiimote para colocá-lo em "
-"modo de descoberta, em seguida clique em OK. Instruções detalhadas em "
-"supertuxkart.net/Wiimote"
+msgstr "Pressione os botões 1+2 simultaneamente em seu wiimote para colocá-lo em modo de descoberta, em seguida clique em OK. Instruções detalhadas em supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2443,7 +2259,6 @@ msgstr "Processando"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Perfil"
 
@@ -2452,7 +2267,6 @@ msgid "Progress"
 msgstr "Progesso"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2460,31 +2274,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Empurre a bola para dentro da jaula oposta para marcar gols. (Apenas jogos "
-"multijogador)"
+msgstr "Empurre a bola para dentro da jaula oposta para marcar gols. (Apenas jogos multijogador)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Jogo Rápido"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Sair"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Sair do servidor."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Configuração da Corrida"
 
@@ -2505,8 +2313,8 @@ msgstr "Campeonato Aleatório"
 msgid "Random Kart"
 msgstr "Kart Aleatório"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Pista aleatória"
 
@@ -2515,84 +2323,68 @@ msgid "Rank"
 msgstr "Classificação"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Classificação >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Atenção!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Sério... um segredo."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Time vermelho venceu"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Cadastrar"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Corrida normal: Todos os tipos de ataque permitidos. Pegue armas e faça bom "
-"uso delas!"
+msgstr "Corrida normal: Todos os tipos de ataque permitidos. Pegue armas e faça bom uso delas!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Recarregar"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Lembrar senha"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Lembrar posição da janela"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Remover"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Renomear"
 
@@ -2618,29 +2410,25 @@ msgstr "Resgatar"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reiniciar"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Recomeçar Corrida"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Reverso"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Reverter:"
 
@@ -2695,43 +2483,37 @@ msgstr "Gatilho direito"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "VELOCIDADE"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr ""
+msgstr "STK Enterprise"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Sara, a Corredora"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Sara, a Maga"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Salvar"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Salvar campeonato"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Escócia"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Buscar"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Buscando"
 
@@ -2741,12 +2523,10 @@ msgid "Select"
 msgstr "Selecionar"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Selecione a dificuldade"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Selecione o modo de jogo"
 
@@ -2756,36 +2536,30 @@ msgstr "Selecione uma pista"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Selecione um kart"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Enviar dados de hardware anonimamente"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Criação do Servidor"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Informação do Servidor"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Seleção de Servidor"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Nome do servidor:"
 
@@ -2800,94 +2574,49 @@ msgstr "Preparar!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Configurar Nova Corrida"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Sombras"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Sombras: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Sombras: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Areia movediça"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Subúrbios brilhantes"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Fazer login"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Fazer Login Como Convidado"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Sair"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Conectado como: %s"
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Conectando"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Conectando como \"%s\""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Conectar-se como um convidado permite a participação em corridas online. "
-"Entretanto, não permite a votação em complemento ou a obtenção de conquistas "
-"enquanto online."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Saindo"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Saindo como \"%s\""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Desde"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Um Jogador"
 
@@ -2897,9 +2626,8 @@ msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Derrapador"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2908,12 +2636,10 @@ msgstr "Derrapagem"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Aparência"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Pico de Neve"
 
@@ -2923,30 +2649,23 @@ msgid "Soccer"
 msgstr "Futebol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
-msgstr ""
+msgstr "Campo de futebol"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Futebol: Somente no modo multijogador. Use seu kart para empurrar a bola ao "
-"gol."
+msgstr "Futebol: Somente no modo multijogador. Use seu kart para empurrar a bola ao gol."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Desculpe, um erro ocorreu ao contatar o site de complementos. Certifique-se "
-"que está conectado à Internet e que o SuperTuxKart não está bloqueado por um "
-"firewall."
+msgstr "Desculpe, um erro ocorreu ao contatar o site de complementos. Certifique-se que está conectado à Internet e que o SuperTuxKart não está bloqueado por um firewall."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2954,7 +2673,6 @@ msgstr "Desculpe, o download do complemento falhou"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efeitos Sonoros"
 
@@ -2963,7 +2681,6 @@ msgstr "Efeitos Sonoros"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Padrão"
 
@@ -2976,11 +2693,10 @@ msgstr "Start"
 msgid "Start Grand Prix"
 msgstr "Iniciar Campeonato"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Iniciar Corrida"
 
@@ -3000,150 +2716,131 @@ msgstr "Virar para a direita"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Modo História"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Strike!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Submeter"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Fundo do Mar"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Complementos do SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Ajuda do SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Opções do SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"O SuperTuxKart pode ser jogado por mais de um jogador no mesmo computador"
+msgstr "O SuperTuxKart pode ser jogado por mais de um jogador no mesmo computador"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart apresenta vários modos de jogo"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "O SuperTuxKart pode se conectar a um servidor para baixar add-ons e notificá-lo sobre atualizações. Também colatamos estatísticas anônimas de hardware a fim de ajudar o desenvolvimento do jogo. Por favor leia a nossa política de privacidade em http://privacy.supertuxkart.net. Você gostaria de ativar esta opção? (Caso mude de idéia, você pode ir em opções, selecionar a aba \"Interface de Usuário\" e editar \"Conectar à Internet\" e \"Enviar estatísticas anônimas de HW\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Alternador - caixas de presentes são transformadas em bananas e vice-versa "
-"por um breve período."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Alternador - caixas de presentes são transformadas em bananas e vice-versa por um breve período."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Mata-Moscas - irá esmagar os karts próximos e diminuir suas velocidades."
+msgstr "Mata-Moscas - irá esmagar os karts próximos e diminuir suas velocidades."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Idioma do Sistema"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Trate seus oponentes como mosquitos! Com a raquete, esmage pelo menos 5 deles em uma corrida."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Templo"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "Termos e  Contratos"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Compressão de textura"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtro de Textura"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"O botão \"derrapagem\" permite derrapar em curvas fechadas e receber uma "
-"propulsão."
+msgstr "O botão \"derrapagem\" permite derrapar em curvas fechadas e receber uma propulsão."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "O Estádio"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-"O módulo de complementos está atualmente desativado na tela de Opções"
+msgstr "O módulo de complementos está atualmente desativado na tela de Opções"
 
 #: src/race/highscore_manager.cpp:101
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"O arquivo de melhores pontuações estava muito velho,\n"
-"todas as pontuações foram apagadas."
+msgstr "O arquivo de melhores pontuações estava muito velho,\ntodas as pontuações foram apagadas."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3156,41 +2853,22 @@ msgstr "Corrida Contra o Relógio"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Corrida Contra o Relógio: Não contém poderes especiais, então só as suas "
-"habilidades contam!"
+msgstr "Corrida Contra o Relógio: Não contém poderes especiais, então só as suas habilidades contam!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Para adicionar um novo Controle/Manche, basta começar o SuperTuxKart com ele "
-"ligado, que aparecerá na lista.\n"
-"\n"
-"Para adicionar uma configuração de teclado, você pode usar o botão abaixo, "
-"NO ENTANTO, vale lembrar que os teclados suportam apenas um número limitado "
-"de teclas pressionadas simultaneamente e são, portanto, inadequados para "
-"mais de um jogador. (Você pode, no entanto, ligar vários teclados no "
-"computador. Lembre-se que precisa usar combinações de teclas diferente neste "
-"caso.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Para adicionar um novo Controle/Manche, basta começar o SuperTuxKart com ele ligado, que aparecerá na lista.\n\nPara adicionar uma configuração de teclado, você pode usar o botão abaixo, NO ENTANTO, vale lembrar que os teclados suportam apenas um número limitado de teclas pressionadas simultaneamente e são, portanto, inadequados para mais de um jogador. (Você pode, no entanto, ligar vários teclados no computador. Lembre-se que precisa usar combinações de teclas diferente neste caso.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Para ajudar a vencer, há alguns poderes que você pode pegar :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "À lua e de volta"
 
@@ -3209,7 +2887,7 @@ msgstr "Os %i Melhores"
 msgid "Track"
 msgstr "Pista"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Pista %i/%i"
@@ -3223,19 +2901,17 @@ msgstr "Pista por %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Grupo de pistas"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Pistas"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Trilinear"
 
@@ -3246,24 +2922,21 @@ msgstr "Tente novamente"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Tutorial"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Tutorial : Seleção de sala"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tipo:"
 
@@ -3271,24 +2944,20 @@ msgstr "Tipo:"
 msgid "Type: Grand Prix"
 msgstr "Tipo: Campeonato"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"Falha ao conectar ao servidor. Verifique sua conexão à internet e tente "
-"novamente mais tarde."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "Falha ao conectar ao servidor. Verifique sua conexão à internet e tente novamente mais tarde."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Desinstalar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "Imparável"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3300,8 +2969,8 @@ msgid "Update"
 msgstr "Atualizar"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Atualizado"
 
@@ -3310,41 +2979,36 @@ msgid "Updated date"
 msgstr "Atualizar data"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Use 10 ou mais poderes em uma corrida."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Utlizar texturas de alta definição"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
-"Use direita/esquerda para selecionar seu time e pressione o botão de disparo"
+msgstr "Use direita/esquerda para selecionar seu time e pressione o botão de disparo"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Utilize o nitro recolhido pressionando <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Informação do Usuário"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interface de usuário"
 
@@ -3353,19 +3017,17 @@ msgid "User defined"
 msgstr "Definido pelo usuário"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Busca por usuário"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Nome de Usuário"
 
@@ -3374,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr "Nome de usuário e/ou email inválido."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Validando dados"
 
@@ -3391,27 +3052,23 @@ msgstr "Versão: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Sincronização Vertical (requer reinicialização)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Ver"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volume"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Votar"
 
@@ -3421,9 +3078,9 @@ msgstr "Voto realizado com sucesso! Você pode fechar a janela agora."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "PESO"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "Você está na CONTRAMÃO!"
 
@@ -3432,60 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Atenção, não é recomendando o uso da tecla 'Shift', pois quando ela é "
-"apertada, todas as teclas que não contém um caracter em caixa-alta são "
-"ignoradas."
+msgstr "Atenção, não é recomendando o uso da tecla 'Shift', pois quando ela é apertada, todas as teclas que não contém um caracter em caixa-alta são ignoradas."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Armas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Efeitos do Tempo"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Efeitos de Clima: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
+msgstr "O que aconteceu, hippongas? O seu grande líder gnu sumiu?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Quando os dispositivos de entrada estão configurados, você esta pronto para "
-"jogar. Selecione o ícone 'Vários jogadores' no menu principal. Na hora de "
-"escolher um kart, cada jogador pode pressionar a tecla \"Atirar\" de seu "
-"controle ou teclado para entrar no jogo. Cada jogador pode usar seu "
-"dispositivo de entrada para selecionar o seu kart. O jogo continua quando "
-"todos os karts estão selecionados. Observe que o mouse não pode ser usado "
-"para esta operação."
+msgstr "Quando os dispositivos de entrada estão configurados, você esta pronto para jogar. Selecione o ícone 'Vários jogadores' no menu principal. Na hora de escolher um kart, cada jogador pode pressionar a tecla \"Atirar\" de seu controle ou teclado para entrar no jogo. Cada jogador pode usar seu dispositivo de entrada para selecionar o seu kart. O jogo continua quando todos os karts estão selecionados. Observe que o mouse não pode ser usado para esta operação."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3493,83 +3135,75 @@ msgid "White"
 msgstr "Branco"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Vença 5 corridas seguidas."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Vença em todos os modos de um jogador contra pelo menos 3 oponentes."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Sim"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Você está pronto para correr. Boa sorte!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Você está jogando como"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
-"Você pode adaptar as suas avaliações anteriores clicando nas estrelas abaixo."
+msgstr "Você pode adaptar as suas avaliações anteriores clicando nas estrelas abaixo."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Você não pode baixar addons sem acesso à internet. Se você deseja baixar addons, vá em opções, selecione a aba \"Interface de Usuário\" e edite \"Conectar-se à internet\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Você não pode jogar online sem acesso à internet. Se você deseja baixar addons, vá em opções, selecione a aba \"Interface de Usuário\" e edite \"Conectar-se à internet\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Você pode jogar sem criar uma conta online selecionando uma conta offline. Entretanto, você não poderá se conectar a amigos, votar em addons, etc. Por favor leia nossa politica de privacidade em "
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Você completou um desafio!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Você completou desafios!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Você terminou o Campeonato!"
 
@@ -3577,37 +3211,35 @@ msgstr "Você terminou o Campeonato!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Você completou o desafio difícil! Número de pontos obtidos neste nível: %i/%i"
+msgstr "Você completou o desafio difícil! Número de pontos obtidos neste nível: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Você completou o desafio fácil! Número de pontos obtidos neste nível: %i/%i"
+msgstr "Você completou o desafio fácil! Número de pontos obtidos neste nível: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Você completou o desafio intermediário! Número de pontos obtidos neste "
-"nível: %i/%i"
+msgstr "Você completou o desafio intermediário! Número de pontos obtidos neste nível: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Você terminou a corrida!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Você tem %d novas requisições de amizade!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "Você tem %d nova requisição de amizade!"
+msgstr[1] "Você tem %d novas requisições de amizade!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Você tem uma nova requisição de amizade!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Você foi eliminado!"
 
@@ -3615,71 +3247,67 @@ msgstr "Você foi eliminado!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Você ainda não votou neste complemento. Selecione sua avaliação desejada "
-"clicando nas estrelas abaixo."
+msgstr "Você ainda não votou neste complemento. Selecione sua avaliação desejada clicando nas estrelas abaixo."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Você necessita de mais pontos\n"
-"para entrar neste desafio!\n"
-"Olhe no minimapa para\n"
-"desafios disponíveis."
+msgstr "Você necessita de mais pontos\npara entrar neste desafio!\nOlhe no minimapa para\ndesafios disponíveis."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Você precisa entrar com uma senha."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Você desbloqueou o campeonato %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Você desbloqueou a pista %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Você receberá um email com mais instruções sobre como resetar sua senha. Por "
-"favor tenha paciência e olhe na sua caixa de spam."
+msgstr "Você receberá um email com mais instruções sobre como resetar sua senha. Por favor tenha paciência e olhe na sua caixa de spam."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Você receberá um email com mais instruções sobrea ativação de sua conta. Por "
-"favor tenha paciência e olhe na sua caixa de spam."
+msgstr "Você receberá um email com mais instruções sobrea ativação de sua conta. Por favor tenha paciência e olhe na sua caixa de spam."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Você venceu a corrida!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "A sua versão do OpenGL aparenta ser muito velha. Por favor verifique se existe uma atualização para o seu driver de vídeo. O SuperTuxKart requer o OpenGL 3.1 ou melhor."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Seu arquivo de configuração estava com problema, por isso ele foi removido e "
-"será substituído por um novo."
+msgstr "Seu arquivo de configuração estava com problema, por isso ele foi removido e será substituído por um novo."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Seu arquivo de configuração era velho demais, por isso foi excluído e um "
-"novo será criado."
+msgstr "Seu arquivo de configuração era velho demais, por isso foi excluído e um novo será criado."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "A versão do seu driver é muito antiga. Por favor instale a última versão do seu driver de vídeo."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3691,7 +3319,6 @@ msgid "Your profile"
 msgstr "Seu perfil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Jardim Zen"
 
@@ -3702,16 +3329,16 @@ msgstr "[nenhuma]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "ações"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "todas"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "por"
@@ -3720,61 +3347,25 @@ msgstr "por"
 msgid "featured"
 msgstr "com recursos"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "alta"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "baixa"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "padrão"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Adevair Heleno https://launchpad.net/~adevairhpj\n"
-"  Average John https://launchpad.net/~averagejohn\n"
-"  Eberval Oliveira Castro https://launchpad.net/~eberval-gmail\n"
-"  Edvaldo de Souza Cruz https://launchpad.net/~edvaldoscruz\n"
-"  Felipe Menezes https://launchpad.net/~felipe-fmc1\n"
-"  Flávio Zavan https://launchpad.net/~flaviozavan\n"
-"  Guilherme Marçal https://launchpad.net/~ogabiefofo\n"
-"  Marcelo R. de Sa https://launchpad.net/~marcelo-jambu\n"
-"  Mateus Ferreira Silva https://launchpad.net/~mtsferreirasilva\n"
-"  Mihailov https://launchpad.net/~mihailov\n"
-"  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
-"  Paulo Roberto de Oliveira Castro https://launchpad.net/~p-oliveira-castro\n"
-"  Pedro Folha https://launchpad.net/~pedrovi\n"
-"  Rafael Neri https://launchpad.net/~rafepel\n"
-"  Rodrigo Borges https://launchpad.net/~rbm0407\n"
-"  Rubens Bueno https://launchpad.net/~rubensvsbueno-l\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Teylo Laundos Aguiar https://launchpad.net/~teylo.aguiar\n"
-"  Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n"
-"  farrer https://launchpad.net/~farrer"
+msgstr "Launchpad Contributions:\n  Adevair Heleno https://launchpad.net/~adevairhpj\n  Average John https://launchpad.net/~averagejohn\n  Eberval Oliveira Castro https://launchpad.net/~eberval-gmail\n  Edvaldo de Souza Cruz https://launchpad.net/~edvaldoscruz\n  Felipe Menezes https://launchpad.net/~felipe-fmc1\n  Flávio Zavan https://launchpad.net/~flaviozavan\n  Guilherme Marçal https://launchpad.net/~ogabiefofo\n  Marcelo R. de Sa https://launchpad.net/~marcelo-jambu\n  Mateus Ferreira Silva https://launchpad.net/~mtsferreirasilva\n  Mihailov https://launchpad.net/~mihailov\n  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n  Paulo Roberto de Oliveira Castro https://launchpad.net/~p-oliveira-castro\n  Pedro Folha https://launchpad.net/~pedrovi\n  Rafael Neri https://launchpad.net/~rafepel\n  Rodrigo Borges https://launchpad.net/~rbm0407\n  Rubens Bueno https://launchpad.net/~rubensvsbueno-l\n  STK-team https://launchpad.net/~stk\n  Teylo Laundos Aguiar https://launchpad.net/~teylo.aguiar\n  Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n  farrer https://launchpad.net/~farrer"
diff --git a/data/po/ro.po b/data/po/ro.po
index 7bdad33a6..566dfcd92 100644
--- a/data/po/ro.po
+++ b/data/po/ro.po
@@ -1,19 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-04-19 14:08+0000\n"
-"Last-Translator: Daniel Butum <Unknown>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/supertuxkart/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
-"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Language: Romanian\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -24,40 +26,42 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
+msgstr " dar sunteți niște neisprăviți jalnici și nu mă învingeți pe mine - Regele karturilor!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (cu handicap)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
 #, c-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s KO"
 
 #: src/states_screens/dialogs/addons_loading.cpp:165
 #, c-format
 msgid "%s MB"
-msgstr "%s MB"
+msgstr "%s MO"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s și %s sunt acum conectați."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -66,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s de %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s s-a conectat."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s este gata"
@@ -86,82 +89,73 @@ msgstr "%s este gata"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "profilul lui %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "serverul lui %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s și %s sunt acum conectați."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' a fost eliminat."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
-msgstr "(Gol)"
+msgstr "(gol)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
-msgstr "(jocul în reţea nu este încă disponibil)"
+msgstr "(jocul în rețea încă nu este disponibil)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
+msgstr "* Un obiect albastru indică un conflict cu altă configuraţie"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Un obiect roșu indică un conflict în configurația actuală"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
+msgstr "* Tastele de control se pot vedea/modifica în meniul Opțiuni"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
+msgstr "* Majoritatea modurilor de joc se pot juca și în stil Grand Prix: în loc de o singură cursă, joci mai multe la rând. Cu cât te plasezi mai bine, cu atât aduni mai multe puncte. Câștigă cine adună mai multe puncte."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Repornește STK pentru aplicarea noilor setări"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Configurația folosită va fi dedusă din tasta  'Select' apăsată pentru intrarea în joc."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -186,15 +180,14 @@ msgstr "2 ani"
 #. I18N: Game mode
 #: src/race/race_manager.hpp:182
 msgid "3 Strikes Battle"
-msgstr ""
+msgstr "Luptă cu 3 lovituri"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
+msgstr "Luptă cu 3 lovituri: Doar cu alți jucători. Lovește jucătorii cu arme până își pierd viețile."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -209,62 +202,57 @@ msgid "9 months"
 msgstr "9 luni"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
-msgstr ""
+msgstr "= Recorduri ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Karturi IA"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
-msgstr "ÃŽntrerupe turneul"
+msgstr "Anulează Marele Premiu"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
-msgstr "Despre"
+msgstr "Despre joc"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:236
 msgid "Accelerate"
-msgstr "Accelerează"
+msgstr "Accelereație"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
+msgstr "Pentru a derapa, accelerează și apasă tasta <%s> în timp ce virezi. Un scurt derapaj te poate ajuta să virezi mai rapid în curbe strânse."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -272,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -283,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -300,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Adaugă jucător"
 
@@ -311,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Adaugă un dispozitiv"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -346,49 +327,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Suplimente"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Toate"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -398,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -419,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Personaje animate: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -445,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Peisaje animate: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -472,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -509,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arene"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "La sfârșitul lumii"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Sunet"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Evită bananele!"
 
@@ -573,79 +538,66 @@ msgstr "Axa %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "ÃŽnapoi"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Înapoi la Cursă"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "ÃŽnapoi la lista dispozitivelor"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "ÃŽnapoi la meniu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Mai mult noroc data viitoare!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Biliniar"
 
@@ -655,39 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bila de popice deviază din pereți. V-a fi aruncată în spate , dacă te uiți "
-"în spate"
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bila de popice deviază din pereți. V-a fi aruncată în spate , dacă te uiți în spate"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -695,7 +641,6 @@ msgid "Brake"
 msgstr "Frână"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -703,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Nu a putut fi accesat serverul  pentru suplimente"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -762,26 +700,23 @@ msgid "Cancel/Back"
 msgstr "Renunță/Înapoi"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -789,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "ÃŽnchide"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -853,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -873,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -885,7 +810,6 @@ msgstr "Confirmă rezoluția în următoarele %i secunde"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -899,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Continuă"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Controale"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Autori"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1002,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Personalizat"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1034,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1042,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Șterge configurația"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1076,24 +979,23 @@ msgstr "Dezactivează dispozitiv"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Dezactivat"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1102,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Nu accelera înainte de start"
 
@@ -1114,27 +1016,24 @@ msgstr "Jos"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1145,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1155,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1168,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1197,27 +1092,24 @@ msgstr "Activează dispozitiv"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Activat"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1232,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Ieșire din cursă"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1260,12 +1154,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1290,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Tura finală!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1313,13 +1205,12 @@ msgstr "Foc"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1334,7 +1225,6 @@ msgstr "Urmăreşte liderul"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1342,14 +1232,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1373,13 +1265,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1393,22 +1284,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1424,51 +1312,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1478,61 +1360,53 @@ msgid "Go!"
 msgstr "Start!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1549,12 +1423,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1564,22 +1436,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Ajutor"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Cele mai bune rezultate"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1590,71 +1458,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Intermediar"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1664,13 +1529,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1689,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1698,7 +1561,7 @@ msgstr ""
 msgid "Lap"
 msgstr "Runda"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1760,50 +1623,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1811,11 +1670,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1826,27 +1725,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1854,18 +1744,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1875,29 +1763,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1905,48 +1797,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1966,13 +1851,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1981,9 +1868,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1996,7 +1887,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "O noua cea mai rapida curba"
 
@@ -2024,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2046,21 +1936,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Novice"
 
@@ -2071,46 +1959,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2118,60 +2001,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2182,14 +2064,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Optiuni"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2198,35 +2077,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2234,8 +2108,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2246,12 +2120,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pauza"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Timp de penalizare!"
 
@@ -2260,7 +2133,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Curtea Penguinilor"
 
@@ -2269,37 +2141,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Jucători"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2308,6 +2181,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2317,44 +2194,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2388,7 +2259,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2397,7 +2267,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2409,25 +2278,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Iesire"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2448,8 +2313,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2458,82 +2323,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Pe locuri!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2559,29 +2410,25 @@ msgstr "Salvare"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Reincepe cursa"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2638,41 +2485,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2682,12 +2523,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2697,36 +2536,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2741,91 +2574,49 @@ msgstr "Pe poziţii!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Configurează o nouă cursă"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2835,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Mărime: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2846,12 +2636,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Skin"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2861,23 +2649,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2887,7 +2673,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Efecte sonore"
 
@@ -2896,7 +2681,6 @@ msgstr "Efecte sonore"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
@@ -2909,11 +2693,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "ÃŽncepe cursa"
 
@@ -2933,12 +2716,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2946,82 +2727,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3030,32 +2798,37 @@ msgstr ""
 msgid "System Language"
 msgstr "Limba sistemului"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtrare textură"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3080,30 +2853,22 @@ msgstr "Cursa contra timp"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3122,7 +2887,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3136,19 +2901,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3159,24 +2922,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3184,20 +2944,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Dezinstalează"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3211,8 +2969,8 @@ msgid "Update"
 msgstr "Actualizare"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Actualizat"
 
@@ -3221,40 +2979,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Interfaţă utilizator"
 
@@ -3263,19 +3017,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3284,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3301,27 +3052,23 @@ msgstr "Versiune: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertical Sync (necesită restart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volum"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3333,7 +3080,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "DRUM GRESIT!"
 
@@ -3344,45 +3091,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Arme"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3393,42 +3135,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Da"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3438,37 +3174,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3489,20 +3224,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Ai terminat cursa!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3512,7 +3250,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3520,36 +3258,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Ai castigat cursa!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3562,6 +3305,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3572,7 +3320,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3583,7 +3330,6 @@ msgstr "[niciuna]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3592,7 +3338,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "de"
@@ -3601,49 +3348,25 @@ msgstr "de"
 msgid "featured"
 msgstr "recomandări"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Alexandru Guduleasa https://launchpad.net/~gulyan89\n"
-"  Daniel Butum https://launchpad.net/~danielcode\n"
-"  DimStar https://launchpad.net/~dominique-launchpad-net\n"
-"  Dominique Leuenberger aka DimStar https://launchpad.net/~dimstar\n"
-"  Matus Michael https://launchpad.net/~m-matus\n"
-"  Nicolae Crefelean https://launchpad.net/~kneekoo\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Vitalie Ciubotaru https://launchpad.net/~vitalie-ciubotaru"
+msgstr "Launchpad Contributions:\n  Alexandru Guduleasa https://launchpad.net/~gulyan89\n  Daniel Butum https://launchpad.net/~danielcode\n  DimStar https://launchpad.net/~dominique-launchpad-net\n  Dominique Leuenberger aka DimStar https://launchpad.net/~dimstar\n  Matus Michael https://launchpad.net/~m-matus\n  Nicolae Crefelean https://launchpad.net/~kneekoo\n  STK-team https://launchpad.net/~stk\n  Vitalie Ciubotaru https://launchpad.net/~vitalie-ciubotaru"
diff --git a/data/po/ru.po b/data/po/ru.po
index 68739eca2..ad938af93 100644
--- a/data/po/ru.po
+++ b/data/po/ru.po
@@ -1,47 +1,50 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Andrei Stepanov, 2015
+# Dmitry Dubrov <dimprogpro@hotmail.ru>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: KroArtem <feeblehamster@gmail.com>\n"
-"Language-Team: M.I.F. Projects <i18n@mifprojects.com>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-16 09:10+0000\n"
+"Last-Translator: Dmitry Dubrov <dimprogpro@hotmail.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/supertuxkart/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"Language: \n"
-"X-Poedit-Language: Russian\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
 #. N (or nothing) otherwise
 #: src/utils/translation.cpp:262
 msgid "   Is this a RTL language?"
-msgstr "   N"
+msgstr "N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" �о вы, жалкие дурачки, никогда не �можете победить мен� - Корол� Картов !"
+msgstr "�о вы, жалкие дурачки, никогда не �можете победить мен� - Корол� Картов !"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d друг в �ети."
+msgstr[1] "%d друга в �ети."
+msgstr[2] "%d друзей в �ети."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr "%s (� гандикапом)"
@@ -57,7 +60,7 @@ msgstr "%s Кбайт"
 msgid "%s MB"
 msgstr "%s Мбайт"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s и %s �ейча� в �ети."
@@ -69,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, автор %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "лучший круг: %s, %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s �ейча� в �ети."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s готов"
@@ -96,79 +98,64 @@ msgstr "Профиль %s"
 msgid "%s's server"
 msgstr "Сервер %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s и %s �ейча� в �ети."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
-msgstr "'%s' ди�квалифицирован."
+msgstr "'%s' выбыл из гонки."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Пу�то)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
-msgstr "(Сетева� игра еще не до�тупна)"
+msgstr "(�етева� игра пока не до�тупна)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr "* Синий значок означает конфликт � другой конфигурацией."
+msgstr "* Синий значок означает конфликт � другой конфигурацией"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr "* кра�ные пункты означают конфликт в текущей конфигурации"
+msgstr "* Кра�ный значок означает конфликт в текущей конфигурации"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr "*Текущие на�тройки можно по�мотреть/изменить в меню �а�тройки"
+msgstr "* Текущие прив�зки клавиш можно по�мотреть/изменить в меню �а�троек"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* В бо�льшую ча�ть �тих видов игры можно �ыграть в Гран-при : вме�то одной "
-"тра��ы, вы можете проезжать не�колько �разу. Чем лучше ваш ранг, тем больше "
-"очков вы получаете. В результате игрок � бо�льшим количе�твом очков "
-"выигрывает кубок."
+msgstr "* В бо�льшую ча�ть �тих видов игры можно �ыграть в Гран-при: вме�то одной тра��ы, вы можете проезжать не�колько �разу. Чем лучше ваш ранг, тем больше очков вы получаете. В результате игрок � бо�льшим количе�твом очков выигрывает кубок."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr "* перезапу�тите STK дл� применени� изменений"
+msgstr "* Перезапу�тите STK дл� применени� изменений"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Выбор конфигурации будет зави�еть от того,  � какого у�трой�тва нажата "
-"кнопка 'Выбрать' при �оединении к игре."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Выбор конфигурации будет зави�еть от того,  � какого у�трой�тва нажата кнопка 'Выбрать' при �оединении к игре."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -199,13 +186,10 @@ msgstr "Битва Трех Ударов"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Битва трех ударов: только в мультиплеере. �такую других � помощью оружи� до "
-"тех пор, пока они не потер�ют в�е �вои жизни."
+msgstr "Битва трех ударов: только в многопользователь�ких играх. �такуйте других � помощью оружи� до тех пор, пока они не потер�ют в�е �вои жизни."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -220,23 +204,20 @@ msgid "9 months"
 msgstr "9 ме��цев"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Результаты ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Боты"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Покинуть Гран-при"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Об игре"
 
@@ -245,39 +226,35 @@ msgstr "Об игре"
 msgid "Accelerate"
 msgstr "Газ"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"У�корьте�ь и нажмите кнопку <%s> во врем� �кольжени�. �емного про�кользив, "
-"вы �можете бы�трее преодолеть крутой поворот."
+msgstr "У�корьте�ь и нажмите кнопку <%s> во врем� �кольжени�. �емного про�кользив, вы �можете бы�трее преодолеть крутой поворот."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
-msgstr "У�кор�йте�ь � помощью <%s> и поворачивайте � помощью <%s> и <%s>"
+msgstr "У�кор�йте�ь при помощи <%s> и поворачивайте � помощью <%s> и <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Прин�ть"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Во��тановление аккаунта"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "Параметры аккаунта"
 
@@ -285,8 +262,7 @@ msgstr "Параметры аккаунта"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "До�тижени�"
 
@@ -296,24 +272,21 @@ msgstr "Дей�твие"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Добавить"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Добавить друга"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
 msgid "Add Keyboard Configuration"
-msgstr "Добавить на�тройки клавиатуры"
+msgstr "Добавить конфигурацию клавиатуры"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Добавить игрока"
 
@@ -324,32 +297,29 @@ msgstr "Добавить контроллер Wii"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Добавить у�трой�тво"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Добавить пользовател�"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Дополнени�"
 
@@ -359,71 +329,66 @@ msgstr "�азвание дополнени�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Дополнени�"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
-msgstr "Adiumy"
+msgstr "�диуми"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "Дополнительные �ффекты"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "В�е"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "В�е тра��ы"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"В�е возможно�ти до�тупны, так что �обирайте оружие и и�пользуйте его � умом!"
+msgstr "В�е возможно�ти до�тупны, так что �обирайте оружие и и�пользуйте его � умом!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "В�егда показывать �кран входа"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "�манда"
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Глобальное затенение"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Глобальное затенение: %s"
@@ -433,25 +398,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "При �охранении вашей гонки возникла ошибка."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Якорь - �ильно замедл�ет карт, наход�щий�� на первой позиции."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
-msgstr "�нимированные игроки"
+msgstr "�нимированные пер�онажи"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "�нимированные пер�онажи: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "�нимированный ландшафт"
 
@@ -459,24 +421,24 @@ msgstr "�нимированный ландшафт"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "�нимированный ландшафт: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "�низотропна� х16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "�низотропна� х2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "�низотропна� х4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "�низотропна� х8"
 
@@ -486,36 +448,32 @@ msgstr "Уже �уще�твует гонка � таким же названи
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Сглаживание"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Сглаживание: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Применить"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Прин�ть новое разрешение"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Игривый тип"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr "Вы дей�твительно хотите удалить �то у�трой�тво?"
+msgstr "Вы дей�твительно хотите удалить �ту конфигурацию?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
@@ -523,49 +481,44 @@ msgstr "Вы дей�твительно хотите удалить �то у�
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Вы дей�твительно хотите удалить '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�рены"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
-msgstr "Around the lighthouse"
+msgstr "Вокруг Ма�ка"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "�е назначено"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "�азначить кнопке 'ESC'"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "�а Краю Света"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Звук"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Избегайте бананов!"
 
@@ -587,81 +540,66 @@ msgstr "О�и джой�тика %d %s"
 msgid "Axis %d inverted"
 msgstr "О�ь %d инвертирована"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "�азад"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Вернуть�� к игре"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Вернуть�� к гонке"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "�азад к выбору �оревнований"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Вернуть�� к �пи�ку у�трой�тв"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Вернуть�� в меню"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Вернуть�� в меню"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Любитель бананов"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Ба�кетбольный м�ч - прыгает за лидером гонки, может приплю�нуть и замедлить "
-"карты на �воём пути."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Ба�кетбольный м�ч - прыгает за лидером гонки, может приплю�нуть и замедлить карты на �воём пути."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Battle Island"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
-msgstr "Beastie"
+msgstr "Биши"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Удачи в �ледующий раз!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Билинейна�"
 
@@ -671,39 +609,33 @@ msgid "Black"
 msgstr "Чёрный"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
-msgstr "Blackhill Mansion"
+msgstr "Тёмный о�обн�к на холме"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Свечение"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Свечение: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Син�� команда победила"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
-msgstr "Bovine Barnyard"
+msgstr "Скотный Двор"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Шар дл� боулинга - от�какивает от �тен. Е�ли вы огл�нете�ь назад, то он "
-"также будет брошен назад."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Шар дл� боулинга - от�какивает от �тен. Е�ли вы огл�нете�ь назад, то он также будет брошен назад."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -711,70 +643,58 @@ msgid "Brake"
 msgstr "Тормоз"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Жевательна� резинка - защитите �еб� � помощью щита, или и�пользуйте её, "
-"обернувши�ь назад, чтобы о�тавить за �обой липкую розовую жижу."
+msgstr "Жевательна� резинка - защитите �еб� � помощью щита, или и�пользуйте её, обернувши�ь назад, чтобы о�тавить за �обой липкую розовую жижу."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "�о � че�тный, по�тому у мен� к Вам предложение."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Пирог - бро�ает�� в ближайшего �оперника, дей�твует лучше в�его на коротких "
-"ра��то�ни�х и длинных пр�мых."
+msgstr "Пирог - бро�ает�� в ближайшего �оперника, дей�твует лучше в�его на коротких ра��то�ни�х и длинных пр�мых."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "�ет до�тупа к �ерверу stkaddons..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Отмена"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Отменить запро�"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -782,26 +702,23 @@ msgid "Cancel/Back"
 msgstr "Отмена/�азад"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
-msgstr "Cave X"
+msgstr "Пещера X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Соревнование пройдено"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Соревнование провалено"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
-msgstr "Чемпионат : Комната Трофеев"
+msgstr "Чемпионат: Комната Трофеев"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Изменить"
 
@@ -809,66 +726,54 @@ msgstr "Изменить"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Выберите карт"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Кри�тоффель Колумбу�"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Щелкните �юда, чтобы начать обучение"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Закрыть"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Храм Какао"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Соберите не меньше 5 бананов за гонку."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Собирайте голубые коробки : они обе�печат ва� оружием или другими бону�ами"
+msgstr "Собирайте голубые коробки: они обе�печат ва� оружием или другими бону�ами"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Собирайте голубые коробки и и�пользуйте оружие � помощью кнопки <%s>, чтобы "
-"убрать �ти �щики � пути!"
+msgstr "Собирайте голубые коробки и и�пользуйте оружие � помощью кнопки <%s>, чтобы убрать �ти �щики � пути!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
-msgstr "Соберите нитро-зар�ды (они будути�пользовать�� их по�ле поворота)"
+msgstr "Соберите нитро-зар�ды (мы будем и�пользовать их по�ле поворота)"
 
 #: src/states_screens/race_gui_base.cpp:648
 msgid "Collect nitro!"
@@ -876,17 +781,13 @@ msgstr "Соберите нитро-зар�ды!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"�итро зар�ды дают возможно�ть у�корить�� при нажатии нужной кнопки тогда, "
-"когда вам �то надо. В правой ча�ти �крана показан текущий уровень нитро "
-"зар�да."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "�итро-зар�ды дают возможно�ть у�корить�� при нажатии нужной кнопки тогда, когда вам �то надо. В правой ча�ти �крана показан текущий уровень нитро зар�да."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Закончите в�е и�пытани�, чтобы открыть большую дверь!"
 
@@ -899,11 +800,11 @@ msgstr "Получено до�тижение \"%s\"."
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Прин�ть"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -911,7 +812,6 @@ msgstr "Подтвердите разрешение в течение %i �ек
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Подключение к Интернет"
 
@@ -919,106 +819,86 @@ msgstr "Подключение к Интернет"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Под�оедините wiimote к менеджеру Bluetooth, затем нажмите Ок. Подробную "
-"ин�трукцию �мотрите на supertuxkart.net/Wiimote"
+msgstr "Под�оедините wiimote к менеджеру Bluetooth, затем нажмите Ок. Подробную ин�трукцию �мотрите на supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"�е �одержит бону�ов, так что только ваши навыки вождени� имеют значение!"
+msgstr "�е �одержит бону�ов, только ваши навыки вождени� имеют значение!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Продолжить"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "Продолжить �охранённую гонку"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "Продолжить."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Управление"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "�евозможно �оздать игрока '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "�е удаёт�� ра�познать контроллер Wii"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "Создать"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "Создать �ервер"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "Создать пользовател�"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "Создать игровой аккаунт"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Создание �ервера"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Разработчики"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Текущий пароль"
 
@@ -1031,13 +911,12 @@ msgid "Currently not signed in"
 msgstr "Вход не произведён"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Пользователь�кие"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Пользователь�кие на�тройки"
 
@@ -1063,7 +942,6 @@ msgstr "DPad вверх"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Отклонить"
 
@@ -1071,28 +949,26 @@ msgstr "Отклонить"
 msgid "Default"
 msgstr "По умолчанию"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Удалить"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Удалить у�трой�тво"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Глубина резко�ти"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Глубина резко�ти: %s"
@@ -1105,24 +981,23 @@ msgstr "Отключить геймпад"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Выкл."
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
-msgstr "Отображать FPS"
+msgstr "Отображать Кадр/�"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Вы дей�твительно хотите прервать Гран-при?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Вы дей�твительно хотите удалить игрока '%s'?"
@@ -1131,8 +1006,8 @@ msgstr "Вы дей�твительно хотите удалить игрока
 msgid "Do you want to save your changes?"
 msgstr "Хотите �охранить изменени�?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "�е жмите газ до �лова 'Марш'"
 
@@ -1143,27 +1018,24 @@ msgstr "Вниз"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Гонка в обратном направлении"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Динамиче�кое о�вещение: %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Изменить"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Изменить Гран-при"
 
@@ -1174,9 +1046,8 @@ msgstr "Охота за �йцами"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr "Охота за �йцами : и��ледуй тра��у, чтобы найти в�е �пр�танные �йца."
+msgstr "Охота за �йцами: и��ледуйте тра��у, чтобы найти в�е �пр�танные �йца."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1184,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr "Яйца: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
-msgstr "Elephpant"
+msgstr "Слон"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Покинул гонку"
 
@@ -1197,26 +1067,24 @@ msgstr "Покинул гонку"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Электронна� почта"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "Электронна� почта должна �одержать от 4 до 50 �имволов!"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "�едо�тупна� �лектронна� почта!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Электронные почты не �овпадают!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
-msgstr "Emule"
+msgstr "Эмуль"
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:98
@@ -1226,27 +1094,24 @@ msgstr "Подключить геймпад"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "Уравн�ть каждого игрока"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
-msgstr "Вкл."
+msgstr "Включён"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Включить дл� в�ех"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Введите им� нового игрока"
 
@@ -1259,47 +1124,47 @@ msgstr "Ошибка при получении ново�тей: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"В�ем:\n"
-"�ажмите клавишу \"Выбор\" дл� при�оединени� к игре!"
+msgstr "В�ем:\n�ажмите клавишу \"Выбрать\" дл� при�оединени� к игре!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "Такой аккаунт �уще�твует"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr "Выход"
+msgstr "Выйти"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
-msgstr "Выход из гонки"
+msgstr "Выйти из гонки"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "Выйти из игры"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Эк�перт"
 
 #: src/states_screens/race_setup_screen.cpp:252
 msgid "Explore tracks to find all hidden eggs"
-msgstr "И��ледуйте тра��ы, чтобы найти в�е �пр�танные �йца"
+msgstr "И��ледуйте тра��ы и найдите в�е �пр�танные �йца"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "Кадр/�: %d/%d/%d - Сложные: %d Цельный, %d Тени - ДальСвета: %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "Кадр/�: %d/%d/%d - %d КТр."
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
@@ -1321,21 +1186,17 @@ msgid "Fetching servers"
 msgstr "Получение �ерверов"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Введите им� пользовател� и �лектронную почту, указанные вами при "
-"реги�трации, дл� �бро�а вашего парол�."
+msgstr "Введите им� пользовател� и �лектронную почту, указанные вами при реги�трации, дл� �бро�а вашего парол�."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Финальный круг!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "�айти �ервер"
 
@@ -1346,21 +1207,14 @@ msgstr "Огонь"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Прежде в�его, вам нужно не�колько у�трой�тв ввода (и�пользование не�кольких "
-"геймпадов или джой�тиков - лучший �по�об играть � не�колькими игроками). "
-"Откройте окно на�троек и на�тройте геймпады. Также возможно играть на "
-"клавиатуре(ах), однако каждому игроку нужны различные �очетани� клавиш, и "
-"помните, что большин�тво клавиатур не подход�т дл� мультиплеерной игры, так "
-"как не поддерживают большое количе�тво одновременно нажатых клавиш."
+msgstr "Прежде в�его, вам нужно не�колько у�трой�тв ввода (и�пользование не�кольких геймпадов или джой�тиков - лучший �по�об играть � не�колькими игроками). Откройте окно на�троек и на�тройте геймпады. Также возможно играть на клавиатуре(ах), однако каждому игроку нужны различные �очетани� клавиш, и помните, что большин�тво клавиатур не подход�т дл� мультиплеерной игры, так как не поддерживают большое количе�тво одновременно нажатых клавиш."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1369,29 +1223,27 @@ msgstr "Следуйте за Лидером"
 
 #: src/states_screens/race_gui_base.cpp:650
 msgid "Follow the leader!"
-msgstr "Следуй за лидером!"
+msgstr "Следуйте за лидером!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Следуй за лидером: будь на втором ме�те, так как по�ле того, как врем� "
-"заканчивает��, каждый по�ледний карт ди�квалифицируют. Будь о�торожен: "
-"обгонишь лидера - также будешь ди�квалифицирован!"
+msgstr "Следуйте за лидером: будьте на втором ме�те, так как по�ле того, как врем� заканчивает��, каждый по�ледний карт ди�квалифицируют. Будьте о�торожны: обгоните лидера - также будете ди�квалифицированы!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
-msgstr "Fort Magma"
+msgstr "Форт Магма"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "�айдено %d контроллеров Wii"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "�айден %d контроллер Wii"
+msgstr[1] "�айдено %d контроллера Wii"
+msgstr[2] "�айдено %d контроллеров Wii"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1415,13 +1267,12 @@ msgstr "За�вка в друзь� отправлена!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Друзь�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Полно�кранный режим"
 
@@ -1435,22 +1286,19 @@ msgstr "Гол!"
 msgid "Game Keys"
 msgstr "Игровые клавиши"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Режим игры"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Режим игры (Ограничение по очкам / времени)"
 
@@ -1466,53 +1314,47 @@ msgstr "Кнопка джой�тика %d"
 msgid "Gamepad hat %d"
 msgstr "D-pad джой�тика %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Главна�"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Покинуть гонку"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Глобальное о�вещение"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Глобальное о�вещение: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Контурное �вечение"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Контурное �вечение: %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
-msgstr "GNU"
+msgstr "Гну"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:68
@@ -1520,63 +1362,55 @@ msgid "Go!"
 msgstr "Вперёд!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Золотой водила"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "О�тров Гран-Парадизо"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Гран-при"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Редактор Гран-при"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Редактор Гран-при"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Прохождение Гран-при:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Уровень графиче�ких �ффектов"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Графика"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "�а�тройки графики"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
-msgstr "Green Valley"
+msgstr "Зелёна� Долина"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1591,14 +1425,12 @@ msgstr "Го�ть %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Го�тевой вход"
+msgid "Guest Log in"
+msgstr "Го�ть: вход"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
-msgstr "Hacienda"
+msgstr "Га�иенда"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -1606,101 +1438,90 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Помощь"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
-msgstr "Hexley"
+msgstr "Хек�ли"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Результаты"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Сбейте 10 картов шаром дл� боулинга."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Сбивайте о�тальных игроков, и�пользу� оружие, пока они не потер�ют в�е �вои "
-"жизни. (Только в мультиплеере)"
+msgstr "Сбивайте о�тальных игроков, и�пользу� оружие, пока они не потер�ют в�е �вои жизни. (Только в мультиплеере)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Сбейте один и тот же карт  не менее 5 раз за гонку."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
-msgstr "Только карты людей"
+msgstr "Только живые игроки"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Я �огла�ен � у�лови�ми и мне е�ть 13 лет или выше. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Е�ли ты победишь мен� в гонке, то � о�вобожу �тарикашку."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Изображение замка означает, что вам необходимо завершить и�пытание, чтобы "
-"разблокировать его."
+msgstr "Изображение замка означает, что вам необходимо завершить и�пытание, чтобы разблокировать его."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "'%s' игнорирует��, нужно было войти в игру раньше!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "О�вещение на о�нове изображени�"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "У�тановить"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Любитель"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr "До�туп в Интернет отключён, пожалуй�та включите его в опци�х"
+msgstr "До�туп в Интернет отключён, пожалуй�та, включите его в на�тройках"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Это ничь�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Секретный"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Зайти"
 
@@ -1710,13 +1531,12 @@ msgstr "Вход на �ервер"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Карты"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "О�тавить �то разрешение"
 
@@ -1735,16 +1555,15 @@ msgid "Keyboard %i"
 msgstr "Клавиатура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
-msgstr "Konqi"
+msgstr "Конки"
 
 #. I18N: Shown at the end of a race
 #: src/states_screens/race_gui_overworld.cpp:108
 msgid "Lap"
 msgstr "Круг"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Круг %i"
@@ -1771,98 +1590,133 @@ msgstr "Влево"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "ЛК-триггер"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "ЛМД центр"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "ЛМД вниз"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "ЛМД влево"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "ЛМД вправо"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "ЛМД вверх"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Левый курок"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Сумеречные лучи"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Сумеречные лучи:  %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Загрузка"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Лобби"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "�а�тройки лобби"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Локальное им� пользовател�"
+msgid "Local Name"
+msgstr "Локальное им�"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
-msgstr "Закрыто"
+msgstr "Заблокировано"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Заблокировано: пройдите до�тупные и�пытани� дл� того, чтобы получить до�туп!"
+msgstr "Заблокировано: пройдите до�тупные и�пытани� дл� получени� до�тупа!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Заблокировано!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "Вход"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "Выход"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "Войти как: %s."
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "Вхожу"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "Вхожу '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "Вход как го�ть даёт тебе право уча�твовать в �етевых гонках, но не даёт тебе право голо�овать за дополнени� или получить любое �етевое до�тижение."
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "Выхожу"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "Выхожу '%s'"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Вход"
 
@@ -1873,46 +1727,35 @@ msgstr "Огл�нуть�� назад"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Пои�к друзей:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Сделайте 5 зано�ов за 1 круг."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Проведите гонку � 5 или более кругами."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Марафонец"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "Мак�. кол-во игроков"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "Мак�имальное врем� (мин.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Только �"
 
@@ -1922,29 +1765,33 @@ msgid "Menu Keys"
 msgstr "Клавиши меню"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "Минигольф"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "Охотник на комаров"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Размытие при движении"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Размытие при движении: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "О�ь мыши %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1952,48 +1799,41 @@ msgstr "Кнопка мыши %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Вниз"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Вверх"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Мультиплеер"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Мультиплеер"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Музыка"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Им�"
 
@@ -2007,19 +1847,21 @@ msgstr "Им� не задано."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr "Слишком длинное им�"
+msgstr "Слишком длинное им�."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Им� �ервера"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "Лохне��ов�кий пруд"
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "�овый"
 
@@ -2028,9 +1870,13 @@ msgstr "�овый"
 msgid "New Grand Prix '%s' now available"
 msgstr "До�тупно новое Гран-при '%s'"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "�овый аккаунт"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "�овый пароль"
 
@@ -2043,7 +1889,7 @@ msgstr "�овый запро�"
 msgid "New difficulty '%s' now available"
 msgstr "До�тупен новый уровень �ложно�ти '%s'"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�овый рекорд круга"
 
@@ -2069,21 +1915,20 @@ msgstr "�итро"
 
 #: src/states_screens/dialogs/select_challenge.cpp:147
 msgid "Nitro challenge"
-msgstr "Собери нитро"
+msgstr "Соберите нитро"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "�ет"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
-msgstr "Nolok"
+msgstr "�олок"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "�ичего"
 
@@ -2093,23 +1938,19 @@ msgid "Normal Race"
 msgstr "Обычна� гонка"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
-msgstr "Northern Resort"
+msgstr "Северный курорт"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Учтите, е�ли вам уда�т�� �кользить в течение не�кольких �екунд, вы получите "
-"дополнительное у�корение в каче�тве награды."
+msgstr "Учтите, е�ли вам уда�т�� �кользить в течение не�кольких �екунд, вы получите дополнительное у�корение в каче�тве награды."
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "�овичок"
 
@@ -2120,46 +1961,41 @@ msgstr "Количе�тво ботов: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Количе�тво ботов"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Количе�тво голов дл� победы"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Количе�тво кругов"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Количе�тво кругов:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
-msgstr "ОК"
+msgstr "Д�"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "По бездорожью"
 
@@ -2167,60 +2003,59 @@ msgstr "По бездорожью"
 msgid "Offline"
 msgstr "�е в �ети"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "�е онлайн аккаунт"
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr "�х да, видите ли, он у мен� в замке и �ейча� будет подан на ужин ..."
+msgstr "�х да, видите ли, он у мен� �ейча� в замке и будет подан на ужин ..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
-msgstr "Old Mine"
+msgstr "Стара� шахта"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
-msgstr "Oliver's Math Class"
+msgstr "Математиче�кий кла�� Оливера"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "В �ети"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Игра по �ети"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Сетевое им� пользовател�"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "Сетевое им� пользовател� должно �одержать от 3 до 30 �имволов!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Сетевое им� пользовател� не должно начинать�� � чи�ла!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Это может делать только хоз�ин игры!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ой! Когда вы в беде, нажмите <%s> чтобы ва� �па�ли"
@@ -2231,51 +2066,43 @@ msgstr "Ой! Когда вы в беде, нажмите <%s> чтобы ва�
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "�а�тройки"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Обзор"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "МОЩ�ОСТЬ"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Парашют - замедл�ет в�е карты, имеющие лучшую позицию."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Пароль"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Пароль:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Изменить пароль"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Пароль должен �одержать от 8 до 30 �имволов!"
 
@@ -2283,24 +2110,23 @@ msgstr "Пароль должен �одержать от 8 до 30 �имвол
 msgid "Password successfully changed."
 msgstr "Пароль у�пешно изменён."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Пароли не �овпадают!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
 msgid "Pause Game"
-msgstr "Пауза"
+msgstr "Пауза в игре"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Пауза"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Штрафное врем�!!"
 
@@ -2309,46 +2135,46 @@ msgid "Pending"
 msgstr "Ожидание"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
-msgstr "Пингвинь� игрова� площадка"
+msgstr "Игрова� площадка пингвинов"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
 msgstr "Выполнение голо�овани�"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
-msgstr "Pidgin"
+msgstr "Пиджин"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Во�произве�ти в�е"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Сыграй на в�ех официальных тра��ах хот� бы раз."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Игроки"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "Игроки могут выбрать профили гандикапа (�ложнее) на �кране выбора карта."
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Пожалуй�та, введите название Гран-при"
 
@@ -2357,6 +2183,10 @@ msgstr "Пожалуй�та, введите название Гран-при"
 msgid "Please re-configure your key bindings."
 msgstr "Пожалуй�та, перена�тройте клавиатуру."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "Пожалуй�та, прочтите общие положени� и у�лови� "
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Пожалуй�та, подождите, пока дополнени� обнов�т��"
@@ -2366,49 +2196,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Пожалуй�та, подождите, пока дополнени� будут загружены"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Вантуз - бро�ает�� пр�мо вперед, чтобы зацепить�� за �пину оппонента, либо "
-"назад, чтобы о�лепить его."
+msgstr "Вантуз - бро�ает�� пр�мо вперед, чтобы зацепить�� за �пину оппонента, либо назад, чтобы о�лепить его."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "Любитель бону�ов"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"�ажмите <%s>, чтобы обернуть��, и нажмите кнопку огн� <%s> при удерживании "
-"<%s> дл� �трельбы назад!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "�ажмите <%s>, чтобы обернуть��, и нажмите кнопку огн� <%s> при удерживании <%s> дл� �трельбы назад!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "\"ESC\" дл� отмены"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "�ажмите кнопку"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"�ажмите 'enter' или дважды щелкните на у�трой�тве, чтобы на�троить его"
+msgstr "�ажмите 'enter' или дважды щелкните на у�трой�тве, чтобы на�троить его"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Двойной клик или \"Enter\" дл� редактировани� игрока"
 
@@ -2424,10 +2243,7 @@ msgstr "�ажмите 'Огонь', чтобы начать �оревнова
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Чтобы попа�ть в меню пои�ка, одновременно нажмите кнопки 1+2 на �воем "
-"wiimote, затем нажмите Ок. Подробную ин�трукцию �мотрите на "
-"supertuxkart.net/Wiimote"
+msgstr "Чтобы попа�ть в меню пои�ка, одновременно нажмите кнопки 1+2 на �воем wiimote, затем нажмите Ок. Подробную ин�трукцию �мотрите на supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2445,7 +2261,6 @@ msgstr "Обработка"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Профиль"
 
@@ -2454,39 +2269,32 @@ msgid "Progress"
 msgstr "Прогре��"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
-msgstr "Puffy"
+msgstr "Паффи"
 
 #: src/states_screens/race_setup_screen.cpp:240
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Забивайте м�ч в противоположные ворота? чтобы за�читывали�ь голы. (Только в "
-"мультиплеерном режиме)"
+msgstr "Забивайте м�ч в противоположные ворота? чтобы за�читывали�ь голы. (Только в мультиплеерном режиме)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Бы�тра� гонка"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Выход"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "Покинуть �ервер."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "�а�тройки гонки"
 
@@ -2507,8 +2315,8 @@ msgstr "Случайное Гран-при"
 msgid "Random Kart"
 msgstr "Случайный карт"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Случайна� тра��а"
 
@@ -2517,91 +2325,75 @@ msgid "Rank"
 msgstr "Позици�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Рейтинг >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "�а �тарт!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Дей�твительно... �екрет."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Кра�на� команда победила"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Реги�траци�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Обычна� гонка - в�е возможно�ти до�тупны, по�тому �обирай оружие и и�пользуй "
-"его � умом!"
+msgstr "Обычна� гонка - в�е возможно�ти до�тупны, по�тому �обирай оружие и и�пользуй его � умом!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Перезагрузить"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Запомнить ра�положение окна"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Удалить"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Переименовать"
 
 #: src/states_screens/dialogs/select_challenge.cpp:64
 #, c-format
 msgid "Required Nitro Points : %i"
-msgstr "�еобходимое количе�тво нитро : %i"
+msgstr "�еобходимое количе�тво нитро: %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:53
 #, c-format
@@ -2620,29 +2412,25 @@ msgstr "Возврат на тра��у"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "�ачать заново"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Перезапу�тить гонку"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "В обратном направлении"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Обратное направление:"
 
@@ -2658,82 +2446,76 @@ msgstr "Вправо"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "ПК-триггер"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "ПМД центр"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "ПМД вниз"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "ПМД влево"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "ПМД вправо"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "ПМД вверх"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Правый курок"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "СКОРОСТЬ"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr "STK Enterprise"
+msgstr "Завод STK"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "Гонщица Сара"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "Ма�терица Сара"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Сохранить"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Сохранить Гран-при"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Scotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Пои�к"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Пои�к"
 
@@ -2743,51 +2525,43 @@ msgid "Select"
 msgstr "Выбрать"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Выберите уровень �ложно�ти"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
-msgstr "Выбрать режим игры"
+msgstr "Выберите режим игры"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr "Выбрать тра��у"
+msgstr "Выберите тра��у"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Выберите карт"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr "Отправл�ть анонимную информацию о железе"
+msgstr "Отправл�ть данные об оборудовании"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Создание �ервера"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Информаци� о �ервере"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Выбор �ервера"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Им� �ервера:"
 
@@ -2802,93 +2576,49 @@ msgstr "Внимание!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Выбрать новую гонку"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Тени"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "Тени: %i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Тени: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
-msgstr "Shifting Sands"
+msgstr "Дюны"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
-msgstr "Shiny Suburbs"
+msgstr "Солнечный Пригород"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Войти"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Войти как го�ть"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "Выйти"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Вы вошли как: %s"
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Вход"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Вход '%s'"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Го�тевой вход разрешает уча�твовать в �етевых гонках, но не позвол�ет "
-"голо�овать за дополнени� и получать до�тижени� в �ети."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "Выход"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "Выход '%s'"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "С даты"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Одиночна� игра"
 
@@ -2898,9 +2628,8 @@ msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "Дрифтёр"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2909,14 +2638,12 @@ msgstr "Зано�"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Тема"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
-msgstr "Snow Peak"
+msgstr "Снежна� вершина"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:186
@@ -2924,30 +2651,23 @@ msgid "Soccer"
 msgstr "Футбол"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
-msgstr "Soccer field"
+msgstr "Футбольное поле"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Футбол: только в мультиплеере. И�пользуй �вой карт, чтобы затолкнуть м�ч в "
-"чужие ворота."
+msgstr "Футбол: только в мультиплеере. И�пользуй �вой карт, чтобы затолкнуть м�ч в чужие ворота."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Извините, произошла ошибка при �оединении � �айтом дополнений. Убедите�ь в "
-"том, что �оединение � Интернетом активно и SuperTuxKart не заблокирован "
-"брандмау�ром"
+msgstr "Извините, произошла ошибка при �оединении � �айтом дополнений. Убедите�ь в том, что �оединение � Интернетом активно и SuperTuxKart не заблокирован брандмау�ром"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2955,7 +2675,6 @@ msgstr "Извините, загрузка дополнений не удала
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Звуковые �ффекты"
 
@@ -2964,7 +2683,6 @@ msgstr "Звуковые �ффекты"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Стандартные"
 
@@ -2977,11 +2695,10 @@ msgstr "Старт"
 msgid "Start Grand Prix"
 msgstr "�ачать Гран-при"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "�ачать гонку"
 
@@ -3001,138 +2718,121 @@ msgstr "Повернуть направо"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "И�тори�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Страйк!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Подтвердить"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
-msgstr "Subsea"
+msgstr "Подводна�"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "Супер Тук�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Дополнени� SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Помощь SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "�а�тройки SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"В SuperTuxKart можно играть в многопользователь�ком режиме на одном "
-"компьютере"
+msgstr "В SuperTuxKart можно играть в многопользователь�ком режиме на одном компьютере"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart предо�тавл�ет не�колько режимов игры"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart может подключать�� к �ерверу дл� загрузки дополнений и уведомл�ть Ва� об обновлени�х. Мы также �обираем анонимную �тати�тику Вашего \"железа\" дл� улучшени� STK. Пожалуй�та, прочтите нашу политику конфиденциально�ти на http://privacy.supertuxkart.net. Вам нужна така� возможно�ть? (Дл� изменени�, найдите �а�тройки, выберите там \"Интерфей�\" и найдите \"Подключение к Интернет\", \"Отправл�ть данные об оборудовании\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
-msgstr "Suzanne"
+msgstr "Сюзан"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Заменитель - коробки � бону�ами превращают�� в бананы и наоборот на "
-"небольшой промежуток времени."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Заменитель - коробки � бону�ами превращают�� в бананы и наоборот на некоторое врем�."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Мухобойка - ра�плющивает проезжающие мимо карты, тем �амым замедл�� их."
+msgstr "Мухобойка - ра�плющивает проезжающие мимо карты, тем �амым замедл�� их."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Язык �и�темы"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "Пред�тавь, что твои оппоненты - комары! Ра�плющь мухобойкой хот� бы 5 оппонентов за гонку."
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "Храм"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "У�лови� и Соглашение"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Сжатие тек�тур"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Фильтраци� тек�тур"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Клавиша зано�а позвол�ет зано�ить карт в резкие повороты и получать "
-"у�корение."
+msgstr "Клавиша зано�а позвол�ет зано�ить карт в резкие повороты и получать у�корение."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
-msgstr "The Stadium"
+msgstr "Стадион"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
@@ -3142,9 +2842,7 @@ msgstr "Модуль дополнений отключен в �а�тройка
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Таблица результатов у�тарела,\n"
-"в�е результаты были удалены."
+msgstr "Таблица результатов у�тарела,\nв�е результаты были удалены."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3157,41 +2855,22 @@ msgstr "Гонка на врем�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Гонка на врем�: не �одержит бону�ов, так что только ваши навыки вождени� "
-"имеют значение!"
+msgstr "Гонка на врем�: не �одержит бону�ов, только ваши навыки вождени� имеют значение!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Дл� того, чтобы добавить Геймпад/Джой�тик, про�то запу�тите SuperTuxKart, "
-"когда он подключен. Он автоматиче�ки по�вит�� в �пи�ке у�трой�тв.\n"
-"\n"
-"Чтобы добавить на�тройки клавиатуры, вы можете нажать на кнопку, наход�щую�� "
-"ниже. �о учтите, что большин�тво клавиатур поддерживают только ограниченное "
-"количе�тво одновременных нажатий клавиш и по�тому не подход�т дл� "
-"многопользователь�кой игры. (Однако вы можете решить �ту проблему "
-"подключением не�кольких клавиатур к компьютеру. �о даже в �том �лучае нужно "
-"назначать различные �очетани� клавиш.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Дл� того, чтобы добавить Геймпад/Джой�тик, про�то запу�тите SuperTuxKart, когда он подключен. Он автоматиче�ки по�вит�� в �пи�ке у�трой�тв.\n\nЧтобы добавить на�тройки клавиатуры, вы можете нажать на кнопку, наход�щую�� ниже. �о учтите, что большин�тво клавиатур поддерживают только ограниченное количе�тво одновременных нажатий клавиш и по�тому не подход�т дл� многопользователь�кой игры. (Однако вы можете решить �ту проблему подключением не�кольких клавиатур к компьютеру. �о даже в �том �лучае нужно назначать различные �очетани� клавиш.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr "Дл� того, чтобы одержать победу, �обирайте �ледующие бону�ы :"
+msgstr "В гонке вам может помочь �бор бону�ов:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "�а Луну и обратно"
 
@@ -3210,7 +2889,7 @@ msgstr "Топ %i"
 msgid "Track"
 msgstr "Тра��а"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Тра��а %i/%i"
@@ -3224,19 +2903,17 @@ msgstr "�втор тра��ы %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Группа тра��ы"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Тра��ы"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Трилинейна�"
 
@@ -3247,24 +2924,21 @@ msgstr "Попробуйте �нова"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Обучение"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
-msgstr "Обучение : Комната выбора"
+msgstr "Обучение: Комната выбора"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
-msgstr "Tux"
+msgstr "Тук�"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Тип :"
 
@@ -3272,24 +2946,20 @@ msgstr "Тип :"
 msgid "Type: Grand Prix"
 msgstr "Тип: Гран-при"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"�евозможно подключить�� к �ерверу. Проверьте ваше интернет �оединение или "
-"попробуйте позже."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "�евозможно подключить�� к �ерверу. Проверьте ваше интернет �оединение или попробуйте позже."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Удалить"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "�еудержимый"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3301,8 +2971,8 @@ msgid "Update"
 msgstr "Обновить"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Обновлено"
 
@@ -3311,40 +2981,36 @@ msgid "Updated date"
 msgstr "Дата загрузки"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "И�пользуйте хот� бы 10 бону�ов за гонку."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr "И�пользовать тек�туры вы�окого разрешени�"
+msgstr "Тек�туры вы�окого разрешени�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr "И�пользуйте вправо/влево дл� выбора команды и нажмите огонь"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "И�пользуйте �обранные вами нитро-зар�ды, нажима� <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Сведени� о пользователе"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Интерфей�"
 
@@ -3353,19 +3019,17 @@ msgid "User defined"
 msgstr "Пользователь�кие"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Пои�к пользовател�"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Им� пользовател�"
 
@@ -3374,13 +3038,12 @@ msgid "Username and/or email address invalid."
 msgstr "Им� пользовател� или �лектронна� почта неверны."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "против"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Подтверждение информации"
 
@@ -3391,27 +3054,23 @@ msgstr "Вер�и�: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Вертикальна� �инхронизаци� (требует�� перезапу�к)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Вид"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Громко�ть"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Голо�овать"
 
@@ -3421,9 +3080,9 @@ msgstr "Голо�ование завершено! Теперь вы может
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "ВЕС"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "�ЕВЕР�ОЕ ��ПР�ВЛЕ�ИЕ!"
 
@@ -3432,58 +3091,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Внимание! �е рекомендует�� и�пользовать клавишу 'Shift', т.к. при её нажатии "
-"в�е клавиши нижнего реги�тра могут не работать."
+msgstr "Внимание! �е рекомендует�� и�пользовать клавишу 'Shift', т.к. при её нажатии в�е клавиши нижнего реги�тра могут не работать."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Оружие"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Погодные �ффекты"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Погодные �ффекты: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr "Что не так, маленькие пухл�ши? Ваш великий вождь GNU пропал?"
+msgstr "Что не так, маленькие пухл�ши? Ваш великий вождь Гну пропал?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"По�ле на�тройки у�трой�тв ввода вы можете играть. Выберите пункт "
-"'мультиплеер' в главном меню. Чтобы в�тупить в игру, каждому игроку �ледует "
-"нажать клавишу 'огонь' его клавиатуры или джой�тика во врем� выбора карта. "
-"Каждый игрок должен и�пользовать �вое у�трой�тво ввода дл� выбора карта. "
-"Когда в�е игроки выберут �ебе карт, игра продолжит��. Заметьте, что мышка не "
-"может быть и�пользована дл� выбора карта в мультиплеере."
+msgstr "По�ле на�тройки у�трой�тв ввода вы можете играть. Выберите пункт 'мультиплеер' в главном меню. Чтобы в�тупить в игру, каждому игроку �ледует нажать клавишу 'огонь' его клавиатуры или джой�тика во врем� выбора карта. Каждый игрок должен и�пользовать �вое у�трой�тво ввода дл� выбора карта. Когда в�е игроки выберут �ебе карт, игра продолжит��. Заметьте, что мышка не может быть и�пользована дл� выбора карта в мультиплеере."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3491,42 +3137,36 @@ msgid "White"
 msgstr "Белый"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
-msgstr "Wilber"
+msgstr "Вилбер"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Выиграйте 5 одиночных гонок подр�д."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Выиграй во в�ех одиночных режимах, против хот� бы 3 оппонентов."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr "Xue"
+msgstr "Сю�"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Да"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Теперь вы готовы к гонке. Удачи!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Вы играете за"
 
@@ -3536,37 +3176,36 @@ msgstr "Вы можете изменить рейтинг нажатием на
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Вы не �можете загружать дополнени� без интернет �оединени�. Е�ли хотите загружать дополнени�, то найдите �а�тройки, выберите там \"Интерфей�\" и найдите \"Подключение к Интернет\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Вы не �можете играть по �ети без интернет �оединени�. Е�ли хочет�� поиграть по �ети, то найдите �а�тройки, выберите там \"Интерфей�\" и найдите \"Подключение к Интернет\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Ты можешь играть не �оздава� �етевой аккаунт, про�то выбери не онлайн аккаунт. �о тогда ты не �можешь �в�зать�� � друзь�м, голо�овать за дополнени� и т.д. Пожалуй�та, прочти наше за�вление конфиденциально�ти на http://privacy.supertuxkart.net"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Вы выиграли �оревнование!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Вы выиграли �оревновани�!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Вы завершили Гран-При!"
 
@@ -3574,36 +3213,36 @@ msgstr "Вы завершили Гран-При!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Вы закончили �ложное и�пытание! Полученные очки на данном уровне: %i/%i"
+msgstr "Вы закончили �ложное и�пытание! Полученные очки на данном уровне: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Вы закончили лёгкое и�пытание! Полученные очки на данном уровне: %i/%i"
+msgstr "Вы закончили лёгкое и�пытание! Полученные очки на данном уровне: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
-"Вы закончили обычное и�пытание! Полученные очки на данном уровне: %i/%i"
+msgstr "Вы закончили обычное и�пытание! Полученные очки на данном уровне: %i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Вы завершили гонку!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "У ва� %d новых запро�ов в друзь�!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "У ва� %d новый запро� в друзь�!"
+msgstr[1] "У ва� %d новых запро�а в друзь�!"
+msgstr[2] "У ва� %d новых запро�ов в друзь�!"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "У ва� новый запро� в друзь�!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Вы ди�квалифицированы!"
 
@@ -3611,56 +3250,51 @@ msgstr "Вы ди�квалифицированы!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Вы еще не голо�овали за данное дополнение. Выберите желаемый рейтинг "
-"нажатием на звёзды ниже."
+msgstr "Вы еще не голо�овали за данное дополнение. Выберите желаемый рейтинг нажатием на звёзды ниже."
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
-"Вам нужно больше очков\n"
-"дл� до�тупа к �тому и�пытанию!\n"
-"До�тупные и�пытани�\n"
-"указаны на миникарте."
+msgstr "Вам нужно больше очков\nдл� до�тупа к �тому и�пытанию!\nДо�тупные и�пытани�\nуказаны на миникарте."
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Вам нужно вве�ти пароль."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Вы открыли Гран При '%0'"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Вы открыли тра��у '%0'"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Вы получите пи�ьмо � дальнейшими ин�трукци�ми дл� �бро�а парол�. Пожалуй�та, "
-"будьте терпеливы и проверьте вашу папку �пама."
+msgstr "Вы получите пи�ьмо � дальнейшими ин�трукци�ми дл� �бро�а парол�. Пожалуй�та, будьте терпеливы и проверьте вашу папку �пама."
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-"Вы получите пи�ьмо � дальнейшими ин�трукци�ми дл� активации аккаунта. "
-"Пожалуй�та, будьте терпеливы и проверьте вашу папку �пама."
+msgstr "Вы получите пи�ьмо � дальнейшими ин�трукци�ми дл� активации аккаунта. Пожалуй�та, будьте терпеливы и проверьте вашу папку �пама."
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Вы выиграли гонку!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "Ваша вер�и� OpenGL оказала�ь �тарой. Пожалуй�та, убедите�ь, что у ва� у�тановлена по�ледн�� вер�и� видео драйвера. SuperTuxKart требует как минимум OpenGL 3.1."
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3671,9 +3305,12 @@ msgstr "Ваш файл на�троек поврежден. Он будет у
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Ваш файл � на�тройками у�тарел, по�тому он был удален, и новый файл будет "
-"�оздан."
+msgstr "Ваш файл � на�тройками у�тарел, по�тому он был удален, и новый файл будет �оздан."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "У теб� �тарый видео драйвер. Пожалуй�та у�танови по�ледний."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3685,9 +3322,8 @@ msgid "Your profile"
 msgstr "Ваш профиль"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
-msgstr "Zen Garden"
+msgstr "Дз�н �ад"
 
 #. I18N: Unbound key binding
 #: src/input/binding.cpp:90
@@ -3696,16 +3332,16 @@ msgstr "[от�ут�твует]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "дей�тви�"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "в�е"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "в и�полнении"
@@ -3714,59 +3350,25 @@ msgstr "в и�полнении"
 msgid "featured"
 msgstr "рекомендуемое"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "лучшие"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "худшие"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "�тандартные"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  AleXoundOS https://launchpad.net/~alexoundos\n"
-"  Alexander 'FONTER' Zinin https://launchpad.net/~spore-09\n"
-"  Andrey Olykainen https://launchpad.net/~andrey.olykainen\n"
-"  Denis Deryabin https://launchpad.net/~denis2010der\n"
-"  Dmitriy Koshel https://launchpad.net/~gaim4a\n"
-"  Dmitry https://launchpad.net/~dmitry-ashkadov\n"
-"  Dmitry Dubrov https://launchpad.net/~dimprogpro\n"
-"  Helen Antonova https://launchpad.net/~vigonett\n"
-"  Igor Shtompel https://launchpad.net/~i.shtompel\n"
-"  Kirill Babeev https://launchpad.net/~kirill-babeev\n"
-"  KroArtem https://launchpad.net/~kroartem\n"
-"  Maxim Kalinin https://launchpad.net/~kalinin-maxim\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Tae-Wong SEO https://launchpad.net/~seotaewong40\n"
-"  adem https://launchpad.net/~adem4ik\n"
-"  pingvin https://launchpad.net/~penguin-tux\n"
-"  Дмитрий https://launchpad.net/~starwars32\n"
-"  Олег  https://launchpad.net/~laoltomsk"
+msgstr "Launchpad Contributions:\n  AleXoundOS https://launchpad.net/~alexoundos\n  Alexander 'FONTER' Zinin https://launchpad.net/~spore-09\n  Andrey Olykainen https://launchpad.net/~andrey.olykainen\n  Denis Deryabin https://launchpad.net/~denis2010der\n  Dmitriy Koshel https://launchpad.net/~gaim4a\n  Dmitry https://launchpad.net/~dmitry-ashkadov\n  Dmitry Dubrov https://launchpad.net/~dimprogpro\n  Helen Antonova https://launchpad.net/~vigonett\n  Igor Shtompel https://launchpad.net/~i.shtompel\n  Kirill Babeev https://launchpad.net/~kirill-babeev\n  KroArtem https://launchpad.net/~kroartem\n  Maxim Kalinin https://launchpad.net/~kalinin-maxim\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  adem https://launchpad.net/~adem4ik\n  pingvin https://launchpad.net/~penguin-tux\n  Дмитрий https://launchpad.net/~starwars32\n  Олег  https://launchpad.net/~laoltomsk\n  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
diff --git a/data/po/sco.po b/data/po/sco.po
index 4676f9ba5..285772914 100644
--- a/data/po/sco.po
+++ b/data/po/sco.po
@@ -1,22 +1,22 @@
-# Scots translation for stk
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2013-04-26 19:40+0000\n"
-"Last-Translator: Marco Cafolla <Cobradabest@aol.com>\n"
-"Language-Team: Scots <sco@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Scots (http://www.transifex.com/projects/p/supertuxkart/language/sco/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s bi %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s bi %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s is redd"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +126,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +140,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +184,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -237,37 +224,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +285,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -314,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +327,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -401,18 +373,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +446,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -576,79 +538,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +607,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +641,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,42 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Marco Cafolla https://launchpad.net/~cobradabest"
+msgstr "Launchpad Contributions:\n  Marco Cafolla https://launchpad.net/~cobradabest"
diff --git a/data/po/sk.po b/data/po/sk.po
index dba2829d9..47b326811 100644
--- a/data/po/sk.po
+++ b/data/po/sk.po
@@ -1,23 +1,22 @@
-# Slovak translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/supertuxkart/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,21 +27,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -58,7 +59,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -70,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s je pripravený(á)"
@@ -97,25 +97,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' bol(a) vyradený(á)."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(prázdne)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(hra po sieti ešte nie je dostupná)"
 
@@ -129,45 +127,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Aktuálne priradenia klávesov môžete vidieť/zmeniť v Nastaveniach"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Mnohé z týchto herných módov možno hrať v štýle Grand Prix: namiesto "
-"hrania jedných pretekov ich budete hrať viac za sebou. Čím lepšie sa "
-"umiestnite, tým viac bodov získate. Na konci vyhrá hrá� s najvä�ším po�tom "
-"bodov pohár."
+msgstr "* Mnohé z týchto herných módov možno hrať v štýle Grand Prix: namiesto hrania jedných pretekov ich budete hrať viac za sebou. Čím lepšie sa umiestnite, tým viac bodov získate. Na konci vyhrá hrá� s najvä�ším po�tom bodov pohár."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -198,7 +185,6 @@ msgstr "Bitka na 3 údery"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -217,23 +203,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Najvyššie skóre ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Prerušiť Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "O hre"
 
@@ -242,37 +225,35 @@ msgstr "O hre"
 msgid "Accelerate"
 msgstr "Zrýchliť"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -280,8 +261,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -291,13 +271,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -308,7 +286,6 @@ msgstr "Pridať konfiguráciu klávesnice"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Pridať hrá�a"
 
@@ -319,32 +296,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Pridať zariadenie"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Doplnky"
 
@@ -354,49 +328,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Doplnky"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "VÅ¡etky"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "VÅ¡etky trate"
 
@@ -406,18 +374,20 @@ msgstr "Je povolený každý úder, tak sa chopte zbraní a využite ich múdro!
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -427,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -453,24 +420,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -480,29 +447,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Použiť nové rozlíšenie"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -517,49 +480,44 @@ msgstr "Ste si istý(á), že chcete natrvalo zmazať túto konfiguráciu?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arény"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Priradiť na kláves ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Na konci sveta"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Zvuk"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Vyhnite sa banánom!"
 
@@ -581,79 +539,66 @@ msgstr "Os %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Späť"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Späť k pretekom"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Späť na zoznam zariadení"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Späť do menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Viac šťastia nabudúce!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -663,39 +608,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingová guľa - odráža sa od stien. Ak sa pozeráte dozadu, bude vyhodená "
-"obrátene."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingová guľa - odráža sa od stien. Ak sa pozeráte dozadu, bude vyhodená obrátene."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -703,7 +642,6 @@ msgid "Brake"
 msgstr "Brzda"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -711,52 +649,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -770,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Zrušiť/Späť"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Úlohy: Miestnosť s trofejami"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -797,61 +725,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Vyberte si motokáru"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Zbierajte modré krabice: dajú vám zbrane alebo iné vylepšenia"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -861,17 +780,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Zber nitra vám umožnuje získať rýchlosť, kedykoľvek si budete priať "
-"stla�ením vhodného klávesu. Svoju aktuálnu hladinu nitra môžete vidieť na "
-"lište v pravej �asti hernej obrazovky."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Zber nitra vám umožnuje získať rýchlosť, kedykoľvek si budete priať stla�ením vhodného klávesu. Svoju aktuálnu hladinu nitra môžete vidieť na lište v pravej �asti hernej obrazovky."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -884,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -896,7 +811,6 @@ msgstr "Potrv�te rozlíšenie po�as %i sekúnd"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -908,101 +822,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Neobsahuje žiadne vylepšenia (powerupy), takže záleží len na vašich "
-"vodi�ských skúsenostiach."
+msgstr "Neobsahuje žiadne vylepšenia (powerupy), takže záleží len na vašich vodi�ských skúsenostiach."
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Pokra�ovať"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Ovládanie"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Autori"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1015,13 +910,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1047,7 +941,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1055,28 +948,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Vymazať konfiguráciu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1089,24 +980,23 @@ msgstr "Deaktivovať zariadenie"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Chcete naozaj vymazať hrá�a '%s' ?"
@@ -1115,8 +1005,8 @@ msgstr "Chcete naozaj vymazať hrá�a '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1127,27 +1017,24 @@ msgstr "Dole"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1158,7 +1045,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1168,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1181,24 +1066,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1210,27 +1093,24 @@ msgstr "Aktivovať zariadenie"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Zapnuté"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Zadajte meno nového hrá�a"
 
@@ -1245,27 +1125,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Skon�iť preteky"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1273,12 +1155,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1303,19 +1185,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Finálne kolo!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1326,21 +1206,14 @@ msgstr "Útok"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Najprv budete potrebovať niekoľko vstupných zariadení (viac gamepadov alebo "
-"joystickov je najlepší spôsob, ako hrať s viacerými ľu�mi). Cho�te do "
-"konfigurácie vstupov a nastavte gamepady. Je tiež možné hrať na "
-"klávesnici(ach), avšak každý hrá� bude potrebovať iný súbor klávesov. "
-"Pamätajte si, že vä�šina klávesníc nie je vhodná pre hru pre viacerých "
-"hrá�ov, pretože nepodporuje veľké množstvo stla�ení klávesov."
+msgstr "Najprv budete potrebovať niekoľko vstupných zariadení (viac gamepadov alebo joystickov je najlepší spôsob, ako hrať s viacerými ľu�mi). Cho�te do konfigurácie vstupov a nastavte gamepady. Je tiež možné hrať na klávesnici(ach), avšak každý hrá� bude potrebovať iný súbor klávesov. Pamätajte si, že vä�šina klávesníc nie je vhodná pre hru pre viacerých hrá�ov, pretože nepodporuje veľké množstvo stla�ení klávesov."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1353,7 +1226,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1361,14 +1233,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1392,13 +1266,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1412,22 +1285,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Herné klávesy"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Herné módy"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1443,51 +1313,45 @@ msgstr "Tla�idlo gamepadu %d"
 msgid "Gamepad hat %d"
 msgstr "Viacsmerové tla�idlo na gamepade %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Všeobecné"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1497,61 +1361,53 @@ msgid "Go!"
 msgstr "Å tart!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1568,12 +1424,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1583,22 +1437,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Pomoc"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Najvyššie skóre"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1606,79 +1456,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Triafajte iných so zbraňami, kým nestratia všetky životy. (len v hrách pre "
-"viacerých hrá�ov)"
+msgstr "Triafajte iných so zbraňami, kým nestratia všetky životy. (len v hrách pre viacerých hrá�ov)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Ak vidíte tla�idlo so zámkou ako táto, na jeho odomknutie potrebujete "
-"dokon�iť úlohu."
+msgstr "Ak vidíte tla�idlo so zámkou ako táto, na jeho odomknutie potrebujete dokon�iť úlohu."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "Ignorujem '%s', potrebovali ste sa pripojiť skôr, aby ste mohli hrať!"
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
-"Ignorujem '%s', potrebovali ste sa pripojiť skôr, aby ste mohli hrať!"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Nainštalovať"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Mierne pokro�ilá"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1688,13 +1530,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Motokáry"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Ponechať toto rozlíšenie"
 
@@ -1713,7 +1554,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1722,7 +1562,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Kolo"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Kolo %i"
@@ -1784,50 +1624,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Na�ítavam"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Uzamknuté: vyriešte aktívne úlohy, aby ste získali prístup k �alším!"
 
@@ -1835,11 +1671,51 @@ msgstr "Uzamknuté: vyriešte aktívne úlohy, aby ste získali prístup k �al
 msgid "Locked!"
 msgstr "Uzamknuté!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1850,27 +1726,18 @@ msgstr "Pozrieť dozadu"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1878,18 +1745,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1899,29 +1764,33 @@ msgid "Menu Keys"
 msgstr "Klávesy v menu"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Os myši %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1929,48 +1798,41 @@ msgstr "Tla�idlo myši %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Hudba"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1990,13 +1852,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2005,9 +1869,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Nový Grand Prix '%s' teraz dostupný"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2020,7 +1888,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Nová obtiažnosť '%s' teraz dostupná"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nové najrýchlejšie kolo"
 
@@ -2048,19 +1916,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2070,21 +1937,19 @@ msgid "Normal Race"
 msgstr "Normálne preteky"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nová�ik"
 
@@ -2095,46 +1960,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Po�et AI motokár"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2142,60 +2002,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Iba vlastník hry môže konať v tomto bode!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2206,14 +2065,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Nastavenia"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2222,35 +2078,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2258,8 +2109,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2270,12 +2121,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pozastavené"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Trestný �as!!"
 
@@ -2284,7 +2134,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Ihrisko pre tu�niaky"
 
@@ -2293,37 +2142,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Hrá�i"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2332,6 +2182,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Prosím, prekonfigurujte svoje priradenie klávesov."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2341,49 +2195,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Pre zrušenie stla�te ESC"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Stla�te kláves"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Stla�te enter alebo dvakrát kliknite na zariadenie, aby ste ho "
-"nakonfigurovali"
+msgstr "Stla�te enter alebo dvakrát kliknite na zariadenie, aby ste ho nakonfigurovali"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Stla�te enter alebo dvakrát kliknite na hrá�a, aby ste ho(ju) upravili"
+msgstr "Stla�te enter alebo dvakrát kliknite na hrá�a, aby ste ho(ju) upravili"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2415,7 +2260,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2424,7 +2268,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2436,25 +2279,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Ukon�iť"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Usporiadanie pretekov"
 
@@ -2475,8 +2314,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Náhodná motokára"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Náhodná dráha"
 
@@ -2485,82 +2324,68 @@ msgid "Rank"
 msgstr "Poradie"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Pripraviť sa!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Odstrániť"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Premenovať"
 
@@ -2586,29 +2411,25 @@ msgstr "Záchrana"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Reštartovať"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Opakovať preteky"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2665,41 +2486,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2709,12 +2524,10 @@ msgid "Select"
 msgstr "Výber"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Vyberte si herný mód"
 
@@ -2724,36 +2537,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2768,91 +2575,49 @@ msgstr "Pozor!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Usporiadať nové preteky"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2862,7 +2627,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2873,12 +2637,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Vzhľad"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2888,23 +2650,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2914,7 +2674,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Zvukové efekty"
 
@@ -2923,7 +2682,6 @@ msgstr "Zvukové efekty"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Štandardná"
 
@@ -2936,11 +2694,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Za�ať Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Za�ať preteky"
 
@@ -2960,12 +2717,10 @@ msgstr "Riadiť doprava"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2973,83 +2728,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Doplnky"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart Pomocník"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart Nastavenia"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart môžete hrať v móde pre viacerých hrá�ov na tom istom po�íta�i"
+msgstr "SuperTuxKart môžete hrať v móde pre viacerých hrá�ov na tom istom po�íta�i"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart obsahuje niekoľko herných módov"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3058,32 +2799,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3095,9 +2841,7 @@ msgstr ""
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Súbor s najvyšším skóre bol príliš starý,\n"
-"všetko najvyššie skóre bolo vymazané."
+msgstr "Súbor s najvyšším skóre bol príliš starý,\nvšetko najvyššie skóre bolo vymazané."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3110,42 +2854,22 @@ msgstr "Preteky na �as"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Preteky na �as: neobsahuje žiadne vylepšenia (powerupy), takže záleží len na "
-"vašich vodi�ských skúsenostiach!"
+msgstr "Preteky na �as: neobsahuje žiadne vylepšenia (powerupy), takže záleží len na vašich vodi�ských skúsenostiach!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Aby ste pridali nové Gamepad/Joystick zariadenie, jednoducho zapnite "
-"SuperTuxKart s ním zapojeným a objaví sa v zozname.\n"
-"\n"
-"Aby ste pridali konfiguráciu klávesnice, môžete použiť tla�idlo nižšie, "
-"AVŠAK všimnite si, že vä�šina klávesníc podporuje len obmedzené množstvo "
-"stla�ení klávesov, a tak sú nevhodné pre hranie hry pre viacerých hrá�ov. "
-"(Do po�íta�a môžete avšak pripojiť viac klávesníc. Pamätajte si, že v "
-"takomto prípade potrebuje každý aj tak iné priradenie klávesov.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Aby ste pridali nové Gamepad/Joystick zariadenie, jednoducho zapnite SuperTuxKart s ním zapojeným a objaví sa v zozname.\n\nAby ste pridali konfiguráciu klávesnice, môžete použiť tla�idlo nižšie, AVŠAK všimnite si, že vä�šina klávesníc podporuje len obmedzené množstvo stla�ení klávesov, a tak sú nevhodné pre hranie hry pre viacerých hrá�ov. (Do po�íta�a môžete avšak pripojiť viac klávesníc. Pamätajte si, že v takomto prípade potrebuje každý aj tak iné priradenie klávesov.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Pomôckou pre víťazstvo sú niektoré vylepšenia (powerupy), ktoré môžete "
-"zobrať:"
+msgstr "Pomôckou pre víťazstvo sú niektoré vylepšenia (powerupy), ktoré môžete zobrať:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3164,7 +2888,7 @@ msgstr "Najlepších %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3178,19 +2902,17 @@ msgstr "Trať od %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Trate"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3201,24 +2923,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3226,20 +2945,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Odinštalovať"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3253,8 +2970,8 @@ msgid "Update"
 msgstr "Aktualizovať"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3263,40 +2980,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3305,19 +3018,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3326,13 +3037,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3343,27 +3053,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Hlasitosť"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3375,7 +3081,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ZL� CESTA!"
 
@@ -3386,45 +3092,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Zbrane"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3435,42 +3136,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "�no"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3480,37 +3175,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Dokon�ili ste Grand Prix!"
 
@@ -3531,20 +3225,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Dokon�ili ste preteky!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Boli ste vyradený(á)!"
 
@@ -3554,7 +3251,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3562,55 +3259,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Vyhrali ste preteky!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Váš konfigura�ný súbor bol chybne vytvorený, takže bol zmazaný a vytvorí sa "
-"nový."
+msgstr "Váš konfigura�ný súbor bol chybne vytvorený, takže bol zmazaný a vytvorí sa nový."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Váš konfigura�ný súbor bol príliš starý, takže bol zmazaný a vytvorí sa nový."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Váš konfigura�ný súbor bol príliš starý, takže bol zmazaný a vytvorí sa nový."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Váš konfigura�ný súbor vstupov nie je kompatibilný s touto verziou STK."
+msgstr "Váš konfigura�ný súbor vstupov nie je kompatibilný s touto verziou STK."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3618,7 +3321,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3629,7 +3331,6 @@ msgstr "[žiadne]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3638,7 +3339,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3647,45 +3349,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Miroslav Remák https://launchpad.net/~miroslavr256\n"
-"  Prescott_SK https://launchpad.net/~prescott66\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Miroslav Remák https://launchpad.net/~miroslavr256\n  Prescott_SK https://launchpad.net/~prescott66\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/sl.po b/data/po/sl.po
index a65548f88..f458d98db 100644
--- a/data/po/sl.po
+++ b/data/po/sl.po
@@ -1,26 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
+# Andrej Znidarsic <andrej.znidarsic@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.5\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-19 20:51+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
-"Language-Team: STK SLO Team\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/supertuxkart/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
-"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: SLOVENIA\n"
-"Language: \n"
-"X-Poedit-Language: Slovenian\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -31,26 +27,27 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Toda vi ubogi mali dirka�i ne boste nikoli mogli premagati mene - kralja "
-"dirkalnikov!"
+msgstr " Toda vi ubogi mali dirka�i ne boste nikoli mogli premagati mene - kralja dirkalnikov!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d prijatelj je povezan."
+msgstr[1] "%d prijatelja sta povezana."
+msgstr[2] "%d prijatelji so povezani"
+msgstr[3] "%d prijateljev je povezanih"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (hendikepiran)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -63,10 +60,10 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s in %s sta zdaj povezana."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -75,19 +72,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s umetnik %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s dirka� %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s je zdaj povezan."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s je pripravljen"
@@ -95,32 +91,30 @@ msgstr "%s je pripravljen"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Profil uporabnika %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Strežnik uporabnika %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s in %s so zdaj povezani."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' je bil izlo�en."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Prazno)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(omrežno igranje še ni na voljo)"
 
@@ -130,51 +124,40 @@ msgstr "* moder predmet pomeni spor z drugo nastavitvijo"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Rde� predmet pomeni spor v trenutnih nastavitvah."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Trenutne nastavitve tipkovnice je mogo�e videti/shraniti v meniju Možnosti"
+msgstr "* Trenutne nastavitve tipkovnice je mogo�e videti/shraniti v meniju Možnosti"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Ve�ino na�inov iger je mogo�e igrati v na�inu turnirja: namesto igranja "
-"posamezne igre jih lahko igrate ve� v vrsti. Boljši kot ste, ve� to�k "
-"dobite. Na koncu igralec z najve� to�kami dobi pokal."
+msgstr "* Ve�ino na�inov iger je mogo�e igrati v na�inu turnirja: namesto igranja posamezne igre jih lahko igrate ve� v vrsti. Boljši kot ste, ve� to�k dobite. Na koncu igralec z najve� to�kami dobi pokal."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Ponovno zaženite STK za uveljavitev novih nastavitev"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Nastavitve bodo dolo�ene glede na to, katero tipko 'Izberi' pritisnete za pridružitev igri."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -203,13 +186,10 @@ msgstr "Bitka na 3 zmage"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Bitka 3 udarcev: le v ve�igralskih igrah. Zadenite druge igralce z orožji "
-"dokler jim ne zmanjka življenj."
+msgstr "Bitka 3 udarcev: le v ve�igralskih igrah. Zadenite druge igralce z orožji dokler jim ne zmanjka življenj."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -224,23 +204,20 @@ msgid "9 months"
 msgstr "9 mesecev"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Najboljši rezultati ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "Ra�unalniški vozniki"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Prekli�i turnir"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "O programu"
 
@@ -249,66 +226,59 @@ msgstr "O programu"
 msgid "Accelerate"
 msgstr "Pospešek"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Za drsenje pospešite in med zavijanje pritisnite tipko <%s>. Drsenje vam "
-"lahko pomaga pri hitrejšem obra�anju, da lažje zvozite ostre ovinke."
+msgstr "Za drsenje pospešite in med zavijanje pritisnite tipko <%s>. Drsenje vam lahko pomaga pri hitrejšem obra�anju, da lažje zvozite ostre ovinke."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Pospešite z <%s> in zavijajte z <%s> in <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Sprejmi"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Obnovitev ra�una"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Nastavitve ra�una"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Dosežki"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Dejanje"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Dodaj prijatelja"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -317,7 +287,6 @@ msgstr "Dodajanje nastavitev tipkovnice"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Dodaj igralca"
 
@@ -328,32 +297,29 @@ msgstr "Dodaj Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Dodaj napravo"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Dodaj uporabnika"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Dodatki"
 
@@ -363,49 +329,43 @@ msgstr "Ime dodatka"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Dodatki"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Napredno izrisovanje (lu�i ipd.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Vse"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Vse proge"
 
@@ -415,46 +375,45 @@ msgstr "Vse je dovoljeno, zato dobite orožja in jih pametno uporabite!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
-msgstr ""
+msgstr "Vedno prikaži prijavni zaslon"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Naravno sen�enje"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Naravno sen�enje: %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Med shranjevanjem turnirja je prišlo do napake."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Sidro - mo�no upo�asni vozilo na prvem mestu."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Animirani vozniki"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animirani vozniki: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Animiran scenarij"
 
@@ -462,58 +421,54 @@ msgstr "Animiran scenarij"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animiran scenarij: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
-msgid "Anisotropic x2"
-msgstr ""
+msgstr "Anizotropi�no x16"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:78
-msgid "Anisotropic x4"
-msgstr ""
+msgid "Anisotropic x2"
+msgstr "Anizotropi�no x2"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr "Anizotropi�no x4"
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
-msgstr ""
+msgstr "Anizotropi�no x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Obstaja drug turnir s tem imenom."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Glajenje robov"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Glajenje robov: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "Uveljavi"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Uveljavi novo lo�ljivost"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Smrtni sovražnik"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -524,51 +479,46 @@ msgstr "Ali ste prepri�ani, da želite trajno izbrisati to nastavitev?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Ali ste prepri�ani, da želite odstraniti '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arene"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Okoli svetilnika"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "Ne dodeli ni�esar"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Dodeli tipki ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Na koncu sveta"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Zvok"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Izognite se bananam!"
 
@@ -590,122 +540,102 @@ msgstr "Os %d %s"
 msgid "Axis %d inverted"
 msgstr "Os %d je obrnjena"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Nazaj"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Nazaj v igro"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Nazaj na dirko"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Nazaj na izbiro izzivov"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Nazaj na seznam naprav"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Nazaj na meni"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Nazaj na meni"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Ljubitelj banan"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Košarkarska žoga - odbija se za vodjo. Med potjo lahko potla�i in upo�asni "
-"vozila."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Košarkarska žoga - odbija se za vodjo. Med potjo lahko potla�i in upo�asni vozila."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Otok bitk"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Ve� sre�e prihodnji�!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
-msgstr ""
+msgstr "Dvolinearno"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "ÄŒrno"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Graš�ina Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Cvetenje"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Cvetenje: %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Modra ekipa je zmagala"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Goveja farma"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Krogla za kegljanje - se odbija od zidov. Če gledate nazaj, bo vržena nazaj."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Krogla za kegljanje - se odbija od zidov. Če gledate nazaj, bo vržena nazaj."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -713,64 +643,52 @@ msgid "Brake"
 msgstr "Zavora"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Žve�ilni gumi  - zaš�itite se s š�itom ali ga uporabite medtem ko gledate "
-"nazaj in pustite za sabo lepljivo roza lužo."
+msgstr "Žve�ilni gumi  - zaš�itite se s š�itom ali ga uporabite medtem ko gledate nazaj in pustite za sabo lepljivo roza lužo."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Torta - vržena je v najbližjega nasprotnika. Najboljše se obnese na kratkih "
-"razdaljah in dolgih ravninah."
+msgstr "Torta - vržena je v najbližjega nasprotnika. Najboljše se obnese na kratkih razdaljah in dolgih ravninah."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Ni mogo�e dostopati do strežnika stkaddons ..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Prekli�i"
 
@@ -784,26 +702,23 @@ msgid "Cancel/Back"
 msgstr "Prekli�i/Nazaj"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Jama X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Izziv je kon�an"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Izziv je spodletel"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Izzivi : Soba s trofejami"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -811,63 +726,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Izbor vozila"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Za igranje vodnika kliknite sem"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Zapri"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Zbirajte modre škatle: dale vam bodo orožja in druge dodatke"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Zberite škatle z darili in izstrelite orožja z <%s>, da te škatle "
-"razstrelite!"
+msgstr "Zberite škatle z darili in izstrelite orožja z <%s>, da te škatle razstrelite!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Zberite steklenice z nitrom (uporabili jih bomo po ovinku)"
 
@@ -877,16 +781,13 @@ msgstr "Zberite nitro!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Pobiranje nitra vam omogo�a pospeške, kadarkoli pritisnete primerno tipko. "
-"Trenutno koli�ino nitra lahko vidite v stolpcu na desni strani zaslona."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Pobiranje nitra vam omogo�a pospeške, kadarkoli pritisnete primerno tipko. Trenutno koli�ino nitra lahko vidite v stolpcu na desni strani zaslona."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -899,11 +800,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -911,7 +812,6 @@ msgstr "Potrdite lo�ljivost v naslednjih %i sekundah"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -919,105 +819,86 @@ msgstr ""
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Povežite svoj wiimote z upravljalnikom Bluetooth in nato kliknite V redu. "
-"Podrobna navodila so na supertuxkart.net/Wiimote"
+msgstr "Povežite svoj wiimote z upravljalnikom Bluetooth in nato kliknite V redu. Podrobna navodila so na supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Ne vsebuje dodatkov, zato štejejo samo vaše vozniške sposobnosti!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Nadaljuj"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Tipke"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Ni mogo�e zaznati wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Zasluge"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1030,13 +911,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Po meri"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Nastavitve po meri"
 
@@ -1062,7 +942,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1070,28 +949,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Izbriši nastavitev"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1104,24 +981,23 @@ msgstr "Onemogo�i napravo"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Onemogo�eno"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Prikaži število slik na sekundo"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Ali ste prepri�ani, da želite preklicati turnir?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ali ste prepri�ani, da želite izbrisati igralca '%s' ?"
@@ -1130,8 +1006,8 @@ msgstr "Ali ste prepri�ani, da želite izbrisati igralca '%s' ?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Ne pospešujte pred napisom zdaj"
 
@@ -1142,29 +1018,26 @@ msgstr "Dol"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Uredi turnir"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1173,7 +1046,6 @@ msgstr "Lovljenje jajc"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Iskanje jajc: raziš�ite proge in najdite vsa skrita jajca."
 
@@ -1183,12 +1055,11 @@ msgid "Eggs: %d / %d"
 msgstr "Jajca: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Izlo�en"
 
@@ -1196,24 +1067,22 @@ msgstr "Izlo�en"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1225,27 +1094,24 @@ msgstr "Omogo�i napravo"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Omogo�eno"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Omogo�eno za vse"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Vnesite ime novega igralca"
 
@@ -1258,31 +1124,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Vsi:\nPritisnite 'Izberi' zdaj za pridružitev igri!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Vsi:\n"
-"Pritisnite 'Izberi' zdaj za pridružitev igri!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Kon�aj dirko"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Dirka�"
 
@@ -1290,12 +1156,12 @@ msgstr "Dirka�"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Raziš�ite proge in najdite vsa skrita jajca"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1320,19 +1186,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Zadnji krog!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1343,21 +1207,14 @@ msgstr "Ogenj"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Potrebujete ve� vnosnih naprav (ve� igralnih ploš�kov ali joystickov je "
-"najboljši na�in za igro z ve� ljudmi). Pojdite v zaslon vnosnih nastavitev "
-"in nastavite igralne ploš�ke. Mogo�e je igrati s tipkovnic-o/ami, vendar bo "
-"vsak igralec potreboval druga�en niz tipk. Ve�ina tipkovnic ni primernih za "
-"ve�igralsko igranje, ker ne podpirajo velikega števila so�asnih pritiskov "
-"tipk."
+msgstr "Potrebujete ve� vnosnih naprav (ve� igralnih ploš�kov ali joystickov je najboljši na�in za igro z ve� ljudmi). Pojdite v zaslon vnosnih nastavitev in nastavite igralne ploš�ke. Mogo�e je igrati s tipkovnic-o/ami, vendar bo vsak igralec potreboval druga�en niz tipk. Ve�ina tipkovnic ni primernih za ve�igralsko igranje, ker ne podpirajo velikega števila so�asnih pritiskov tipk."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1370,24 +1227,24 @@ msgstr "Sledite vodji!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Sledite vodji: poskusite biti drugi, saj bo zadnje vozilo diskvalificirano "
-"vsaki�, ko se �as izte�e. Pozor: izlo�eni boste tudi, �e boste pred vodjo!"
+msgstr "Sledite vodji: poskusite biti drugi, saj bo zadnje vozilo diskvalificirano vsaki�, ko se �as izte�e. Pozor: izlo�eni boste tudi, �e boste pred vodjo!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Utrdba magme"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Najdenih je bilo %d naprav wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1411,13 +1268,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Celozaslonski na�in"
 
@@ -1431,22 +1287,19 @@ msgstr "GOL!"
 msgid "Game Keys"
 msgstr "Tipke za igranje"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Na�ini igre"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1462,51 +1315,45 @@ msgstr "Gumb na igralnem ploš�ku %d"
 msgid "Gamepad hat %d"
 msgstr "Ve�smerni gumb na igralnem ploš�ku %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Splošno"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Predaj dirko"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1516,61 +1363,53 @@ msgid "Go!"
 msgstr "Zdaj !"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Turnir"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Urejevalnik turnirjev"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "urejevalnik turnirjev"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Napredek turnirja"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Raven grafi�nih u�inkov"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafika"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Grafi�ne nastavitve"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Zelena dolina"
 
@@ -1587,12 +1426,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1602,22 +1439,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Pomo�"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Seznam najboljših"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1625,78 +1458,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Streljajte na ostale z orožji, dokler ne izgubijo vseh svojih življenj. (Le "
-"v ve�igralskih igrah)"
+msgstr "Streljajte na ostale z orožji, dokler ne izgubijo vseh svojih življenj. (Le v ve�igralskih igrah)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Le �loveški igralci"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Če me premagaš pri dirkanju, bom izpustil starega norca."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Če vidite gumb s klju�avnico kot je ta na desni, morate dokon�ati izziv, da "
-"jo odklenete."
+msgstr "Če vidite gumb s klju�avnico kot je ta na desni, morate dokon�ati izziv, da jo odklenete."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Prezrtje '%s', za igranje bi se morali pridružiti prej!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Namesti"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Voznik"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Izena�eno"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1706,13 +1532,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Dirkalniki"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Obdrži to lo�ljivost"
 
@@ -1731,7 +1556,6 @@ msgid "Keyboard %i"
 msgstr "Tipkovnica %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1740,7 +1564,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Krog"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Krog %i"
@@ -1802,50 +1626,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Nalaganje"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Zaklenjeno: rešite dejavne izzive za dostop do ve� stvari!"
 
@@ -1853,11 +1673,51 @@ msgstr "Zaklenjeno: rešite dejavne izzive za dostop do ve� stvari!"
 msgid "Locked!"
 msgstr "Zaklenjeno!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1868,27 +1728,18 @@ msgstr "Pogled nazaj"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1896,18 +1747,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Le jaz"
 
@@ -1917,29 +1766,33 @@ msgid "Menu Keys"
 msgstr "Menijske tipke"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Miškina os %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1947,48 +1800,41 @@ msgstr "Miškin gumb %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Ve�igralska igra"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Ve�igralstvo"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Glasba"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2008,13 +1854,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2023,9 +1871,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Na voljo je nov turnir '%s'"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2038,7 +1890,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Na voljo je nova težavnost '%s'"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nov najhitrejši krog"
 
@@ -2066,19 +1918,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Izziv z nitrom"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Brez"
 
@@ -2088,21 +1939,19 @@ msgid "Normal Race"
 msgstr "Obi�ajna dirka"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Severno letoviš�e"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr "Če vam uspe drseti ve� sekund, za nagrado dobite dodatno pohitritev!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Za�etnik"
 
@@ -2113,46 +1962,41 @@ msgstr "Število ra�unalniških igralcev: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Število ra�unalniških igralcev"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Å tevilo golov za zmago"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "V redu"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Bogu za hrbtom"
 
@@ -2160,60 +2004,59 @@ msgstr "Bogu za hrbtom"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Sedaj je v mojem gradu in postrežen bo za ve�erjo ..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Zapuš�eni rudnik"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliverjeva matemati�na u�ilnica"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Nastavitve lahko spremeni samo igralec gostitelj!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Ups! Ko ste v težavah, pritisnite <%s> za rešitev"
@@ -2224,14 +2067,11 @@ msgstr "Ups! Ko ste v težavah, pritisnite <%s> za rešitev"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Možnosti"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2240,35 +2080,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Padalo - upo�asni vsa vozila pred vami"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2276,8 +2111,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2288,12 +2123,11 @@ msgstr "Premor igre"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "V premoru"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Kazenski �as!!"
 
@@ -2302,7 +2136,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinovo igriš�e"
 
@@ -2311,45 +2144,50 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Predvajaj vse"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Igralci"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Vnesite ime turnirja"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "Znova nastavite zmožnosti tipk."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Po�akajte medtem ko se dodatki posodabljajo"
@@ -2359,51 +2197,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Po�akajte medtem ko se dodatki nalagajo"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Odmaševalnik - vrzite ga naravnost, da potegnete nasprotnika nazaj ali "
-"nazaj, da nasprotnika oslepite."
+msgstr "Odmaševalnik - vrzite ga naravnost, da potegnete nasprotnika nazaj ali nazaj, da nasprotnika oslepite."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Za preklic pritisnite ESC."
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Pritisnite tipko"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Za nastavitev naprave pritisnite vnosno tipko (enter) ali pa jo dvojno "
-"kliknite"
+msgstr "Za nastavitev naprave pritisnite vnosno tipko (enter) ali pa jo dvojno kliknite"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Za urejanje igralca pritisnite vnosno tipko (enter) ali pa ga dvojno kliknite"
+msgstr "Za urejanje igralca pritisnite vnosno tipko (enter) ali pa ga dvojno kliknite"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2417,9 +2244,7 @@ msgstr "Pritisnite ogenj za za�etek izziva"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Hkrati pritisnite gumba 1+2 na svojem wiimote, da preide v na�in odkrivanja, "
-"nato kliknite V redu. Podrobna navodila so na  supertuxkart.net/Wiimote."
+msgstr "Hkrati pritisnite gumba 1+2 na svojem wiimote, da preide v na�in odkrivanja, nato kliknite V redu. Podrobna navodila so na  supertuxkart.net/Wiimote."
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2437,7 +2262,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2446,7 +2270,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2454,30 +2277,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Potisnite žogo v nasprotno kletko in zadenite gol. (le v ve�igralskih igrah)"
+msgstr "Potisnite žogo v nasprotno kletko in zadenite gol. (le v ve�igralskih igrah)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Kon�aj"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Nastavitev dirke"
 
@@ -2491,15 +2309,15 @@ msgstr "Naklju�na arena"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Naklju�ni turnir"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Naklju�no vozilo"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Naklju�na proga"
 
@@ -2508,83 +2326,68 @@ msgid "Rank"
 msgstr "Mesto"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Ocena >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Pripravljeni!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Rde�a ekipa zmaga"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Obi�ajna igra: vse je dovoljeno, zato dobite orožja in jih pametno uporabite!"
+msgstr "Obi�ajna igra: vse je dovoljeno, zato dobite orožja in jih pametno uporabite!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Zapomni si mesto okna"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Odstrani"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -2610,29 +2413,25 @@ msgstr "Reševanje"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Lo�ljivost"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Znova zaženi dirko"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Ponoven za�etek dirke"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2689,41 +2488,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "Podjetje STK"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Shrani turnir"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Å kotska"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2733,12 +2526,10 @@ msgid "Select"
 msgstr "Izbira"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Izberite na�in igre"
 
@@ -2748,36 +2539,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Izbor vozila"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2792,91 +2577,49 @@ msgstr "Pozor!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Nastavi novo dirko"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Premikajo�e sipine"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Bleš�e�e predmestje"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2886,7 +2629,6 @@ msgid "Size: %s"
 msgstr "Velikost: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2897,12 +2639,10 @@ msgstr "Drsenje"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Tema"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snežni vrh"
 
@@ -2912,29 +2652,23 @@ msgid "Soccer"
 msgstr "Nogomet"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Nogometno igriš�e"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Nogomet: le v ve�igralskih igrah. S svojim dirkalnikom porinite žogo v gol."
+msgstr "Nogomet: le v ve�igralskih igrah. S svojim dirkalnikom porinite žogo v gol."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Med vzpostavljanjem stika s spletiš�em dodatkov je prišlo do napake. "
-"Prepri�ajte se, da ste povezani na Internet in da požarni zid ne blokira "
-"SuperTuxKart."
+msgstr "Med vzpostavljanjem stika s spletiš�em dodatkov je prišlo do napake. Prepri�ajte se, da ste povezani na Internet in da požarni zid ne blokira SuperTuxKart."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2942,7 +2676,6 @@ msgstr "Oprostite, prejem dodatka je spodletel"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Zvo�ni u�inki"
 
@@ -2951,7 +2684,6 @@ msgstr "Zvo�ni u�inki"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Obi�ajna"
 
@@ -2964,11 +2696,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Za�ni turnir"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Za�ni dirko"
 
@@ -2988,12 +2719,10 @@ msgstr "Zavij desno"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Na�in zgodbe"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3001,84 +2730,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Pod morjem"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Dodatki SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Pomo� SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Možnosti SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-"SuperTuxKart je mogo�e igrati v ve�igralskem na�inu na istem ra�unalniku"
+msgstr "SuperTuxKart je mogo�e igrati v ve�igralskem na�inu na istem ra�unalniku"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart vsebuje ve� na�inov igre"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzana"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Zamenjava - škatle z darili se za kratek �as spremenijo v banane in obratno."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Zamenjava - škatle z darili se za kratek �as spremenijo v banane in obratno."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Stepalnik - stla�i vozila v bližini in jih upo�asni."
 
@@ -3087,33 +2801,37 @@ msgstr "Stepalnik - stla�i vozila v bližini in jih upo�asni."
 msgid "System Language"
 msgstr "Sistem jezik"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Filtriranje tekstur"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Tipka 'drsenje' vam omogo�a drsenje v ostrih ovinkih in pridobitev pospeška."
+msgstr "Tipka 'drsenje' vam omogo�a drsenje v ostrih ovinkih in pridobitev pospeška."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3125,9 +2843,7 @@ msgstr "Modul dodatkov je trenutno v Možnostih onemogo�en"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Datoteka z najboljšimi izidi je bila prestara,\n"
-"zato so bili vsi rezultati izbrisani."
+msgstr "Datoteka z najboljšimi izidi je bila prestara,\nzato so bili vsi rezultati izbrisani."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3140,40 +2856,22 @@ msgstr "Dirka na �as"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Dirka na �as: Ne vsebuje nobenih pripomo�kov, štejejo samo vaše vozniške "
-"sposobnosti!"
+msgstr "Dirka na �as: Ne vsebuje nobenih pripomo�kov, štejejo samo vaše vozniške sposobnosti!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Za dodajanje nove naprave igralni ploš�ek/Joystick, povežite napravo in "
-"zaženite SuperTuxKart. Naprava se bo pojavila na seznamu.\n"
-"\n"
-"Za dodajanje nastavitve tipkovnice lahko uporabite gumb spodaj, VENDAR "
-"vedite, da ve�ina tipkovnic podpira omejeno koli�ino so�asnih pritiskov na "
-"tipke in so zato neprimerne za ve�igralske igre. (Hkrati lahko na ra�unalnik "
-"povežete ve� tipkovnic. V tem primeru še vedno vsi potrebujejo razli�ne "
-"tipkovne bližnjice.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Za dodajanje nove naprave igralni ploš�ek/Joystick, povežite napravo in zaženite SuperTuxKart. Naprava se bo pojavila na seznamu.\n\nZa dodajanje nastavitve tipkovnice lahko uporabite gumb spodaj, VENDAR vedite, da ve�ina tipkovnic podpira omejeno koli�ino so�asnih pritiskov na tipke in so zato neprimerne za ve�igralske igre. (Hkrati lahko na ra�unalnik povežete ve� tipkovnic. V tem primeru še vedno vsi potrebujejo razli�ne tipkovne bližnjice.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Za lažjo zmago lahko poberete razli�ne dodatke:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Na luno in nazaj"
 
@@ -3192,7 +2890,7 @@ msgstr "Najboljših %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3206,19 +2904,17 @@ msgstr "Progo je ustvaril %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Proge"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3229,45 +2925,40 @@ msgstr "Poskusite znova"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Vodnik"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Vodnik: soba za izbiro"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Vrsta:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Vrsta: turnir"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Odstrani"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3281,8 +2972,8 @@ msgid "Update"
 msgstr "Posodobi"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Posodobljeno"
 
@@ -3291,40 +2982,36 @@ msgid "Updated date"
 msgstr "Posodobljeno dne"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Zbrani nitro uporabite s pritiskom na tipko <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Uporabniški vmesnik"
 
@@ -3333,19 +3020,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3354,13 +3039,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "proti"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3371,27 +3055,23 @@ msgstr "Razli�ica: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Navpi�no usklajevanje (zahteva ponoven zagon)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Glasnost"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3403,7 +3083,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "NAPAÄŒNA SMER!"
 
@@ -3412,59 +3092,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Opozorilo, 'Shift' ni priporo�ena tipka. Ob pritisku tipke shift bodo vse "
-"tipke, ki vsebujejo znak, ki je v primeru velikih �rk druga�en, prenehale "
-"delovati."
+msgstr "Opozorilo, 'Shift' ni priporo�ena tipka. Ob pritisku tipke shift bodo vse tipke, ki vsebujejo znak, ki je v primeru velikih �rk druga�en, prenehale delovati."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Orožja"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Vremenski u�inki"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Vremenski u�inki: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Kaj je narobe mali hipiji? Mar vašega velikega vodje gnuja ni?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Ko so vnosne naprave nastavljene, lahko za�nete igrati. V glavnem meniju "
-"izberite ikono 've�igralska dirka'. Ko je �as za izbiro dirkalnika mora vsak "
-"igralec za pridružitev igri pritisniti tipko 'ogenj' na tipkovnici ali "
-"igralnemu ploš�ku. Vsak igralec lahko za izbiro svojega dirkalnika uporabi "
-"svojo vnosno napravo. Igra se nadaljuje, ko vsi igralci izberejo svoj "
-"dirkalnik. Za to opravilo ne morete uporabiti miške."
+msgstr "Ko so vnosne naprave nastavljene, lahko za�nete igrati. V glavnem meniju izberite ikono 've�igralska dirka'. Ko je �as za izbiro dirkalnika mora vsak igralec za pridružitev igri pritisniti tipko 'ogenj' na tipkovnici ali igralnemu ploš�ku. Vsak igralec lahko za izbiro svojega dirkalnika uporabi svojo vnosno napravo. Igra se nadaljuje, ko vsi igralci izberejo svoj dirkalnik. Za to opravilo ne morete uporabiti miške."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3472,42 +3138,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Da"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Sedaj ste pripravljeni na dirkanje. Vso sre�o!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Igrate kot"
 
@@ -3517,37 +3177,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Kon�ali ste izziv!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Kon�ali ste izzive!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Dokon�ali ste turnir!"
 
@@ -3568,20 +3227,24 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Kon�ali ste dirko!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Bili ste odstranjeni!"
 
@@ -3591,7 +3254,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3599,56 +3262,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Odklenili ste turnir %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Odklenili ste progo %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Zmagali ste dirko!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Vaša nastavitvena datoteka je bila slabo oblikovana, zato je bila izbrisana. "
-"Ustvarjena bo nova nastavitvena datoteka."
+msgstr "Vaša nastavitvena datoteka je bila slabo oblikovana, zato je bila izbrisana. Ustvarjena bo nova nastavitvena datoteka."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Vaša nastavitvena datoteka je bila prestara, zato je bila izbrisana. Ustvarjena bo nova nastavitvena datoteka."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Vaša nastavitvena datoteka je bila prestara, zato je bila izbrisana. "
-"Ustvarjena bo nova nastavitvena datoteka."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Vaša vhodna nastavitvena datoteka ni združljiva s to razli�ico STK-ja."
+msgstr "Vaša vhodna nastavitvena datoteka ni združljiva s to razli�ico STK-ja."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3656,7 +3324,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zenovski vrt"
 
@@ -3667,7 +3334,6 @@ msgstr "[brez]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3676,7 +3342,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ","
@@ -3685,48 +3352,25 @@ msgstr ","
 msgid "featured"
 msgstr "zmožnost"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "obi�ajna"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
-"  Auria https://launchpad.net/~auria-mg\n"
-"  Denis_Ubuntu https://launchpad.net/~sirdrinksalot\n"
-"  Domen Knez https://launchpad.net/~dmen\n"
-"  Matic Gradišer https://launchpad.net/~0micky\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Sasa Batistic https://launchpad.net/~sasa-batistic"
+msgstr "Launchpad Contributions:\n  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n  Auria https://launchpad.net/~auria-mg\n  Denis_Ubuntu https://launchpad.net/~sirdrinksalot\n  Domen Knez https://launchpad.net/~dmen\n  Matic Gradišer https://launchpad.net/~0micky\n  STK-team https://launchpad.net/~stk\n  Sasa Batistic https://launchpad.net/~sasa-batistic"
diff --git a/data/po/sq.po b/data/po/sq.po
index 17a680772..cf077c4bd 100644
--- a/data/po/sq.po
+++ b/data/po/sq.po
@@ -1,22 +1,22 @@
-# Albanian translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 11:54+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Albanian <sq@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/supertuxkart/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +58,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s është gati"
@@ -96,25 +96,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' është eliminuar."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Bosh)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(Rrjeti per lojen nuk është ne dispozicion për momentin)"
 
@@ -128,46 +126,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Tastet momentale bindes mund te shikohen/ndërrohen në Menun e Opcioneve"
+msgstr "* Tastet momentale bindes mund te shikohen/ndërrohen në Menun e Opcioneve"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Shumica e këtyre llojeve lojëve gjithashtu mund të luhet në një mënyrë të "
-"Çmimit të Madh: në vend që të luajnë një garë të vetme, ju luani më shumë në "
-"një herë. Mirë duke u radhitur, aq më shumë pikë të marrësh. Në fund, "
-"lojtari me më shumë pikë fiton kupen."
+msgstr "* Shumica e këtyre llojeve lojëve gjithashtu mund të luhet në një mënyrë të Çmimit të Madh: në vend që të luajnë një garë të vetme, ju luani më shumë në një herë. Mirë duke u radhitur, aq më shumë pikë të marrësh. Në fund, lojtari me më shumë pikë fiton kupen."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -198,7 +184,6 @@ msgstr "3 Grevistë ne Ndeshje"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -217,23 +202,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Rezultat i lartë ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Ndalo Garen e madhe"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Rreth nesh"
 
@@ -242,37 +224,35 @@ msgstr "Rreth nesh"
 msgid "Accelerate"
 msgstr "Përshpejto"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -280,8 +260,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -291,13 +270,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -308,7 +285,6 @@ msgstr "Shto/ndrysho konfiguracionin e tastatures"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Shto Lojtar"
 
@@ -319,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Shto paisjet"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Shtesat"
 
@@ -354,72 +327,66 @@ msgstr "Emri i shteses"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Shtesat"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Të gjitha"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Te gjitha  kënget"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Te gjitha te shtenat lejohen, keshtu qe kap nje arm dhe bej kerdi duke i "
-"perdorur!"
+msgstr "Te gjitha te shtenat lejohen, keshtu qe kap nje arm dhe bej kerdi duke i perdorur!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -429,25 +396,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Karakteret e animuara: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -455,24 +419,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Skenat e animuara: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -482,37 +446,32 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Aprovo rezulucionin e ri"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
 msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
-"A jeni i sigurt qe deshironi ta shlyeni kete konfiguracion perfundimisht?"
+msgstr "A jeni i sigurt qe deshironi ta shlyeni kete konfiguracion perfundimisht?"
 
 #: src/states_screens/edit_gp_screen.cpp:123
 #: src/states_screens/grand_prix_editor_screen.cpp:109
@@ -520,49 +479,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenat"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Fute tek ESC tasti"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Tek bota perfundon"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Zëri"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Largohu nga bananet!"
 
@@ -584,79 +538,66 @@ msgstr "Axis %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Prapa"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Kthehy ne garë"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Kthehu tek prapa tek lista e paisjeve"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Kthehu në menu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Fatë të mbarë heres tjeter!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -666,39 +607,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Top i boulingut - shkund muret. nese ti je duke shikuar mrapa, ai do te "
-"shkoj mrapa."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Top i boulingut - shkund muret. nese ti je duke shikuar mrapa, ai do te shkoj mrapa."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -706,7 +641,6 @@ msgid "Brake"
 msgstr "Frena"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -714,52 +648,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -773,26 +700,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -800,61 +724,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -864,14 +779,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -884,11 +798,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -896,7 +810,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -910,97 +823,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1013,13 +909,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1045,7 +940,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1053,28 +947,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1087,24 +979,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1113,8 +1004,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1125,27 +1016,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1156,7 +1044,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1166,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1179,24 +1065,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1208,27 +1092,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1243,27 +1124,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1271,12 +1154,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1301,19 +1184,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1324,13 +1205,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1345,7 +1225,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1353,14 +1232,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1384,13 +1264,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1404,22 +1283,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1435,51 +1311,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1489,61 +1359,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1560,12 +1422,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1575,22 +1435,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1601,71 +1457,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1675,13 +1528,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1700,7 +1552,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1709,7 +1560,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1771,50 +1622,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1822,11 +1669,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1837,27 +1724,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1865,18 +1743,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1886,29 +1762,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1916,48 +1796,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1977,13 +1850,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1992,9 +1867,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2007,7 +1886,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2035,19 +1914,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2057,21 +1935,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2082,46 +1958,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2129,60 +2000,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2193,14 +2063,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2209,35 +2076,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2245,8 +2107,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2257,12 +2119,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2271,7 +2132,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2280,37 +2140,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2319,6 +2180,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2328,44 +2193,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2399,7 +2258,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2408,7 +2266,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2420,25 +2277,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2459,8 +2312,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2469,82 +2322,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2570,29 +2409,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2649,41 +2484,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2693,12 +2522,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2708,36 +2535,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2752,91 +2573,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2846,7 +2625,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2857,12 +2635,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2872,23 +2648,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2898,7 +2672,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2907,7 +2680,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2920,11 +2692,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2944,12 +2715,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2957,82 +2726,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3041,32 +2797,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3091,30 +2852,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3133,7 +2886,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3147,19 +2900,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3170,24 +2921,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3195,20 +2943,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3222,8 +2968,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3232,40 +2978,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3274,19 +3016,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3295,13 +3035,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3312,27 +3051,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3344,7 +3079,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3355,45 +3090,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3404,42 +3134,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3449,37 +3173,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3500,20 +3223,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3523,7 +3248,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3531,36 +3256,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3573,6 +3303,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3583,7 +3318,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3594,7 +3328,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3603,7 +3336,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3612,44 +3346,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Arianit Kukaj https://launchpad.net/~arking\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Arianit Kukaj https://launchpad.net/~arking\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/sr.po b/data/po/sr.po
index d324e12f3..0727bea98 100644
--- a/data/po/sr.po
+++ b/data/po/sr.po
@@ -1,26 +1,24 @@
-# Serbian translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011.
-# Саша Петровић <salepetronije@gmail.com>, 2012, 2013, 2014.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011
+# Саша Петровић <salepetronije@gmail.com>, 2012-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:09+0000\n"
-"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
-"Language-Team: �рп�ки <xfce4@xfce4.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/supertuxkart/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -31,23 +29,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" �ли, ви бедне мале ништарије никад нећете моћи да победите мене - Краља "
-"колица!"
+msgstr " �ли, ви бедне мале ништарије никад нећете моћи да победите мене - Краља колица!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -63,7 +61,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s и %s �у �ада повезани �а мрежом."
@@ -75,19 +73,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s од %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s од %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s је �ада повезан на мрежу."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s је �преман/на"
@@ -102,25 +99,23 @@ msgstr "%s-ов профил"
 msgid "%s's server"
 msgstr "%s-ов �ервер"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s и %s �у �ада повезани �а мрежом."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "„%s“ је и�пао/ла."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Празно)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(игра у мрежи још није до�тупна)"
 
@@ -134,47 +129,34 @@ msgstr "* Црвена �тавка значи да има �укоба �а т
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Тренутно подешена дугмад �е могу видети/променити у изборнику Могућно�ти"
+msgstr "* Тренутно подешена дугмад �е могу видети/променити у изборнику Могућно�ти"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Већина ових начина игре �е могу играти и као Велика награда: уме�то да "
-"возите једну трку, возите више заредом. Што боље ме�то о�војите, више бодова "
-"добијате. �а крају, играч �а највише бодова о�ваја пехар."
+msgstr "* Већина ових начина игре �е могу играти и као Велика награда: уме�то да возите једну трку, возите више заредом. Што боље ме�то о�војите, више бодова добијате. �а крају, играч �а највише бодова о�ваја пехар."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr "* Покрените поново СТК за примену нових по�тавки"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-"* Одабир по�тавки ће �е извршити по томе које дугме за одабир буде "
-"прити�нутно за придруживање игри."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* Одабир по�тавки ће �е извршити по томе које дугме за одабир буде прити�нутно за придруживање игри."
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -205,13 +187,10 @@ msgstr "Борба на 3 удара"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"Битка на три поготка: Само у играма �а више играча. Погађајте о�тале оружјем "
-"док не изгубе �воје животе."
+msgstr "Битка на три поготка: Само у играма �а више играча. Погађајте о�тале оружјем док не изгубе �воје животе."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -226,23 +205,20 @@ msgid "9 months"
 msgstr "9 ме�еци"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= �ајбоља до�тигнућа ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr "Колица роботи"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Прекини Велику награду"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "О програму"
 
@@ -251,39 +227,35 @@ msgstr "О програму"
 msgid "Accelerate"
 msgstr "Убрзај"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Убрзајте и прити�ните дугме <%s> док �крећете у клизање. Кратко клизање може "
-"помоћи да боље и оштрије �кренете."
+msgstr "Убрзајте и прити�ните дугме <%s> док �крећете у клизање. Кратко клизање може помоћи да боље и оштрије �кренете."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Убрзајте �а <%s> и управљајте уз помоћ <%s> и <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr "Прихвати"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr "Опоравак налога"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr "По�тавке налога"
 
@@ -291,8 +263,7 @@ msgstr "По�тавке налога"
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "До�тигнућа"
 
@@ -302,13 +273,11 @@ msgstr "Радња"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr "Додај"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "Додај пријатеља"
 
@@ -319,7 +288,6 @@ msgstr "Додај подешавање та�татуре"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Додај играча"
 
@@ -330,32 +298,29 @@ msgstr "Додај даљин�ки управљач Wii конзоле"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Додај уређај"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr "Додај кори�ника"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Додаци"
 
@@ -365,71 +330,66 @@ msgstr "�азив додатка"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Додаци"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "�дјуми"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr "�апредне �тавке (�ветла, итд.)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Све"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Све �тазе"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Сви ударци �у дозвољени, зато хватајте оружја и паметно их употребите!"
+msgstr "Сви ударци �у дозвољени, зато хватајте оружја и паметно их употребите!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr "Увек приказуј екран за пријаву"
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "Околно окружење"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "Околно окружење : %s"
@@ -439,25 +399,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr "Де�ила �е грешка приликом покушаја чувања велике награде."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Сидро — у великој мери у�порава колица на првом ме�ту."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Оживљени ликови"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Оживљени ликови : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Оживљена околина"
 
@@ -465,24 +422,24 @@ msgstr "Оживљена околина"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Оживљена околина : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "�низотропно x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "�низотропно x2�низотропно x"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "�низотропно x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Anisotropic x8"
 
@@ -492,29 +449,25 @@ msgstr "Трка за велику награду �а таквим именом
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr "Умекшавање"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr "Умекшавање : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr "Примени"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Примени нову размеру"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -529,49 +482,44 @@ msgstr "Да ли �те �игурни да желите трајно избр
 msgid "Are you sure you want to remove '%s'?"
 msgstr "Да ли �игурно желите да уклоните „%s“?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Борилишта"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Око �ветионика"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr "�емој ништа да доделиш"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Додели дугмету „Изађи“"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "�а крају �вета"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Звук"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Избегавај банане!"
 
@@ -593,80 +541,66 @@ msgstr "О�е %d %s"
 msgid "Axis %d inverted"
 msgstr "О�овина %d обрнута"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "�азад"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "�азад на игру"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "�азад на трку"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "�азад на избор изазова"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "�азад на �пи�ак уређаја"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "�азад на изборник"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "�азад на изборник"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Кошаркашка лопта од�каче за вођом, и може �пљоштити и у�порити колица у�пут."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Кошаркашка лопта од�каче за вођом, и може �пљоштити и у�порити колица у�пут."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "О�трво битке"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Њушкало"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Зверчица"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Више �реће �ледећи пут!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Билинеарни"
 
@@ -676,39 +610,33 @@ msgid "Black"
 msgstr "Црна"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Палата Црног брега"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr "Сјај"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr "Сјај : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Плави �у победили"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Штала �а говедима"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Кугла за куглање — одбија �е од зидова. Уколико гледате назад, биће бачена "
-"уназад."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Кугла за куглање — одбија �е од зидова. Уколико гледате назад, биће бачена уназад."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -716,64 +644,52 @@ msgid "Brake"
 msgstr "Кочи"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Жвакаћа гума - браните �е штитом, или је кори�тите да гледајући уназад "
-"о�тавите лепљиву љубича�ту �ме�у иза �ебе."
+msgstr "Жвакаћа гума - браните �е штитом, или је кори�тите да гледајући уназад о�тавите лепљиву љубича�ту �ме�у иза �ебе."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Колач — бачен на најближег противника, најбољи на кратком домету и дугим "
-"правцима."
+msgstr "Колач — бачен на најближег противника, најбољи на кратком домету и дугим правцима."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "�е могу да при�тупим �лужитељу �тк додатака..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -787,26 +703,23 @@ msgid "Cancel/Back"
 msgstr "Откажи/�азад"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Пећина Ик�"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Изазов је и�пуњен"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Изазов није и�пуњен"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Изазови: Соба награда"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr "Измени"
 
@@ -814,63 +727,52 @@ msgstr "Измени"
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Изаберите колица"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Кликните овде да пу�тите објашњење"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Затвори"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Скупљајте плаве кутије : оне дају оружје и друга побољшања"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Сакупите кутије поклоне, и и�палите оружје уз помоћ <%s> да би одували те "
-"кутије!"
+msgstr "Сакупите кутије поклоне, и и�палите оружје уз помоћ <%s> да би одували те кутије!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Сакупљајте боце �а нитром (кори�тићемо их по�ле кривине)"
 
@@ -880,17 +782,13 @@ msgstr "Сакупите нитро!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Скупљање нитра вам омогућује да повећате брзину кад год пожелите прити�ком "
-"на одговарајуће дугме. Можете видети тренутну попуну нитра у �премнику на "
-"де�ној �трани екрана."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Скупљање нитра вам омогућује да повећате брзину кад год пожелите прити�ком на одговарајуће дугме. Можете видети тренутну попуну нитра у �премнику на де�ној �трани екрана."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr "Да би откључали велика врата, и�пуните �ве изазове!"
 
@@ -903,11 +801,11 @@ msgstr "И�пуњена до�тигнућа „%s“"
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr "Потврди"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -915,7 +813,6 @@ msgstr "Потврди размеру у наредних %i �екунди"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr "Повежи �е на интернет"
 
@@ -923,105 +820,86 @@ msgstr "Повежи �е на интернет"
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Повежите wiimote �а управником Блутута, затим кликните У реду. Ближа "
-"упут�тва �е налазе на supertuxkart.net/Wiimote"
+msgstr "Повежите wiimote �а управником Блутута, затим кликните У реду. Ближа упут�тва �е налазе на supertuxkart.net/Wiimote"
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "�е �адржи појачања, тако да важе �амо ваше вештине вожње!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "�а�тави"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr "�а�тави �ачувану трку за велику награду"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr "�а�тави."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Управљачи"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr "�и�ам у�пео да �творим играча „%s“."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "�и�ам у�пео да препознам wii даљин�ки управљач"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr "�аправи"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr "�аправи �ервер"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr "�аправи играча"
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr "�аправи налог на мрежи"
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr "Стварам �ервер"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "За�луге"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr "Тренутна лозинка"
 
@@ -1034,13 +912,12 @@ msgid "Currently not signed in"
 msgstr "Тренутно ни�те упи�ани"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Прилагођено"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Прилагођене по�тавке..."
 
@@ -1066,7 +943,6 @@ msgstr "Д-дугме горе"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr "Одбиј"
 
@@ -1074,28 +950,26 @@ msgstr "Одбиј"
 msgid "Default"
 msgstr "Подразумевано"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr "Обриши"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Избриши подешавање"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr "Дубина поља"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr "Дубина поља : %s"
@@ -1108,24 +982,23 @@ msgstr "Онемогући уређај"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Онемогућен"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Прикажи број �личица по �екунди"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Да ли заи�та желите да напу�тите велику награду?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Да ли �тварно желите да избришете играча „%s“ ?"
@@ -1134,8 +1007,8 @@ msgstr "Да ли �тварно желите да избришете играч
 msgid "Do you want to save your changes?"
 msgstr "Да ли желите да �ачувате измене по�тавки?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "�е убрзавајте пре знака крени"
 
@@ -1146,27 +1019,24 @@ msgstr "Доле"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr "Вози уназад"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr "Живо о�ветљење : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr "Уреди"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr "Уреди трку за велику награду"
 
@@ -1177,7 +1047,6 @@ msgstr "Лов на јаје"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Лов на јаје: И�тражујте �тазе у потрази за �кривеним јајима."
 
@@ -1187,12 +1056,11 @@ msgid "Eggs: %d / %d"
 msgstr "Јаја: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Слонче"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Избачен"
 
@@ -1200,24 +1068,22 @@ msgstr "Избачен"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr "Е-пошта"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr "Е-пошта мора да �адржи између 4 и 50 знакова."
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr "Е-пошта није и�правна!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr "Е-пошта �е не поклапа!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Емазга"
 
@@ -1229,27 +1095,24 @@ msgstr "Омогући уређај"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Укључен"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Омогућен �вима"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Уне�ите име новог играча"
 
@@ -1262,31 +1125,31 @@ msgstr "Де�ила �е грешка приликом преузимања н
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Сви:\nПрити�ните „Одабери“ �ада да би � прикључили игри!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Сви:\n"
-"Прити�ните „Одабери“ �ада да би � прикључили игри!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr "Излаз"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "�апу�ти трку"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr "�апу�ти игру"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Стручњак"
 
@@ -1294,13 +1157,12 @@ msgstr "Стручњак"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "И�тражујте �тазе у потрази за �кривеним јајима."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
-"Слич/s: %d/%d/%d  - Број полигона: %d равни,%d �ена - даљина �ветла : %d"
+msgstr "Слич/s: %d/%d/%d  - Број полигона: %d равни,%d �ена - даљина �ветла : %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr "Слич/s:%d/%d/%d - %d KTris"
@@ -1325,21 +1187,17 @@ msgid "Fetching servers"
 msgstr "Добављање података о �ерверима"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
-"Да би поништили �адашњу лозинку, уне�ите кори�ничко име и адре�у е-поште "
-"којим �те �е упи�али."
+msgstr "Да би поништили �адашњу лозинку, уне�ите кори�ничко име и адре�у е-поште којим �те �е упи�али."
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "По�ледњи круг!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr "Пронађи �ервер"
 
@@ -1350,21 +1208,14 @@ msgstr "Пуцај"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Прво, биће вам потребно неколико уређаја уно�а (по�едовање више гејмпеда и "
-"џој�тика је најбољи начин да играте �а неколико људи). Идите на екран "
-"подешавања уно�а и поде�ите гејмпедове. Такође је могуће играти и на "
-"та�татури/ама, међутим, �ваком играчу ће требати другачији низ дугмади. "
-"Имајте на уму да већина та�татура није погодна за играње више играча зато "
-"што не подржавају велики број прити�ака дугмади и�товремено."
+msgstr "Прво, биће вам потребно неколико уређаја уно�а (по�едовање више гејмпеда и џој�тика је најбољи начин да играте �а неколико људи). Идите на екран подешавања уно�а и поде�ите гејмпедове. Такође је могуће играти и на та�татури/ама, међутим, �ваком играчу ће требати другачији низ дугмади. Имајте на уму да већина та�татура није погодна за играње више играча зато што не подржавају велики број прити�ака дугмади и�товремено."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1377,25 +1228,23 @@ msgstr "Прати вођу!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Прати вођу: О�војите друго ме�то, јер ће трка бити поништена по�ледњим "
-"колицима �ваки пут када бројач откуца нулу. Пажња: �ко претичете вођу бићете "
-"такође избачени из трке."
+msgstr "Прати вођу: О�војите друго ме�то, јер ће трка бити поништена по�ледњим колицима �ваки пут када бројач откуца нулу. Пажња: �ко претичете вођу бићете такође избачени из трке."
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Утврђење Магма"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Пронашао �ам %d wii даљин�ких управљача"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1419,13 +1268,12 @@ msgstr "По�лат је захтев за пријатељ�тво."
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr "Пријатељи"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Цео екран"
 
@@ -1439,22 +1287,19 @@ msgstr "Погодак!"
 msgid "Game Keys"
 msgstr "Дугмад игре"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "�ачини игре"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr "Вр�та игре (ограничење погодака / ограничење времена)"
 
@@ -1470,51 +1315,45 @@ msgstr "Гејмпед та�тер %d"
 msgid "Gamepad hat %d"
 msgstr "Гејмпед капа %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Опште"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Оду�тани од трке"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr "Опште о�ветљење"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr "Опште о�ветљење : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr "Сјај (обри�а)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr "Сјај (обри�а) : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Гну"
 
@@ -1524,61 +1363,53 @@ msgid "Go!"
 msgstr "Крени!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Велика награда"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr "Уредник трка за велику награду"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr "Уредник трка за велику награду"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "�апредак у трци за велику награду:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Ступањ графичких деј�тава"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Графика"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "По�тавке графике"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Зелена долина"
 
@@ -1595,12 +1426,10 @@ msgstr "Го�т %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr "Упи� го�та"
+msgid "Guest Log in"
+msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Хацијенда"
 
@@ -1610,22 +1439,18 @@ msgstr "Хацијенда"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Помоћ"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Хек�ли"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "�ајбољи резултати"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1633,78 +1458,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Погађајте друге оружјем док не изгубе �ве животе. (Само у играма �а више "
-"играча)"
+msgstr "Погађајте друге оружјем док не изгубе �ве животе. (Само у играма �а више играча)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Само љут�ки играчи"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr "Слажем �е �а у�ловима изнад и навршио �ам 13 година. "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "�ко ме у�пеш победити у трци, о�лободићу �тару ништарију."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Уколико видите дугме �а катанцем попут овог, треба да завршите изазов да "
-"би�те га откључали."
+msgstr "Уколико видите дугме �а катанцем попут овог, треба да завршите изазов да би�те га откључали."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Занемарујем „%s“, треба раније да �е прикључите да би�те играли!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Угради"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Средњи"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr "При�туп интернету је онемогућен. Молим, укључите га у могућно�тима"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "�ерешено је"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr "Прикључи �е"
 
@@ -1714,13 +1532,12 @@ msgstr "Придружујем �е �ерверу"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Колица"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Задржи ову размеру"
 
@@ -1739,7 +1556,6 @@ msgid "Keyboard %i"
 msgstr "Та�татура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Конки"
 
@@ -1748,7 +1564,7 @@ msgstr "Конки"
 msgid "Lap"
 msgstr "Круг"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Круг %i"
@@ -1810,50 +1626,46 @@ msgstr "Леви окидач"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr "Лева палица"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr "Лева палица : %s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Учитавам"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr "Предворје"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr "По�тавке предворја"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr "Ме�но кори�ничко име"
+msgid "Local Name"
+msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Закључано"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Закључано : одрадите �адашње изазове да добијете при�туп другима!"
 
@@ -1861,11 +1673,51 @@ msgstr "Закључано : одрадите �адашње изазове да
 msgid "Locked!"
 msgstr "Закључано!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr "Пријава"
 
@@ -1876,27 +1728,18 @@ msgstr "Поглед уназад"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr "Потражи још пријатеља:"
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1904,18 +1747,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr "�ајвећи број играча"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr "�ајмање време (min.)"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Само ја"
 
@@ -1925,29 +1766,33 @@ msgid "Menu Keys"
 msgstr "Дугмад изборника"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr "Замућење покрета"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr "Замућење покрета: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "О�а миша %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1955,48 +1800,41 @@ msgstr "Та�тер миша %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr "Помери наниже"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr "Помери навише"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Више играча"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Више играча"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Музика"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr "Име"
 
@@ -2016,13 +1854,15 @@ msgstr "Име је предугачко."
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr "Име �ервера"
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr "�ово"
 
@@ -2031,9 +1871,13 @@ msgstr "�ово"
 msgid "New Grand Prix '%s' now available"
 msgstr "�ова Велика награда „%s“ је �ада до�тупна"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr "�ова лозинка"
 
@@ -2046,7 +1890,7 @@ msgstr "�ови захтев"
 msgid "New difficulty '%s' now available"
 msgstr "�ова тежина „%s“ је �ада до�тупна"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�ови најбржи круг"
 
@@ -2074,19 +1918,18 @@ msgstr "�итро"
 msgid "Nitro challenge"
 msgstr "�итро изазов"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr "�е"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "�олок"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "�ишта"
 
@@ -2096,23 +1939,19 @@ msgid "Normal Race"
 msgstr "Обична трка"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Северно одмориште"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Знајте да ако у�пете да клизате неколико �екунди, примићете додатно убрзање "
-"као награду!"
+msgstr "Знајте да ако у�пете да клизате неколико �екунди, примићете додатно убрзање као награду!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "�овајлија"
 
@@ -2123,46 +1962,41 @@ msgstr "Број колица вештачке памети : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Број колица вештачке памети"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Циљни број погодака"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr "Број кругова"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr "Број кругова:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "У реду"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "�из утабану �тазу"
 
@@ -2170,60 +2004,59 @@ msgstr "�из утабану �тазу"
 msgid "Offline"
 msgstr "Ван мреже"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "О, да, види, он је �ада у мом дворцу, и биће �лужен за вечеру..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Стари рудник"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Оливеров ча� математике"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr "�а мрежи"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr "Играње више играча на мрежи"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr "Име играча за мрежу"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr "Име играча за мрежну игру мора да има између 3 и 30 знакова!"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr "Име играча за мрежну игру не �ме да почиње бројем!"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Само мај�тор игре може да делује у овом тренутку!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Јој! Када �те у неприлици, прити�ните <%s> за �па�авање"
@@ -2234,14 +2067,11 @@ msgstr "Јој! Када �те у неприлици, прити�ните <%s>
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Могућно�ти"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr "Преглед"
 
@@ -2250,35 +2080,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Падобран — у�порава �ве колица у бољем положају."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr "Лозинка"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr "Лозинка :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr "Измени лозинку"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr "Лозинка мора да има између 8 и 30 знакова!"
 
@@ -2286,8 +2111,8 @@ msgstr "Лозинка мора да има између 8 и 30 знакова!
 msgid "Password successfully changed."
 msgstr "Лозинка је у�пешно промењена."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr "Лозинке �е не поклапају!"
 
@@ -2298,12 +2123,11 @@ msgstr "За�тани �а игром"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "За�танак"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Казнено време!!"
 
@@ -2312,7 +2136,6 @@ msgid "Pending"
 msgstr "�а чекању"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Пингвиново игралиште"
 
@@ -2321,37 +2144,38 @@ msgid "Performing vote"
 msgstr "Гла�ање"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Голупко"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Играјте �ве"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Играчи"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr "Молим, уне�ите име трке за велику награду"
 
@@ -2360,6 +2184,10 @@ msgstr "Молим, уне�ите име трке за велику награ
 msgid "Please re-configure your key bindings."
 msgstr "Молим поново поде�ите дугмиће игре."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Молим �ачекајте док �е не надограде додаци"
@@ -2369,48 +2197,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Молим �ачекајте док �е не учитају додаци"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Клип — баците га право напред да повучете противника уназад, или га баците "
-"док гледате позади да би�те некоме заклонили видик."
+msgstr "Клип — баците га право напред да повучете противника уназад, или га баците док гледате позади да би�те некоме заклонили видик."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-"Прити�ните <%s> за поглед уназад, и гађајте из оружја �а <%s> прити�кајући "
-"<%s> за гађање уназад."
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "Прити�ните <%s> за поглед уназад, и гађајте из оружја �а <%s> прити�кајући <%s> за гађање уназад."
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Прити�ните Изађи за прекид"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Прити�ните неко дугме"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Прити�ните „уне�и“ или кликните двапут на уређај да га поде�ите"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Прити�ните „уне�и“ или кликните двапут на играча да га измените"
 
@@ -2426,10 +2244,7 @@ msgstr "Прити�ните пали за покретање изазова"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Прити�ните и�товремено дугмад 1+2 на wiimote-у ради прела�ка у и�траживање, "
-"а затим кликните на У реду. Ближа упут�тва �е налазе на адре�и "
-"supertuxkart.net/Wiimote"
+msgstr "Прити�ните и�товремено дугмад 1+2 на wiimote-у ради прела�ка у и�траживање, а затим кликните на У реду. Ближа упут�тва �е налазе на адре�и supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2447,7 +2262,6 @@ msgstr "Обрађујем"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr "Профил"
 
@@ -2456,7 +2270,6 @@ msgid "Progress"
 msgstr "�апредак"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "�адувенко"
 
@@ -2464,31 +2277,25 @@ msgstr "�адувенко"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Гурните лопту у �упротан гол да би по�тигли погодак. (Само у играма �а више "
-"играча)"
+msgstr "Гурните лопту у �упротан гол да би по�тигли погодак. (Само у играма �а више играча)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr "Брза игра"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr "�апу�ти �ервер"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Подешавање трке"
 
@@ -2509,8 +2316,8 @@ msgstr "�а�умична трка за велику награду"
 msgid "Random Kart"
 msgstr "�а�умични колица"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "�а�умична �таза"
 
@@ -2519,84 +2326,68 @@ msgid "Rank"
 msgstr "Положај"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "Оцена >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Спремни!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Победа црвених"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr "Упи�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Обична трка: Сваки напад је дозвољен, зато узимајте оружја и паметно их "
-"употребите!"
+msgstr "Обична трка: Сваки напад је дозвољен, зато узимајте оружја и паметно их употребите!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr "Поново учитај"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr "Запамти лозинку"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Запамти положај прозора"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Уклони"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Преименуј"
 
@@ -2622,29 +2413,25 @@ msgstr "Спашавање"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Размера"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Поново покрени"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Понови трку"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Уназад"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr "Уназад:"
 
@@ -2701,41 +2488,35 @@ msgstr "Де�ни окидач"
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr "Сачувај"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr "Сачувај трку за велику награду"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Шкот�ка"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr "Тражи"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr "Претражујем"
 
@@ -2745,12 +2526,10 @@ msgid "Select"
 msgstr "Изабери"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr "Изаберите тежину"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Изаберите начин игре"
 
@@ -2760,36 +2539,30 @@ msgstr "Изаберите �тазу"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Изаберите колица"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr "Пошаљите податке о уређају безимено"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr "Прављење �ервера"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr "Подаци о �ерверу"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr "Избор �ервера"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr "Име �ервера :"
 
@@ -2804,93 +2577,49 @@ msgstr "Позор!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Поде�и нову трку"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr "Сене"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr "Сене: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Живи пе�ак"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Сјајна предграђа"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr "Упишите �е"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr "Упишите �е као го�т"
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr "И�пишите �е"
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr "Упи�ани �те као: %s."
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr "Упи�"
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr "Упи� у „%s“"
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-"Упи� као го�т омогућава уче�твовање у тркама на мрежи, али не и гла�ање за "
-"додатке или �акупљање до�тигнућа при игрању на мрежи."
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr "И�пи�"
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr "И�пи� из „%s“"
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr "Од"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr "Игра једног играча"
 
@@ -2900,7 +2629,6 @@ msgid "Size: %s"
 msgstr "Величина: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2911,12 +2639,10 @@ msgstr "Проклизавање"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Ма�ка"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Снежни врх"
 
@@ -2926,30 +2652,23 @@ msgid "Soccer"
 msgstr "Фудбал"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Фудбал�ко игралиште"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"�огомет: Само у играма �а више играча. Употребите колица за по�тизање "
-"поготка лоптом."
+msgstr "�огомет: Само у играма �а више играча. Употребите колица за по�тизање поготка лоптом."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Извините, дошло је до греше приликом �тупања у везу �а веб �ајтом додатака. "
-"Проверите да ли �те повезани на Интернет и да Супер Так� колица ни�у "
-"�пречена ватреним зидом."
+msgstr "Извините, дошло је до греше приликом �тупања у везу �а веб �ајтом додатака. Проверите да ли �те повезани на Интернет и да Супер Так� колица ни�у �пречена ватреним зидом."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2957,7 +2676,6 @@ msgstr "Жао ми је, преузимање додатака није у�п
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Звучни ефекти"
 
@@ -2966,7 +2684,6 @@ msgstr "Звучни ефекти"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Уобичајено"
 
@@ -2979,11 +2696,10 @@ msgstr "Почни"
 msgid "Start Grand Prix"
 msgstr "Почни Велику награду"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Почни трку"
 
@@ -3003,12 +2719,10 @@ msgstr "Скрени де�но"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Прича"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3016,83 +2730,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr "Пошаљи"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Подморје"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "Супер Так�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Додаци Супер Так� колица"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Помоћ Супер Так� колицаа"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Могућно�ти Супер Так� колица"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "Супер Так� колица �е могу играти �а више играча на и�том рачунару"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "Супер Так� колица има неколико начина игре"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Сузана"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Замењивач — кутије поклона �у претворене у банане и обрнуто за кратко време."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Замењивач — кутије поклона �у претворене у банане и обрнуто за кратко време."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Спљоштилица - �пљоштиће колица, у�поривши их."
 
@@ -3101,34 +2801,37 @@ msgstr "Спљоштилица - �пљоштиће колица, у�порив
 msgid "System Language"
 msgstr "Језик �и�тема"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr "У�лови уговора"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr "Сажимање тек�туре"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Пробирање тек�туре"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Дугме проклизавања омогућава проклизавање у оштрим заокретима и даје додатну "
-"гурку."
+msgstr "Дугме проклизавања омогућава проклизавање у оштрим заокретима и даје додатну гурку."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Игралиште"
 
@@ -3140,9 +2843,7 @@ msgstr "Јединица додатака је тренутно и�кључен
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Датотека �а најбољим резултатима је превише �тара,\n"
-"�ви најбољи резултати �у избри�ани."
+msgstr "Датотека �а најбољим резултатима је превише �тара,\n�ви најбољи резултати �у избри�ани."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3155,41 +2856,22 @@ msgstr "Временом ограничена трка"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Временом ограничена трка: �е �адржи појачања, тако да важе �амо ваше вештине "
-"вожње!"
+msgstr "Временом ограничена трка: �е �адржи појачања, тако да важе �амо ваше вештине вожње!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Да би�те додали нови гејмпед/џој�тик уређај, једно�тавно покрените Супер "
-"Так� колица �а прикљученим уређајем и он ће �е појавити на ли�ти.\n"
-"\n"
-"Да би�те додали по�тавке та�татуре, можете кори�тити дугме и�под, МЕЂУТИМ, "
-"обратите пажњу да већина та�татура подржава �амо ограничен број и�товремено "
-"прити�нутих дугамди, те �у �тога неподе�не за играње �а више играча. "
-"(Можете, међутим, да прикључите више та�татура на рачунар. Упамтите да и у "
-"овом �лучају �ваки играч треба да има различите дугмиће за игру.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Да би�те додали нови гејмпед/џој�тик уређај, једно�тавно покрените Супер Так� колица �а прикљученим уређајем и он ће �е појавити на ли�ти.\n\nДа би�те додали по�тавке та�татуре, можете кори�тити дугме и�под, МЕЂУТИМ, обратите пажњу да већина та�татура подржава �амо ограничен број и�товремено прити�нутих дугамди, те �у �тога неподе�не за играње �а више играча. (Можете, међутим, да прикључите више та�татура на рачунар. Упамтите да и у овом �лучају �ваки играч треба да има различите дугмиће за игру.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Да вам помогну до победе, по�тоје нека појачања која можете покупити :"
+msgstr "Да вам помогну до победе, по�тоје нека појачања која можете покупити :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "До Ме�еца и назад"
 
@@ -3208,7 +2890,7 @@ msgstr "�ајбољих %i"
 msgid "Track"
 msgstr "Стаза"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr "Стаза %i/%i"
@@ -3222,19 +2904,17 @@ msgstr "Стазу је направио — %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr "Скуп �таза"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Стазе"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Трилинерно"
 
@@ -3245,24 +2925,21 @@ msgstr "Покушајте поново"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Упознавање"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Упут�тво : Соба избора"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Так�"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Вр�та:"
 
@@ -3270,22 +2947,18 @@ msgstr "Вр�та:"
 msgid "Type: Grand Prix"
 msgstr "Вр�та: трка за велику награду"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-"�и�ам у�пео да �е повежем �а �ервером. Проверите мрежну везу, или покушајте "
-"поново ка�није."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "�и�ам у�пео да �е повежем �а �ервером. Проверите мрежну везу, или покушајте поново ка�није."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Уклони"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3299,8 +2972,8 @@ msgid "Update"
 msgstr "О�вежи"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "О�вежен"
 
@@ -3309,40 +2982,36 @@ msgid "Updated date"
 msgstr "О�вежени датум"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr "Кори�ти тек�туре ви�оког квалитета"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "�итро који �те покупили употребите прити�ком на <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr "Подаци о кори�нику"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Кори�ничко �учеље"
 
@@ -3351,19 +3020,17 @@ msgid "User defined"
 msgstr "Кори�нички одређено"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr "Претрага кори�ника"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr "Кори�ничко име"
 
@@ -3372,13 +3039,12 @@ msgid "Username and/or email address invalid."
 msgstr "Кори�ничко име или е-пошта ни�у и�правни."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "Против"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr "Подаци о и�правно�ти"
 
@@ -3389,27 +3055,23 @@ msgstr "Издање: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "У�правно у�клађивање (захтева поновно покретање)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr "Преглед"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Гла�ноћа"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr "Гла�ајте"
 
@@ -3421,7 +3083,7 @@ msgstr "Гла�ање је у�пешно! Сада можете да затв
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "ПОГРЕШ�� ПУТ!"
 
@@ -3430,59 +3092,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Упозорење, „shift“ није препоручљив та�тер : када је „shift“ прити�нут, �ви "
-"та�тери који �адрже знак који је другачији када �е пише великим �ловима, "
-"пре�таће да функционишу."
+msgstr "Упозорење, „shift“ није препоручљив та�тер : када је „shift“ прити�нут, �ви та�тери који �адрже знак који је другачији када �е пише великим �ловима, пре�таће да функционишу."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Оружја"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Водени ути�ци"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Времен�ки ути�ци : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Шта није у реду, мали хипчићи? �ема вашег �илног гну вође?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Када �у улазни уређаји подешени, �премни �те за игру. Изаберите иконицу "
-"„трка више играча“ у главном изборнику. Када дође време за избор колица, "
-"�ваки играч може да прити�не та�тер „пуцај“ на �вом гејмпаду или та�татури "
-"да би при�тупио игри. Сваки играч може да кори�ти �вој улазни уређај да би "
-"изабрао �воја колица. Игра �е на�тавља када �ви буду изабрали колица. Знајте "
-"да миш не може бити коришћен за ову радњу."
+msgstr "Када �у улазни уређаји подешени, �премни �те за игру. Изаберите иконицу „трка више играча“ у главном изборнику. Када дође време за избор колица, �ваки играч може да прити�не та�тер „пуцај“ на �вом гејмпаду или та�татури да би при�тупио игри. Сваки играч може да кори�ти �вој улазни уређај да би изабрао �воја колица. Игра �е на�тавља када �ви буду изабрали колица. Знајте да миш не може бити коришћен за ову радњу."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3490,42 +3138,36 @@ msgid "White"
 msgstr "Бела"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Вилбер"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "ХР591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Да"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Спремни �те за трку. Срећно!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Играте као"
 
@@ -3535,37 +3177,36 @@ msgstr "Своје оцене можете да прилагодите клик
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "И�пунили �те изазов!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "И�пунили �те изазове!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Завршили �те Велику трку!"
 
@@ -3573,8 +3214,7 @@ msgstr "Завршили �те Велику трку!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
-"И�пунили �те тежак изазов изазов! Бодови зарађени на овом �тупњу: %i/%i"
+msgstr "И�пунили �те тежак изазов изазов! Бодови зарађени на овом �тупњу: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
@@ -3587,20 +3227,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Завршили �те трку!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr "Имате %d нових захтев за пријатељ�тво!"
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr "Имате нови захтев за пријатељ�тво!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "И�пали �те!"
 
@@ -3608,11 +3251,9 @@ msgstr "И�пали �те!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
-"Још увек ни�те гла�али за овај додатак. Изаберите жељену оцену кликом на "
-"звездице и�под"
+msgstr "Још увек ни�те гла�али за овај додатак. Изаберите жељену оцену кликом на звездице и�под"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3620,51 +3261,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr "Треба да уне�ете лозинку."
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Откључали �те велику награду %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Откључали �те �тазу %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Победили �те у трци!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Ваша датотека подешавања је била неи�правна, те је обри�ана и нова ће бити "
-"направљена."
+msgstr "Ваша датотека подешавања је била неи�правна, те је обри�ана и нова ће бити направљена."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Ваша датотека подешавања је била превише �тара, те је обри�ана и нова ће бити направљена."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Ваша датотека подешавања је била превише �тара, те је обри�ана и нова ће "
-"бити направљена."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3676,7 +3323,6 @@ msgid "Your profile"
 msgstr "Ваш профил"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Зен башта"
 
@@ -3687,7 +3333,6 @@ msgstr "[ништа]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr "радње"
 
@@ -3696,7 +3341,8 @@ msgstr "радње"
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "изводи"
@@ -3705,45 +3351,25 @@ msgstr "изводи"
 msgid "featured"
 msgstr "издвојено"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr "ви�око"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr "ни�ко"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "уобичајено"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  dboki89 https://launchpad.net/~dboki89\n"
-"  Миро�лав �иколић https://launchpad.net/~lipek\n"
-"  Саша Петровић https://launchpad.net/~salepetronije"
+msgstr "Launchpad Contributions:\n  STK-team https://launchpad.net/~stk\n  dboki89 https://launchpad.net/~dboki89\n  Миро�лав �иколић https://launchpad.net/~lipek\n  Саша Петровић https://launchpad.net/~salepetronije"
diff --git a/data/po/sv.po b/data/po/sv.po
index 2f6200cfa..583ba9576 100644
--- a/data/po/sv.po
+++ b/data/po/sv.po
@@ -1,20 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart svn revision 2943\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:10+0000\n"
-"Last-Translator: Mikael Mildén <Unknown>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/supertuxkart/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: SWEDEN\n"
-"Language: \n"
-"X-Poedit-Language: Swedish\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,21 +26,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -55,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -67,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s av %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s är redo"
@@ -94,33 +95,29 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "\"%s\" har eliminerats."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Tomt)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(nätverksspel är inte tillgängligt ännu)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-"* Ett blått objekt betyder att det finns en konflikt med en annan "
-"konfiguration"
+msgstr "* Ett blått objekt betyder att det finns en konflikt med en annan konfiguration"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
@@ -128,45 +125,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Du kan se och ändra aktuella tangentbordsinställningar under Inställningar"
+msgstr "* Du kan se och ändra aktuella tangentbordsinställningar under Inställningar"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* De flesta spellägen kan även spelas som ett Grand Prix: Istället för att "
-"köra ett enda lopp så kan du spela flera på raken. Ju bättre du är rankad, "
-"desto fler poäng får du. I slutändan vinner spelaren med flest poäng kuppen."
+msgstr "* De flesta spellägen kan även spelas som ett Grand Prix: Istället för att köra ett enda lopp så kan du spela flera på raken. Ju bättre du är rankad, desto fler poäng får du. I slutändan vinner spelaren med flest poäng kuppen."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -197,7 +183,6 @@ msgstr "Tre träffar"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -216,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Topplistan ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Avbryt Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Om"
 
@@ -241,37 +223,35 @@ msgstr "Om"
 msgid "Accelerate"
 msgstr "Gasa"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -279,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -290,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -307,7 +284,6 @@ msgstr "Lägg till tangentbordsinställningar"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Lägg till spelare"
 
@@ -318,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Lägg till en enhet"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Tillägg"
 
@@ -353,49 +326,43 @@ msgstr "Tilläggets namn"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Tillägg"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Alla"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Alla banor"
 
@@ -405,18 +372,20 @@ msgstr "Alla faror tillåtna, så plocka vapen och använd dem smart!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -426,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Ankare - saktar ner ledarbilen ordentligt."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animerade spelare : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -452,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animerad terräng : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -479,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Tillämpa ny upplösning"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -516,49 +478,44 @@ msgstr "Vill du verkligen ta bort de här inställningarna permanent?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenor"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Bind till Escape-knappen"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Vid världens ände"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Ljud"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Undvik bananer!"
 
@@ -580,79 +537,66 @@ msgstr "Axel %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Tillbaka"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Tillbaka till loppet"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Tillbaka till enhetslistan"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Tillbaka till menyn"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Stridsön"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Monster"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Bättre lycka nästa gång!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -662,38 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Ladugården"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowlingklot - studsar mot väggar. Om du tittar bakåt så kastas den bakåt."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowlingklot - studsar mot väggar. Om du tittar bakåt så kastas den bakåt."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -701,7 +640,6 @@ msgid "Brake"
 msgstr "Bromsa"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -709,53 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Tårta - kastas på närmsta rival, bäst på kort avstånd och långa raksträckor."
+msgstr "Tårta - kastas på närmsta rival, bäst på kort avstånd och långa raksträckor."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Kan inte komma åt stkaddons-servern..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -769,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Avbryt/Tillbaka"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Grotta X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Utmaningar: Troférum"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -796,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Välj en gokart"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "Samla på blåa lådor: de ger dig vapen eller andra powerups"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -860,16 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Samla nitro ger dig en hastighetsökning när du önskar genom att trycka "
-"lämplig knapp. Du kan se din nitronivå i stapeln till höger om spelskärmen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Samla nitro ger dig en hastighetsökning när du önskar genom att trycka lämplig knapp. Du kan se din nitronivå i stapeln till höger om spelskärmen."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -882,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -894,7 +809,6 @@ msgstr "Bekräfta upplösning inom %i sekunder"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -908,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Innehåller inga powerups, endast dina körfärdigheter spelar roll!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Fortsätt"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontroller"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Tack till"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1011,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1043,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1051,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Ta bort konfiguration"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1085,24 +978,23 @@ msgstr "Inaktivera enhet"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Inaktiverad"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Visa bildfrekvens"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Vill du verkligen ta bort spelaren \"%s\"?"
@@ -1111,8 +1003,8 @@ msgstr "Vill du verkligen ta bort spelaren \"%s\"?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Gasa inte förrän loppet startar"
 
@@ -1123,27 +1015,24 @@ msgstr "Ner"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1154,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1164,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elefant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1177,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1206,27 +1091,24 @@ msgstr "Aktivera enhet"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Aktiverad"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Ange namnet på nya spelaren"
 
@@ -1241,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Avsluta loppet"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Expert"
 
@@ -1269,12 +1153,12 @@ msgstr "Expert"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1299,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Sista varvet!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1322,21 +1204,14 @@ msgstr "Skjut"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Först så behöver du flera inmatningsenheter (att ha flera handkontroller "
-"eller styrspakar är bästa sättet att spela flera stycken på). Gå in i "
-"Kontrollinställningarna och ställ in din handkontroll, det är även möjligt "
-"att använda tangentbord, däremot måste alla spelare ha olika tangenter, kom "
-"även ihåg att de flesta tangentbord inte klarar av för många nedtryckningar "
-"samtidigt."
+msgstr "Först så behöver du flera inmatningsenheter (att ha flera handkontroller eller styrspakar är bästa sättet att spela flera stycken på). Gå in i Kontrollinställningarna och ställ in din handkontroll, det är även möjligt att använda tangentbord, däremot måste alla spelare ha olika tangenter, kom även ihåg att de flesta tangentbord inte klarar av för många nedtryckningar samtidigt."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1349,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1357,14 +1231,15 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1388,13 +1263,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Helskärm"
 
@@ -1408,22 +1282,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Speltangenter"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Spellägen"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1439,51 +1310,45 @@ msgstr "Spelkontrollsknapp %d"
 msgid "Gamepad hat %d"
 msgstr "Spelkontrollshatt %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Allmänt"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1493,61 +1358,53 @@ msgid "Go!"
 msgstr "Kör!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand prix-tävling"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Nivå för grafiska effekter"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafik"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1564,12 +1421,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Hacienda"
 
@@ -1579,22 +1434,18 @@ msgstr "Hacienda"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hjälp"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Topplista"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1602,78 +1453,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Skjut andra med vapen tills de har förlorat alla sina liv (endast i "
-"flerspelarläget)"
+msgstr "Skjut andra med vapen tills de har förlorat alla sina liv (endast i flerspelarläget)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Om du ser en knapp med ett lås, som den här, måste du klara en utmaning för "
-"att låsa upp den."
+msgstr "Om du ser en knapp med ett lås, som den här, måste du klara en utmaning för att låsa upp den."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "Ignorerar \"%s\", du måste hoppa in tidigare för att spela!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Installera"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Medel"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1683,13 +1527,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Gokartar"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Behåll denna upplösning"
 
@@ -1708,7 +1551,6 @@ msgid "Keyboard %i"
 msgstr "Tangentbord %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1717,7 +1559,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Varv"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Varv %i"
@@ -1779,50 +1621,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Läser in"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "LÃ¥st"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Låst: lös aktiva utmaningar för att få tillgång till mer!"
 
@@ -1830,11 +1668,51 @@ msgstr "Låst: lös aktiva utmaningar för att få tillgång till mer!"
 msgid "Locked!"
 msgstr "LÃ¥st!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1845,27 +1723,18 @@ msgstr "Titta bakåt"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1873,18 +1742,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Bara jag"
 
@@ -1894,29 +1761,33 @@ msgid "Menu Keys"
 msgstr "Menyknappar"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Musaxel %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1924,48 +1795,41 @@ msgstr "Musknapp %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Flerspelarläge"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Flera spelare"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Musik"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1985,13 +1849,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2000,9 +1866,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Nya grand prix-tävlingen \"%s\" finns tillgänglig"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2015,7 +1885,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Nya svårighetsgraden \"%s\" finns tillgänglig"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Nytt snabbaste varv"
 
@@ -2043,19 +1913,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Ingen"
 
@@ -2065,21 +1934,19 @@ msgid "Normal Race"
 msgstr "Normal tävling"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Nordlig tillflyktsort"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Nybörjare"
 
@@ -2090,46 +1957,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Antal datorstyrda gokartar"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "OK"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2137,60 +1999,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Gammal gruva"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Olivers matematikklass"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Endast spelägaren kan agera just nu!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2201,14 +2062,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Inställningar"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2217,35 +2075,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Fallskärm - saktar ner alla bilar framför dig."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2253,8 +2106,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2265,12 +2118,11 @@ msgstr "Pausa spelet"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Pausat"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Strafftid!!"
 
@@ -2279,7 +2131,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Pingvinens lekplats"
 
@@ -2288,37 +2139,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Spela alla"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Spelare"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2327,6 +2179,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Konfigurera om dina tangentbindningar."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Vänta medan tillägg uppdateras"
@@ -2336,49 +2192,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Vänta medan tillägg laddas in"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Sugkopp - kasta rakt för att dra en motspelare mot dig, eller kasta medan du "
-"tittar bakåt för att förblinda en annan."
+msgstr "Sugkopp - kasta rakt för att dra en motspelare mot dig, eller kasta medan du tittar bakåt för att förblinda en annan."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Tryck ESC för att avbryta"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Tryck på en tangent"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Tryck Enter eller dubbelklicka på en enhet för att konfigurera den"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Tryck på Enter eller dubbelklicka på en spelare för att ändra honom/henne"
+msgstr "Tryck på Enter eller dubbelklicka på en spelare för att ändra honom/henne"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2410,7 +2257,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2419,7 +2265,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2431,25 +2276,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Tävlingsinställningar"
 
@@ -2470,8 +2311,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Slumpmässig gokart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Slumpmässig bana"
 
@@ -2480,82 +2321,68 @@ msgid "Rank"
 msgstr "Ranking"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Klara!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Ta bort"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Byt namn"
 
@@ -2581,29 +2408,25 @@ msgstr "Rädda"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Starta om"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Starta om tävlingen"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2660,41 +2483,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Skottland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2704,12 +2521,10 @@ msgid "Select"
 msgstr "Välj"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Välj ett spelläge"
 
@@ -2719,36 +2534,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2763,91 +2572,49 @@ msgstr "Färdiga!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Anordna ny tävling"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Sand och pyramider"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Glittrande förorter"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2857,7 +2624,6 @@ msgid "Size: %s"
 msgstr "Storlek: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2868,12 +2634,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Skal"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Snötopp"
 
@@ -2883,28 +2647,23 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Tyvärr inträffade ett fel när tilläggswebbsidan kontaktades. Se till att du "
-"är ansluten till Internet, och att SuperTuxKart inte blockeras av en "
-"brandvägg."
+msgstr "Tyvärr inträffade ett fel när tilläggswebbsidan kontaktades. Se till att du är ansluten till Internet, och att SuperTuxKart inte blockeras av en brandvägg."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2912,7 +2671,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Ljudeffekter"
 
@@ -2921,7 +2679,6 @@ msgstr "Ljudeffekter"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standard"
 
@@ -2934,11 +2691,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Starta Grand Prix-tävling"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Starta tävling"
 
@@ -2958,12 +2714,10 @@ msgstr "Styr höger"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2971,83 +2725,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Undervatten"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Tillägg till SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Hjälp för SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Inställningar för SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart kan spelas i flerspelarläget på samma dator"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart innehåller flera olika spellägen"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Bytare - presenter transformeras till bananer och omvänt för en kort tid."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Bytare - presenter transformeras till bananer och omvänt för en kort tid."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Flugsmälla - kommer mosa bilar i närheten, vilket saktar ner dem."
 
@@ -3056,32 +2796,37 @@ msgstr "Flugsmälla - kommer mosa bilar i närheten, vilket saktar ner dem."
 msgid "System Language"
 msgstr "Systemspråk"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadion"
 
@@ -3093,9 +2838,7 @@ msgstr "Tilläggsmodulen är för närvarande inaktiverad i Alternativskärmen."
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Filen för topplista var för gammal,\n"
-" alla rekord har raderats."
+msgstr "Filen för topplista var för gammal,\n alla rekord har raderats."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3108,40 +2851,22 @@ msgstr "Tidsförsök"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Tidsförsök: innehåller inga powerups så endast dina färdigheter som förare "
-"räknas!"
+msgstr "Tidsförsök: innehåller inga powerups så endast dina färdigheter som förare räknas!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"För att lägga till en ny handkontroll/styrspak, starta helt enkelt "
-"SuperTuxKart med den inkopplad och den ska visas i listan.\n"
-"\n"
-"För att lägga till en tangentbordskonfiguration, så kan du använda knapparna "
-"nedan, MEN observera att de flesta tangentbord inte kan hantera flera "
-"knappnedtryckningar samtidigt och är därför inte rekommenderat för "
-"flerspelarläget. (Du kan dock koppla in flera tangentbord än ett men kom "
-"ihåg att de ska ha olika knappar bundna.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "För att lägga till en ny handkontroll/styrspak, starta helt enkelt SuperTuxKart med den inkopplad och den ska visas i listan.\n\nFör att lägga till en tangentbordskonfiguration, så kan du använda knapparna nedan, MEN observera att de flesta tangentbord inte kan hantera flera knappnedtryckningar samtidigt och är därför inte rekommenderat för flerspelarläget. (Du kan dock koppla in flera tangentbord än ett men kom ihåg att de ska ha olika knappar bundna.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "För att hjälpa dig vinna så finns det powerups som du kan samla:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3160,7 +2885,7 @@ msgstr "Topp %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3174,19 +2899,17 @@ msgstr "Bana av %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Banor"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3197,24 +2920,21 @@ msgstr "Försök igen"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Handledning : Välj"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3222,20 +2942,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Avinstallera"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3249,8 +2967,8 @@ msgid "Update"
 msgstr "Uppdatera"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3259,40 +2977,36 @@ msgid "Updated date"
 msgstr "Datum för uppdatering"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Användargränssnitt"
 
@@ -3301,19 +3015,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3322,13 +3034,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3339,27 +3050,23 @@ msgstr "Version: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertikal synkronisering (kräver omstart)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Volym"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3371,7 +3078,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "FEL VÄG!"
 
@@ -3380,59 +3087,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Varning, \"Shift\" är inte en rekommenderad tangent : när shift trycks ned "
-"så kommer alla tangenter som innehåller ett tecken som skiljer sig som "
-"versal att sluta fungera."
+msgstr "Varning, \"Shift\" är inte en rekommenderad tangent : när shift trycks ned så kommer alla tangenter som innehåller ett tecken som skiljer sig som versal att sluta fungera."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Vapen"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Vädereffekter : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"När inmatningsenheterna har konfigurerats så är du redo att spela. Välj "
-"ikonen \"flerspelartävling\" i huvudmenyn. När det är dags att välja en "
-"gokart så kan varje spelare trycka på \"skjut\"-knappen på sina styrspakar "
-"eller tangentbord för att gå med i spelet. Varje spelare kan använda sina "
-"inmatningsenheter för att välja en gokart. Spelet fortsätter när alla har "
-"valt en gokart. Observera att musen inte kan användas för detta."
+msgstr "När inmatningsenheterna har konfigurerats så är du redo att spela. Välj ikonen \"flerspelartävling\" i huvudmenyn. När det är dags att välja en gokart så kan varje spelare trycka på \"skjut\"-knappen på sina styrspakar eller tangentbord för att gå med i spelet. Varje spelare kan använda sina inmatningsenheter för att välja en gokart. Spelet fortsätter när alla har valt en gokart. Observera att musen inte kan användas för detta."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3440,42 +3133,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Ja"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3485,37 +3172,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Du har slutfört Grand Prix-tävlingen!"
 
@@ -3536,20 +3222,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Du kom i mål!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Du har blivit eliminerad!"
 
@@ -3559,7 +3247,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3567,51 +3255,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Du vann loppet!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Din konfigurationsfil innehöll fel så den togs bort och en ny kommer att "
-"skapas."
+msgstr "Din konfigurationsfil innehöll fel så den togs bort och en ny kommer att skapas."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Din konfigurationsfil var för gammal, så den togs bort och en ny kommer att skapas."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Din konfigurationsfil var för gammal, så den togs bort och en ny kommer att "
-"skapas."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3623,7 +3317,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zenträdgården"
 
@@ -3634,7 +3327,6 @@ msgstr "[ingen]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3643,7 +3335,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "av"
@@ -3652,52 +3345,25 @@ msgstr "av"
 msgid "featured"
 msgstr "rekommenderat"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Anders Carlsson https://launchpad.net/~kk7ntl9af-gk9\n"
-"  Arve Eriksson https://launchpad.net/~031299870-telia\n"
-"  Daniel Nylander https://launchpad.net/~yeager\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  MDxm https://launchpad.net/~mdxm3000\n"
-"  Mathias Tillman https://launchpad.net/~master-homer\n"
-"  Mikael Mildén https://launchpad.net/~mikael-milden\n"
-"  Phoenix https://launchpad.net/~thephoenix\n"
-"  Rikard Edgren https://launchpad.net/~rikard-edgren\n"
-"  Rikard Johansson https://launchpad.net/~rikard-jo\n"
-"  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n  Anders Carlsson https://launchpad.net/~kk7ntl9af-gk9\n  Arve Eriksson https://launchpad.net/~031299870-telia\n  Daniel Nylander https://launchpad.net/~yeager\n  Dawid Gan https://launchpad.net/~deveee\n  MDxm https://launchpad.net/~mdxm3000\n  Mathias Tillman https://launchpad.net/~master-homer\n  Mikael Mildén https://launchpad.net/~mikael-milden\n  Phoenix https://launchpad.net/~thephoenix\n  Rikard Edgren https://launchpad.net/~rikard-edgren\n  Rikard Johansson https://launchpad.net/~rikard-jo\n  STK-team https://launchpad.net/~stk"
diff --git a/data/po/tr.po b/data/po/tr.po
index c0fd46eb2..c4b121103 100644
--- a/data/po/tr.po
+++ b/data/po/tr.po
@@ -1,23 +1,23 @@
-# Turkish translation for stk
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
+# Volkan Gezer <volkangezer@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:07+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Turkish <tr@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/supertuxkart/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,22 +28,22 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Fakat siz beceriksiz ahmaklar beni asla yenemeyeceksiniz - Kartların Kralı!"
+msgstr " Fakat siz beceriksiz ahmaklar beni asla yenemeyeceksiniz - Kartların Kralı!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -59,7 +59,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -71,19 +71,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, %s tarafından"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s, %s tarafından"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s hazır"
@@ -98,25 +97,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' yok edildi."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(BoÅŸ)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(ağ oyunu henüz mevcut değil)"
 
@@ -130,47 +127,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Şu anki tuş bağlantıları Seçenekler menüsünden görülebilir / "
-"deÄŸiÅŸtirilebilir"
+msgstr "* Şu anki tuş bağlantıları Seçenekler menüsünden görülebilir / değiştirilebilir"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Bu oyun kiplerinden pek çoğu Grand Prix şeklinde de oynanabilir. Böylece "
-"tek kişilik yarış oynamak yerine diğerleriyle yarışabilirsiniz. Daha iyi "
-"sıralamalar yaptıkça daha fazla pun kazanırsınız. Oyunun sonunda da en çok "
-"puan yapmış oyuncu kupayı kazanır."
+msgstr "* Bu oyun kiplerinden pek çoğu Grand Prix şeklinde de oynanabilir. Böylece tek kişilik yarış oynamak yerine diğerleriyle yarışabilirsiniz. Daha iyi sıralamalar yaptıkça daha fazla pun kazanırsınız. Oyunun sonunda da en çok puan yapmış oyuncu kupayı kazanır."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -201,13 +185,10 @@ msgstr "3 VuruÅŸlu SavaÅŸ"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
-"3 Vuruşlu Savaş: Sadece çok oyunculu oyunlarda. Canlarını kaybedinceye kadar "
-"diÄŸerlerine silahlarla ateÅŸ edin."
+msgstr "3 Vuruşlu Savaş: Sadece çok oyunculu oyunlarda. Canlarını kaybedinceye kadar diğerlerine silahlarla ateş edin."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -222,23 +203,20 @@ msgid "9 months"
 msgstr "9 ay"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Yüksek Puanlar ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Grand Prix'i Durdur"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Hakkında"
 
@@ -247,39 +225,35 @@ msgstr "Hakkında"
 msgid "Accelerate"
 msgstr "Hızlandırıcı"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
-"Dönerken kaymak için hızlan ve <%s> tuşuna bas. Kısa bir süre kaymak, keskin "
-"virajları alman için daha hızlı dönmeni sağlar."
+msgstr "Dönerken kaymak için hızlan ve <%s> tuşuna bas. Kısa bir süre kaymak, keskin virajları alman için daha hızlı dönmeni sağlar."
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "<%s> ile hızlan ve <%s> <%s> tuşları ile yön değiştir"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Kabul Et"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -287,8 +261,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -298,13 +271,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -315,7 +286,6 @@ msgstr "Klavye Yapılandırması Ekle"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Oyuncu Ekle"
 
@@ -326,32 +296,29 @@ msgstr "Wiimote Ekle"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Aygıt ekle"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Eklentiler"
 
@@ -361,71 +328,66 @@ msgstr "Eklenti ismi"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Eklentiler"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Tümü"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Tüm Yollar"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Tüm patlatmalara izin var, öyleyse silahları kap ve onları zekice kullan !"
+msgstr "Tüm patlatmalara izin var, öyleyse silahları kap ve onları zekice kullan !"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -435,25 +397,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Çapa - birinci konumdaki aracı inanılmaz derecede yavaşlatır."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Hareketli Karakterler"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Animasyonlu Karakterler : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Hareketli Manzara"
 
@@ -461,24 +420,24 @@ msgstr "Hareketli Manzara"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Animasyonlu Manzara : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "Eşyönsüz x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "Eşyönsüz x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "Eşyönsüz x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "Eşyönsüz x8"
 
@@ -488,29 +447,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "Yeni çözünürlüğü uygula"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -525,49 +480,44 @@ msgstr "Bu yapılandırmayı kalıcı olarak silmek istediğinizden emin misiniz
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "Arenalar"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "Deniz feneri çevresinde"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "ESC tuÅŸuna ata"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Dünyanın Sonunda"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Ses ve Müzik"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Muzlardan kaç !"
 
@@ -589,81 +539,66 @@ msgstr "Eksenler %d %s"
 msgid "Axis %d inverted"
 msgstr "Eksen %d ters çevrilmiş"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Geri"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Oyuna Dön"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Yarışa Geri Dön"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "Meydan okuma seçimine geri dön"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Aygıt listesine geri dön"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Menüye Dön"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Menüye dön"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Basket Topu - liderin arkasından zıplar ve önündeki araçları ezip "
-"yavaÅŸlatabilir."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Basket Topu - liderin arkasından zıplar ve önündeki araçları ezip yavaşlatabilir."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Savaş Adası"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Bir dahaki oyunda iyi ÅŸanslar!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "Çift Doğrusal"
 
@@ -673,39 +608,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Karatepe Konağı"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "Mavi Takım Kazandı"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Durgun Çiftlik"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Bowling Topu - duvarlardan seker. Arkaya doğru bakarsanız geriye doğru "
-"atabilirsiniz."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Bowling Topu - duvarlardan seker. Arkaya doğru bakarsanız geriye doğru atabilirsiniz."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -713,64 +642,52 @@ msgid "Brake"
 msgstr "Fren"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
-"Şişen Sakız - kendini bir kalkanla koru veya arkana bakarken pembe yapışkan "
-"bir baloncuk bırakmak için kullan"
+msgstr "Şişen Sakız - kendini bir kalkanla koru veya arkana bakarken pembe yapışkan bir baloncuk bırakmak için kullan"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Kek - en yakın rakibe atılır, kısa mesafede veya uzun düzlüklerde en "
-"etkilidir."
+msgstr "Kek - en yakın rakibe atılır, kısa mesafede veya uzun düzlüklerde en etkilidir."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "stkaddons (stkeklenti) sunucusuna eriÅŸilemiyor..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Ä°ptal"
 
@@ -784,26 +701,23 @@ msgid "Cancel/Back"
 msgstr "Ä°ptal / Geri"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Gizemli MaÄŸara"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Mücadele Tamamlandı"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Mücadele Başarısız"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Meydan Okuma : Kupa Odası"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -811,63 +725,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Bir Kart Seçin"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Öğreticiyi oynamak için buraya tıkla"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "Kapat"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Mavi kutuları toplayın : bunlar size silah ve diğer güç nesnelerini verecek"
+msgstr "Mavi kutuları toplayın : bunlar size silah ve diğer güç nesnelerini verecek"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-"Hediye kutusu topla ve bu kutuları uçurmak için <%s> tuşu ile silahı ateşle!"
+msgstr "Hediye kutusu topla ve bu kutuları uçurmak için <%s> tuşu ile silahı ateşle!"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Nitro şişeleri topla (kıvrımdan sonra kullanacağız)"
 
@@ -877,17 +780,13 @@ msgstr "Nitro biriktir!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Nitro toplamak, istediğiniz zaman uygun tuşa basarak hız artışı kazanmanızı "
-"sağlar. O anki nitro seviyenizi oyun ekranının sağ tarafındaki seviye "
-"çubuğundan görebilirsiniz."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Nitro toplamak, istediğiniz zaman uygun tuşa basarak hız artışı kazanmanızı sağlar. O anki nitro seviyenizi oyun ekranının sağ tarafındaki seviye çubuğundan görebilirsiniz."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -900,11 +799,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -912,7 +811,6 @@ msgstr "Çözünürlüğü %i saniye içinde onaylayın"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -920,105 +818,86 @@ msgstr ""
 msgid ""
 "Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
 "instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Wiimote'unuzu Bluetooth yöneticinize bağlayın ve ardından Tamam tıklayın. "
-"Ayrıntılı talimatlar supertuxkart.net/Wiimote adresinde."
+msgstr "Wiimote'unuzu Bluetooth yöneticinize bağlayın ve ardından Tamam tıklayın. Ayrıntılı talimatlar supertuxkart.net/Wiimote adresinde."
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "Güç nesneleri içermiyor, yani sadece sürüş yeteneğiniz için!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Devam"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Kontroller"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Hiç wiimote tespit edilmedi :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Hazırlayanlar"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1031,13 +910,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "KiÅŸisel"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Özel ayarlar..."
 
@@ -1063,7 +941,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1071,28 +948,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Yapılandırmayı Sil"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1105,24 +980,23 @@ msgstr "Aygıtı Devre Dışı Bırak"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Devre Dışı"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "SBK Göster"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Gerçekten Büyük Yarış'ı iptal etmek istiyor musun?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "'%s' oyuncusunu gerçekten silmek istiyor musunuz?"
@@ -1131,8 +1005,8 @@ msgstr "'%s' oyuncusunu gerçekten silmek istiyor musunuz?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "Gitmeden önce hızlanmayın"
 
@@ -1143,27 +1017,24 @@ msgstr "Aşağı"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1174,7 +1045,6 @@ msgstr "Yumurta Avı"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "Yumurta avı: Tüm gizli yumurtaları bulmak için yolları keşfedin."
 
@@ -1184,12 +1054,11 @@ msgid "Eggs: %d / %d"
 msgstr "Yumurtalar: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "Elendi"
 
@@ -1197,24 +1066,22 @@ msgstr "Elendi"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1226,27 +1093,24 @@ msgstr "Aygıtı Aktifleştir"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Etkin"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Tümü için etkinleştir"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Yeni oyuncunun ismini girin"
 
@@ -1259,31 +1123,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Herkes:\nOyuna katılmak için şimdi 'Seç' tıklayın!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Herkes:\n"
-"Oyuna katılmak için şimdi 'Seç' tıklayın!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Yarıştan çık"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Uzman"
 
@@ -1291,12 +1155,12 @@ msgstr "Uzman"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "Tüm gizli yumurtaları bulmak için yolları keşfedin."
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1321,19 +1185,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Son tur!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1344,22 +1206,14 @@ msgstr "AteÅŸ"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"İlk önce, birkaç tane girdi aygıtına (birden fazla oyun kumandası veya oyun "
-"çubuğu birkaç kişiyle birlikte oynamak için en iyi yoldur). Girdi "
-"yapılandırma ekranına gidin ve oyun çubuklarınızın kurulumunu yapın. Ayrıca "
-"klavye(ler) üzerinden oynamak da mümkündür, bununla birlikte her oyuncu "
-"farklı tuş setleri kullanmalıdır, ayrıca çoğu klavyenin yüksek sayıda tuş "
-"basışını desteklemediği için çoklu oynama için uygun olmadığını aklınızda "
-"bulundurun."
+msgstr "İlk önce, birkaç tane girdi aygıtına (birden fazla oyun kumandası veya oyun çubuğu birkaç kişiyle birlikte oynamak için en iyi yoldur). Girdi yapılandırma ekranına gidin ve oyun çubuklarınızın kurulumunu yapın. Ayrıca klavye(ler) üzerinden oynamak da mümkündür, bununla birlikte her oyuncu farklı tuş setleri kullanmalıdır, ayrıca çoğu klavyenin yüksek sayıda tuş basışını desteklemediği için çoklu oynama için uygun olmadığını aklınızda bulundurun."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1372,25 +1226,22 @@ msgstr "Lideri takip et!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
-"Lideri takip et: Sayaç her sıfıra düştüğünde en son kalan yarış aracı "
-"diskalifiye olduğundan ikinci olmak üzere yarışın. Dikkat: liderini önünde "
-"olmak da sizi kaybettirecek!"
+msgstr "Lideri takip et: Sayaç her sıfıra düştüğünde en son kalan yarış aracı diskalifiye olduğundan ikinci olmak üzere yarışın. Dikkat: liderini önünde olmak da sizi kaybettirecek!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Fort Magma"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "%d wiimote bulundu"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1414,13 +1265,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Tam ekran"
 
@@ -1434,22 +1284,19 @@ msgstr "GOL!"
 msgid "Game Keys"
 msgstr "Oyun Tuşları"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Oyun Kipleri"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1465,51 +1312,45 @@ msgstr "Oyun tablası düğmesi %d"
 msgid "Gamepad hat %d"
 msgstr "Oyun kumandası şapkası %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Genel"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "Yarışı Bırak"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1519,61 +1360,53 @@ msgid "Go!"
 msgstr "Git!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Grand Prix ilerlemesi:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Grafik Efekt Seviyesi"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Grafik"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Görüntü Ayarları"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "YeÅŸil Vadi"
 
@@ -1590,12 +1423,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Çiftlik"
 
@@ -1605,22 +1436,18 @@ msgstr "Çiftlik"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Yardım"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Yüksek Puanlar"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1628,79 +1455,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Diğerlerini silahlarınızla tüm canlarını kaybedene kadar vurun. (Yalnızca "
-"çok oyunculu bölümlerde)"
+msgstr "Diğerlerini silahlarınızla tüm canlarını kaybedene kadar vurun. (Yalnızca çok oyunculu bölümlerde)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Sadece gerçek kullanıcılar"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Eğer beni yarışta yenebilirsen, yaşlı moruğu serbest bırakacağım."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Eğer burada olduğu gibi kilitli bir düğme görüyorsanız, onu açmak için bir "
-"meydan okumayı tamamlamanız gerekmektedir."
+msgstr "Eğer burada olduğu gibi kilitli bir düğme görüyorsanız, onu açmak için bir meydan okumayı tamamlamanız gerekmektedir."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr "'%s' göz ardı ediliyor, oynamak için daha önce daha önce katılmalıydınız."
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
-"'%s' göz ardı ediliyor, oynamak için daha önce daha önce katılmalıydınız."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Kur"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Orta Seviye"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "Beraberlik"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1710,13 +1529,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Kartlar"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Bu çözünürlüğü sakla"
 
@@ -1735,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Klavye %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1744,7 +1561,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Tur"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Tur %i"
@@ -1806,50 +1623,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Yükleniyor"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Kilitli : Daha fazlasına erişmek için aktif meydan okumaları hallet"
 
@@ -1857,11 +1670,51 @@ msgstr "Kilitli : Daha fazlasına erişmek için aktif meydan okumaları hallet"
 msgid "Locked!"
 msgstr "Kilitli !"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1872,27 +1725,18 @@ msgstr "Arkaya Bak"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1900,18 +1744,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Yalnızca Ben"
 
@@ -1921,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Menü Tuşları"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Fare ekseni %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1951,48 +1797,41 @@ msgstr "Fare düğmesi %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Çok oyunculu"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Çok Oyuncu"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Müzik"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -2012,13 +1851,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2027,9 +1868,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Yeni Grand Prix '%s' ÅŸimdi uygun"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2042,7 +1887,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "Yeni zorluk '%s' ÅŸimdi uygun"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Yeni en hızlı tur"
 
@@ -2070,19 +1915,18 @@ msgstr "Nitro"
 msgid "Nitro challenge"
 msgstr "Nitro meydan okuması"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -2092,23 +1936,19 @@ msgid "Normal Race"
 msgstr "Normal Yarış"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Kuzey Mesire"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
-"Eğer birkaç saniye kaymayı başarırsan, ödül olarak bonus bir hızlandırma "
-"alacaksın!"
+msgstr "Eğer birkaç saniye kaymayı başarırsan, ödül olarak bonus bir hızlandırma alacaksın!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Acemi"
 
@@ -2119,46 +1959,41 @@ msgstr "Bilgisayar Araç Sayısı: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "YZ kartların sayısı"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "Kazanmak için gol sayısı"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Tamam"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Yenen yoldan dışarı"
 
@@ -2166,60 +2001,59 @@ msgstr "Yenen yoldan dışarı"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "Ooo, evet. Åžimdi benim kalemde ve akÅŸam yemeÄŸi verilecek..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Eski Maden"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Oliver'in Matematik Sınıfı"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Yalnızca oyun ustaları burada hareket edebilir!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Olamaz! Başın beladaysa, kurtarılmak için <%s> tuşuna bas"
@@ -2230,14 +2064,11 @@ msgstr "Olamaz! Başın beladaysa, kurtarılmak için <%s> tuşuna bas"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Seçenekler"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2246,35 +2077,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Paraşüt - daha iyi konumdaki tüm araçları yavaşlatır"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2282,8 +2108,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2294,12 +2120,11 @@ msgstr "Oyunu Duraklat"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Durdu"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Ceza zamanı!!"
 
@@ -2308,7 +2133,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Penguen Oyun Alanı"
 
@@ -2317,37 +2141,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Tümünü oyna"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Oyuncular"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2356,6 +2181,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Lütfen tuş bağlantılarınızı yeniden yapılandırın."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Eklentiler güncelleninceye kadar bekleyin"
@@ -2365,52 +2194,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Eklentiler yükleninceye kadar bekleyin"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Pompa - rakibi geri çekmek için düz atın veya arkaya bakarak birinin "
-"görüşünü engellemek için atın."
+msgstr "Pompa - rakibi geri çekmek için düz atın veya arkaya bakarak birinin görüşünü engellemek için atın."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "İptal etmek için ESC tuşuna basın"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Bir tuşa basın"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-"Bir aygıtı yapılandırmak için üstündeyken enter tuşuna basın veya iki kere "
-"tıklayın"
+msgstr "Bir aygıtı yapılandırmak için üstündeyken enter tuşuna basın veya iki kere tıklayın"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Bir oyuncuyu düzenlemek için üstündeyken enter tuşuna basın veya iki kere "
-"tıklayın"
+msgstr "Bir oyuncuyu düzenlemek için üstündeyken enter tuşuna basın veya iki kere tıklayın"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2424,10 +2241,7 @@ msgstr "Mücadeleyi başlatmak için ateş düğmesine bas"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"Wiimote'unuzu keşif kipine koymak için 1+2 tuşlarına aynı anda basın ve "
-"ardından Tamam tıklayın. Ayrıntılı talimatlar supertuxkart.net/Wiimote "
-"adresinde"
+msgstr "Wiimote'unuzu keşif kipine koymak için 1+2 tuşlarına aynı anda basın ve ardından Tamam tıklayın. Ayrıntılı talimatlar supertuxkart.net/Wiimote adresinde"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2445,7 +2259,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2454,7 +2267,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2462,30 +2274,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"Gol atmak için toplu karşı kafese ittir. (Sadece çoklu oyunculu oyunlarda)"
+msgstr "Gol atmak için toplu karşı kafese ittir. (Sadece çoklu oyunculu oyunlarda)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Çık"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Yarış Ayarları"
 
@@ -2506,8 +2313,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Rastgele Kart"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Rastgele Yol"
 
@@ -2516,84 +2323,68 @@ msgid "Rank"
 msgstr "Sıra"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "BeÄŸeni >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Hazır!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "Kırmızı Takım Kazandı"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
-"Normal Yarış: Tüm uçurmalar serbest olduğundan silahları yakalayın ve "
-"akıllıca kullanın!"
+msgstr "Normal Yarış: Tüm uçurmalar serbest olduğundan silahları yakalayın ve akıllıca kullanın!"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Pencere konumunu hatırla"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Kaldır"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
@@ -2619,29 +2410,25 @@ msgstr "Kurtarma"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Yeniden BaÅŸlat"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Yarışı yeniden başlat"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Tersine Çevir"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2698,41 +2485,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "İskoçya"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2742,12 +2523,10 @@ msgid "Select"
 msgstr "Seç"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Bir oyun kipi seçin"
 
@@ -2757,36 +2536,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Araç seç"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2801,91 +2574,49 @@ msgstr "Dikkat!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Yeni Yarış Ayarları"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Bataklık Kumları"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Parlak Kent Dolayları"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2895,7 +2626,6 @@ msgid "Size: %s"
 msgstr "Boyut:%s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2906,12 +2636,10 @@ msgstr "Savrulma"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Görünüm"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "Kar Tepesi"
 
@@ -2921,30 +2649,23 @@ msgid "Soccer"
 msgstr "Futbol"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Futbol sahası"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
-"Maç: Sadece çok oyunculu oyunlarda. Aracı kullanarak gol atmak üzere topu "
-"itin."
+msgstr "Maç: Sadece çok oyunculu oyunlarda. Aracı kullanarak gol atmak üzere topu itin."
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Üzgünüz, eklendi web sitesine erişilirken bir hata oluştu. Internet'e bağlı "
-"olduğunuzu ve SuperTuxKart'ın güvenlik duvarı tarafından engellenmediğinden "
-"emin olun."
+msgstr "Üzgünüz, eklendi web sitesine erişilirken bir hata oluştu. Internet'e bağlı olduğunuzu ve SuperTuxKart'ın güvenlik duvarı tarafından engellenmediğinden emin olun."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2952,7 +2673,6 @@ msgstr "Üzgünüz, eklenti indirme başarısız"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Ses Efektleri"
 
@@ -2961,7 +2681,6 @@ msgstr "Ses Efektleri"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Standart"
 
@@ -2974,11 +2693,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Grand Prix'e BaÅŸla"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Yarışa Başla"
 
@@ -2998,12 +2716,10 @@ msgstr "SaÄŸ Yap"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Hikaye Oyunu"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -3011,84 +2727,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Deniz altı"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart Eklentileri"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart Yardım"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart Seçenekler"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart aynı bilgisayar üzerinde çok oyunculu kipte oynanabilir"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart birkaç oyun kipine sahiptir"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Değiştirici - kısa bir süre için hediye kutuları muza, ve muzlar kutulara "
-"dönüştürülür."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Değiştirici - kısa bir süre için hediye kutuları muza, ve muzlar kutulara dönüştürülür."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Sineklik - yakındaki araçları vurarak, yavaşlatır."
 
@@ -3097,34 +2798,37 @@ msgstr "Sineklik - yakındaki araçları vurarak, yavaşlatır."
 msgid "System Language"
 msgstr "Sistem Dili"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "Doku filtreleme"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"'Savrulma' tuşu, hız arttırıcı almanızı ve keskin dönüşlerde kaymanızı "
-"saÄŸlar."
+msgstr "'Savrulma' tuşu, hız arttırıcı almanızı ve keskin dönüşlerde kaymanızı sağlar."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Stadyum"
 
@@ -3136,9 +2840,7 @@ msgstr "Eklentiler modülü şuan Ayarlar ekranından devre dışı bırakılmı
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Yüksek skor dosyası çok eskiydi,\n"
-"tüm yüksek skorlar silindi."
+msgstr "Yüksek skor dosyası çok eskiydi,\ntüm yüksek skorlar silindi."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3151,39 +2853,22 @@ msgstr "Zaman Yarışı"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Zaman Yarışı: Güç nesneleri bulunmuyor, önemli olan sadece sürüş yeteneğiniz!"
+msgstr "Zaman Yarışı: Güç nesneleri bulunmuyor, önemli olan sadece sürüş yeteneğiniz!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Yeni bir oyun tablası / oyun çubuğu eklemek için aygıt bağlıyken "
-"SuperTuxKart'ı başlatın, aygıtın listede belirdiğini göreceksiniz.\n"
-"Bir klavye yapılandırması eklemek için aşağıdaki düğmeyi kullanabilirsiniz. "
-"BUNUNLA BİRLİKTE lütfen çoğu klavyenin yalnızca sınırlı bir eşzamanlı tuş "
-"basmayı desteklediğini ve bu yüzden çok oyunculu oyunlar için uygun "
-"olmadığını unutmayın. (Bununla birlikte bilgisayara birden fazla klavye "
-"bağlayabilirsiniz, yine de herkes farklı tuş bağlayıcılara sahip olmalıdır.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Yeni bir oyun tablası / oyun çubuğu eklemek için aygıt bağlıyken SuperTuxKart'ı başlatın, aygıtın listede belirdiğini göreceksiniz.\nBir klavye yapılandırması eklemek için aşağıdaki düğmeyi kullanabilirsiniz. BUNUNLA BİRLİKTE lütfen çoğu klavyenin yalnızca sınırlı bir eşzamanlı tuş basmayı desteklediğini ve bu yüzden çok oyunculu oyunlar için uygun olmadığını unutmayın. (Bununla birlikte bilgisayara birden fazla klavye bağlayabilirsiniz, yine de herkes farklı tuş bağlayıcılara sahip olmalıdır.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-"Kazanmanızda yardımcı olacak bazı güç nesnelerini toplayabilirsiniz :"
+msgstr "Kazanmanızda yardımcı olacak bazı güç nesnelerini toplayabilirsiniz :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "Aya gidiÅŸ ve geliÅŸ"
 
@@ -3202,7 +2887,7 @@ msgstr "En Ä°yi %i"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3216,19 +2901,17 @@ msgstr "Yolu hazırlayan: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Yollar"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "Üç çizgili"
 
@@ -3239,24 +2922,21 @@ msgstr "Tekrar dene"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Öğretici"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Eğitsel : Seçim Odası"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Tür :"
 
@@ -3264,20 +2944,18 @@ msgstr "Tür :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Kaldır"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3291,8 +2969,8 @@ msgid "Update"
 msgstr "Güncelle"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "Güncellenmiş"
 
@@ -3301,40 +2979,36 @@ msgid "Updated date"
 msgstr "Güncelleme zamanı"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Topladığın nitroyu kullanmak için <%s> tuşuna bas!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Kullanıcı Arayüzü"
 
@@ -3343,19 +3017,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3364,13 +3036,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "Ä°LE"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3381,27 +3052,23 @@ msgstr "Sürüm: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Dikey Senkronizasyon (yeniden baÅŸlatma gerektirir)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Ses Seviyesi"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3413,7 +3080,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "YANLIŞ YÖN!"
 
@@ -3422,58 +3089,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Uyarı, shift önerilen bir tuş değildir : shift tuşuna basıldığında, büyük "
-"harf hali farklı karakter içeren tüm tuşlar çalışmayı bırakacaktır."
+msgstr "Uyarı, shift önerilen bir tuş değildir : shift tuşuna basıldığında, büyük harf hali farklı karakter içeren tüm tuşlar çalışmayı bırakacaktır."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Silahlar"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Hava Durumu Efektleri"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Hava Efektleri : %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Ne oldu küçük hippiler? Muhteşem GNU lideriniz mi kayıp?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Girdi aygıtları ayarlandıktan sonra, oynamaya hazırsınız demektir. Menüden "
-"çok oyuncu yarışını seçin. Sıra bir kart seçmeye geldiğinde her oyuncu kendi "
-"oyun tablasından veya klavyesinden ateş tuşuna basarak oyuna katılabilir. "
-"Her oyuncu kartını seçmek için kendi girdi aygıtını kullanabilir. Oyun "
-"herkes kartını seçtikten sonra devam eder. Unutmayın bu işlem için fare "
-"kullanılamaz."
+msgstr "Girdi aygıtları ayarlandıktan sonra, oynamaya hazırsınız demektir. Menüden çok oyuncu yarışını seçin. Sıra bir kart seçmeye geldiğinde her oyuncu kendi oyun tablasından veya klavyesinden ateş tuşuna basarak oyuna katılabilir. Her oyuncu kartını seçmek için kendi girdi aygıtını kullanabilir. Oyun herkes kartını seçtikten sonra devam eder. Unutmayın bu işlem için fare kullanılamaz."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3481,42 +3135,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Evet"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Artık yarışa hazırsın. İyi şanslar!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Åžu olarak oynuyorsunuz"
 
@@ -3526,37 +3174,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Bir mücadele tamamladınız!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Mücadeleleri tamamladınız!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Grand Prix'i tamamladınız!"
 
@@ -3577,20 +3224,22 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Yarışı tamamladınız!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Elendiniz!"
 
@@ -3600,7 +3249,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3608,51 +3257,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Grand prix %0 kilidini açtınız"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "%0 yolunu açtınız"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Yarışı kazandınız!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Yapılandırma dosyanız hatalıydı, bu yüzden silindi ve yeni bir tane "
-"oluÅŸturulacak."
+msgstr "Yapılandırma dosyanız hatalıydı, bu yüzden silindi ve yeni bir tane oluşturulacak."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Yapılandırma dosyanız çok eskiydi, bu yüzden silindi ve yeni bir tane oluşturulacak."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Yapılandırma dosyanız çok eskiydi, bu yüzden silindi ve yeni bir tane "
-"oluÅŸturulacak."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3664,7 +3319,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Zen Bahçesi"
 
@@ -3675,7 +3329,6 @@ msgstr "[hiçbiri]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3684,7 +3337,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "-"
@@ -3693,51 +3347,25 @@ msgstr "-"
 msgid "featured"
 msgstr "öne çıkan"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "standart"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Muhammet Kara https://launchpad.net/~muhammet-k\n"
-"  Osman Tosun https://launchpad.net/~rainman-neu\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Volkan Gezer https://launchpad.net/~volkangezer\n"
-"  emre can yılmaz https://launchpad.net/~ecylmz\n"
-"  linuxseven https://launchpad.net/~linuxseven\n"
-"  maidis https://launchpad.net/~ozbekanil\n"
-"  yakup https://launchpad.net/~mutouk\n"
-"  zeugma https://launchpad.net/~sunder67"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Muhammet Kara https://launchpad.net/~muhammet-k\n  Osman Tosun https://launchpad.net/~rainman-neu\n  STK-team https://launchpad.net/~stk\n  Volkan Gezer https://launchpad.net/~volkangezer\n  emre can yılmaz https://launchpad.net/~ecylmz\n  linuxseven https://launchpad.net/~linuxseven\n  maidis https://launchpad.net/~ozbekanil\n  yakup https://launchpad.net/~mutouk\n  zeugma https://launchpad.net/~sunder67"
diff --git a/data/po/tt.po b/data/po/tt.po
index 18309e77c..ae1f92c31 100644
--- a/data/po/tt.po
+++ b/data/po/tt.po
@@ -1,22 +1,22 @@
-# Tatar translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2015-01-12 12:11+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Tatar <tt@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/supertuxkart/language/tt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tt\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +57,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -96,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +125,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +183,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -237,37 +223,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +284,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -314,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +326,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -401,18 +372,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +478,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -576,79 +537,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +606,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +640,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +699,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +809,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +978,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1003,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1015,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1091,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1153,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1204,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1309,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1357,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1433,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1455,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1558,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1667,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1722,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1760,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1794,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1912,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1933,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1956,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +1998,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2061,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2117,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2191,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2320,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2407,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2520,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2571,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2623,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2633,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2646,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2670,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2678,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2713,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2795,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2850,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2884,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2898,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2919,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2941,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2966,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2976,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3049,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3088,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3253,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3300,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3325,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,42 +3343,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee"
diff --git a/data/po/uk.po b/data/po/uk.po
index 7518b4bb0..447345c41 100644
--- a/data/po/uk.po
+++ b/data/po/uk.po
@@ -1,21 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: M.I.F. Projects <i18n@mifprojects.com>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/supertuxkart/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: UKRAINE\n"
-"Language: \n"
-"X-Poedit-Language: Ukrainian\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -26,21 +26,23 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d друг у мережі."
+msgstr[1] "%d друга в мережі."
+msgstr[2] "%d друзів у мережі."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -56,10 +58,10 @@ msgstr "%s Кбайт"
 msgid "%s MB"
 msgstr "%s Мбайт"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s та %s зараз в мережі."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -68,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s, автор %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s, автор %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s у мережі."
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s готовий"
@@ -88,32 +89,30 @@ msgstr "%s готовий"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Профіль %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "Сервер %s"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s та %s зараз у мережі."
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "„%s“ ди�кваліфікований."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Пу�то)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(мережева гра ще не до�тупна)"
 
@@ -123,72 +122,60 @@ msgstr "* �иній значок означає конфлікт з іншою
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Червоні елементи �відчать про конфлікт у поточній конфігурації"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-"* Поточні призначенн� клавіш можна подивити�ь/змінити в меню Параметри"
+msgstr "* Поточні призначенн� клавіш можна подивити�ь/змінити в меню Параметри"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* У більшу ча�тину цих видів гри можна зіграти в Гран-Прі: замі�ть однієї "
-"тра�и, ти можеш проїжджати декілька одразу. Чим вищий твій рейтинг, тим "
-"більше очок ти отримуєш. У результаті гравець з більшою кількі�тю очок "
-"виграє� кубок."
+msgstr "* У більшу ча�тину цих видів гри можна зіграти в Гран-Прі: замі�ть однієї тра�и, ти можеш проїжджати декілька одразу. Чим вищий твій рейтинг, тим більше очок ти отримуєш. У результаті гравець з більшою кількі�тю очок виграє� кубок."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Перезапу�тіть STK аби за�то�увати нові налаштуванн�"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
-msgstr ""
+msgstr "1 мі��ць"
 
 #: src/states_screens/addons_screen.cpp:50
 msgid "1 week"
-msgstr ""
+msgstr "1 тиждень"
 
 #: src/states_screens/addons_screen.cpp:56
 msgid "1 year"
-msgstr ""
+msgstr "1 рік"
 
 #: src/states_screens/addons_screen.cpp:51
 msgid "2 weeks"
-msgstr ""
+msgstr "2 тижні"
 
 #: src/states_screens/addons_screen.cpp:57
 msgid "2 years"
-msgstr ""
+msgstr "2 роки"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:182
@@ -197,7 +184,6 @@ msgstr "Битва трьох ударів"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -205,34 +191,31 @@ msgstr ""
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
-msgstr ""
+msgstr "3 мі��ці"
 
 #: src/states_screens/addons_screen.cpp:54
 msgid "6 months"
-msgstr ""
+msgstr "6 мі��ців"
 
 #: src/states_screens/addons_screen.cpp:55
 msgid "9 months"
-msgstr ""
+msgstr "9 мі��ців"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Результати ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "ШІ �уперників"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Покинути Гран-прі"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Про гру"
 
@@ -241,64 +224,59 @@ msgstr "Про гру"
 msgid "Accelerate"
 msgstr "Газ"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
-msgstr ""
+msgstr "При�корюйте�� клавішею  <%s>, а керуйте клавішами  <%s> і  <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Прийн�ти"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Відновленн� екаунту"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "�алаштуванн� екаунту"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "До��гненн�"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Ді�"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "Додати"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "Додати друга"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -307,7 +285,6 @@ msgstr "Додати налаштуванн� клавіатури"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Додати гравц�"
 
@@ -318,32 +295,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Додати при�трій"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "Додати кори�тувача"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Додатки"
 
@@ -353,158 +327,146 @@ msgstr "�азва додатку"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Додатки"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "�дюма"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Розширений ковеєр (о�вітленн�, тощо)"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "У�е"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "У�і тра�и"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"У�і витівки дозволені, отож збирай знар�дд� та викори�товуй їх розумно!"
+msgstr "У�і витівки дозволені, отож збирай знар�дд� та викори�товуй їх розумно!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
+msgstr "Завжди показувати екран входу"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Вплив оточенн� (�О)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Вплив оточенн� : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Стала�� помилка під ча� збереженн� вашого гран-прі."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "Якір — �ильно уповільнює карт, що знаходить�� на першій позиції."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "�німовані пер�онажі"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "�німовані пер�онажі: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
-msgstr ""
+msgstr "�німована декораці�"
 
 #. I18N: in graphical options
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "�німований ландшафт: %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
-msgid "Anisotropic x2"
-msgstr ""
+msgstr "Aнізотропна x16"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:78
-msgid "Anisotropic x4"
-msgstr ""
+msgid "Anisotropic x2"
+msgstr "�нізотропна x2"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr "�нізотропна x4"
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
-msgstr ""
+msgstr "�нізотропна x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Інше гран-прі вже і�нує з такою ж назвою."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Згладжуванн�"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Згладжуванн� : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "За�то�увати"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "За�то�увати нову роздільну здатні�ть"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Запеклий ворог"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -515,51 +477,46 @@ msgstr "Ти дій�но хочеш вилучити цей при�трій?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Ви дій�но бажаєте видалити '%s'?"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�рени"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
-msgstr ""
+msgstr "�авколо ма�ка"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "Призначити кнопці „ESC“"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "�а краю �віту"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "�удіо"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Уникай бананів!"
 
@@ -567,7 +524,7 @@ msgstr "Уникай бананів!"
 #: src/input/binding.cpp:284
 #, c-format
 msgid "Axis %d"
-msgstr ""
+msgstr "Ві�ь %d"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:272
@@ -579,123 +536,104 @@ msgstr "О�і джой�тика %d %s"
 #: src/input/binding.cpp:279
 #, c-format
 msgid "Axis %d inverted"
-msgstr ""
+msgstr "Ві�ь %d інвертовано"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Повернути��"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Повернути�� до гри"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Повернути�� до гонки"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
-msgstr ""
+msgstr "Повернути�ь до вибору виклику"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Повернути�� до переліку при�троїв"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
-msgstr ""
+msgstr "Повернути�ь до меню"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Повернути�� до меню"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "Любитель бананів"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "О�трів битв"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Гончак"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Звір�тко"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "�а�тупного разу поща�тить!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
-msgstr ""
+msgstr "Білінійний"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Чорна"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
-msgstr ""
+msgstr "Маєток на чорному пагорбі"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "Цвітінн�"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Цвітінн� : %s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
-msgstr ""
+msgstr "Перемога за �иніми"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Скотний двір"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Кул� дл� гри у кеглі — від�какує від �тін. Якщо ти озирнеш�� назад, вона "
-"буде кинута у зворотному напр�мку."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Кул� дл� гри у кеглі — від�какує від �тін. Якщо ти озирнеш�� назад, вона буде кинута у зворотному напр�мку."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -703,7 +641,6 @@ msgid "Brake"
 msgstr "Гальма"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -711,60 +648,51 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Кек� — кидаєть�� в найближчого �уперника, діє найкраще на коротких від�тан�х "
-"та довгих пр�мих."
+msgstr "Кек� — кидаєть�� в найближчого �уперника, діє найкраще на коротких від�тан�х та довгих пр�мих."
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "�емає до�тупу до �ервера додатків stkaddons.net…"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Ска�увати"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Ска�увати запит"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -772,126 +700,109 @@ msgid "Cancel/Back"
 msgstr "Відміна/назад"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Секретна печера"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
-msgstr ""
+msgstr "Виклик завершено"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
-msgstr ""
+msgstr "Виклик провалено"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Змаганн�: зала призів"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "Змінити"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Обери карт"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Крі�тофер Коламбу�"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
-msgstr ""
+msgstr "�ати�ніть тут, аби отримати довідку"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
-msgstr ""
+msgstr "Закрити"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Храм Какао"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Зібрати 5 бананів на прот�зі гонки"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Збирай блакитні коробки: вони дадуть тобі знар�дд� чи інші під�иленн�"
+msgstr "Збирай блакитні коробки: вони дадуть тобі знар�дд� чи інші під�иленн�"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
-msgstr ""
+msgstr "Збирайте балони з азотом (викори�таємо їх пі�л� повороту)"
 
 #: src/states_screens/race_gui_base.cpp:648
 msgid "Collect nitro!"
-msgstr ""
+msgstr "Збирай азот!"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Збирай зар�ди „нітро“, що дають можливі�ть збільшувати швидкі�ть по "
-"нати�ненню призначеної клавіші, в той момент, коли тобі це потрібно. �а "
-"панелі праворуч ти можеш побачити �вій поточний рівень зар�ду „нітро“."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Збирай зар�ди „нітро“, що дають можливі�ть збільшувати швидкі�ть по нати�ненню призначеної клавіші, в той момент, коли тобі це потрібно. �а панелі праворуч ти можеш побачити �вій поточний рівень зар�ду „нітро“."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Завершіть в�і виклики аби відкрити браму!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Завершене до��гненн� \"%s\"."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "Підтвердити"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -899,9 +810,8 @@ msgstr "Підтвердь рішенн� прот�гом %i �екунд"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "З'єднати�ь з інтернетом"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
@@ -911,121 +821,102 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"�е мі�тить під�илень, так що лише твої навички кермуванн� мають значенн�!"
+msgstr "�е мі�тить під�илень, так що лише твої навички кермуванн� мають значенн�!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Продовжити"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Продовжити збережений ГП"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Продовжити."
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "Керуванн�"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "Скопіювати"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "�е вдаєть�� �творити гравц� '%s'."
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
-msgstr ""
+msgstr "�е ви�влено при�троїв wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "Створити"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "Створити �ервер"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "Створити кори�тувача"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Триває �творенн� �ервера"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Уча�ники проекту"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "Поточний пароль"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Поточний пароль невірний."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
-msgstr ""
+msgstr "Вла�ний"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
-msgstr ""
+msgstr "Вла�ні налаштуванн�..."
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
@@ -1049,39 +940,36 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "Відхилити"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Типово"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Видалити"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Вилучити налаштуванн�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Глибина різко�ті : %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1091,34 +979,33 @@ msgstr "Відключити при�трій"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Вимкнено"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Відображати кад./�ек."
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
-msgstr ""
+msgstr "Ви �правді бажаєте завершити Гран-прі?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Ти дій�но бажаєш вилучити гравц� „%s“?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Ви дій�но бажаєте зберегти ваші зміни?"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "�е ти�ни на газ до �лова „Вперед“"
 
@@ -1129,29 +1016,26 @@ msgstr "Вниз"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Динамічне о�вітленн� : %s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Змінити"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Змінити гран-прі"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1160,47 +1044,43 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
 msgid "Eggs: %d / %d"
-msgstr ""
+msgstr "Яйц�: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Слон"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
-msgstr ""
+msgstr "Вибули"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "Ел. пошта"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Email невірний!"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Email-адре�и не �півпадають!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "О�ел"
 
@@ -1212,34 +1092,31 @@ msgstr "Включити при�трій"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Увімкнено"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
-msgstr ""
+msgstr "До�тупно дл� в�іх"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Введіть ім’� нового гравц�"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Помилка завантаженн� новин: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
@@ -1247,40 +1124,42 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "Вийти"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Покинути перегони"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Покинути гру"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Ек�перт"
 
 #: src/states_screens/race_setup_screen.cpp:252
 msgid "Explore tracks to find all hidden eggs"
-msgstr ""
+msgstr "До�ліджуйте треки аби знайти в�і приховані �йц�"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1288,12 +1167,12 @@ msgstr ""
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Отриманн� до��гнень"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Отриманн� друзів"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
@@ -1302,24 +1181,22 @@ msgstr ""
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Отриманн� �ерверів"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "О�таннє коло!"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "Знайти �ервер"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1328,21 +1205,14 @@ msgstr "Вогонь"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"Перш за в�е, тобі потрібно декілька при�троїв введенн� (викори�танн� "
-"декількох ігрових пультів чи джой�тиків — кращий �по�іб грати з кількома "
-"гравц�ми). Відкрий вікно налаштувань й налаштуй ігрові пульти. Також можна "
-"грати на клавіатур-і(-ах), проте кожному гравцеві потрібні різні поєднанн� "
-"клавіш, і пам’�тай, що більші�ть клавіатур не підход�ть дл� колективної гри, "
-"о�кільки не підтримують велику кількі�ть одноча�но нати�нутих клавіш."
+msgstr "Перш за в�е, тобі потрібно декілька при�троїв введенн� (викори�танн� декількох ігрових пультів чи джой�тиків — кращий �по�іб грати з кількома гравц�ми). Відкрий вікно налаштувань й налаштуй ігрові пульти. Також можна грати на клавіатур-і(-ах), проте кожному гравцеві потрібні різні поєднанн� клавіш, і пам’�тай, що більші�ть клавіатур не підход�ть дл� колективної гри, о�кільки не підтримують велику кількі�ть одноча�но нати�нутих клавіш."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1351,11 +1221,10 @@ msgstr "Слідуй за лідером"
 
 #: src/states_screens/race_gui_base.cpp:650
 msgid "Follow the leader!"
-msgstr ""
+msgstr "Слідуй за лідером!"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1363,14 +1232,16 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Форт Магма"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1378,58 +1249,54 @@ msgstr ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Запит дружби прийн�то!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Запит дружби �ка�овано!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Запит дружби відхилено!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Запит дружби наді�лано!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Друзі"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "�а ве�ь екран"
 
 #. I18N: Shown when a goal is scored
 #: src/states_screens/race_gui_base.cpp:70
 msgid "GOAL!"
-msgstr ""
+msgstr "ЦІЛЬ!"
 
 #. I18N: Key binding section
 #: src/states_screens/options_screen_input2.cpp:144
 msgid "Game Keys"
 msgstr "Ігрові клавіші"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Режим гри"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1445,51 +1312,45 @@ msgstr "Кнопка ігрового пульта %d"
 msgid "Gamepad hat %d"
 msgstr "D-pad джой�тика %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Головна"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "Глобальне о�вітленн�"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Глобальне о�вітленн� : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Cвітінн� (обри�ів)"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Cвітінн� (обри�ів) : %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "GNU"
 
@@ -1499,63 +1360,55 @@ msgid "Go!"
 msgstr "Вперед!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "Золоті руки"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Гран-прі"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Редактор гран-прі"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Редактор гран-прі"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
-msgstr ""
+msgstr "Прогре� Гран-прі:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Рівень графічних ефектів"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "Графіка"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
-msgstr ""
+msgstr "Графічні налаштуванн�"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
-msgstr ""
+msgstr "Зелена але�"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1566,16 +1419,14 @@ msgstr "Гі�ть"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Гі�ть %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "��ьєнда"
 
@@ -1585,117 +1436,105 @@ msgstr "��ьєнда"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Довідка"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Хак�лі"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "Кращі результати"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Вцілити 10 кулею дл� боулінгу."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Збивайте інших гравців, викори�товуючи знар�дд�, поки вони не втрат�ть у�і "
-"�вої житт� (лише у колективній грі)."
+msgstr "Збивайте інших гравців, викори�товуючи знар�дд�, поки вони не втрат�ть у�і �вої житт� (лише у колективній грі)."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Вцілити того �амого ворого 5 розів за гонку."
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
-msgstr ""
+msgstr "Тільки люди"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Зображенн� замка означає, що тобі необхідно завершити випробуванн�, щоб "
-"розблокувати його."
+msgstr "Зображенн� замка означає, що тобі необхідно завершити випробуванн�, щоб розблокувати його."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "„%s“ ігноруєть��, потрібно було увійти в гру раніше!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "В�тановленн�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Середній рівень"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "Це �екрет"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "Приєднати�ь"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Приднати�ь до �ервера"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Карти"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Залишити цю роздільну здатні�ть"
 
@@ -1706,7 +1545,7 @@ msgstr "Слідуй за картом лідера, але не обган�й
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Прив’�зка клавіш"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1714,7 +1553,6 @@ msgid "Keyboard %i"
 msgstr "Клавіатура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Конкі"
 
@@ -1723,20 +1561,20 @@ msgstr "Конкі"
 msgid "Lap"
 msgstr "Коло"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Коло № %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Кола"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
 #, c-format
 msgid "Laps : %i"
-msgstr ""
+msgstr "Коло: %i"
 
 #: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
 msgid "Leader"
@@ -1785,66 +1623,101 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "Йде завантаженн�"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "Лобі"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "�алаштуванн� лобі"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-"Заблоковано: �першу виконай до�тупні змаганн� і тоді отримаєш до�туп!"
+msgstr "Заблоковано: �першу виконай до�тупні змаганн� і тоді отримаєш до�туп!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
 msgstr "Заблоковано!"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
-#: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
-msgid "Login"
+#. I18N: In the login dialog
+msgid "Log In"
 msgstr ""
 
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
+#: src/states_screens/main_menu_screen.cpp:175
+#: src/states_screens/main_menu_screen.cpp:186
+msgid "Login"
+msgstr "Увійти"
+
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
 msgid "Look Back"
@@ -1852,46 +1725,35 @@ msgstr "Озирнути�ь назад"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "Уча�ник марафону"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "Мак�. кількі�ть гравців"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Лише �"
 
@@ -1901,29 +1763,33 @@ msgid "Menu Keys"
 msgstr "Клавіші меню"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
+msgstr "Мініґольф"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "Розмиванн� у ру�і"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Розмиванн� у ру�і: %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Ві�ь миші %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1931,50 +1797,43 @@ msgstr "Кнопка миші %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "Вниз"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "Вгору"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Колективна гра"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Колективна гра"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Музика"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Ім’�"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
@@ -1982,47 +1841,53 @@ msgstr ""
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "�азва пу�та."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "�азва задовга"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
+msgstr "�азва �ервера"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "�овий"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "До�тупне нове Гран-прі „%s“"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "�овий пароль"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "�овий запит"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "До�тупний новий рівень �кладно�ті „%s“"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "�овий рекорд найшвидшого кола"
 
@@ -2048,21 +1913,20 @@ msgstr "�ітро"
 
 #: src/states_screens/dialogs/select_challenge.cpp:147
 msgid "Nitro challenge"
-msgstr ""
+msgstr "Виклик азоту"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "�і"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "�олок"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "�ічого"
 
@@ -2072,21 +1936,19 @@ msgid "Normal Race"
 msgstr "Звичайна гонка"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Північний курорт"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr ""
+msgstr "Зауважте, �кщо ви керуєте зано�ом кілька �екунд, то отримаєте бону� швидко�ті!"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Початківець"
 
@@ -2097,107 +1959,101 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Кількі�ть віртуальних картів"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "Кількі�ть кіл"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "Кількі�ть кіл:"
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "Гаразд"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
+msgstr "Поза мережею"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Старий кар’єр"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Математичний кла� Олівера"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "У мережі"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Це може робити лише го�подар гри!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2208,62 +2064,54 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Параметри"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "Огл�д"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Парашут — �повільнює у�і карти, що мають кращу позицію."
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "Пароль :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "Зміна парол�"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Пароль у�пішно змінено."
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Паролі не збігають��!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2272,21 +2120,19 @@ msgstr "Пауза"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Пауза"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Штрафний ча�!!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Очікуванн�"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Ігровий Майданчик Пінгвіна"
 
@@ -2295,37 +2141,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Піджин"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Відтворити в�е"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Гравці"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2334,6 +2181,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Будь ла�ка, переналаштуй клавіатуру."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Будь ла�ка, зачекайте, поки додатки оновл�ть��"
@@ -2343,56 +2194,48 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Будь ла�ка, зачекайте поки додаток звантажуєть��"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Вантуз — кидаєть�� пр�мо вперед, щоб зачепити�� за �пину опонента, або "
-"назад, щоб за�ліпити його."
+msgstr "Вантуз — кидаєть�� пр�мо вперед, щоб зачепити�� за �пину опонента, або назад, щоб за�ліпити його."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "�ати�ніть клавішу ESC, щоб �ка�увати"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "�ати�ніть клавішу"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "�ати�ни Enter або ж двічі клацни на при�трій дл� його налаштуванн�."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "Подвійне клацанн� чи Enter дл� редагуванн� гравц�"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
-msgstr ""
+msgstr "�ати�ніть \"вогонь\" щоб відтворити підказки"
 
 #: src/states_screens/race_gui_overworld.cpp:532
 msgid "Press fire to start the challenge"
-msgstr ""
+msgstr "�ати�ніть \"вогонь\" щоб почати гонку"
 
 #: src/input/wiimote_manager.cpp:390
 msgid ""
@@ -2412,20 +2255,18 @@ msgstr "Проблеми з вилученн�м додатка „%s“."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Обробка"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "Профіль"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Перебіг"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Паффі"
 
@@ -2437,31 +2278,27 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "Швидка гра"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Покинути �ервер."
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "�алаштуванн� гонки"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Випадково"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2469,15 +2306,15 @@ msgstr "Випадкова арена"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Випадкове гран-прі"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "Випадковий карт"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Випадкова тра�а"
 
@@ -2486,15 +2323,10 @@ msgid "Rank"
 msgstr "Мі�це"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
+msgstr "Оцінка >="
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
@@ -2502,83 +2334,74 @@ msgid "Ready!"
 msgstr "�а �тарт!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Справжній ... �екрет."
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
-msgstr ""
+msgstr "Перемогли червоні"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "Зареє�трувати"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Перезавантажити"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Запам'�тати пароль"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
-msgstr ""
+msgstr "Запам'�тати розташуванн� вікна"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Закрити"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "Перейменувати"
 
 #: src/states_screens/dialogs/select_challenge.cpp:64
 #, c-format
 msgid "Required Nitro Points : %i"
-msgstr ""
+msgstr "�еобхідна кількі�ть азоту :  %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:53
 #, c-format
 msgid "Required Rank : %i"
-msgstr ""
+msgstr "�еобхідний рейтинг: %i"
 
 #: src/states_screens/dialogs/select_challenge.cpp:58
 #, c-format
 msgid "Required Time : %i"
-msgstr ""
+msgstr "�еобхідний ча�: %i"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:254
@@ -2587,35 +2410,31 @@ msgstr "Повернути�� на тра�у"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "Роздільна здатні�ть"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Перезапу�тити"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "Почати гонку �початку"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
-msgstr ""
+msgstr "Зворотний пор�док"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "Зворотний пор�док:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Обернено"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2664,45 +2483,39 @@ msgstr ""
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "ШВИДКІСТЬ"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "Зберегти"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Зберегти гран-прі"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "Шотланді�"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Пошук"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Триває пошук"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2710,57 +2523,49 @@ msgid "Select"
 msgstr "Вибрати"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Оберіть рівень �кладно�ті"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Обери режим гри"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Оберіть трек"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
-msgstr ""
+msgstr "Оберіть карт"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "Створенн� �ерврера"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "Інформаці� про �ервер"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "Вибір �ервера"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "�азва �ервера:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Сервер у�пішно �творено. Тепер ви можете приєднати�ь."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2769,93 +2574,51 @@ msgstr "Увага!"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Обери нову гонку"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
+msgstr "Тіні"
+
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Тіні: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Рухомі пі�ки"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "О�вітлене передмі�т�"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "Увійти"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "Увійти �к гі�ть"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Від"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "Самітна гра"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2863,61 +2626,53 @@ msgid "Size: %s"
 msgstr "Розмір: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
 msgid "Skidding"
-msgstr ""
+msgstr "Ковзанн�"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Жупан"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "За�ніжена вершина"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:186
 msgid "Soccer"
-msgstr ""
+msgstr "Футбол"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
-msgstr ""
+msgstr "Футбольне поле"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Вибачай, �тала�� помилка при з’єднанні із �айтом додатків. Переконай��, що "
-"з’єднанн� з Інтернетом активна, а SuperTuxKart не заблокований фаєрволом."
+msgstr "Вибачай, �тала�� помилка при з’єднанні із �айтом додатків. Переконай��, що з’єднанн� з Інтернетом активна, а SuperTuxKart не заблокований фаєрволом."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
-msgstr ""
+msgstr "Вибачте, завантаженн� цього доповненн� не вдало��"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Звукові ефекти"
 
@@ -2926,30 +2681,28 @@ msgstr "Звукові ефекти"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Стандартні"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Почати"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "Почати Гран-прі"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Почати гонку"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Стан"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2963,132 +2716,119 @@ msgstr "Звернути праворуч"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
-msgstr ""
+msgstr "Режим і�торії"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "Удар!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "Відправити"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "Під водою"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
-msgstr ""
+msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Додатки SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Довідка SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Параметри SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart можна грати у колективному режимі на одному комп’ютері"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart мі�тить декілька режимів гри"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Сюзанна"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Замінювач — коробки з бону�ами перетворюють�� на банани і навпаки на "
-"невеликий проміжок ча�у."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Замінювач — коробки з бону�ами перетворюють�� на банани і навпаки на невеликий проміжок ча�у."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-"Мухобійка — причавлює проїжджаючі мимо карти, тим �амим �повільнюючи їх."
+msgstr "Мухобійка — причавлює проїжджаючі мимо карти, тим �амим �повільнюючи їх."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
 msgid "System Language"
 msgstr "Мова �и�теми"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Угода та умови"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "Сти�ненн� тек�тур"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
-msgstr ""
+msgstr "Фільтраці� тек�тур"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Стадіон"
 
@@ -3100,9 +2840,7 @@ msgstr "Модуль додатків відключений у розділі 
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Таблиц� результатів за�таріла,\n"
-"у�і результаті були у�унені."
+msgstr "Таблиц� результатів за�таріла,\nу�і результаті були у�унені."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3115,48 +2853,29 @@ msgstr "Гонка на ча�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Гонка на ча�: не мі�тить під�илень, так що лише твої навички кермуванн� "
-"мають значенн�!"
+msgstr "Гонка на ча�: не мі�тить під�илень, так що лише твої навички кермуванн� мають значенн�!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"Дл� того, щоб додати ігровий пульт чи джой�тик, про�то запу�ти SuperTuxKart "
-"коли він підключений. Він автоматично з’�вить�� в �пи�ку при�троїв.\n"
-"\n"
-"Щоб додати налаштуванн� клавіатури, ти можеш нажати на кнопку, що "
-"знаходить�� нижче. �ле врахуй, що більші�ть клавіатур підтримують лише "
-"обмежену кількі�ть одноча�них нати�кань клавіш, і тому не підход�ть дл� "
-"колективної гри. (Однак, ти можеш вирішити цю проблему підключенн�м "
-"декількох клавіатур до комп’ютера. �ле навіть у цьому випадку потрібно "
-"призначати різні комбінації клавіш.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "Дл� того, щоб додати ігровий пульт чи джой�тик, про�то запу�ти SuperTuxKart коли він підключений. Він автоматично з’�вить�� в �пи�ку при�троїв.\n\nЩоб додати налаштуванн� клавіатури, ти можеш нажати на кнопку, що знаходить�� нижче. �ле врахуй, що більші�ть клавіатур підтримують лише обмежену кількі�ть одноча�них нати�кань клавіш, і тому не підход�ть дл� колективної гри. (Однак, ти можеш вирішити цю проблему підключенн�м декількох клавіатур до комп’ютера. �ле навіть у цьому випадку потрібно призначати різні комбінації клавіш.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "Дл� того, щоб перемогти, збирай на�тупні під�иленн�:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
-msgstr ""
+msgstr "До мі��ц� і назад"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Сьогодні"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3166,12 +2885,12 @@ msgstr "�айкращі %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Трек"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Трек %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3182,21 +2901,19 @@ msgstr "�втор тра�и: %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "Група треків"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Тра�и"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
-msgstr ""
+msgstr "Трилінійне"
 
 #: src/states_screens/dialogs/addons_loading.cpp:369
 #: src/states_screens/dialogs/addons_loading.cpp:406
@@ -3205,47 +2922,42 @@ msgstr "Спробувати ще раз"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
-msgstr ""
+msgstr "�авчанн�"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "�авчанн�: огл�дова кімната"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Тук�"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
-msgstr ""
+msgstr "Тип:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Type: гран-прі"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Вилучити"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "�е зупинити"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3257,88 +2969,81 @@ msgid "Update"
 msgstr "Оновленн�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
-msgstr ""
+msgstr "Оновлено"
 
 #: src/states_screens/addons_screen.cpp:111
 msgid "Updated date"
 msgstr "Дата оновленн�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
-msgstr ""
+msgstr "Викори�товуйте азот клавішею  <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "Інформаці� про кори�тувача"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Інтерфей� кори�тувача"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Визначені кори�тувачем"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "Пошук кори�тувачів"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "Кори�тувач"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
-msgstr ""
+msgstr "проти"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Перевірка інформації"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3347,29 +3052,25 @@ msgstr "Вер�і�: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Вертикальна �инхронізаці� (необхідний перезапу�к)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Виглад"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Гучні�ть"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "Голо�"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
@@ -3377,9 +3078,9 @@ msgstr ""
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "��"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "�ЕВІР�ИЙ ��ПРЯМОК!"
 
@@ -3388,103 +3089,84 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Увага! �е рекомендуєть�� викори�товувати клавішу „Shift“, тому що при її "
-"нати�канні у�і клавіші нижнього регі�тру можуть не працювати."
+msgstr "Увага! �е рекомендуєть�� викори�товувати клавішу „Shift“, тому що при її нати�канні у�і клавіші нижнього регі�тру можуть не працювати."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Знар�дд�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
-msgstr ""
+msgstr "Погодні умови"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Погодні ефекти: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Пі�л� налаштуванн� при�троїв введенн� ти готовий до гри. Вибери пункт "
-"„Колективна гра“ у головному меню. Щоб в�тупити в гру, кожному гравцеві �лід "
-"нати�нути клавішу „вогонь“ на клавіатурі чи джой�тику під ча� вибору карта. "
-"Кожен гравець має викори�тати �вій при�трій введенн� дл� вибору карта. Коли "
-"у�і гравці виберуть �обі карт, гра продовжить��. Зауваж, що мишка не може "
-"бути викори�тана дл� вибору карта у колективній грі."
+msgstr "Пі�л� налаштуванн� при�троїв введенн� ти готовий до гри. Вибери пункт „Колективна гра“ у головному меню. Щоб в�тупити в гру, кожному гравцеві �лід нати�нути клавішу „вогонь“ на клавіатурі чи джой�тику під ча� вибору карта. Кожен гравець має викори�тати �вій при�трій введенн� дл� вибору карта. Коли у�і гравці виберуть �обі карт, гра продовжить��. Зауваж, що мишка не може бути викори�тана дл� вибору карта у колективній грі."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Біла"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Уїлбер"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Виграти 5 гонок за раз"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "Ек� �р 591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Так"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
-msgstr ""
+msgstr "Тепер ти готовий до заїздів. У�піхів!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
-msgstr ""
+msgstr "Ви граєте �к"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
@@ -3492,37 +3174,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
-msgstr ""
+msgstr "Ви виконали завданн�!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
-msgstr ""
+msgstr "Ви виконали завданн�!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Ти завершив Гран-Прі!"
 
@@ -3543,20 +3224,23 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Ти завершив гонку!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "У ва� новий запит дружби!"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Ти ди�кваліфікований!"
 
@@ -3566,7 +3250,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3574,50 +3258,57 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Потрібно вказати пароль"
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
-msgstr ""
+msgstr "Ви відкрили гран-прі %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
-msgstr ""
+msgstr "Ви відкрили трек %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Ти виграв гонку!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Твій файл налаштувань пошкоджений. Він буде вилучений і замінений новим."
+msgstr "Твій файл налаштувань пошкоджений. Він буде вилучений і замінений новим."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Твій файл з налаштуванн�ми за�тарів, тому він вилучений і буде �творений новий файл."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Твій файл з налаштуванн�ми за�тарів, тому він вилучений і буде �творений "
-"новий файл."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3626,10 +3317,9 @@ msgstr "Ваш файл налаштувань не�умі�ний з цією
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Ваш профіль"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Сад у �тилі дзен"
 
@@ -3640,16 +3330,16 @@ msgstr "[від�утнє]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "дії"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "в�і"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "у виконанні"
@@ -3658,49 +3348,25 @@ msgstr "у виконанні"
 msgid "featured"
 msgstr "рекомендований"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "�тандарт"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Helen Antonova https://launchpad.net/~vigonett\n"
-"  JOker https://launchpad.net/~spenser26\n"
-"  Pasha Sydoryshyn https://launchpad.net/~pandorrarv\n"
-"  Pavlo Bilyak https://launchpad.net/~pavlo1997\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Volodymyr Bodenchuk https://launchpad.net/~bodenchuk\n"
-"  Сергій Дубик https://launchpad.net/~dubyk-library"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Helen Antonova https://launchpad.net/~vigonett\n  JOker https://launchpad.net/~spenser26\n  Maks Lyashuk aka Ma)(imuM https://launchpad.net/~probel\n  Pasha Sydoryshyn https://launchpad.net/~pandorrarv\n  Pavlo Bilyak https://launchpad.net/~pavlo1997\n  STK-team https://launchpad.net/~stk\n  Volodymyr Bodenchuk https://launchpad.net/~bodenchuk\n  Сергій Дубик https://launchpad.net/~dubyk-library"
diff --git a/data/po/uz.po b/data/po/uz.po
index 220fc8355..32864d32e 100644
--- a/data/po/uz.po
+++ b/data/po/uz.po
@@ -1,22 +1,22 @@
-# Uzbek translation for stk
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2012-12-11 15:47+0000\n"
-"Last-Translator: Umidjon Almasov <u.almasov@gmail.com>\n"
-"Language-Team: Uzbek <uz@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Uzbek (http://www.transifex.com/projects/p/supertuxkart/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -27,21 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr ""
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -57,7 +57,7 @@ msgstr ""
 msgid "%s MB"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -69,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr ""
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr ""
@@ -96,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr ""
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr ""
 
@@ -128,13 +125,11 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
@@ -144,25 +139,20 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -193,7 +183,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr ""
 
@@ -237,37 +223,35 @@ msgstr ""
 msgid "Accelerate"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -286,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -303,7 +284,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr ""
 
@@ -314,32 +294,29 @@ msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr ""
 
@@ -349,49 +326,43 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr ""
 
@@ -401,18 +372,20 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -422,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr ""
 
@@ -448,24 +418,24 @@ msgstr ""
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -475,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +478,44 @@ msgstr ""
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr ""
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr ""
 
@@ -576,79 +537,66 @@ msgstr ""
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr ""
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr ""
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -658,36 +606,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr ""
 
 #. I18N: Key binding name
@@ -696,7 +640,6 @@ msgid "Brake"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr ""
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr ""
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
@@ -763,26 +699,23 @@ msgid "Cancel/Back"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr ""
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr ""
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr ""
 
@@ -854,14 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +809,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +822,80 @@ msgstr ""
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr ""
 
@@ -1035,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +978,23 @@ msgstr ""
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr ""
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr ""
@@ -1103,8 +1003,8 @@ msgstr ""
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr ""
 
@@ -1115,27 +1015,24 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1156,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr ""
 
@@ -1169,24 +1064,22 @@ msgstr ""
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr ""
 
@@ -1198,27 +1091,24 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr ""
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr ""
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr ""
 
@@ -1233,27 +1123,29 @@ msgid ""
 "Press 'Select' now to join the game!"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr ""
 
@@ -1261,12 +1153,12 @@ msgstr ""
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1291,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1314,13 +1204,12 @@ msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
 msgstr ""
 
@@ -1335,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1343,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr ""
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1374,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr ""
 
@@ -1394,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1425,51 +1309,45 @@ msgstr ""
 msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr ""
 
@@ -1479,61 +1357,53 @@ msgid "Go!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr ""
 
@@ -1550,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr ""
 
@@ -1565,22 +1433,18 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1591,71 +1455,68 @@ msgid ""
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr ""
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr ""
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr ""
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1665,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr ""
 
@@ -1690,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr ""
 
@@ -1699,7 +1558,7 @@ msgstr ""
 msgid "Lap"
 msgstr ""
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr ""
@@ -1761,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr ""
 
@@ -1812,11 +1667,51 @@ msgstr ""
 msgid "Locked!"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1827,27 +1722,18 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1855,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr ""
 
@@ -1876,29 +1760,33 @@ msgid "Menu Keys"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1906,48 +1794,41 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1967,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1982,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -1997,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr ""
 
@@ -2025,19 +1912,18 @@ msgstr ""
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr ""
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr ""
 
@@ -2047,21 +1933,19 @@ msgid "Normal Race"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr ""
 
@@ -2072,46 +1956,41 @@ msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr ""
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr ""
 
@@ -2119,60 +1998,59 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr ""
@@ -2183,14 +2061,11 @@ msgstr ""
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2199,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2235,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2247,12 +2117,11 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr ""
 
@@ -2261,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr ""
 
@@ -2270,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr ""
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2309,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr ""
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr ""
@@ -2318,44 +2191,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr ""
 
@@ -2389,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2398,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr ""
 
@@ -2410,25 +2275,21 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr ""
 
@@ -2449,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr ""
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr ""
 
@@ -2459,82 +2320,68 @@ msgid "Rank"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr ""
 
@@ -2560,29 +2407,25 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2639,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2683,12 +2520,10 @@ msgid "Select"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr ""
 
@@ -2698,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2742,91 +2571,49 @@ msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2836,7 +2623,6 @@ msgid "Size: %s"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2847,12 +2633,10 @@ msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr ""
 
@@ -2862,23 +2646,21 @@ msgid "Soccer"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr ""
 
@@ -2888,7 +2670,6 @@ msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr ""
 
@@ -2897,7 +2678,6 @@ msgstr ""
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr ""
 
@@ -2910,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr ""
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr ""
 
@@ -2934,12 +2713,10 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2947,82 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr ""
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr ""
 
@@ -3031,32 +2795,37 @@ msgstr ""
 msgid "System Language"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr ""
 
@@ -3081,30 +2850,22 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr ""
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr ""
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr ""
 
@@ -3123,7 +2884,7 @@ msgstr ""
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3137,19 +2898,17 @@ msgstr ""
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3160,24 +2919,21 @@ msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr ""
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr ""
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr ""
 
@@ -3185,20 +2941,18 @@ msgstr ""
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3212,8 +2966,8 @@ msgid "Update"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3222,40 +2976,36 @@ msgid "Updated date"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr ""
 
@@ -3264,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3285,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3302,27 +3049,23 @@ msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr ""
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr ""
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3334,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr ""
 
@@ -3345,45 +3088,40 @@ msgid ""
 "working."
 msgstr ""
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr ""
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
 msgstr ""
@@ -3394,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr ""
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr ""
 
@@ -3439,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr ""
 
@@ -3490,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr ""
 
@@ -3513,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3521,36 +3253,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr ""
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3563,6 +3300,11 @@ msgid ""
 "created."
 msgstr ""
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr ""
@@ -3573,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr ""
 
@@ -3584,7 +3325,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3593,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr ""
@@ -3602,42 +3343,25 @@ msgstr ""
 msgid "featured"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Umidjon Almasov https://launchpad.net/~kdemon"
+msgstr "Launchpad Contributions:\n  Umidjon Almasov https://launchpad.net/~kdemon"
diff --git a/data/po/vi.po b/data/po/vi.po
index 96ac101d8..fddf5f1bd 100644
--- a/data/po/vi.po
+++ b/data/po/vi.po
@@ -1,23 +1,22 @@
-# Vietnamese translation for stk
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the stk package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: stk\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:12+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/supertuxkart/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,22 +27,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
-" Nhưng lũ vô dụng các ngươi sẽ không thể nào đánh bại được ta - Vua �ua Xe!"
+msgstr " Nhưng lũ vô dụng các ngươi sẽ không thể nào đánh bại được ta - Vua �ua Xe!"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -59,7 +57,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr ""
@@ -71,19 +69,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s bởi %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s bởi %s"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s đã sẵn sàng"
@@ -98,25 +95,23 @@ msgstr ""
 msgid "%s's server"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr ""
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "'%s' đã bị loại."
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(Trống)"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(Chức năng chơi qua mạng chưa sẵn sàng)"
 
@@ -130,45 +125,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* Danh sách phím bấm có thể thấy/thay đổi trong phần Tùy ch�n"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* Phần lớn các chế độ chơi này có thể được chơi theo kiểu giải Grand Prix: "
-"thay vì chơi một vòng đua duy nhất, bạn có thể chơi nhi�u vòng liên tục. Vị "
-"thứ của bạn càng cao, bạn sẽ càng nhận thêm được nhi�u điểm. Cuối cùng, "
-"ngư�i chơi cao điểm nhất sẽ thắng giải đấu."
+msgstr "* Phần lớn các chế độ chơi này có thể được chơi theo kiểu giải Grand Prix: thay vì chơi một vòng đua duy nhất, bạn có thể chơi nhi�u vòng liên tục. Vị thứ của bạn càng cao, bạn sẽ càng nhận thêm được nhi�u điểm. Cuối cùng, ngư�i chơi cao điểm nhất sẽ thắng giải đấu."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr ""
 
@@ -199,7 +183,6 @@ msgstr "Trận chiến 3 lần tấn công"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -218,23 +201,20 @@ msgid "9 months"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= Danh sách điểm cao ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "Ngừng giải Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "Giới thiệu"
 
@@ -243,37 +223,35 @@ msgstr "Giới thiệu"
 msgid "Accelerate"
 msgstr "Tăng tốc"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "Tăng tốc với <%s> và chuyển hướng với <%s> và <%s>"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -281,8 +259,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr ""
 
@@ -292,13 +269,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr ""
 
@@ -309,7 +284,6 @@ msgstr "Thêm cấu hình bàn phím"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "Thêm ngư�i chơi"
 
@@ -320,32 +294,29 @@ msgstr "Thêm Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "Thêm một thiết bị"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "Tiện �ch"
 
@@ -355,72 +326,66 @@ msgstr "Tên Tiện �ch"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "Tiện �ch Tải V�"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "Tất cả"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "Tất cả vòng đua"
 
 #: src/states_screens/race_setup_screen.cpp:202
 msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-"Tất cả các chiêu đòn đ�u được cho phép dùng, vậy hãy nhặt vũ khí và dùng "
-"chúng cẩn thận!"
+msgstr "Tất cả các chiêu đòn đ�u được cho phép dùng, vậy hãy nhặt vũ khí và dùng chúng cẩn thận!"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr ""
@@ -430,25 +395,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "M� neo - làm chậm một cách đáng kể nhân vật đứng đầu"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "Nhân Vật �ộng"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "Nhân vật có thể cử động : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "Cảnh Vật �ộng"
 
@@ -456,24 +418,24 @@ msgstr "Cảnh Vật �ộng"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "Cảnh vật có thể chuyển động : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr ""
 
@@ -483,29 +445,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "�p dụng độ phân giải mới"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -520,49 +478,44 @@ msgstr "Bạn có chắc bạn muốn xóa hoàn toàn thiết lập này?"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "�ấu trư�ng"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "�ặt cho phím ESC"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "Nơi tận cùng của thế giới"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "Âm thanh"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "Tránh những quả chuối!"
 
@@ -584,81 +537,66 @@ msgstr "Gamepad axe %d %s"
 msgid "Axis %d inverted"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "Quay v�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "Quay V� Trò Chơi"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "Quay v� vòng đua"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "Quay v� danh sách thiết bị"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "Quay v� Menu"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "Quay v� trình đơn chính"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-"Quả bóng rổ - nhảy sau ngư�i dẫn đầu, và có thể đè bẹp và làm chậm ngư�i "
-"chơi xuống đư�ng đua."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr "Quả bóng rổ - nhảy sau ngư�i dẫn đầu, và có thể đè bẹp và làm chậm ngư�i chơi xuống đư�ng đua."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "Hòn �ảo Chiến �ấu"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "Chúc may mắn lần sau!"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr ""
 
@@ -668,39 +606,33 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "Biệt Thự Blackhill"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "Nông trại"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-"Banh bowling - bật ra khi đụng tư�ng. Nếu bạn đang nhìn lại phía sau, trái "
-"banh sẽ được ném ra phía sau."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr "Banh bowling - bật ra khi đụng tư�ng. Nếu bạn đang nhìn lại phía sau, trái banh sẽ được ném ra phía sau."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -708,7 +640,6 @@ msgid "Brake"
 msgstr "Thắng"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -716,53 +647,45 @@ msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-"Bánh - ném đến kẻ thù gần nhất, dùng tốt trên cự li ngắn và đư�ng thẳng"
+msgstr "Bánh - ném đến kẻ thù gần nhất, dùng tốt trên cự li ngắn và đư�ng thẳng"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "Không thể kết nối tới server chứa tiện ích..."
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "Huỷ b�"
 
@@ -776,26 +699,23 @@ msgid "Cancel/Back"
 msgstr "Hủy b�/Quay lại"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Hang X"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "Thử Thách Hoàn Thành"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "Thử Thách Thất Bại"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "Thử thách: Phòng vật phẩm"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -803,62 +723,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "Ch�n nhân vật"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "Nhấn đây để xem hướng dẫn"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "�óng"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-"Nhặt các hộp màu xanh: chúng sẽ cho bạn vũ khi hay các khả năng đặc biệt khác"
+msgstr "Nhặt các hộp màu xanh: chúng sẽ cho bạn vũ khi hay các khả năng đặc biệt khác"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "Thu thập hộp tăng tốc (ta sẽ sử dụng chúng sau các khúc quẹo)"
 
@@ -868,17 +778,13 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-"Thu thập Hộp Tăng Tốc cho phép bạn tăng tốc mỗi khi bạn muốn bằng cách nhấn "
-"phím phù hợp. Bạn có thể theo dõi mức Nhiên Liệu hiện tại ở thanh đo ở bên "
-"phải màn hình khi đang chơi."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr "Thu thập Hộp Tăng Tốc cho phép bạn tăng tốc mỗi khi bạn muốn bằng cách nhấn phím phù hợp. Bạn có thể theo dõi mức Nhiên Liệu hiện tại ở thanh đo ở bên phải màn hình khi đang chơi."
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -891,11 +797,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -903,7 +809,6 @@ msgstr "Xác nhận độ phân giải trong %i giây"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -915,101 +820,82 @@ msgstr ""
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"Không chứa vật phẩm nào, vì vậy chỉ có khả năng lái xe của bạn mới quan "
-"tr�ng!"
+msgstr "Không chứa vật phẩm nào, vì vậy chỉ có khả năng lái xe của bạn mới quan tr�ng!"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "Tiếp tục"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "�i�u khiển"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "Không thể nhận diện được cái Wiimote nào :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "Các đóng góp"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1022,13 +908,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "Tùy ch�n"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "Tùy chỉnh tự ch�n..."
 
@@ -1054,7 +939,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1062,28 +946,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "Xóa Thiết Lập"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1096,24 +978,23 @@ msgstr "Vô Hiệu Thiết Bị"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "Tắt"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "Hiển thị Số Khung Hình/Giây"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "Bạn có thực sự muốn thoát Giải �ấu?"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "Bạn có thực sự muốn xóa ngư�i chơi '%s'?"
@@ -1122,8 +1003,8 @@ msgstr "Bạn có thực sự muốn xóa ngư�i chơi '%s'?"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "�ừng tăng tốc trước lệnh xuất phát"
 
@@ -1134,27 +1015,24 @@ msgstr "Xuống"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1165,7 +1043,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr ""
 
@@ -1175,12 +1052,11 @@ msgid "Eggs: %d / %d"
 msgstr "Trứng: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "�ã bị loại"
 
@@ -1188,24 +1064,22 @@ msgstr "�ã bị loại"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1217,27 +1091,24 @@ msgstr "Bật thiết bị"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "Bật"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "Bật cho tất cả"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "Nhập vào tên ngư�i chơi mới"
 
@@ -1250,31 +1121,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "Tất cả m�i ngư�i:\nNhấn 'Select' ngay để tham gia trò chơi!"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"Tất cả m�i ngư�i:\n"
-"Nhấn 'Select' ngay để tham gia trò chơi!"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "Thoát vòng đua"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "Khó"
 
@@ -1282,12 +1153,12 @@ msgstr "Khó"
 msgid "Explore tracks to find all hidden eggs"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1312,19 +1183,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "Vòng cuối"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1335,21 +1204,14 @@ msgstr "Bắn"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"�ầu tiên, bạn sẽ cần một vài thiết bị (nhi�u gamepad hay joystick là cách "
-"tốt nhất để chơi nhi�u ngư�i). Tới màn hình chỉnh thiết bị và tùy chỉnh "
-"gamepad. Bạn có thể chơi trên 1 hay nhi�u bàn phím, tuy nhiên, mỗi ngư�i "
-"chơi cần có một thiết lập bàn phím riêng, và nên nhớ rằng hầu hết bàn phím "
-"không thích hợp để chơi chế độ nhi�u ngư�i, bởi vì chúng không hỗ trợ nhi�u "
-"phím nhấn một lúc."
+msgstr "�ầu tiên, bạn sẽ cần một vài thiết bị (nhi�u gamepad hay joystick là cách tốt nhất để chơi nhi�u ngư�i). Tới màn hình chỉnh thiết bị và tùy chỉnh gamepad. Bạn có thể chơi trên 1 hay nhi�u bàn phím, tuy nhiên, mỗi ngư�i chơi cần có một thiết lập bàn phím riêng, và nên nhớ rằng hầu hết bàn phím không thích hợp để chơi chế độ nhi�u ngư�i, bởi vì chúng không hỗ trợ nhi�u phím nhấn một lúc."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1362,7 +1224,6 @@ msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1370,14 +1231,14 @@ msgid ""
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "Lâu �ài Cổ"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "Tìm thấy %d cái wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1401,13 +1262,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "Toàn màn hình"
 
@@ -1421,22 +1281,19 @@ msgstr ""
 msgid "Game Keys"
 msgstr "Phím trò chơi"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "Chế độ trò chơi"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1452,51 +1309,45 @@ msgstr "Nút gamepad %d"
 msgid "Gamepad hat %d"
 msgstr "Gamepad hat %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "Chung"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "B� Cuộc"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1506,61 +1357,53 @@ msgid "Go!"
 msgstr "Xuất phát!"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "Giải �ấu Grand Prix"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "Tiến trình Grand Prix:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "Mức hiệu ứng đồ h�a"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "�ồ hoạ"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "Tùy Chỉnh �ồ H�a"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "Thung LÅ©ng Xanh"
 
@@ -1577,12 +1420,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "Mi�n Viễn Tây"
 
@@ -1592,22 +1433,18 @@ msgstr "Mi�n Viễn Tây"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "Hướng dẫn"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "�iểm Cao"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1615,78 +1452,71 @@ msgstr ""
 msgid ""
 "Hit others with weapons until they lose all their lives. (Only in "
 "multiplayer games)"
-msgstr ""
-"Tấn công những ngư�i chơi khác bằng vũ khí cho đến khi h� mất hết mạng . "
-"(Chỉ trong phần chơi mạng)"
+msgstr "Tấn công những ngư�i chơi khác bằng vũ khí cho đến khi h� mất hết mạng . (Chỉ trong phần chơi mạng)"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "Chỉ dành cho ngư�i chơi"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "Nếu ngươi có thể thắng ta ở đua xe, ta sẽ trả tự do cho lão già."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr ""
-"Nếu bạn thấy một nút với chiếc chìa khóa như thế này, bạn cần hoàn tất một "
-"thử thách để mở khóa nó."
+msgstr "Nếu bạn thấy một nút với chiếc chìa khóa như thế này, bạn cần hoàn tất một thử thách để mở khóa nó."
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "�ang từ chối '%s', bạn cần tham gia sớm hơn để chơi!"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "Cài đặt"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "Vừa phải"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1696,13 +1526,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "Nhân vật"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "Giữ độ phân giải này"
 
@@ -1721,7 +1550,6 @@ msgid "Keyboard %i"
 msgstr "Bàn phím %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1730,7 +1558,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "Vòng"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "Vòng Thứ %i"
@@ -1792,50 +1620,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "�ang tải"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "Bị khóa"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "Bị khóa: hoàn thành thử thách để tham gia được nhi�u vòng đua hơn!"
 
@@ -1843,11 +1667,51 @@ msgstr "Bị khóa: hoàn thành thử thách để tham gia được nhi�u v
 msgid "Locked!"
 msgstr "Bị khóa"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1858,27 +1722,18 @@ msgstr "Nhìn sau"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1886,18 +1741,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "Chỉ mình tôi"
 
@@ -1907,29 +1760,33 @@ msgid "Menu Keys"
 msgstr "Phím Trình �ơn"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "Mouse axis %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1937,48 +1794,41 @@ msgstr "Nút chuột %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "Nhi�u Ngư�i Chơi"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "Chơi Mạng"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "Âm nhạc"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1998,13 +1848,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -2013,9 +1865,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "Giải Grand Prix mới '%s' đã có hiệu lực"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2028,7 +1884,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "�ộ khó mới '%s' đã có hiệu lực"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "Vòng đua mới nhanh nhất"
 
@@ -2056,19 +1912,18 @@ msgstr "Tăng Tốc"
 msgid "Nitro challenge"
 msgstr ""
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "Không"
 
@@ -2078,21 +1933,19 @@ msgid "Normal Race"
 msgstr "Chế �ộ Thư�ng"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "Núi Tuyết"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "Dá»…"
 
@@ -2103,46 +1956,41 @@ msgstr "Số ngư�i chơi máy: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "Số ngư�i chơi máy"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr ""
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "�ồng ý"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "Ra Kh�i Con �ư�ng"
 
@@ -2150,61 +1998,59 @@ msgstr "Ra Kh�i Con �ư�ng"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
-"À đúng rồi, ông ta đang ở lâu đài của ta và sẽ được nấu thành bữa tối..."
+msgstr "À đúng rồi, ông ta đang ở lâu đài của ta và sẽ được nấu thành bữa tối..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "Hầm m�"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "Lớp Toán của Oliver"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "Chỉ ngư�i chơi tốt mới làm được!"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "Rất tiếc! Khi bạn đang gặp rắc rối, nhấn <%s> để được giải cứu"
@@ -2215,14 +2061,11 @@ msgstr "Rất tiếc! Khi bạn đang gặp rắc rối, nhấn <%s> để đư
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "Cài �ặt"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2231,35 +2074,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "Dù - làm chậm tất cả các xe ở phía trước mình"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2267,8 +2105,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2279,12 +2117,11 @@ msgstr "Tạm dừng"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "Tạm dừng"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "Phạm Luật!!"
 
@@ -2293,7 +2130,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "Sân Chơi Chim Cánh Cụt"
 
@@ -2302,37 +2138,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "Chơi tất cả"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "Ngư�i chơi"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2341,6 +2178,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "Xin hãy chỉnh lại phím."
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "Xin vui lòng đợi khi các tiện ích bổ sung được cập nhật"
@@ -2350,49 +2191,40 @@ msgid "Please wait while the add-ons are loading"
 msgstr "Xin ch� trong khi tiện ích đang được tải"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
-msgstr ""
-"Giác hút - ném thẳng để kéo đối phương lại, hay ném khi đang nhìn ra sau để "
-"làm tầm nhìn của một ngư�i bị che khuất."
+msgstr "Giác hút - ném thẳng để kéo đối phương lại, hay ném khi đang nhìn ra sau để làm tầm nhìn của một ngư�i bị che khuất."
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "Nhấn ESC để thoát!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "Ấn một phím"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "Nhấn phím enter hay click đôi chuột vào một thiết bị để cấu hình"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-"Nhấn phím enter hay click đôi chuột vào một ngư�i chơi để sửa đổi thông tin"
+msgstr "Nhấn phím enter hay click đôi chuột vào một ngư�i chơi để sửa đổi thông tin"
 
 #: src/states_screens/race_gui_overworld.cpp:462
 msgid "Press fire to play the tutorial"
@@ -2424,7 +2256,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2433,7 +2264,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2441,30 +2271,25 @@ msgstr "Puffy"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
-"�ẩy bóng vào lưới đối phương để mở tỷ số. (Chỉ có chế độ nhi�u ngư�i chơi)"
+msgstr "�ẩy bóng vào lưới đối phương để mở tỷ số. (Chỉ có chế độ nhi�u ngư�i chơi)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "Thoát"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "Cài đặt vòng đua"
 
@@ -2485,8 +2310,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "Nhân vật ngẫu nhiên"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "Vòng đua ngẫu nhiên"
 
@@ -2495,82 +2320,68 @@ msgid "Rank"
 msgstr "Xếp hạng"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "Chuẩn Bị"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "Nhớ vị trí cửa sổ"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "Xóa b�"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "�ổi tên"
 
@@ -2596,29 +2407,25 @@ msgstr "Cứu trợ"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "�ộ phân giải"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "Chơi lại"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "�ua lại"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "Chạy Ngược"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2675,41 +2482,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "�ất nước Scotland"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2719,12 +2520,10 @@ msgid "Select"
 msgstr "Ch�n"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "Ch�n chế độ chơi"
 
@@ -2734,36 +2533,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "Ch�n Nhân Vật"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2778,91 +2571,49 @@ msgstr "Sẵn Sàng"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "Vòng �ua Mới"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "Kim tự tháp Ai Cập"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "Ngoại Ô �ầy Nắng"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2872,7 +2623,6 @@ msgid "Size: %s"
 msgstr "Kích thước: %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2883,12 +2633,10 @@ msgstr "Trượt Bánh"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "Giao Diện"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "�ỉnh Núi Tuyết"
 
@@ -2898,27 +2646,23 @@ msgid "Soccer"
 msgstr "�á banh"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "Sân bóng đá"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr ""
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr ""
-"Xin lỗi, có lỗi khi đang liên lạc với trang web chứa phần mở rộng. Bạn phải "
-"chắc là đã kết nối Internet và SuperTuxKart không bị khóa bởi tư�ng lửa."
+msgstr "Xin lỗi, có lỗi khi đang liên lạc với trang web chứa phần mở rộng. Bạn phải chắc là đã kết nối Internet và SuperTuxKart không bị khóa bởi tư�ng lửa."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2926,7 +2670,6 @@ msgstr "Xin lỗi, việc tải các tiện ích đã thất bại"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "Hiệu Ứng Âm thanh"
 
@@ -2935,7 +2678,6 @@ msgstr "Hiệu Ứng Âm thanh"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "Chuẩn"
 
@@ -2948,11 +2690,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "Bắt đầu giải Grand Prix"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "Bắt �ầu Cuộc �ua"
 
@@ -2972,12 +2713,10 @@ msgstr "Rẽ Phải"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "Câu Chuyện"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2985,84 +2724,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "�áy Biển"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "Tiện �ch Tải V� SuperTuxKart"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "Giúp �ỡ SuperTuxKart"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "Tùy Chỉnh SuperTuxKart"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart không thể chơi ở chế độ mạng trên cùng một máy tính"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SupertuxKart có nhi�u chế độ chơi khác nhau"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-"Biến Hình - hộp quà biến thành v� chuối và ngược lại trong một khoảng th�i "
-"gian ngắn."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr "Biến Hình - hộp quà biến thành v� chuối và ngược lại trong một khoảng th�i gian ngắn."
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "Vỉ �ập Ruồi - đập bẹp đối phương ở gần, làm chậm h� lai."
 
@@ -3071,33 +2795,37 @@ msgstr "Vỉ �ập Ruồi - đập bẹp đối phương ở gần, làm chậm
 msgid "System Language"
 msgstr "Ngôn Ngữ Của Hệ Thống"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "L�c h�a tiết"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-"Nút \"trượt\" giúp bạn trượt trên những khúc cua gấp và được tăng tốc."
+msgstr "Nút \"trượt\" giúp bạn trượt trên những khúc cua gấp và được tăng tốc."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "Viện Bảo Tàng"
 
@@ -3109,9 +2837,7 @@ msgstr "Phần Tiện �ch đã bị vô hiệu hóa trong màn hình Cài �ặ
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"Tập tin Kỷ Lục đã quá cũ,\n"
-"tất cả các kỷ lục đã bị xóa."
+msgstr "Tập tin Kỷ Lục đã quá cũ,\ntất cả các kỷ lục đã bị xóa."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3124,41 +2850,22 @@ msgstr "�ua Th�i Gian"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-"�ua Th�i Gian: không có vật phẩm, do đó hãy sử dụng kỹ năng đua của bạn tốt "
-"nhất!"
+msgstr "�ua Th�i Gian: không có vật phẩm, do đó hãy sử dụng kỹ năng đua của bạn tốt nhất!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"�ể thêm mới một thiết bị Gamepad/Joystick, đơn giản là khởi động "
-"SuperTuxKart khi thiết bị đã được cắm vào và nó sẽ xuất hiện trong danh "
-"sách\n"
-"\n"
-"�ể thêm một cấu hình bàn phím, bạn có thể ấn nút bên dưới, TUY NHIÊN lưu ý "
-"là hầu hết bàn phím giới hạn số lượng phím ấn cùng lúc và do đó không phù "
-"hợp với chế độ chơi nhi�u ngư�i. (Tuy nhiên, bạn có thê kết nối nhi�u bàn "
-"phím tới máy tính. Nên nhớ rằng mỗi ngư�i cũng phải có một cấu hình bàn phím "
-"khác nhau trong trư�ng hợp này.)"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "�ể thêm mới một thiết bị Gamepad/Joystick, đơn giản là khởi động SuperTuxKart khi thiết bị đã được cắm vào và nó sẽ xuất hiện trong danh sách\n\n�ể thêm một cấu hình bàn phím, bạn có thể ấn nút bên dưới, TUY NHIÊN lưu ý là hầu hết bàn phím giới hạn số lượng phím ấn cùng lúc và do đó không phù hợp với chế độ chơi nhi�u ngư�i. (Tuy nhiên, bạn có thê kết nối nhi�u bàn phím tới máy tính. Nên nhớ rằng mỗi ngư�i cũng phải có một cấu hình bàn phím khác nhau trong trư�ng hợp này.)"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "�ể chiến thắng, có các vật phẩm sau bạn có thể thu thập :"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "�ến Mặt Trăng Và Quay Trở Lại"
 
@@ -3177,7 +2884,7 @@ msgstr "�ứng trong %i ngư�i dẫn đầu"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3191,19 +2898,17 @@ msgstr "�ược tạo bởi %s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "Bản �ồ"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr ""
 
@@ -3214,24 +2919,21 @@ msgstr "Thử lại"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "Hướng dẫn"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "Hướng dẫn chơi : Ch�n Phòng"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "Kiểu :"
 
@@ -3239,20 +2941,18 @@ msgstr "Kiểu :"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "Gỡ cài đặt"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3266,8 +2966,8 @@ msgid "Update"
 msgstr "Cập nhật"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr ""
 
@@ -3276,40 +2976,36 @@ msgid "Updated date"
 msgstr "Ngày cập nhật"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "Sử dụng hộp tăng tốc bạn đã thu thập bằng phím <%s>!"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "Giao diện ngư�i dùng"
 
@@ -3318,19 +3014,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3339,13 +3033,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3356,27 +3049,23 @@ msgstr "Phiên bản: %d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "Vertical Sync (yêu cầu khởi động lại)"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "Âm lượng"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3388,7 +3077,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "SAI �ƯỜNG"
 
@@ -3397,58 +3086,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"Cảnh báo, phím 'Shift' không phải là phím được đ� nghị : khi phím shift được "
-"nhấn, tất cả các phím có kí tự in hoa khác in thư�ng sẽ không hoạt động."
+msgstr "Cảnh báo, phím 'Shift' không phải là phím được đ� nghị : khi phím shift được nhấn, tất cả các phím có kí tự in hoa khác in thư�ng sẽ không hoạt động."
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "Vũ khí"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "Hiệu Ứng Th�i Tiết"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "Hiệu Ứng Th�i Tiết: %s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "Sao thế, lũ híp pi kia? Thủ lĩnh gnu vĩ đại đã mất tích à?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"Khi các thiết bị được cấu hình, bạn đã sẵn sàng để chơi. Ch�n biểu tượng "
-"\"Chơi Mạng\" trong trình đơn chính. Khi lựa ch�n một nhân vật, mỗi ngư�i "
-"chơi có thể nhấn vào phím 'Bắn' của gamepad hoặc bàn phím để tham gia trò "
-"chơi. Mỗi ngư�i chơi có thể sử dụng thiết bị của h� để ch�n nhân vật của h�. "
-"Trò chơi tiếp tục khi tất cả m�i ngư�i đã lựa ch�n xong nhân vật. Lưu ý rằng "
-"chuột không sử dụng được trong chức năng này."
+msgstr "Khi các thiết bị được cấu hình, bạn đã sẵn sàng để chơi. Ch�n biểu tượng \"Chơi Mạng\" trong trình đơn chính. Khi lựa ch�n một nhân vật, mỗi ngư�i chơi có thể nhấn vào phím 'Bắn' của gamepad hoặc bàn phím để tham gia trò chơi. Mỗi ngư�i chơi có thể sử dụng thiết bị của h� để ch�n nhân vật của h�. Trò chơi tiếp tục khi tất cả m�i ngư�i đã lựa ch�n xong nhân vật. Lưu ý rằng chuột không sử dụng được trong chức năng này."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3456,42 +3132,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "Hành Tinh XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "Có"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "Bạn đã sẵn sàng đua. Chúc may mắn!"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "Bạn đang chơi với ngư�i dùng"
 
@@ -3501,37 +3171,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "Bạn đã hoàn thành một thử thách!"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "Bạn đã hoàn thành một thử thách!"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "Bạn đã hoàn thành giải Grand Prix!"
 
@@ -3552,20 +3221,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "Bạn đã hoàn thành cuộc đua!"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "Bạn đã bị loại!"
 
@@ -3575,7 +3245,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3583,56 +3253,61 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "Bạn đã mở khóa giải đấu Grand Prix %0"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "Bạn đã mở khóa đư�ng đua %0"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "Bạn đã chiến thắng cuộc đua!"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
 "created."
-msgstr ""
-"Tập tin cấu hình của bạn đã bị thay đổi, do đó nó đã bị xóa và một cái mới "
-"sẽ được tạo ra."
+msgstr "Tập tin cấu hình của bạn đã bị thay đổi, do đó nó đã bị xóa và một cái mới sẽ được tạo ra."
 
 #: src/config/user_config.cpp:711
 msgid ""
 "Your config file was too old, so it was deleted and a new one will be "
 "created."
+msgstr "Tập tin cấu hình của bạn đã quá cũ, do đó nó đã bị xóa và một cái mới sẽ được tạo ra."
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
 msgstr ""
-"Tập tin cấu hình của bạn đã quá cũ, do đó nó đã bị xóa và một cái mới sẽ "
-"được tạo ra."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
-msgstr ""
-"Tập tin cấu hình của bạn không tương thích với phiên bản STK hiện tại."
+msgstr "Tập tin cấu hình của bạn không tương thích với phiên bản STK hiện tại."
 
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
@@ -3640,7 +3315,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "Vư�n Hoa Anh �ào"
 
@@ -3651,7 +3325,6 @@ msgstr "[không có]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3660,7 +3333,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "bởi"
@@ -3669,47 +3343,25 @@ msgstr "bởi"
 msgid "featured"
 msgstr "Tính Năng"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "chuẩn"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  Huynh Yen Loc https://launchpad.net/~nightgaunt13\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Vo Xuan Tien https://launchpad.net/~tienvx2008gs\n"
-"  Võ Xuân Tiến https://launchpad.net/~vo-ngan-90\n"
-"  Zombifier https://launchpad.net/~duckhoi1234"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Huynh Yen Loc https://launchpad.net/~nightgaunt13\n  STK-team https://launchpad.net/~stk\n  Vo Xuan Tien https://launchpad.net/~tienvx2008gs\n  Võ Xuân Tiến https://launchpad.net/~vo-ngan-90\n  Zombifier https://launchpad.net/~duckhoi1234"
diff --git a/data/po/zh_CN.po b/data/po/zh_CN.po
index c493de5ab..9c159e8e7 100644
--- a/data/po/zh_CN.po
+++ b/data/po/zh_CN.po
@@ -1,20 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: SuperTuxKart 0.7\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:03+0000\n"
-"Last-Translator: Dawid Gan <deveee@gmail.com>\n"
-"Language-Team: acme_pjz <acme_pjz@hotmail.com>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-14 11:00+0000\n"
+"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/supertuxkart/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
-"X-Poedit-Country: CHINA\n"
-"Language: \n"
-"X-Poedit-Language: Chinese\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -25,21 +26,21 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr " �过你们这些�怜的�蠢货是永远��能打败我这个赛车之王的�"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
 msgstr ""
@@ -55,7 +56,7 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
 msgstr "%s 和 %s 当�在线。"
@@ -67,19 +68,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s 作者 %s"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s 由 %s 创造"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
 msgstr "%s 当�在线。"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s 准备好了"
@@ -94,25 +94,23 @@ msgstr "%s 的个人资料"
 msgid "%s's server"
 msgstr "%s 的�务器"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
 msgstr "%s, %s 和 %s 当�在线。"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "%s 被淘汰掉了。"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "(æ— )"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "目��支��网游�"
 
@@ -126,43 +124,34 @@ msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* 当�按键设置�以在选项��中查看/修改"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* 大多数游�模�也�以在锦标赛模�中使用： �仅仅是玩一个地图，而是玩一系列的地图。 �场比赛您的排�越��，所获得的积分就越多。 "
-"最�积分最高的玩家将赢得锦标赛。"
+msgstr "* 大多数游�模�也�以在锦标赛模�中使用： �仅仅是玩一个地图，而是玩一系列的地图。 �场比赛您的排�越��，所获得的积分就越多。 最�积分最高的玩家将赢得锦标赛。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
 msgstr ""
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
 msgstr "..."
 
@@ -193,7 +182,6 @@ msgstr "三击对战"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -212,23 +200,20 @@ msgid "9 months"
 msgstr "9 个月"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "== 高分榜 =="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "放弃锦标赛"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "关于"
 
@@ -237,37 +222,35 @@ msgstr "关于"
 msgid "Accelerate"
 msgstr "加速"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr "转弯时�加速并按� <%s>  键实现漂移。 短时间漂移�以帮助你快速过弯哦亲"
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "按下 <%s> 键加速，<%s> and <%s> 控制方�。"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
 msgstr ""
 
@@ -275,8 +258,7 @@ msgstr ""
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
 msgstr "�就"
 
@@ -286,13 +268,11 @@ msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
 msgstr "添加好�"
 
@@ -303,7 +283,6 @@ msgstr "添加键盘按键设置"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "添加玩家"
 
@@ -314,32 +293,29 @@ msgstr "添加 Wiimote"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "添加设备"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
 msgstr ""
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "附加"
 
@@ -349,49 +325,43 @@ msgstr "附加组件�称"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "附加组件"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "所有"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "所有赛�"
 
@@ -401,18 +371,20 @@ msgstr "所有�具都�用，��使用它们会有�想�到的效果哦
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
 msgstr ""
 
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
 msgstr "环境光�收"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
 msgstr "环境光�收: %s"
@@ -422,25 +394,22 @@ msgid "An error occurred while trying to save your grand prix."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "锚 - 使得第一�的速度大大下�。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "角色动画"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "角色动画：%s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "场景动画"
 
@@ -448,24 +417,24 @@ msgstr "场景动画"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "场景动画：%s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "��异性 x16"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "��异性 x2"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "��异性 x4"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "��异性 x8"
 
@@ -475,29 +444,25 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "使用新的分辨率"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
 msgstr ""
 
@@ -512,49 +477,44 @@ msgstr "你确定�永久删除这个按键设置�？"
 msgid "Are you sure you want to remove '%s'?"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "对战地图"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "�塔岛"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "设置为ESC键"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "世界的尽头"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "音频"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "注�香蕉皮�"
 
@@ -576,79 +536,66 @@ msgstr "è½´ %d %s"
 msgid "Axis %d inverted"
 msgstr "轴 %d ��"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "�退"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "回到游�"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "继续游�"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "回到挑战赛选择画�"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "返回设备列表"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "回到��"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "返回主��"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr "烂篮� - 跟�领先者滚，并�有�能会碾压到路上的赛车让其�速。"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "战斗之岛"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "希望你下次�气好一些�"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "�线性"
 
@@ -658,36 +605,32 @@ msgid "Black"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "黑山宅邸"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "�队获胜"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "养牛场"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "�龄� - 碰到墙�会�弹，�是赛车被碰到那就…… 嘿嘿 :-) 在��看的时候，�龄��以���射。"
 
 #. I18N: Key binding name
@@ -696,7 +639,6 @@ msgid "Brake"
 msgstr "刹车"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -704,52 +646,45 @@ msgstr "泡泡糖 - 产生大泡泡��护你， 或者在��看时用， 
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr "蛋糕 - 自动瞄准最近的敌人， 适�于短�离或正�方的对手。"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "无法连接stkaddons�务器。"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "�消"
 
@@ -763,26 +698,23 @@ msgid "Cancel/Back"
 msgstr "�消/返回"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "Xæ´žç©´"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "挑战赛完�"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "挑战赛失败"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "挑战赛 : 奖�展览室"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
 msgstr ""
 
@@ -790,61 +722,52 @@ msgstr ""
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "选择一辆赛车"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "点这里开始教学"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "关闭"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
 msgstr ""
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "收集�色�箱 - 它们是游��具， 包�武器或者其它好东西。"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "收集礼物箱并使用<%s>键��射武器，将这些箱�炸飞�"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "收集氮气瓶 （转弯�将会用上）"
 
@@ -854,14 +777,13 @@ msgstr "收集氮气�"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr "收集氮气作为燃料， 当你按键使用它时， 赛车�以获得很大的加速。 你�以在�幕�侧看到当�燃料的数�。"
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
 msgstr ""
 
@@ -874,11 +796,11 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
 msgstr ""
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -886,7 +808,6 @@ msgstr "%i 秒���原有分辨率"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
 msgstr ""
 
@@ -900,97 +821,80 @@ msgstr "将你的 Wiimote 连接到�牙管�器， 然�点击确定。 详
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "这个模�下没有�具，就是考验你的驾驶技术�"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "继续"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
 msgstr ""
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "控制"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
 msgstr ""
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "检测�到任何 Wiimote :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
-
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
 msgstr ""
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "致谢"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
 msgstr ""
 
@@ -1003,13 +907,12 @@ msgid "Currently not signed in"
 msgstr ""
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "自定义"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "自定义设置..."
 
@@ -1035,7 +938,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
 msgstr ""
 
@@ -1043,28 +945,26 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
 msgstr ""
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "删除按键设置"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
 msgstr ""
@@ -1077,24 +977,23 @@ msgstr "�止设备"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "已�用"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "显示帧速率"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "你真的�退出锦标赛�？"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "你确定�删除玩家“%s�？"
@@ -1103,8 +1002,8 @@ msgstr "你确定�删除玩家“%s�？"
 msgid "Do you want to save your changes?"
 msgstr ""
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "请��在“开始�显示之�加速"
 
@@ -1115,27 +1014,24 @@ msgstr "下"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
 msgstr ""
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
 msgstr ""
 
@@ -1146,7 +1042,6 @@ msgstr "收集彩蛋"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "收集彩蛋：在赛�里探险，找到所有的��彩蛋。"
 
@@ -1156,12 +1051,11 @@ msgid "Eggs: %d / %d"
 msgstr "彩蛋: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "被淘汰"
 
@@ -1169,24 +1063,22 @@ msgstr "被淘汰"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1198,27 +1090,24 @@ msgstr "开�设备"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
+msgid "Enable per-player handicaps"
 msgstr ""
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "已�用"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "�用所有"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "输入玩家姓�："
 
@@ -1231,31 +1120,31 @@ msgstr ""
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
+msgstr "��玩家：\\n\n请按“选择�键加入游��"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
-"��玩家：\\n\n"
-"请按“选择�键加入游��"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
 msgstr ""
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "退出比赛"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
 msgstr ""
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "专家"
 
@@ -1263,12 +1152,12 @@ msgstr "专家"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "在赛�里探险，找到所有的��彩蛋"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
@@ -1293,19 +1182,17 @@ msgid "Fetching servers"
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
 msgstr ""
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "最�一圈�"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
 msgstr ""
 
@@ -1316,17 +1203,14 @@ msgstr "使用�具"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"�进行多人游�, 首先你需�多个输入设备（最高是多个游�手柄）。 进入输入设置界�设置游�手柄。 你也�以�使用键盘进行多人游�, "
-"但是�个玩家的按键设置�能有��的按键, 而且大多数键盘支��时按下的按键数有�, 因此�适于多人游�。"
+msgstr "�进行多人游�, 首先你需�多个输入设备（最高是多个游�手柄）。 进入输入设置界�设置游�手柄。 你也�以�使用键盘进行多人游�, 但是�个玩家的按键设置�能有��的按键, 而且大多数键盘支��时按下的按键数有�, 因此�适于多人游�。"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1339,7 +1223,6 @@ msgstr "跟紧�大�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1347,14 +1230,14 @@ msgid ""
 msgstr "跟紧�大： 你至多�能跑到第二�， �隔一定时间最�一�会被淘汰掉。 注�：如果你超过了�大，你也会被淘汰�"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "熔岩城堡"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "找到 %d 个 Wiimote"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1378,13 +1261,12 @@ msgstr ""
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "全�幕"
 
@@ -1398,22 +1280,19 @@ msgstr "进��"
 msgid "Game Keys"
 msgstr "游�键�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "游�模�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
 msgstr ""
 
@@ -1429,51 +1308,45 @@ msgstr "手柄按钮 %d"
 msgid "Gamepad hat %d"
 msgstr "手柄帽 %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "常规"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "放弃比赛"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1483,61 +1356,53 @@ msgid "Go!"
 msgstr "开始�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
 msgstr ""
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "锦标赛"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
 msgstr ""
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "锦标赛进度:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "图形特效等级"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "图�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "图�设置"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "翠绿山谷"
 
@@ -1554,12 +1419,10 @@ msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
+msgid "Guest Log in"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "大庄园"
 
@@ -1569,22 +1432,18 @@ msgstr "大庄园"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "帮助"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "高分榜"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
 msgstr ""
 
@@ -1595,71 +1454,68 @@ msgid ""
 msgstr "用�具攻击其他玩家直到对手丢掉所有的命。 �能在多人游�中玩该模�。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
 msgstr ""
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "�有人类玩家"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "如果你能在赛车上赢过我，我就会把那�家伙放了"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "如果你看到一个按钮带有�这样的�的图标， 你就必须�完�一个特定挑战任务�能解�。"
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "忽略了“%s�，您应该早点加入�"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "安装"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "中级"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "平局"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
 msgstr ""
 
@@ -1669,13 +1525,12 @@ msgstr ""
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "赛车"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "��这个分辨率"
 
@@ -1694,7 +1549,6 @@ msgid "Keyboard %i"
 msgstr "键盘 %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1703,7 +1557,7 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "圈"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "第 %i 圈"
@@ -1765,50 +1619,46 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "正在读�"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
+msgid "Local Name"
 msgstr ""
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "已�定"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "该挑战已被�定：请先完�其它挑战�"
 
@@ -1816,11 +1666,51 @@ msgstr "该挑战已被�定：请先完�其它挑战�"
 msgid "Locked!"
 msgstr "已�定�"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
 msgstr ""
 
@@ -1831,27 +1721,18 @@ msgstr "��看"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
-
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
 msgstr ""
 
@@ -1859,18 +1740,16 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
 msgstr ""
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "�有自己"
 
@@ -1880,29 +1759,33 @@ msgid "Menu Keys"
 msgstr "��键"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
 msgstr ""
 
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
 msgstr ""
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "鼠标轴 %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1910,48 +1793,41 @@ msgstr "鼠标按钮 %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "多人游�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "多人游�"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "音�"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
 msgstr ""
 
@@ -1971,13 +1847,15 @@ msgstr ""
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
 msgstr ""
 
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
 msgstr ""
 
@@ -1986,9 +1864,13 @@ msgstr ""
 msgid "New Grand Prix '%s' now available"
 msgstr "已解�新的锦标赛：%s"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
 msgstr ""
 
@@ -2001,7 +1883,7 @@ msgstr ""
 msgid "New difficulty '%s' now available"
 msgstr "已解�新的难度级别：%s"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "新的最快圈速："
 
@@ -2029,19 +1911,18 @@ msgstr "氮气"
 msgid "Nitro challenge"
 msgstr "氮气挑战"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "æ— "
 
@@ -2051,21 +1932,19 @@ msgid "Normal Race"
 msgstr "正常比赛"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "北国风光"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr "亲，如果你�功漂移数秒，将会得到一个加速奖励哦�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "�级"
 
@@ -2076,46 +1955,41 @@ msgstr "电脑玩家数� : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "电脑玩家数�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "还需赢得的目标数"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "确定"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "人迹罕至之地"
 
@@ -2123,60 +1997,59 @@ msgstr "人迹罕至之地"
 msgid "Offline"
 msgstr ""
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "没错，你看，他正在我的城堡里，�将被当�晚�..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "�矿井"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "奥利弗的数学课"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
 msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
 msgstr ""
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "�有游�建立者�以干这个事情�"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "哎呀呀�当你被困�了，按 <%s> �以��哦"
@@ -2187,14 +2060,11 @@ msgstr "哎呀呀�当你被困�了，按 <%s> �以��哦"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "选项"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
 msgstr ""
 
@@ -2203,35 +2073,30 @@ msgid "POWER"
 msgstr ""
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "��伞 - �慢你�方所有玩家的速度。"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
 msgstr ""
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
 msgstr ""
 
@@ -2239,8 +2104,8 @@ msgstr ""
 msgid "Password successfully changed."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
 msgstr ""
 
@@ -2251,12 +2116,11 @@ msgstr "暂�游�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "暂�"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "抢跑罚时!!!"
 
@@ -2265,7 +2129,6 @@ msgid "Pending"
 msgstr ""
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "�鹅游�场"
 
@@ -2274,37 +2137,38 @@ msgid "Performing vote"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "玩所有关�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "玩家"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
 msgstr ""
 
@@ -2313,6 +2177,10 @@ msgstr ""
 msgid "Please re-configure your key bindings."
 msgstr "请�新设置您的键�"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "附加组件正在更新，请�候"
@@ -2322,44 +2190,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "附加组件正在加载，请�候"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr "马桶�� - ���射�以把��玩家��拉， 你则得到加速； ���射则�以把别人的挡风玻璃给挡�， 让他们看��方�。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
 msgstr ""
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "按 ESC �消"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "请按一个键..."
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "按回车或�击一个设备��置它"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "按回车或�击一个玩家以编辑其资料"
 
@@ -2375,8 +2237,7 @@ msgstr "按使用�具键开始挑战"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"�时按 Wiimote 上的 1+2 按钮使其进入�现模�， 然�点击确定。 详细步骤�� supertuxkart.net/Wiimote"
+msgstr "�时按 Wiimote 上的 1+2 按钮使其进入�现模�， 然�点击确定。 详细步骤�� supertuxkart.net/Wiimote"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2394,7 +2255,6 @@ msgstr ""
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
 msgstr ""
 
@@ -2403,7 +2263,6 @@ msgid "Progress"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2415,25 +2274,21 @@ msgstr "把�推到对�的�门里�赢得分数（仅多人游��用）
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "退出"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "建立游�"
 
@@ -2454,8 +2309,8 @@ msgstr ""
 msgid "Random Kart"
 msgstr "�机车辆"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "�机赛�"
 
@@ -2464,82 +2319,68 @@ msgid "Rank"
 msgstr "排�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "评分 >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "�就���"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "红队获胜"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
 msgstr ""
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr "常规比赛：所有�具都�用， ��使用它们会有�想�到的效果�"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
 msgstr ""
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "�存窗��置"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "删除"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "�命�"
 
@@ -2565,29 +2406,25 @@ msgstr "自�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "�新开始"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "�新开始游�"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "��"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
 msgstr ""
 
@@ -2644,41 +2481,35 @@ msgstr ""
 msgid "SPEED"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
 msgstr "STK�业�"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
 msgstr ""
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
 msgstr ""
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "�格兰"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
 msgstr ""
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
 msgstr ""
 
@@ -2688,12 +2519,10 @@ msgid "Select"
 msgstr "选择"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
 msgstr ""
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "选择游�模�"
 
@@ -2703,36 +2532,30 @@ msgstr ""
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "选择赛车"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
 msgstr ""
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
 msgstr ""
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
 msgstr ""
 
@@ -2747,91 +2570,49 @@ msgstr "预备�"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "开始新游�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "漂移沙漠"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "晴朗的市郊"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
-
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
 msgstr ""
 
@@ -2841,7 +2622,6 @@ msgid "Size: %s"
 msgstr "大�： %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
 msgstr ""
 
@@ -2852,12 +2632,10 @@ msgstr "漂移"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "皮肤"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "积雪的顶峰"
 
@@ -2867,23 +2645,21 @@ msgid "Soccer"
 msgstr "足�"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "足�场"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr "足�模�：仅多人游��用。 把�推到对�的�门里�赢得分数。"
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr "很抱歉， 在连接到附加组件网站的过程中出现了错误。 请确�你已�连接上网络， 并且SuperTuxKart没有被防�墙拦截。"
 
@@ -2893,7 +2669,6 @@ msgstr "抱歉，下载附加组件失败"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "音效"
 
@@ -2902,7 +2677,6 @@ msgstr "音效"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "标准"
 
@@ -2915,11 +2689,10 @@ msgstr ""
 msgid "Start Grand Prix"
 msgstr "开始锦标赛"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "开始游�"
 
@@ -2939,12 +2712,10 @@ msgstr "�转"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "剧情模�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
 msgstr ""
 
@@ -2952,82 +2723,69 @@ msgstr ""
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "水下赛�"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "超级�鹅"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart 附加组件"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart 帮助"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart 选项"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart 支�在�一�计算机上进行多人游�。"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart 有多�游�模�："
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
 msgstr ""
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "魔法箱� - 使得箱�和香蕉皮� 氮气和泡泡糖在短时间内暂时颠倒。"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "��� - 会挤��近的赛车， 使它们�速。"
 
@@ -3036,32 +2794,37 @@ msgstr "��� - 会挤��近的赛车， 使它们�速。"
 msgid "System Language"
 msgstr "使用系统语言"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "纹�过滤"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "“漂移�键�以使你在过急弯时漂移并获得短暂的加速。"
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "体育场"
 
@@ -3073,9 +2836,7 @@ msgstr "附加组件功能被�用， 请在“选项�界�中修改"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"高分榜文件过旧，\n"
-"将会被清除。"
+msgstr "高分榜文件过旧，\n将会被清除。"
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
@@ -3088,34 +2849,22 @@ msgstr "竞速模�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "竞速模� - 该模�下没有�具， 因此该模�将考验你的驾驶技术�"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"�新增游�手柄设备，请先将设备连接到计算机，��动SuperTuxKart。\n"
-"\n"
-"�新增键盘设置，请点击下�按钮。但�注�：大多数键盘支��时按下的按键数有�，因此�适于多人游�。你�以将多个键盘连接到计算机。但是这时�人的按键设置�然"
-"�能有��的按键。"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "�新增游�手柄设备，请先将设备连接到计算机，��动SuperTuxKart。\n\n�新增键盘设置，请点击下�按钮。但�注�：大多数键盘支��时按下的按键数有�，因此�适于多人游�。你�以将多个键盘连接到计算机。但是这时�人的按键设置�然�能有��的按键。"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "下�这些�具�以帮助你获得游�的胜利："
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "往返月�"
 
@@ -3134,7 +2883,7 @@ msgstr "�%i�"
 msgid "Track"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
 msgstr ""
@@ -3148,19 +2897,17 @@ msgstr "%s 设计的地图"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "赛�"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "三线性"
 
@@ -3171,24 +2918,21 @@ msgstr "�试"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "教学关"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "教程：关�选择室"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "类型:"
 
@@ -3196,20 +2940,18 @@ msgstr "类型:"
 msgid "Type: Grand Prix"
 msgstr ""
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
 msgstr ""
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "�载"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
 msgstr ""
 
@@ -3223,8 +2965,8 @@ msgid "Update"
 msgstr "æ›´æ–°"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "最近更新"
 
@@ -3233,40 +2975,36 @@ msgid "Updated date"
 msgstr "更新日期"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
 msgstr ""
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "按下 <%s> �使用收集到的氮气"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
 msgstr ""
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "用户界�"
 
@@ -3275,19 +3013,17 @@ msgid "User defined"
 msgstr ""
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
 msgstr ""
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
 msgstr ""
 
@@ -3296,13 +3032,12 @@ msgid "Username and/or email address invalid."
 msgstr ""
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
 msgstr ""
 
@@ -3313,27 +3048,23 @@ msgstr "版本：%d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "垂直�步（需��新�动游�）"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
 msgstr ""
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "音�"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
 msgstr ""
 
@@ -3345,7 +3076,7 @@ msgstr ""
 msgid "WEIGHT"
 msgstr ""
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "你走�了!"
 
@@ -3354,54 +3085,45 @@ msgid ""
 "Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
 "keys that contain a character that is different in upper-case will stop "
 "working."
-msgstr ""
-"注�，�推�使用“Shift�键：\n"
-"Shift 按下时， 所有带字�的键会��大�写， 因而�能正常工作。"
+msgstr "注�，�推�使用“Shift�键：\nShift 按下时， 所有带字�的键会��大�写， 因而�能正常工作。"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "�具"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "天气效果"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "天气效果：%s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "怎么了，�嬉皮士？你的伟大的GNU领导��了？"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"当输入设备�置好之�，你就准备好开始游�了。 选择主��中的“多人游��选项。 选择赛车的时候， ��玩家用键盘或�自手柄上的“开��键�加入游�， "
-"并且用�自的输入设备�选择赛车。 当�个人都选好赛车之�游�将继续。 注�这时�能用鼠标�选择赛车。"
+msgstr "当输入设备�置好之�，你就准备好开始游�了。 选择主��中的“多人游��选项。 选择赛车的时候， ��玩家用键盘或�自手柄上的“开��键�加入游�， 并且用�自的输入设备�选择赛车。 当�个人都选好赛车之�游�将继续。 注�这时�能用鼠标�选择赛车。"
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3409,42 +3131,36 @@ msgid "White"
 msgstr ""
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
 msgstr ""
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "是"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "准备好开始比赛。 �你好�"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "你使用的玩家:"
 
@@ -3454,37 +3170,36 @@ msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
 msgstr ""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "你完�了一项挑战赛�"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "你完�了挑战赛�"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "�喜你完�锦标赛�"
 
@@ -3505,20 +3220,21 @@ msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
 msgstr ""
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "�喜你完�比赛�"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
 msgstr ""
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "你被淘汰了�"
 
@@ -3528,7 +3244,7 @@ msgid ""
 "clicking the stars beneath"
 msgstr ""
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
@@ -3536,36 +3252,41 @@ msgid ""
 "available challenges."
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "你解�了锦标赛“%0�"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "你解�了赛�“%0�"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "�喜你赢得了比赛�"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3578,6 +3299,11 @@ msgid ""
 "created."
 msgstr "你的�置文件太�了，新的�置文件已�创建。"
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "你的按键设置与当�版本的 SuperTuxKart �兼容。"
@@ -3588,7 +3314,6 @@ msgid "Your profile"
 msgstr ""
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "禅宗花园"
 
@@ -3599,7 +3324,6 @@ msgstr "[æ— ]"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
 msgstr ""
 
@@ -3608,7 +3332,8 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "作者："
@@ -3617,50 +3342,25 @@ msgstr "作者："
 msgid "featured"
 msgstr "精�"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
 msgstr ""
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "标准"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dawid Gan https://launchpad.net/~deveee\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  Sizhuang Liu https://launchpad.net/~lsz\n"
-"  Xhacker Liu https://launchpad.net/~xhacker\n"
-"  acme_pjz https://launchpad.net/~acme-pjz\n"
-"  jin https://launchpad.net/~zhangj\n"
-"  lks https://launchpad.net/~lks\n"
-"  luojie-dune https://launchpad.net/~luojie-dune\n"
-"  sohey https://launchpad.net/~sohey33"
+msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  Sizhuang Liu https://launchpad.net/~lsz\n  Xhacker Liu https://launchpad.net/~xhacker\n  acme_pjz https://launchpad.net/~acme-pjz\n  jin https://launchpad.net/~zhangj\n  lks https://launchpad.net/~lks\n  luojie-dune https://launchpad.net/~luojie-dune\n  sohey https://launchpad.net/~sohey33"
diff --git a/data/po/zh_TW.po b/data/po/zh_TW.po
index 0936515b4..a067ec0af 100644
--- a/data/po/zh_TW.po
+++ b/data/po/zh_TW.po
@@ -1,23 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
+# cges30901 <cges30901@gmail.com>, 2015
+# Jeff Huang <s8321414@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: supertuxkart.pot\n"
+"Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 18:36-0500\n"
-"PO-Revision-Date: 2014-12-28 14:06+0000\n"
-"Last-Translator: Bill <cges30901@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-03-20 09:45+0000\n"
+"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/supertuxkart/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-01-20 00:41+0000\n"
-"X-Generator: Launchpad (build 17304)\n"
 "Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. I18N: Do NOT literally translate this string!! Please enter Y as the
 #. translation if your language is a RTL (right-to-left) language,
@@ -28,24 +28,24 @@ msgstr "   N"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1484 data/po/gui_strings.h:1487
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
 msgstr " 但就憑你們這些蠢�是沒辦法打敗我的�我�是賽車之王�"
 
 #. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:407
+#: src/online/online_player_profile.cpp:429
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "�在有 %d 個朋�在線上。"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:359
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (殘障)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -58,10 +58,10 @@ msgstr "%s KB"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: src/online/online_player_profile.cpp:396
+#: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s 與 %s �在在線上。"
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -70,19 +70,18 @@ msgctxt "addons"
 msgid "%s by %s"
 msgstr "%s 由 %s 製作"
 
-#. I18N: as in "fastest lap: 60 seconds by Wilber"
-#: src/modes/linear_world.cpp:355
+#: src/modes/linear_world.cpp:358
 #, c-format
 msgctxt "fastest_lap"
 msgid "%s by %s"
 msgstr "%s 由 %s 跑完"
 
-#: src/online/online_player_profile.cpp:392
+#: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s �在在線上。"
 
-#: src/guiengine/widgets/player_kart_widget.cpp:419
+#: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
 msgid "%s is ready"
 msgstr "%s 準備好了"
@@ -90,32 +89,30 @@ msgstr "%s 準備好了"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "%s 的個人檔案"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "%s 的伺�器"
 
-#: src/online/online_player_profile.cpp:401
+#: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s�%s 與 %s 都在線上。"
 
-#: src/modes/world.cpp:1149
+#: src/modes/world.cpp:1147
 #, c-format
 msgid "'%s' has been eliminated."
 msgstr "「%s�已經被淘汰。"
 
-#. I18N: for empty highscores entries
 #. I18N: ./data/gui/track_info.stkgui
-#: src/states_screens/track_info_screen.cpp:252 data/po/gui_strings.h:65
-#: data/po/gui_strings.h:68 data/po/gui_strings.h:71
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
 msgid "(Empty)"
 msgstr "（無）"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:1002
 msgid "(network play is not yet available)"
 msgstr "(網路連線�戰功能尚未完�)"
 
@@ -125,48 +122,40 @@ msgstr "※�色的項目表示與�一個項目有��"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* 紅色的項目表示與目�的設定��"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
-#: data/po/gui_strings.h:977
 msgid "* Current key bindings can be seen/changed in menu Options"
 msgstr "* 目�的按�組��以在主�單的「�項�中查看或更改"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1060
 msgid ""
 "* Most of these game modes can also be played in a Grand Prix fashion: "
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr ""
-"* 這些�戲模�大多都能在大�賽中進行。 在大�賽中，玩家會進行��一場的比賽。 玩家的�次愈高，得到分數愈多。 最終由總�分最高者�得冠�。"
+msgstr "* 這些�戲模�大多都能在大�賽中進行。 在大�賽中，玩家會進行��一場的比賽。 玩家的�次愈高，得到分數愈多。 最終由總�分最高者�得冠�。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:874
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* �新啟動 STK 以套用新的設定"
 
 #. I18N: ./data/gui/options_input.stkgui
-#: data/po/gui_strings.h:1102
 msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr "* 使用何種設定將會由加入�戲時所按下的「�擇��確定。"
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#: data/po/gui_strings.h:451 data/po/gui_strings.h:529
-#: data/po/gui_strings.h:734 data/po/gui_strings.h:748
-#: data/po/gui_strings.h:774
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -195,7 +184,6 @@ msgstr "三擊�戰"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1048
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
@@ -214,23 +202,20 @@ msgid "9 months"
 msgstr "9 個月"
 
 #. I18N: ./data/gui/track_info.stkgui
-#: data/po/gui_strings.h:62
 msgid "= Highscores ="
 msgstr "= 高分榜 ="
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:195
 msgid "AI karts"
-msgstr ""
+msgstr "電腦�控的賽車"
 
-#: src/states_screens/race_result_gui.cpp:178
+#: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
 msgstr "放棄大�賽"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:187
 msgid "About"
 msgstr "關於"
 
@@ -239,64 +224,59 @@ msgstr "關於"
 msgid "Accelerate"
 msgstr "加速"
 
-#: src/tracks/track_object_presentation.cpp:945
+#: src/tracks/track_object_presentation.cpp:975
 #, c-format
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
 msgstr "轉彎時加速並按下 <%s> �來甩尾。甩尾了一會兒能夠幫助你更快地急轉彎。"
 
-#: src/tracks/track_object_presentation.cpp:875
+#: src/tracks/track_object_presentation.cpp:897
 #, c-format
 msgid "Accelerate with <%s> and steer with <%s> and <%s>"
 msgstr "用 <%s> 加速，用 <%s> 和 <%s> 轉彎"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:552 data/po/gui_strings.h:623
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "��"
 
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:507 data/po/gui_strings.h:763
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "帳號�復"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101 data/po/gui_strings.h:738
+#: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "帳號設定值"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100 data/po/gui_strings.h:179
-#: data/po/gui_strings.h:778
+#: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "�就"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "動作"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1173
 msgid "Add"
-msgstr ""
+msgstr "新增"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:548
 msgid "Add Friend"
-msgstr ""
+msgstr "新增朋�"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -305,7 +285,6 @@ msgstr "新增按�設定"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:365
 msgid "Add Player"
 msgstr "新增玩家"
 
@@ -316,32 +295,29 @@ msgstr "新增 Wii �桿"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1099
 msgid "Add a device"
 msgstr "新增�置"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:246 data/po/gui_strings.h:335
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "新增使用者"
 
-#. I18N: track group name
-#. I18N: kart group name
-#. I18N: arena group name
-#. I18N: track group name
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:155
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
 #: src/states_screens/grand_prix_editor_screen.cpp:336
 #: src/states_screens/kart_selection.cpp:286
-#: src/states_screens/arenas_screen.cpp:83
-#: src/states_screens/easter_egg_screen.cpp:145 data/po/gui_strings.h:1277
-#: data/po/gui_strings.h:1313
+#: src/states_screens/tracks_screen.cpp:155
 msgid "Add-Ons"
 msgstr "附加元件"
 
@@ -351,49 +327,43 @@ msgstr "附加元件�稱"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:163
 msgid "Addons"
 msgstr "附加元件"
 
-#. I18N: ../stk-assets/karts/20_adiumy/kart.xml
-#: data/po/gui_strings.h:1355
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
 msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:810
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "進階�水線（光線等）"
 
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: if all kart animations are enabled
-#. I18N: Time filters for add-ons
-#. I18N: name of the tab that will show tracks from all groups
-#. I18N: name of the tab that will show arenas from all groups
-#. I18N: name of the tab that will show tracks from all groups
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
-#: src/states_screens/tracks_screen.cpp:145
-#: src/states_screens/options_screen_video.cpp:412
-#: src/states_screens/grand_prix_editor_screen.cpp:333
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
-#: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/edit_track_screen.cpp:147
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
-#: src/states_screens/gp_info_screen.cpp:76 data/po/gui_strings.h:1281
-#: data/po/gui_strings.h:1317
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
 msgid "All"
 msgstr "全部"
 
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: Section in easter egg tracks selection screen
-#: data/po/gui_strings.h:423 data/po/gui_strings.h:1305
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
 msgid "All Tracks"
 msgstr "全部賽�"
 
@@ -403,46 +373,45 @@ msgstr "�以使用所有的攻擊手段，收集武器並巧妙的使用它們
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1121
 msgid "Always show login screen"
-msgstr ""
+msgstr "總是顯示登入畫�"
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:826
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "環境光�蔽"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:442
+#: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "環境光�蔽：%s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "嘗試儲存您的大�賽時發生錯誤。"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:406
 msgid "Anchor - slows down greatly the kart in the first position."
 msgstr "�錨──使領頭的車�大幅減速。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:866
 msgid "Animated Characters"
 msgstr "角色動畫"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:428
+#: src/states_screens/options_screen_video.cpp:450
 #, c-format
 msgid "Animated Characters : %s"
 msgstr "角色動畫 : %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:854
 msgid "Animated Scenery"
 msgstr "場景動畫"
 
@@ -450,58 +419,54 @@ msgstr "場景動畫"
 #. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
 #. UserConfigParams::m_pixel_shaders ? enabled : disabled);
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:422
+#: src/states_screens/options_screen_video.cpp:444
 #, c-format
 msgid "Animated Scenery : %s"
 msgstr "場景動畫 : %s"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
 msgid "Anisotropic x16"
 msgstr "��異性�質貼圖�濾 - 16 �"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
 msgid "Anisotropic x2"
 msgstr "��異性�質貼圖�濾 - 2 �"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
 msgid "Anisotropic x4"
 msgstr "��異性�質貼圖�濾 - 4 �"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
 msgid "Anisotropic x8"
 msgstr "��異性�質貼圖�濾 - 8 �"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "已有其他��的大�賽存在。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:838
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "�鋸齒"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:439
+#: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "�鋸齒：%s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:877
 msgid "Apply"
-msgstr ""
+msgstr "套用"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1265
 msgid "Apply new resolution"
 msgstr "套用新的畫�解�度"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:14
 msgid "Arch Enemy"
-msgstr ""
+msgstr "死敵"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -512,51 +477,46 @@ msgstr "您確定�永久刪除這個設定？"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "您確定�移除「%s�嗎？"
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1269 data/po/gui_strings.h:1340
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
 msgid "Arenas"
 msgstr "競技場"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
-#: data/po/gui_strings.h:1457
 msgid "Around the lighthouse"
 msgstr "�繞燈塔"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1144
 msgid "Assign nothing"
-msgstr ""
+msgstr "未指定"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1140
 msgid "Assign to ESC key"
 msgstr "指定為 ESC �"
 
 #. I18N: ./data/grandprix/4_atworldsend.grandprix
-#: data/po/gui_strings.h:1343
 msgid "At World's End"
 msgstr "在世界的盡頭"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:598
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_video.cpp:136
 #: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_ui.cpp:119 data/po/gui_strings.h:269
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
 msgid "Audio"
 msgstr "音效"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:883 data/po/gui_strings.h:961
+#: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
 msgstr "�開香蕉皮�"
 
@@ -578,118 +538,101 @@ msgstr "軸 %d %s"
 msgid "Axis %d inverted"
 msgstr "逆轉第 %d 軸"
 
-#. I18N: name of buttons on gamepads
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
 #: src/states_screens/dialogs/addons_loading.cpp:284
-#: src/input/gamepad_config.cpp:216 data/po/gui_strings.h:1297
 msgid "Back"
 msgstr "返回"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:884
 msgid "Back to Game"
 msgstr "回到�戲"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:907
 msgid "Back to Race"
 msgstr "回到比賽"
 
-#: src/states_screens/race_result_gui.cpp:194
+#: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
 msgstr "回到挑戰�擇"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1200
 msgid "Back to device list"
 msgstr "回到�置列表"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:900
 msgid "Back to menu"
 msgstr "回到�單"
 
-#: src/states_screens/race_result_gui.cpp:200
+#: src/states_screens/race_result_gui.cpp:211
 msgid "Back to the menu"
 msgstr "回到�單"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:50
 msgid "Banana Lover"
-msgstr ""
+msgstr "香蕉愛好者"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:412
 msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
 msgstr "籃�──跳�領頭的賽車手，並一路壓�並�低經�的車�。"
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
-#: data/po/gui_strings.h:1499
 msgid "Battle Island"
 msgstr "�戰之島"
 
-#. I18N: ../stk-assets/karts/beagle/kart.xml
-#: data/po/gui_strings.h:1403
-msgid "Beagle"
-msgstr "Beagle"
-
 #. I18N: ../stk-assets/karts/beastie/kart.xml
-#: data/po/gui_strings.h:1358
 msgid "Beastie"
 msgstr "Beastie"
 
 #. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:163
+#: src/states_screens/grand_prix_lose.cpp:161
 msgid "Better luck next time!"
 msgstr "下次�氣會更好�"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:75
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
 msgid "Bilinear"
 msgstr "雙線性"
 
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "黑�"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
-#: data/po/gui_strings.h:1418
 msgid "Blackhill Mansion"
 msgstr "黑陵宅邸"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:818
 msgid "Bloom"
-msgstr ""
+msgstr "光暈"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:449
+#: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "光暈：%s"
 
-#: src/states_screens/race_result_gui.cpp:960
+#: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
 msgstr "�隊�了"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
-#: data/po/gui_strings.h:1442
 msgid "Bovine Barnyard"
 msgstr "畜牧農場"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:400
 msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
 msgstr "�齡� - �到牆會�彈。若您正往後看，則會往後丟。"
 
 #. I18N: Key binding name
@@ -698,7 +641,6 @@ msgid "Brake"
 msgstr "煞車"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:391
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
@@ -706,58 +648,51 @@ msgstr "泡泡糖 - 變�防護罩以�護自己，或者在回頭時使用在
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1472 data/po/gui_strings.h:1475
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "但我是很公平的，所以我會跟你打個賭。"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:394
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
 msgstr "蛋糕──丟�最近的�手，在短�離時以�長直線上最易命中。"
 
-#: src/addons/news_manager.cpp:315 src/addons/addons_manager.cpp:97
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
 msgstr "無法連上�戲的附加元件伺�器……"
 
-#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/user_screen.cpp:83
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
-#: data/po/gui_strings.h:135 data/po/gui_strings.h:143
-#: data/po/gui_strings.h:258 data/po/gui_strings.h:308
-#: data/po/gui_strings.h:347 data/po/gui_strings.h:526
-#: data/po/gui_strings.h:627 data/po/gui_strings.h:655
-#: data/po/gui_strings.h:695 data/po/gui_strings.h:711
-#: data/po/gui_strings.h:1218 data/po/gui_strings.h:1230
+#: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr "�消"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "目�的請求"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -765,88 +700,76 @@ msgid "Cancel/Back"
 msgstr "�消�返回"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
-#: data/po/gui_strings.h:1424
 msgid "Cave X"
 msgstr "未知的洞穴"
 
-#: src/states_screens/feature_unlocked.cpp:492
+#: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
 msgstr "挑戰完�"
 
-#: src/states_screens/race_gui.cpp:311 src/states_screens/race_gui.cpp:313
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
 msgstr "挑戰失敗"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
-#: data/po/gui_strings.h:91
 msgid "Challenges : Trophy Room"
 msgstr "挑戰模� : ��室"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
-#: data/po/gui_strings.h:745
 msgid "Change"
-msgstr ""
+msgstr "變更"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
 #. I18N: ./data/gui/karts_online.stkgui
 #. I18N: In the kart selection (player setup) screen
-#: data/po/gui_strings.h:1285 data/po/gui_strings.h:1301
 msgid "Choose a Kart"
 msgstr "�擇一�賽車"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:2
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "克里斯多�·哥倫布"
 
 #. I18N: ./data/gui/help1.stkgui
-#: data/po/gui_strings.h:953
 msgid "Click here to play the tutorial"
 msgstr "按這裡來玩教學"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:503 data/po/gui_strings.h:564
-#: data/po/gui_strings.h:611 data/po/gui_strings.h:635
-#: data/po/gui_strings.h:719 data/po/gui_strings.h:771
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
 msgid "Close"
 msgstr "關閉"
 
-#. I18N: ../stk-assets/tracks/30_chocolate/track.xml
-#: data/po/gui_strings.h:1436
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "��寺院"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:53
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "在一場比賽中收集到至少 5 個香蕉。"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:957
 msgid "Collect blue boxes : they will give you weapons or other powerups"
 msgstr "收集�色的箱�：它們將會給您武器或其他強化�具"
 
-#: src/tracks/track_object_presentation.cpp:892
+#: src/tracks/track_object_presentation.cpp:916
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
 msgstr "收集禮物盒，並用 <%s> 發射武器，來炸飛這些箱��"
 
-#: src/tracks/track_object_presentation.cpp:912
+#: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
 msgstr "收集氮氣�（我們將在轉彎之後使用它們）"
 
@@ -856,31 +779,30 @@ msgstr "收集氮氣��"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:965
 msgid ""
 "Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
 msgstr "收集氮氣�讓你能隨時按設定的氮氣�來加速。 �戲畫��方的指示�會顯示目�你所�有的燃料�。"
 
-#: src/tracks/track_object_presentation.cpp:859
+#: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "完�所有挑戰以解開大門的鎖�"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "已完��就「%s�"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:495 data/po/gui_strings.h:679
 msgid "Confirm"
-msgstr ""
+msgstr "確�"
 
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 #: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
 #, c-format
 msgid "Confirm resolution within %i seconds"
@@ -888,9 +810,8 @@ msgstr "於 %i 秒內確�畫�解�度是���"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1133
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "連線到網路"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
@@ -902,174 +823,153 @@ msgstr "把你的 Wiimote 連接到�牙管�器，然後按確定。在 http:
 msgid "Contains no powerups, so only your driving skills matter!"
 msgstr "沒有�具，所以您�能�您的賽車技巧了�"
 
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 #. I18N: ./data/gui/tutorial_message_dialog.stkgui
 #. I18N: Button in tutorial
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#: src/states_screens/race_result_gui.cpp:175
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212 data/po/gui_strings.h:117
-#: data/po/gui_strings.h:262 data/po/gui_strings.h:1151
-#: data/po/gui_strings.h:1157 data/po/gui_strings.h:1203
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
 msgid "Continue"
 msgstr "繼續"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:142 data/po/gui_strings.h:215
+#: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "繼續已儲存的大�賽"
 
-#: src/states_screens/race_result_gui.cpp:145
+#: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "繼續。"
 
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:600
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_video.cpp:139
-#: src/states_screens/options_screen_ui.cpp:121 data/po/gui_strings.h:1091
-#: data/po/gui_strings.h:1192
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
 msgid "Controls"
 msgstr "�控"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1072
 msgid "Copy"
-msgstr ""
+msgstr "複製"
 
-#: src/states_screens/register_screen.cpp:178
-#: src/states_screens/register_screen.cpp:185
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "無法建立玩家「%s�。"
 
-#: src/input/wiimote_manager.cpp:422
+#: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
 msgstr "未�測到任何 Wii �桿 :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:651 data/po/gui_strings.h:1214
 msgid "Create"
-msgstr ""
+msgstr "建立"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:471
 msgid "Create Server"
-msgstr ""
+msgstr "建立伺�器"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:659
 msgid "Create User"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#: data/po/gui_strings.h:667
-msgid "Create online account"
-msgstr ""
+msgstr "建立使用者"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "正在建立伺�器"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
-#: data/po/gui_strings.h:121
 msgid "Credits"
 msgstr "鳴�"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:487
 msgid "Current Password"
-msgstr ""
+msgstr "目�的密碼"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "目�的密碼無效。"
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "目�尚未登入"
 
 #. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:389
+#: src/states_screens/options_screen_video.cpp:411
 msgid "Custom"
 msgstr "自訂"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1245
 msgid "Custom settings..."
 msgstr "個別化設定"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "方��下"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "方��左"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "方���"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "方��上"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:556
 msgid "Decline"
-msgstr ""
+msgstr "拒絕"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "�設"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:250 data/po/gui_strings.h:339
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111 data/po/gui_strings.h:1196
+#: src/states_screens/options_screen_input2.cpp:111
 msgid "Delete Configuration"
 msgstr "刪除設定"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:846
 msgid "Depth of field"
-msgstr ""
+msgstr "景深"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
+#: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "景深：%s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1079,34 +979,33 @@ msgstr "�用�置"
 
 #. I18N: in the graphical options tooltip;
 #. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:61
-#: src/states_screens/dialogs/custom_video_settings.cpp:85
-#: src/states_screens/options_screen_video.cpp:410
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
 msgid "Disabled"
 msgstr "已�用"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1117
 msgid "Display FPS"
 msgstr "顯示畫�楨速率(FPS)"
 
-#: src/states_screens/race_result_gui.cpp:343
+#: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
 msgstr "你真的想放棄大�賽？"
 
 #. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:534
+#: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
 msgstr "您確定�刪除玩家 %s 嗎？"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "您�儲存您的變動嗎？"
 
-#: src/karts/controller/player_controller.cpp:340
 #: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
 msgstr "��在起跑�加速"
 
@@ -1117,29 +1016,26 @@ msgstr "下"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:83
 msgid "Drive in reverse"
-msgstr ""
+msgstr "��駕駛"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:433
+#: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "動態燈光：%s"
 
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1076 data/po/gui_strings.h:1177
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "編輯"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
-#: data/po/gui_strings.h:1161
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "編輯大�賽"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1148,7 +1044,6 @@ msgstr "復活節彩蛋狩�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1056
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
 msgstr "復活節彩蛋狩�：探索賽�以找到所有隱�的復活節彩蛋。"
 
@@ -1158,12 +1053,11 @@ msgid "Eggs: %d / %d"
 msgstr "復活節彩蛋：%d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
-#: data/po/gui_strings.h:1400
 msgid "Elephpant"
 msgstr "Elephpant"
 
-#: src/states_screens/race_result_gui.cpp:463
-#: src/states_screens/race_result_gui.cpp:824
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
 msgstr "被淘汰"
 
@@ -1171,24 +1065,22 @@ msgstr "被淘汰"
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:518 data/po/gui_strings.h:683
 msgid "Email"
-msgstr ""
+msgstr "電�郵件"
 
-#: src/states_screens/register_screen.cpp:246
+#: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "電�郵件必須為 4 至 50 個字元長�"
 
-#: src/states_screens/register_screen.cpp:252
+#: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "電�郵件無效�"
 
-#: src/states_screens/register_screen.cpp:230
+#: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "電�郵件�符��"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
-#: data/po/gui_strings.h:1394
 msgid "Emule"
 msgstr "Emule"
 
@@ -1200,64 +1092,61 @@ msgstr "啟用�置"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1129
-msgid "Enable handicapped users"
-msgstr ""
+msgid "Enable per-player handicaps"
+msgstr "啟用�個玩家的障礙賽"
 
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: src/states_screens/options_screen_video.cpp:407 data/po/gui_strings.h:277
-#: data/po/gui_strings.h:289
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
 msgid "Enabled"
 msgstr "已啟用"
 
 #. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:65
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
 msgstr "啟用所有"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: data/po/gui_strings.h:1222
 msgid "Enter the new player's name"
 msgstr "請輸入新玩家的�稱"
 
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "下載新�時錯誤：「%s�"
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
-"��玩家：\n"
-"�在按「�擇��來加入�戲�"
+msgstr "��玩家：\n�在按「�擇��來加入�戲�"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr "已存在的線上帳號"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:580
 msgid "Exit"
-msgstr ""
+msgstr "離開"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:931
 msgid "Exit Race"
 msgstr "退出比賽"
 
-#: src/states_screens/user_screen.cpp:82
+#: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "離開�戲"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:442 data/po/gui_strings.h:796
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Expert"
 msgstr "專家"
 
@@ -1265,51 +1154,49 @@ msgstr "專家"
 msgid "Explore tracks to find all hidden eggs"
 msgstr "探索賽�來找到所有隱�的復活節彩蛋"
 
-#: src/graphics/irr_driver.cpp:1776
+#: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS：%d/%d/%d - 多�計數： %d 固體� %d 陰影 - 光線散佈： %d"
 
-#: src/graphics/irr_driver.cpp:1785
+#: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS：%d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "正在擷��就"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "正在擷�朋�"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "正在擷�最後的投票"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "正在擷�伺�器"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
-#: data/po/gui_strings.h:510
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "填入您在註冊時使用的使用者�稱�電�郵件地�以�置您的密碼。"
 
-#: src/modes/linear_world.cpp:277
+#: src/modes/linear_world.cpp:276
 msgid "Final lap!"
 msgstr "最後一圈�"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:467
 msgid "Find Server"
-msgstr ""
+msgstr "尋找伺�器"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1318,17 +1205,14 @@ msgstr "å°„æ“Š"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1006
 msgid ""
 "First, you will need several input devices (having multiple gamepads or "
 "joysticks is the best way to play with several people). Go in the input "
 "configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
 "because they do not support large number of keypresses."
-msgstr ""
-"首先， 你需�多個輸入�置（使用好幾個�戲手把或�桿是與人�樂的最好方�）。 進到輸入設置畫�去設定�戲手把。 你也�以�使用�盤來進行多人�戲， "
-"但是��玩家需�有��的按�組�， 而且�注�大部分的�盤支�的�時按�數有�， 因此���拿來進行多人�戲。"
+msgstr "首先， 你需�多個輸入�置（使用好幾個�戲手把或�桿是與人�樂的最好方�）。 進到輸入設置畫�去設定�戲手把。 你也�以�使用�盤來進行多人�戲， 但是��玩家需�有��的按�組�， 而且�注�大部分的�盤支�的�時按�數有�， 因此���拿來進行多人�戲。"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:180
@@ -1341,7 +1225,6 @@ msgstr "緊隨領隊�"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1044
 msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
@@ -1349,44 +1232,43 @@ msgid ""
 msgstr "緊隨領隊： ��第二�， 在�程中�隔一段時間最後一�就會失去資格。 注�： 超�領隊也會被淘汰�"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
-#: data/po/gui_strings.h:1502
 msgid "Fort Magma"
 msgstr "岩漿�塞"
 
-#: src/input/wiimote_manager.cpp:414
+#: src/input/wiimote_manager.cpp:413
 #, c-format
-msgid "Found %d wiimote(s)"
-msgstr "找到 %d 個 Wii �桿"
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] "找到 %d 個 Wii �桿"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "朋�已移除�"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "已接�朋�請求�"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "朋�請求已�消�"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "朋�請求已拒絕�"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "朋�請求已寄出�"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99 data/po/gui_strings.h:752
+#: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "朋�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1257
 msgid "Fullscreen"
 msgstr "全螢幕"
 
@@ -1400,24 +1282,21 @@ msgstr "得分�"
 msgid "Game Keys"
 msgstr "�戲按�"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:380 data/po/gui_strings.h:946
-#: data/po/gui_strings.h:992 data/po/gui_strings.h:1025
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Game Modes"
 msgstr "�戲模�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:106
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "�戲類型（�制目標/�制時間)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1431,51 +1310,45 @@ msgstr "手把按鈕 %d"
 msgid "Gamepad hat %d"
 msgstr "手把帽桿 %d"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:372 data/po/gui_strings.h:938
-#: data/po/gui_strings.h:984 data/po/gui_strings.h:1017
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "General"
 msgstr "一般"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:919
 msgid "Give Up Race"
 msgstr "放棄比賽"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:830
 msgid "Global illumination"
-msgstr ""
+msgstr "全域照明"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:465
+#: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "全域照明：%s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:834
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "光�（外框）"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:453
+#: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "光�（輪廓）：%s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
-#: data/po/gui_strings.h:1370
 msgid "Gnu"
 msgstr "Gnu"
 
@@ -1485,61 +1358,53 @@ msgid "Go!"
 msgstr "�啊�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:32
 msgid "Gold driver"
-msgstr ""
+msgstr "金牌駕駛"
 
-#. I18N: ../stk-assets/tracks/20_island/track.xml
-#: data/po/gui_strings.h:1490
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "大天堂島"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
-#: data/po/gui_strings.h:419
 msgid "Grand Prix"
 msgstr "大�賽"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:183
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "大�賽編輯器"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
-#: data/po/gui_strings.h:1064
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "大�賽編輯器"
 
-#: src/states_screens/race_result_gui.cpp:1205
+#: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
 msgstr "大�賽進度："
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1241
 msgid "Graphical Effects Level"
 msgstr "圖�特效等級"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:597
-#: src/states_screens/options_screen_input2.cpp:85
 #: src/states_screens/options_screen_audio.cpp:64
 #: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_ui.cpp:118 data/po/gui_strings.h:1237
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
 msgid "Graphics"
 msgstr "圖�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
-#: data/po/gui_strings.h:806
 msgid "Graphics Settings"
 msgstr "圖形設定"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
-#: data/po/gui_strings.h:1496
 msgid "Green Valley"
 msgstr "綠色山谷"
 
@@ -1552,16 +1417,14 @@ msgstr "�客"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "訪客 %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
-#: data/po/gui_strings.h:599
-msgid "Guest Sign in"
-msgstr ""
+msgid "Guest Log in"
+msgstr "訪客登入"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
-#: data/po/gui_strings.h:1454
 msgid "Hacienda"
 msgstr "大地莊園"
 
@@ -1571,24 +1434,20 @@ msgstr "大地莊園"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:171 data/po/gui_strings.h:896
-#: data/po/gui_strings.h:927
 msgid "Help"
 msgstr "說明"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
-#: data/po/gui_strings.h:1361
 msgid "Hexley"
 msgstr "Hexley"
 
-#: src/states_screens/race_result_gui.cpp:1243
+#: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
 msgstr "最高分數"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:11
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "用�齡�打中 10 次賽車。"
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
@@ -1597,87 +1456,83 @@ msgid ""
 msgstr "利用武器攻擊�手，直到他們掛掉。（�能在多人�戲中進行）"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:17
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "在一場比賽中打中�一臺賽車至少 5 次。"
 
 #. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:63
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
 msgid "Human players only"
 msgstr "��人類玩家"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:619
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "我��以上�款，且我已年滿 13 歲。 "
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1478 data/po/gui_strings.h:1481
 msgid "If you can beat me at racing, I will free the old codger."
 msgstr "如果你能在賽車上��我，我就會把那�傢伙放了"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:969
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
 msgstr "若您看到一個�這樣帶有鎖頭的按鈕， 表示您需�完�一項特定挑戰�能將它解鎖。"
 
-#: src/input/input_manager.cpp:716
+#: src/input/input_manager.cpp:729
 #, c-format
 msgid "Ignoring '%s', you needed to join earlier to play!"
 msgstr "忽略「%s�，您必須�早一點加入�戲�"
 
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr "基於圖片的照明"
+
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1289
 msgid "Install"
 msgstr "安�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:438 data/po/gui_strings.h:792
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Intermediate"
 msgstr "中等難度"
 
-#: src/states_screens/user_screen.cpp:283
-#: src/states_screens/register_screen.cpp:347
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "網路存�已�用，請在�項中啟用它"
 
-#: src/states_screens/race_result_gui.cpp:965
+#: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
 msgstr "平手"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:56
 msgid "It's secret"
-msgstr ""
+msgstr "這是祕密"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:707
 msgid "Join"
-msgstr ""
+msgstr "加入"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "加入伺�器"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:1332
 msgid "Karts"
 msgstr "賽車"
 
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: data/po/gui_strings.h:304
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
 msgid "Keep this resolution"
 msgstr "��這個解�度"
 
@@ -1688,7 +1543,7 @@ msgstr "緊跟著領隊，但別超�他�"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "按��定"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1696,7 +1551,6 @@ msgid "Keyboard %i"
 msgstr "�盤 %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
-#: data/po/gui_strings.h:1388
 msgid "Konqi"
 msgstr "Konqi"
 
@@ -1705,14 +1559,14 @@ msgstr "Konqi"
 msgid "Lap"
 msgstr "圈"
 
-#: src/modes/linear_world.cpp:304
+#: src/modes/linear_world.cpp:303
 #, c-format
 msgid "Lap %i"
 msgstr "第 %i 圈"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "圈"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1732,85 +1586,81 @@ msgstr "å·¦"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "左�桿"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "左姆指�"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "左姆指下"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "左姆指左"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "左姆指�"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "左姆指上"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "左扳機"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:822
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "一�閃光（上�射線）"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:457
+#: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "一�光（上�射線）：%s"
 
-#: src/guiengine/engine.cpp:1324
+#: src/guiengine/engine.cpp:1330
 msgid "Loading"
 msgstr "載入中"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:568
 msgid "Lobby"
-msgstr ""
+msgstr "大廳"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:723
 msgid "Lobby Settings"
-msgstr ""
+msgstr "大廳設定"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:663
-msgid "Local Username"
-msgstr ""
+msgid "Local Name"
+msgstr "本機�稱"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
 msgstr "未解鎖"
 
-#: src/states_screens/tracks_screen.cpp:283
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
 #: src/states_screens/arenas_screen.cpp:237
 #: src/states_screens/arenas_screen.cpp:267
 #: src/states_screens/easter_egg_screen.cpp:225
 #: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
 msgstr "已鎖定：您必須先通�其它挑戰�能掌�更多�"
 
@@ -1818,13 +1668,53 @@ msgstr "已鎖定：您必須先通�其它挑戰�能掌�更多�"
 msgid "Locked!"
 msgstr "已鎖定�"
 
-#. I18N: ./data/gui/user_screen.stkgui
 #. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr "登入"
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr "登出"
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr "登入為：%s。"
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr "正在登入"
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr "正在登入「%s�"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr "以訪客身份登入讓您�以�與線上比賽，但您無法�附加元件進行投票，或是在玩線上�戲時��任何�就。"
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr "正在登出"
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr "正在登出「%s�"
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186 data/po/gui_strings.h:311
-#: data/po/gui_strings.h:583
+#: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "登入"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1833,46 +1723,35 @@ msgstr "�後看"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
-#: data/po/gui_strings.h:756
 msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ../stk-assets/wip-tracks/20_luna/track.xml
-#: data/po/gui_strings.h:1508
-msgid "Luna"
-msgstr ""
+msgstr "尋找更多朋�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:29
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "在一圈裡� 5 次甩尾。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:23
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "玩一場 5 圈或更多的比賽。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:20
 msgid "Marathoner"
-msgstr ""
+msgstr "馬拉�跑者"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:647 data/po/gui_strings.h:731
 msgid "Max. number of players"
-msgstr ""
+msgstr "最大玩家數�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:102
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "最大時間（分�）"
 
 #. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:414
+#: src/states_screens/options_screen_video.cpp:436
 msgid "Me Only"
 msgstr "�有自己"
 
@@ -1882,29 +1761,33 @@ msgid "Menu Keys"
 msgstr "�單按�"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
-#: data/po/gui_strings.h:1406
 msgid "Minigolf"
-msgstr ""
+msgstr "迷你高爾夫"
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr "蚊��人"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:842
 msgid "Motion blur"
-msgstr ""
+msgstr "動態模糊"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:436
+#: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "動態模糊：%s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:299
 #, c-format
 msgid "Mouse axis %d %s"
 msgstr "滑鼠軸 %d %s"
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
 #: src/input/binding.cpp:295
 #, c-format
 msgid "Mouse button %d"
@@ -1912,98 +1795,97 @@ msgstr "滑鼠按� %d"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1169
 msgid "Move down"
-msgstr ""
+msgstr "�下移動"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1165
 msgid "Move up"
-msgstr ""
+msgstr "�上移動"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:155
 msgid "Multiplayer"
 msgstr "多人�戲"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:384 data/po/gui_strings.h:950
-#: data/po/gui_strings.h:996 data/po/gui_strings.h:1029
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Multi­player"
 msgstr "多人�戲"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:273
 msgid "Music"
 msgstr "音樂"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: src/states_screens/server_selection.cpp:91
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 #: src/states_screens/online_profile_achievements.cpp:73
-#: data/po/gui_strings.h:540 data/po/gui_strings.h:703
+#: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "�稱"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "�稱須為 4 至 30 個字元長"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "�稱是空的。"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "�稱太長"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
-#: data/po/gui_strings.h:643 data/po/gui_strings.h:727
 msgid "Name of the server"
-msgstr ""
+msgstr "伺�器�稱"
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr "尼斯湖水怪的池塘"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1068
 msgid "New"
-msgstr ""
+msgstr "新增"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
 msgstr "�在�以�加新的「%s�大�賽"
 
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr "新線上帳號"
+
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:491
 msgid "New Password"
-msgstr ""
+msgstr "新密碼"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "新請求"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
 msgid "New difficulty '%s' now available"
 msgstr "�在�以挑戰新的「%s�難度"
 
-#: src/modes/linear_world.cpp:361
+#: src/modes/linear_world.cpp:363
 msgid "New fastest lap"
 msgstr "新的最快圈速"
 
@@ -2031,19 +1913,18 @@ msgstr "氮氣"
 msgid "Nitro challenge"
 msgstr "氮氣挑戰"
 
+#: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
-#: src/states_screens/dialogs/message_dialog.cpp:104
 msgid "No"
-msgstr ""
+msgstr "�"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
-#: data/po/gui_strings.h:1364
 msgid "Nolok"
 msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:416
 #: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
 msgid "None"
 msgstr "ç„¡"
 
@@ -2053,21 +1934,19 @@ msgid "Normal Race"
 msgstr "正常比賽"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
-#: data/po/gui_strings.h:1409
 msgid "Northern Resort"
 msgstr "北國��"
 
-#: src/tracks/track_object_presentation.cpp:953
+#: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
 msgstr "請注�，如果你�功甩尾數秒�，你將�得�外加速作為�勵�"
 
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:434 data/po/gui_strings.h:788
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
 msgid "Novice"
 msgstr "新手難度"
 
@@ -2078,107 +1957,101 @@ msgstr "電腦�控的賽車數�：%i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:79
 msgid "Number of AI karts"
 msgstr "電腦�控的賽車數�"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:98
 msgid "Number of goals to win"
 msgstr "��的得分數�"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
-#: data/po/gui_strings.h:75
 msgid "Number of laps"
-msgstr ""
+msgstr "圈數"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:125
 msgid "Number of laps:"
-msgstr ""
+msgstr "圈數："
 
 #. I18N: ./data/gui/edit_track.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
-#: src/states_screens/dialogs/message_dialog.cpp:98
-#: src/states_screens/dialogs/message_dialog.cpp:111 data/po/gui_strings.h:132
-#: data/po/gui_strings.h:242 data/po/gui_strings.h:331
-#: data/po/gui_strings.h:691 data/po/gui_strings.h:1226
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
 msgstr "確�"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-#: data/po/gui_strings.h:1349
 msgid "Off the beaten track"
 msgstr "人跡罕至之處"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "離線"
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr "離線帳號"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1466 data/po/gui_strings.h:1469
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
 msgstr "沒錯，你看，他正在我的城堡裡，�將被當�晚�..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
-#: data/po/gui_strings.h:1445
 msgid "Old Mine"
 msgstr "廢棄礦�"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
-#: data/po/gui_strings.h:1412
 msgid "Oliver's Math Class"
 msgstr "奧力佛的數學課"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: src/states_screens/online_profile_friends.cpp:149
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 #: src/states_screens/main_menu_screen.cpp:170
-#: src/states_screens/main_menu_screen.cpp:185 data/po/gui_strings.h:159
-#: data/po/gui_strings.h:226 data/po/gui_strings.h:315
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "上線中"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:459
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "線上多人�戲"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:671
 msgid "Online Username"
-msgstr ""
+msgstr "線上使用者�稱"
 
-#: src/states_screens/register_screen.cpp:234
+#: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "線上使用者�稱必須在 3 至 30 個字元之間�"
 
-#: src/states_screens/register_screen.cpp:238
+#: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "線上使用者�稱�能以數字開頭�"
 
-#: src/input/input_manager.cpp:746
+#: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
 msgstr "�有比賽發起人�以執行動作�"
 
-#: src/tracks/track_object_presentation.cpp:932
+#: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
 msgstr "糟糕�當你有麻煩時，按 <%s> 被救�"
@@ -2189,62 +2062,54 @@ msgstr "糟糕�當你有麻煩時，按 <%s> 被救�"
 #. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:167 data/po/gui_strings.h:892
-#: data/po/gui_strings.h:923
 msgid "Options"
 msgstr "�項"
 
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
-#: data/po/gui_strings.h:455
 msgid "Overview"
-msgstr ""
+msgstr "總覽"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "能�"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:403
 msgid "Parachute - slows down all karts in a better position."
 msgstr "��傘──減慢所有領先您的車�的速度"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#. I18N: ./data/gui/online/register.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:238 data/po/gui_strings.h:327
-#: data/po/gui_strings.h:675
 msgid "Password"
-msgstr ""
+msgstr "密碼"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
-#: data/po/gui_strings.h:742
 msgid "Password :"
-msgstr ""
+msgstr "密碼："
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
-#: data/po/gui_strings.h:483
 msgid "Password Change"
-msgstr ""
+msgstr "變更密碼"
 
-#: src/states_screens/register_screen.cpp:242
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "密碼必須在 8 至 30 個字元間�"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "密碼�功變更。"
 
-#: src/states_screens/register_screen.cpp:226
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "兩次輸入的密碼�一致�"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2253,68 +2118,71 @@ msgstr "�戲暫�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-#: data/po/gui_strings.h:880 data/po/gui_strings.h:903
 msgid "Paused"
 msgstr "暫�"
 
-#: src/karts/controller/player_controller.cpp:338
 #: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
 msgid "Penalty time!!"
 msgstr "�跑懲罰時間���"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "等待處�中"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
-#: data/po/gui_strings.h:1346
 msgid "Penguin Playground"
 msgstr "��樂園"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "執行投票"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
-#: data/po/gui_strings.h:1382
 msgid "Pidgin"
 msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
-#: data/po/gui_strings.h:300
 msgid "Play all"
 msgstr "跑所有賽�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:5
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "玩��個官方賽�至少一次。"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/server_selection.cpp:92
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
 #: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_video.cpp:138
 #: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_ui.cpp:120 data/po/gui_strings.h:222
-#: data/po/gui_strings.h:354
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
 msgid "Players"
 msgstr "玩家"
 
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr "玩家�以在賽車��畫�中��有障礙的（較困難）的設定檔"
+
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
-#: data/po/gui_strings.h:1210
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "請輸入大�賽的�稱"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
 msgid "Please re-configure your key bindings."
 msgstr "請�新設定您的按�組�。"
 
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr "請閱讀�款與�用情�"
+
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
 msgstr "附加元件更新中請�待"
@@ -2324,44 +2192,38 @@ msgid "Please wait while the add-ons are loading"
 msgstr "附加元件載入中請�待"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:397
 msgid ""
 "Plunger - throw straight to pull an opponent back, or throw while looking "
 "back to make one lose sight."
 msgstr "�盤──直接丟出去來拉著一��手的背後，或是當�後看時丟出來�蔽後頭�手的視線。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:38
 msgid "Powerup Love"
-msgstr ""
+msgstr "能力���具的愛好"
 
-#: src/tracks/track_object_presentation.cpp:904
+#: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr "按下 <%s> 以�後看，並按下 <%s> 加上 <%s> 以�後開��"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
-#: data/po/gui_strings.h:1148
 msgid "Press ESC to cancel"
 msgstr "按下 ESC �消"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
-#: data/po/gui_strings.h:1136
 msgid "Press a key"
 msgstr "按任一�"
 
 #. I18N: ./data/gui/options_input.stkgui
 #. I18N: In the input configuration screen
-#: data/po/gui_strings.h:1095
 msgid "Press enter or double-click on a device to configure it"
 msgstr "按 Enter 或��置雙擊以設定該�置"
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: In the player configuration screen
-#: data/po/gui_strings.h:361
 msgid "Press enter or double-click on a player to edit him/her"
 msgstr "按 Enter 或�玩家雙擊以編輯該玩家"
 
@@ -2377,9 +2239,7 @@ msgstr "請按「射擊�開始這場挑戰"
 msgid ""
 "Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
 "mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-"於您的 Wiimote �時按下 1 跟 2 按鈕進入�尋模�，然後點擊確定。在 http://supertuxkart.net/Wiimote "
-"有詳細的指示。"
+msgstr "於您的 Wiimote �時按下 1 跟 2 按鈕進入�尋模�，然後點擊確定。在 http://supertuxkart.net/Wiimote 有詳細的指示。"
 
 #: src/states_screens/dialogs/addons_loading.cpp:357
 #, c-format
@@ -2393,20 +2253,18 @@ msgstr "移除「%s�附加元件時�到�題。"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "處�中"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:475
 msgid "Profile"
-msgstr ""
+msgstr "個人檔案"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "進度"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
-#: data/po/gui_strings.h:1376
 msgid "Puffy"
 msgstr "Puffy"
 
@@ -2418,31 +2276,27 @@ msgstr "將�推到��的�門來得分。（�有在多人�戲中）"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:463
 msgid "Quick Play"
-msgstr ""
+msgstr "快速�戲"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: data/po/gui_strings.h:191
 msgid "Quit"
 msgstr "��"
 
-#: src/states_screens/race_result_gui.cpp:148
+#: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "離開伺�器。"
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:94 data/po/gui_strings.h:426
-#: data/po/gui_strings.h:781
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
 msgid "Race Setup"
 msgstr "比賽設定"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "隨機"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2450,15 +2304,15 @@ msgstr "隨機競技場"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "隨機大�賽"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
 msgid "Random Kart"
 msgstr "隨機賽車"
 
-#: src/states_screens/tracks_screen.cpp:297
 #: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
 msgid "Random Track"
 msgstr "隨機賽�"
 
@@ -2467,82 +2321,68 @@ msgid "Rank"
 msgstr "排�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-#: data/po/gui_strings.h:1328
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
 msgid "Rating >="
 msgstr "評價 >="
 
-#. I18N: ../stk-assets/wip-tracks/20_mansion/track.xml
-#: data/po/gui_strings.h:1514
-msgid "Ravenbridge mansion"
-msgstr ""
-
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:64
 msgid "Ready!"
 msgstr "就��"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:59
 msgid "Really ... a secret."
-msgstr ""
+msgstr "真的...祕密。"
 
-#: src/states_screens/race_result_gui.cpp:956
+#: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
 msgstr "紅隊�了"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:595
 msgid "Register"
-msgstr ""
+msgstr "註冊"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1036
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
 msgstr "一般比賽：所有的招數都能使用，把所有武器都撿來並好好使用它們��"
 
-#: src/states_screens/gp_info_screen.cpp:149
-#: src/states_screens/gp_info_screen.cpp:174
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "�新載入"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
-#: data/po/gui_strings.h:230 data/po/gui_strings.h:319
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "記�密碼"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1261
 msgid "Remember window location"
 msgstr "記�視窗�置"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:544 data/po/gui_strings.h:1080
-#: data/po/gui_strings.h:1181
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "Remove"
 msgstr "移除"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:254 data/po/gui_strings.h:343
-#: data/po/gui_strings.h:1084
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
 msgid "Rename"
 msgstr "�新命�"
 
@@ -2568,35 +2408,31 @@ msgstr "救�"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1253
 msgid "Resolution"
 msgstr "解�度"
 
-#: src/states_screens/race_result_gui.cpp:188
+#: src/states_screens/race_result_gui.cpp:199
 msgid "Restart"
 msgstr "�新開始"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: data/po/gui_strings.h:915
 msgid "Restart Race"
 msgstr "比賽�來"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:199
 msgid "Reverse"
 msgstr "��進行比賽"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
-#: data/po/gui_strings.h:129
 msgid "Reverse:"
-msgstr ""
+msgstr "��："
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "��"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2606,84 +2442,78 @@ msgstr "�"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "��桿"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "�姆指�"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "�姆指下"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "�姆指左"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "�姆指�"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "�姆指上"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "�扳機"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "速度"
 
-#. I18N: ../stk-assets/tracks/startrack/track.xml
-#: data/po/gui_strings.h:1493
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr ""
+msgstr "STK �業號"
 
-#. I18N: ../stk-assets/karts/20_sara_the_wizard/kart.xml
-#: data/po/gui_strings.h:1373
-msgid "Sara the wizard"
-msgstr ""
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr "賽車手 Sara"
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr "巫師 Sara"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
-#: data/po/gui_strings.h:1185
 msgid "Save"
-msgstr ""
+msgstr "儲存"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
-#: data/po/gui_strings.h:1154 data/po/gui_strings.h:1206
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "儲存大�賽"
 
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-#: data/po/gui_strings.h:1433
-msgid "Scotland"
-msgstr "蘇格蘭"
-
-#. I18N: ./data/gui/online/user_search.stkgui
 #. I18N: ./data/gui/online/profile_friends.stkgui
-#: data/po/gui_strings.h:448 data/po/gui_strings.h:759
+#. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "�尋"
 
 #: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:287
+#: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "正在�尋"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2691,57 +2521,49 @@ msgid "Select"
 msgstr "�擇"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:784
 msgid "Select a difficulty"
-msgstr ""
+msgstr "�擇難度"
 
 #. I18N: ./data/gui/racesetup.stkgui
-#: data/po/gui_strings.h:803
 msgid "Select a game mode"
 msgstr "�擇�戲模�"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "�擇賽�"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
-#: data/po/gui_strings.h:888
 msgid "Select kart"
 msgstr "�擇賽車"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1125
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "傳�匿�硬體統計資訊"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
-#: data/po/gui_strings.h:639
 msgid "Server Creation"
-msgstr ""
+msgstr "建立伺�器"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
-#: data/po/gui_strings.h:699
 msgid "Server Info"
-msgstr ""
+msgstr "伺�器資訊"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
-#: data/po/gui_strings.h:532
 msgid "Server Selection"
-msgstr ""
+msgstr "伺�器��"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
-#: data/po/gui_strings.h:572
 msgid "Server name :"
-msgstr ""
+msgstr "伺�器�稱："
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "伺�器�功建立。您�在�以加入了。"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2750,93 +2572,51 @@ msgstr "�備�"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:198 data/po/gui_strings.h:911
+#: src/states_screens/race_result_gui.cpp:209
 msgid "Setup New Race"
 msgstr "安排新賽事"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:814
 msgid "Shadows"
-msgstr ""
+msgstr "é™°å½±"
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:445
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr "陰影：%i"
+
+#: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "陰影：%s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
-#: data/po/gui_strings.h:1415
 msgid "Shifting Sands"
 msgstr "漂移沙漠"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
-#: data/po/gui_strings.h:1430
 msgid "Shiny Suburbs"
 msgstr "陽光邊郊"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:587 data/po/gui_strings.h:607
 msgid "Sign In"
-msgstr ""
+msgstr "登入"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
-#: data/po/gui_strings.h:591
 msgid "Sign In As Guest"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-#: data/po/gui_strings.h:479
-msgid "Sign Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Signed in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Signing in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:445
-#, c-format
-msgid "Signing in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#: data/po/gui_strings.h:603
-msgid ""
-"Signing in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Signing out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:444
-#, c-format
-msgid "Signing out '%s'"
-msgstr ""
+msgstr "以訪客身份登入"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "版本歷程"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:151
 msgid "Singleplayer"
-msgstr ""
+msgstr "單人�戲"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2844,9 +2624,8 @@ msgid "Size: %s"
 msgstr "大�： %s"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:26
 msgid "Skid-row"
-msgstr ""
+msgstr "甩尾滑行"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2855,12 +2634,10 @@ msgstr "甩尾�刺"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
-#: data/po/gui_strings.h:1113
 msgid "Skin"
 msgstr "外觀"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-#: data/po/gui_strings.h:1451
 msgid "Snow Peak"
 msgstr "雪山巔峰"
 
@@ -2870,23 +2647,21 @@ msgid "Soccer"
 msgstr "足�"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
-#: data/po/gui_strings.h:1448
 msgid "Soccer field"
 msgstr "足�場"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1052
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
 msgstr "足�：�有在多人�戲中。使用你的賽車將�推進�門。"
 
-#: src/states_screens/main_menu_screen.cpp:550
 #: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
 msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
 msgstr "抱歉，連接到附加元件網站時發生錯誤。請確定您已經連接到網際網路且 SuperTuxKart 沒有被防�牆阻擋。"
 
@@ -2896,7 +2671,6 @@ msgstr "附加元件下載失敗，抱歉"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:285
 msgid "Sound Effects"
 msgstr "音效"
 
@@ -2905,30 +2679,28 @@ msgstr "音效"
 #. I18N: ./data/gui/easter_egg.stkgui
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
-#: data/po/gui_strings.h:1273 data/po/gui_strings.h:1309
 msgid "Standard"
 msgstr "標準"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "開始"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
 msgstr "開始大�賽"
 
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:87 data/po/gui_strings.h:211
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
 msgid "Start Race"
 msgstr "比賽開始"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2942,95 +2714,80 @@ msgstr "�轉"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
-#: data/po/gui_strings.h:147
 msgid "Story Mode"
 msgstr "劇情模�"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:8
 msgid "Strike!"
-msgstr ""
+msgstr "打擊出去�"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:499 data/po/gui_strings.h:522
 msgid "Submit"
-msgstr ""
+msgstr "�出"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
-#: data/po/gui_strings.h:1439
 msgid "Subsea"
 msgstr "深邃海底"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
-#: data/po/gui_strings.h:800
 msgid "SuperTux"
 msgstr "SuperTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#: data/po/gui_strings.h:1320
 msgid "SuperTuxKart Addons"
 msgstr "SuperTuxKart 附加元件"
 
-#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:368 data/po/gui_strings.h:934
-#: data/po/gui_strings.h:980 data/po/gui_strings.h:1013
+#. I18N: ./data/gui/help4.stkgui
 msgid "SuperTuxKart Help"
 msgstr "SuperTuxKart 說明"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
 #. I18N: ./data/gui/options_video.stkgui
-#: data/po/gui_strings.h:218 data/po/gui_strings.h:265
-#: data/po/gui_strings.h:350 data/po/gui_strings.h:1087
-#: data/po/gui_strings.h:1105 data/po/gui_strings.h:1188
-#: data/po/gui_strings.h:1233
+#. I18N: ./data/gui/user_screen_tab.stkgui
 msgid "SuperTuxKart Options"
 msgstr "SuperTuxKart �項"
 
 #. I18N: ./data/gui/help4.stkgui
-#: data/po/gui_strings.h:999
 msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
 msgstr "SuperTuxKart �以在�一�電腦上進行多人�戲模�。"
 
 #. I18N: ./data/gui/help3.stkgui
-#: data/po/gui_strings.h:1032
 msgid "SuperTuxKart features several game modes"
 msgstr "SuperTuxKart �供數種�戲模�"
 
-#: src/main.cpp:1129
+#: src/main.cpp:1201
 msgid ""
 "SuperTuxKart may connect to a server to download add-ons and notify you of "
 "updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Would you like this feature to be enabled? (To change "
-"this setting at a later time, go to options, select tab 'User Interface', "
-"and edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
-msgstr ""
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr "SuperTuxKart �能會連線到伺�器下載附加元件並�醒您更新資訊。我們也會收集匿�的硬體統計資訊以�助 STK 的開發。請到 http://privacy.supertuxkart.net 詳閱我們的隱�權政策。您想�讓此功能開啟嗎？（若�在�後改變這個設定，請到�項中，��「使用者介��分�，然後編輯「連線到網際網路��「傳�匿�硬體統計�）。"
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
-#: data/po/gui_strings.h:1397
 msgid "Suzanne"
 msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:409
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
 msgstr "交�器──在一�段時間內將禮物箱變�香蕉，香蕉變�禮物箱。"
 
 #. I18N: ./data/gui/help2.stkgui
-#: data/po/gui_strings.h:415
 msgid "Swatter - will squash karts close by, slowing them down."
 msgstr "蒼蠅�──將���近的車�並減慢它們的速度。"
 
@@ -3039,32 +2796,37 @@ msgstr "蒼蠅�──將���近的車�並減慢它們的速度。"
 msgid "System Language"
 msgstr "使用系統語系"
 
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr "把你的�手當�蚊�打�在一場比賽中用蒼蠅�打��手至少 5 次。"
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr "寺院"
+
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:615
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "�款與�議"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:858
 msgid "Texture compression"
-msgstr ""
+msgstr "�質壓縮"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:870
 msgid "Texture filtering"
 msgstr "�質濾�"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
-#: data/po/gui_strings.h:973
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
 msgstr "「甩尾�刺���以讓你在急彎處打滑並順勢�刺"
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
-#: data/po/gui_strings.h:1505
 msgid "The Stadium"
 msgstr "大競技場"
 
@@ -3076,13 +2838,11 @@ msgstr "這個附加元件目�在�項畫�中被�用"
 msgid ""
 "The highscore file was too old,\n"
 "all highscores have been erased."
-msgstr ""
-"高分榜的檔案格�太舊了，\n"
-"所有的高分紀錄都將被清除。"
+msgstr "高分榜的檔案格�太舊了，\n所有的高分紀錄都將被清除。"
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "最大玩家數必須在 2 至 12 個間。"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -3091,41 +2851,29 @@ msgstr "競速計時"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1040
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
 msgstr "競速計時：沒有�具�用，您�能�您的賽車技巧�"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
 "\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-"�新增�戲手把/�桿， 請先連接到電腦後�啟動SuperTuxKart就會出�在�置清單中。\n"
-"\n"
-"�新增一組按�組�， 請按下�的按鈕， 但是請注�： 大部分的�盤支�的�時按�數有�， 因此���多人�戲。 您�以將多個�盤連接到電腦。 "
-"但是這時�人的按�組��然�能有�複的按�。"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr "�新增�戲手把/�桿， 請先連接到電腦後�啟動SuperTuxKart就會出�在�置清單中。\n\n�新增一組按�組�， 請按下�的按鈕， 但是請注�： 大部分的�盤支�的�時按�數有�， 因此���多人�戲。 您�以將多個�盤連接到電腦。 但是這時�人的按�組��然�能有�複的按�。"
 
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:388
 msgid "To help you win, there are some powerups you can collect :"
 msgstr "有些�具您�以收集來幫助您�得比賽："
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-#: data/po/gui_strings.h:1352
 msgid "To the moon and back"
 msgstr "往返月�"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "今日"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -3135,12 +2883,12 @@ msgstr "� %i �"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "賽�"
 
-#: src/states_screens/race_result_gui.cpp:1121
+#: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "賽� %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -3151,19 +2899,17 @@ msgstr "賽�作者：%s"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-#: data/po/gui_strings.h:207
 msgid "Track group"
-msgstr ""
+msgstr "賽�群組"
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
-#: data/po/gui_strings.h:203 data/po/gui_strings.h:1336
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
 msgid "Tracks"
 msgstr "賽�"
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
 msgstr "三線性"
 
@@ -3174,47 +2920,42 @@ msgstr "�試一次"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455 data/po/gui_strings.h:175
+#: src/states_screens/race_gui_overworld.cpp:455
 msgid "Tutorial"
 msgstr "教學"
 
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
-#: data/po/gui_strings.h:297
 msgid "Tutorial : Selection Room"
 msgstr "教學: 訓練�擇室"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
-#: data/po/gui_strings.h:1367
 msgid "Tux"
 msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
-#: data/po/gui_strings.h:430
 msgid "Type :"
 msgstr "類型："
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "類型：大�賽"
 
-#: src/online/xml_request.cpp:77
+#: src/online/xml_request.cpp:83
 msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr "無法連線到伺�器。請檢查您的連線並在�後�試。"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
-#: data/po/gui_strings.h:1293
 msgid "Uninstall"
 msgstr "移除"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:44
 msgid "Unstoppable"
-msgstr ""
+msgstr "無法阻擋"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -3226,8 +2967,8 @@ msgid "Update"
 msgstr "æ›´æ–°"
 
 #. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-#: data/po/gui_strings.h:1324
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
 msgid "Updated"
 msgstr "已更新"
 
@@ -3236,78 +2977,71 @@ msgid "Updated date"
 msgstr "更新日期"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:41
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "在一場�戲中使用 10 個或更多的能力���具。"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:862
 msgid "Use high definition textures"
-msgstr ""
+msgstr "使用高畫質的�質"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
-#: data/po/gui_strings.h:110
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "使用左/�方��來��您的隊�並按下開始"
 
-#: src/tracks/track_object_presentation.cpp:922
+#: src/tracks/track_object_presentation.cpp:949
 #, c-format
 msgid "Use the nitro you collected by pressing <%s>!"
 msgstr "按 <%s> 使用你收集的氮氣�"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
-#: data/po/gui_strings.h:536
 msgid "User Info"
-msgstr ""
+msgstr "使用者資訊"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
-#: src/states_screens/user_screen.cpp:599
-#: src/states_screens/options_screen_input2.cpp:87
 #: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_video.cpp:137
-#: src/states_screens/options_screen_input.cpp:140 data/po/gui_strings.h:1109
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
 msgid "User Interface"
 msgstr "介�"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "使用者定義"
 
 #. I18N: ./data/gui/online/user_search.stkgui
-#: data/po/gui_strings.h:445
 msgid "User search"
-msgstr ""
+msgstr "使用者�尋"
 
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
-#: src/states_screens/online_profile_friends.cpp:67 data/po/gui_strings.h:234
-#: data/po/gui_strings.h:323 data/po/gui_strings.h:514
 msgid "Username"
-msgstr ""
+msgstr "使用者�稱"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "使用者�稱�/或電�郵件�置無效。"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
-#: data/po/gui_strings.h:113
 msgid "VS"
 msgstr "VS"
 
-#: src/states_screens/register_screen.cpp:302
 #: src/states_screens/dialogs/change_password_dialog.cpp:235
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "驗證資訊"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3316,39 +3050,35 @@ msgstr "版本：%d"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
-#: data/po/gui_strings.h:1249
 msgid "Vertical Sync (requires restart)"
 msgstr "垂直�步（�戲�新啟動後生效）"
 
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
 #. I18N: ./data/gui/online/notification_dialog.stkgui
 #. I18N: User info dialog
-#: data/po/gui_strings.h:560 data/po/gui_strings.h:715
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "檢視"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
-#: data/po/gui_strings.h:281 data/po/gui_strings.h:293
 msgid "Volume"
 msgstr "音�"
 
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
-#: data/po/gui_strings.h:631
 msgid "Vote"
-msgstr ""
+msgstr "投票"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "投票�功�您�在�以關掉視窗了。"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "��"
 
-#: src/modes/linear_world.cpp:880
+#: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
 msgstr "方�錯誤�"
 
@@ -3359,134 +3089,119 @@ msgid ""
 "working."
 msgstr "注�，�建議使用「Shift��： 當 Shift 按下时， 所有字��會變�為大寫， 原先的�寫按�就無法作用。"
 
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help2.stkgui
 #. I18N: Tab in help menu
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: Tab in help menu
-#: data/po/gui_strings.h:376 data/po/gui_strings.h:942
-#: data/po/gui_strings.h:988 data/po/gui_strings.h:1021
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
 msgid "Weapons"
 msgstr "武器"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
-#: data/po/gui_strings.h:850
 msgid "Weather Effects"
 msgstr "天氣特效"
 
 #. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:425
+#: src/states_screens/options_screen_video.cpp:447
 #, c-format
 msgid "Weather Effects : %s"
 msgstr "天氣特效：%s"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-#: data/po/gui_strings.h:1460 data/po/gui_strings.h:1463
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
 msgstr "怎麼啦？�傢伙，你們�大的GNU首領�見了嗎？"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
-#: data/po/gui_strings.h:1010
 msgid ""
 "When input devices are configured, you are ready to play. Select the "
 "'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr ""
-"當輸入�置設定完�後， 您就已經準備好開始�戲。 在主�單點�「多人�戲��項。 �擇賽車的時候， "
-"��玩家都�以按下手把或是�盤上「射擊��來加入比賽。 ��玩家�以使用輸入�置來�擇賽車。 當�個人都�好了，�戲將會繼續進行。 "
-"注�這時滑鼠�能無法進行�作。"
+msgstr "當輸入�置設定完�後， 您就已經準備好開始�戲。 在主�單點�「多人�戲��項。 �擇賽車的時候， ��玩家都�以按下手把或是�盤上「射擊��來加入比賽。 ��玩家�以使用輸入�置來�擇賽車。 當�個人都�好了，�戲將會繼續進行。 注�這時滑鼠�能無法進行�作。"
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "白色"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
-#: data/po/gui_strings.h:1385
 msgid "Wilber"
 msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:47
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "在一次競賽中�得 5 場比賽。"
 
 #. I18N: ./data/achievements.xml
-#: data/po/gui_strings.h:35
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "在所有至少 3 個�手的單人模�中��。"
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
-#: data/po/gui_strings.h:1421
 msgid "XR591"
 msgstr "XR591"
 
-#. I18N: ../stk-assets/karts/20_xue/kart.xml
-#: data/po/gui_strings.h:1391
+#. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
 msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253 data/po/gui_strings.h:139
+#: src/states_screens/edit_gp_screen.cpp:253
 msgid "Yes"
 msgstr "確定"
 
-#: src/tracks/track_object_presentation.cpp:961
+#: src/tracks/track_object_presentation.cpp:996
 msgid "You are now ready to race. Good luck!"
 msgstr "你�在已準備好比賽。�你好��"
 
 #. I18N: ./data/gui/options_players.stkgui
-#: data/po/gui_strings.h:357
 msgid "You are playing as"
 msgstr "你�在的身份是"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "您�以點擊下方的星星以修改先�的評分等級。"
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "您無法在沒有網路連線時下載附加元件。若您想�下載附加元件，到�項中，��「使用者介����，並編輯「連線到網際網路�。"
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "您無法在沒有網路連線時玩線上�戲。若您想�玩線上�戲，到�項中，��「使用者介����，並編輯「連線到網際網路�。"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
-#: data/po/gui_strings.h:687
 msgid ""
-"You can play without creating an online account by unchecking the online "
-"checkbox, though then you can not connect to friends, vote for addons etc. "
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "您�以��離線帳號以��在��玩時建立線上帳號。雖然這樣您就無法與朋�連線，為附加元件投票等。請到 http://privacy.supertuxkart.net 詳閱我們的隱��明"
 
-#: src/states_screens/race_result_gui.cpp:164
-#: src/states_screens/grand_prix_win.cpp:125
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
 msgid "You completed a challenge!"
 msgstr "你完�大�賽了�"
 
-#: src/states_screens/race_result_gui.cpp:165
+#: src/states_screens/race_result_gui.cpp:176
 msgid "You completed challenges!"
 msgstr "你完�了挑戰�"
 
-#: src/states_screens/grand_prix_win.cpp:280
+#: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
 msgstr "您完�了大�賽�"
 
@@ -3494,33 +3209,34 @@ msgstr "您完�了大�賽�"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "您完�了困難的挑戰�在這個等級得到的點數：%i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "您完�了簡單的挑戰�在這個等級得到的點數：%i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "您完�了中等的挑戰�在這個等級得到的點數：%i/%i"
 
-#: src/karts/kart.cpp:855
+#: src/karts/kart.cpp:856
 msgid "You finished the race!"
 msgstr "您完�比賽了�"
 
-#: src/online/online_player_profile.cpp:444
+#: src/online/online_player_profile.cpp:466
 #, c-format
-msgid "You have %d new friend requests!"
-msgstr ""
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] "您有 %d 個新的朋�請求�"
 
-#: src/online/online_player_profile.cpp:449
+#: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "您有一個新的朋�請求�"
 
-#: src/modes/world.cpp:1146
+#: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
 msgstr "您已經被淘汰�"
 
@@ -3528,46 +3244,51 @@ msgstr "您已經被淘汰�"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "您尚未�此附加元件投票。您�以點擊下方的星星以��您想�的評分等級"
 
-#: src/karts/kart.cpp:1898
+#: src/karts/kart.cpp:1913
 msgid ""
 "You need more points\n"
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "您需�更多的點數\n來進入這個挑戰�\n在�地圖上檢查\n�用的挑戰。"
 
-#: src/states_screens/user_screen.cpp:423
+#: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "您必須輸入密碼。"
 
-#: src/states_screens/feature_unlocked.cpp:567
+#: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
 msgstr "你解鎖了 %0 大�賽"
 
-#: src/states_screens/feature_unlocked.cpp:529
+#: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
 msgstr "你解鎖了 %0 賽�"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
-#: data/po/gui_strings.h:767
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "您將會收到一�電�郵件，就如何�設密碼進一步說明。請�心等待，並�時檢查您的垃圾郵件匣。"
 
-#: src/states_screens/register_screen.cpp:310
+#: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "您將會收到一�電�郵件，就如何啟動帳號進一步說明。請�心等待，並�時檢查您的垃圾郵件匣。"
 
-#: src/karts/kart.cpp:855 src/karts/kart.cpp:874
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
 msgstr "您�得了這場比賽�"
 
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr "您的 OpenGL 版本似乎太舊了。請確�您的顯示�驅動程�是�有更新。SuperTuxKart 需� OpenGL 3.1 或更新的版本。"
+
 #: src/config/user_config.cpp:700
 msgid ""
 "Your config file was malformed, so it was deleted and a new one will be "
@@ -3580,6 +3301,11 @@ msgid ""
 "created."
 msgstr "您的設定檔太舊了， 它已經被移除並由一份新的�代。"
 
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr "你的驅動程�版本太舊。請安�最新的顯示�驅動程�。"
+
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
 msgstr "您的�戲�作設定檔與此版本的 SuperTuxKart �相容。"
@@ -3587,10 +3313,9 @@ msgstr "您的�戲�作設定檔與此版本的 SuperTuxKart �相容。"
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "您的個人檔案"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
-#: data/po/gui_strings.h:1427
 msgid "Zen Garden"
 msgstr "禪�花園"
 
@@ -3601,16 +3326,16 @@ msgstr "�無】"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
-#: data/po/gui_strings.h:576
 msgid "actions"
-msgstr ""
+msgstr "動作"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "所有"
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
 #: src/states_screens/race_gui_base.cpp:540
 msgid "by"
 msgstr "作者"
@@ -3619,49 +3344,25 @@ msgstr "作者"
 msgid "featured"
 msgstr "特色"
 
-#. I18N: ../stk-assets/wip-tracks/20_harvest/track.xml
-#: data/po/gui_strings.h:1511
-msgid "harvest"
-msgstr ""
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr "高"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "high"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
 msgid "low"
-msgstr ""
+msgstr "低"
 
-#. I18N: ../stk-assets/wip-tracks/20_newton/track.xml
-#: data/po/gui_strings.h:1517
-msgid "newton"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/20_sara_the_racer/kart.xml
-#: data/po/gui_strings.h:1379
-msgid "sara the racer"
-msgstr ""
-
-#. I18N: track group name
-#. I18N: kart group name
 #. I18N: arena group name
 #. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:153
-#: src/states_screens/kart_selection.cpp:284
+#. I18N: kart group name
+#. I18N: track group name
 #: src/states_screens/arenas_screen.cpp:81
 #: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
 msgid "standard"
 msgstr "一般"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Bill https://launchpad.net/~cges30901\n"
-"  Carl X. Su https://launchpad.net/~bcbcarl\n"
-"  STK-team https://launchpad.net/~stk\n"
-"  WM https://launchpad.net/~wandererm\n"
-"  jyc https://launchpad.net/~alphabet14\n"
-"  minhsien https://launchpad.net/~minhsien0330\n"
-"  tryneeds https://launchpad.net/~tryneeds\n"
-"  Ｖ字�(Vdragon) https://launchpad.net/~vdragon"
+msgstr "Launchpad Contributions:\n  Bill https://launchpad.net/~cges30901\n  Carl X. Su https://launchpad.net/~bcbcarl\n  Jeff Huang https://launchpad.net/~s8321414\n  STK-team https://launchpad.net/~stk\n  WM https://launchpad.net/~wandererm\n  jyc https://launchpad.net/~alphabet14\n  minhsien https://launchpad.net/~minhsien0330\n  tryneeds https://launchpad.net/~tryneeds\n  Ｖ字�(Vdragon) https://launchpad.net/~vdragon"

From 52b1aef99ca08f66b5d4d963472fdd62ccbbb3ee Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 23 Mar 2015 13:12:28 +1100
Subject: [PATCH 041/331] Updates Asian fonts.

---
 data/fonts/StkChineseFont.xml | Bin 159310 -> 173972 bytes
 data/fonts/wqyMicroHei0.png   | Bin 63155 -> 62386 bytes
 data/fonts/wqyMicroHei1.png   | Bin 75208 -> 72553 bytes
 data/fonts/wqyMicroHei2.png   | Bin 80036 -> 79866 bytes
 data/fonts/wqyMicroHei3.png   | Bin 83184 -> 84063 bytes
 data/fonts/wqyMicroHei4.png   | Bin 72494 -> 77233 bytes
 data/fonts/wqyMicroHei5.png   | Bin 42310 -> 57225 bytes
 data/fonts/wqyMicroHei6.png   | Bin 11009 -> 41619 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/fonts/StkChineseFont.xml b/data/fonts/StkChineseFont.xml
index 5485aeecb8792a44184e831a93ca0a30f2ae48d4..f8c86b7d9ed54d6237ab3c92b0d6034665a2cbc8 100755
GIT binary patch
literal 173972
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
R_LIZrcI}HNt0ucm{vRg@rV9W7

literal 159310
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
Uzsqd&96Gy7kC<6L^VFID4=mKfW&i*H

diff --git a/data/fonts/wqyMicroHei0.png b/data/fonts/wqyMicroHei0.png
index 3f12274a18b7e742a9025deb96940318d13ba436..0006d273fa385e12a1191894d4fad16e54b04b14 100755
GIT binary patch
literal 62386
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

literal 63155
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
K$kobNg#91exz$?$

diff --git a/data/fonts/wqyMicroHei1.png b/data/fonts/wqyMicroHei1.png
index 22051fde5dfba1ad1a2d9b5c185999407d4d29ca..2de876ba7b664d2034c939af07e1e5d8bc75342d 100755
GIT binary patch
literal 72553
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
KDosju(f<b$)1ZC;

literal 75208
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%0AH`Yb^
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
H^RWL1K<8NV

diff --git a/data/fonts/wqyMicroHei2.png b/data/fonts/wqyMicroHei2.png
index d38f128e0a39079feb327ce0938f326892f82f9b..0d8c0f9a70e0412aca28ef4e16553a26d76c2384 100755
GIT binary patch
literal 79866
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

literal 80036
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%0A(${M
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
RjsS>5K}JQo=JU6Z{{wWv0#5({

diff --git a/data/fonts/wqyMicroHei3.png b/data/fonts/wqyMicroHei3.png
index 6c4244eaa482e1b61a1d73522f19eda092c421ea..1fae7772c8d7bc4e6b1fc06a40e89023c0c37ce0 100755
GIT binary patch
literal 84063
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
S+4pz`An<hcb6Mw<&;$VY(w2Jw

literal 83184
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

diff --git a/data/fonts/wqyMicroHei4.png b/data/fonts/wqyMicroHei4.png
index 7fc3f46d665b641e6ad2ac4deda42ce7fbedbdd2..c789d25eaff4de9fb132b70e51fce2bfb920917d 100755
GIT binary patch
literal 77233
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
CxK%Cy

literal 72494
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
IRkn@#FFrv2aR2}S

diff --git a/data/fonts/wqyMicroHei5.png b/data/fonts/wqyMicroHei5.png
index f0050c28e1527effab637e7cc75423b4653b830a..4c76c0850b298aefc4351dba5cb7465eda7f5811 100755
GIT binary patch
literal 57225
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

literal 42310
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

diff --git a/data/fonts/wqyMicroHei6.png b/data/fonts/wqyMicroHei6.png
index 2af5bc3a11b9de6af424323309ca859f8033cce2..c21d12bd2e20183074d77090716f530127d163dc 100755
GIT binary patch
literal 41619
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

literal 11009
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


From a01fa2f8a780c8feace6def95ac0390f6e5fb522 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 23 Mar 2015 16:53:22 +1100
Subject: [PATCH 042/331] Updated changelog.

---
 CHANGELOG.md | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 960ff5cd2..61b5f5b0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,18 @@
-##SuperTuxKart 0.8.1
+## SupertTuxKart 0.9 (April 2015)
+* Fully shader-based rendering
+* New tracks Cocoa Temple and Gran Paradiso
+* Graphical improvements to many other tracks
+* New karts amanda and gavroche
+* New and improved tux kart
+* Online login which allows to:
+** connect with friends and see when they are playing
+** vote for addons
+** collect online achievements
+* Grand Prix editor, including creation of random GPs 
+* Different kart physics
+
+
+## SuperTuxKart 0.8.1 (26. November 2013)
 * New track STK Enterprise
 * Updated track The old mines
 * Updated Lighthouse track
@@ -18,8 +32,7 @@
 * Wiimote support
 
 
-
-##SuperTuxKart 0.8
+## SuperTuxKart 0.8 (11. December 2012)
 * Story mode and new challenge set
 * Improved AI
 * Skidding and better collision physics
@@ -34,7 +47,7 @@
 * New music
 
 
-##SuperTuxKart 0.7.3
+## SuperTuxKart 0.7.3 (2. November 2011)
 * New Zen Garden and Subsea tracks
 * New Island battle arena
 * New Suzanne kart
@@ -50,7 +63,7 @@
 * Better placement of rescued karts
 * Transition track-making to blender 2.5/2.6
 
-##SuperTuxKart 0.7.2
+## SuperTuxKart 0.7.2 (15. July 2011)
 * Added in-game addon manager
 * Fixed major memory leaks
 * New Snow Peak track by Samuncle
@@ -60,11 +73,11 @@
 * Improve gamepad configuration under Windows (add ability to tell gamepads apart)
 * Various other tweaks done and glitches fixed
 
-##SuperTuxKart 0.7.1b
+## SuperTuxKart 0.7.1b (21. April 2011)
 * Fix circular dependency in challenges
 * Updated translations
 
-##SuperTuxKart 0.7.1
+## SuperTuxKart 0.7.1 (15. April 2011)
 * Particle  (smoke, splash, fire) and weather effects
 * New Fort Magma by Samuncle, new Shiny Suburbs track by Horace
 * New Beagle kart by wolterh
@@ -83,7 +96,7 @@
 * Full RTL (right to left) support
 * Various other tweaks done and glitches fixed
 
-##SuperTuxKart 0.7 (December 2010)
+## SuperTuxKart 0.7 (December 2010)
 Too many to list them all. Main points:
 
 * Irrlicht:
@@ -97,11 +110,11 @@ Too many to list them all. Main points:
 * New art:
   - New tracks farm, hacienda, scotland, secret garden
 
-##SuperTuxKart 0.6.2a (October 2009)
+## SuperTuxKart 0.6.2a (October 2009)
 * Bugfix: STK would crash while trying to save the config file
           on Windows Vista.
 
-##SuperTuxKart 0.6.2 (July 2009)
+## SuperTuxKart 0.6.2 (July 2009)
 * Bugfix: Game could crash in rare circumstances.
 * Bugfix: Restarting a GP (with the in-race menu ESC) would not subtract already allocated points.
 * Bugfix: A race could be finished with an invalid shortcut.
@@ -111,10 +124,10 @@ Too many to list them all. Main points:
 * Bugfix: GP result showed kart identifier instead of name.
 * Improvement: there is now 1 1 sec. wait period for the race result screen, avoiding the problem that someone presses space/enter at the end of a race, immediately quitting the menu before it can be read.
 
-##SuperTuxKart 0.6.1a (February 2009)
+## SuperTuxKart 0.6.1a (February 2009)
 * Bugfix: battle mode would not display track groups.
 
-##SuperTuxKart 0.6.1 (February 2009)
+## SuperTuxKart 0.6.1 (February 2009)
 * Added new kart ("Puffy"), new battle map ("Cave"), and new music for Snow Mountain.
 * Fixed bug in track selection screen that could cause a crash when track groups were used.
 * Fixed crash in character selection that could happen if an old user config file existed.
@@ -124,7 +137,7 @@ Too many to list them all. Main points:
 * Added slow-down for karts driving backwards.
 * Somewhat reduced 'shaking' of AI driven karts.
 
-##SuperTuxKart 0.6 (January 2009)
+## SuperTuxKart 0.6 (January 2009)
 * New improved physics and kart handling
 * Added sharp turns and nitro speed boost (replacing wheelies and jump)
 * Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas
@@ -147,7 +160,7 @@ Too many to list them all. Main points:
   - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral),
     thanks to Samjam for the patch.
 
-##SuperTuxKart 0.5 (May 2008)
+## SuperTuxKart 0.5 (May 2008)
 * Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, Canyon, Crescent Crossing and StarTrack
 * Complete Challenges to unlock game modes, new tracks and a skidding preview
 * New Follow the Leader game mode
@@ -161,7 +174,7 @@ Too many to list them all. Main points:
 	- an AI crash fix (Chris Morris)
 
 
-##SuperTuxKart 0.4 (February 2008)
+## SuperTuxKart 0.4 (February 2008)
 * New physics handling using the bullet physics engine
 * New kart: wilber
 * Improved 'Shifting Sands' and 'Lighthouse' tracks
@@ -172,7 +185,7 @@ Too many to list them all. Main points:
 * Additional music and main theme
 	
 	
-##SuperTuxKart 0.3 (May 2007)
+## SuperTuxKart 0.3 (May 2007)
 * Highscore lists	
 * Shortcut detection 	
 * Improved AI

From 9b604d37e5d8c9c3dfde323d73e23ad18ab28c85 Mon Sep 17 00:00:00 2001
From: samuncle <samuncle06@gmail.com>
Date: Mon, 23 Mar 2015 07:00:48 +0100
Subject: [PATCH 043/331] Add more infor in the changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61b5f5b0d..2392d1e9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,9 @@
 ## SupertTuxKart 0.9 (April 2015)
-* Fully shader-based rendering
+* Fully shader-based rendering engine
 * New tracks Cocoa Temple and Gran Paradiso
 * Graphical improvements to many other tracks
 * New karts amanda and gavroche
-* New and improved tux kart
+* New and improved tux, adiumy, sara the wizard and the racer, xue kart
 * Online login which allows to:
 ** connect with friends and see when they are playing
 ** vote for addons

From b61823e1af81a68ac8e1145eb8b1fbd394d53c43 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 23 Mar 2015 17:23:03 +1100
Subject: [PATCH 044/331] Added GSoC students (initial version, names might
 need to be changed).

---
 data/CREDITS | Bin 13580 -> 13898 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index 656a28d86e046b32aa6a87000cd744fd72c52b88..d46b149519863c6ba584dcfca64eece97a8aa336 100644
GIT binary patch
delta 326
zcmXYs%MHRn3`FOGh&WI~3Lpi*4FN((+#(7H5MUucB|*R`4NwdcT~HOzNo4J=J@$-e
z-`8LA8GFrIIdN8^SiVBtl@hT^s$3`T1@E!%*7PmURIAcR0sS47qb?QcNld`D%)AIk
zZ$>?bbwnqF<?BIr&s!*JSRMC53j{L8jIilN9autL=|X0!&6vYt(ONdEW+vjec0p$<
zBu_x97C$g$s!Na)VJaPO>gxu%WX$|r@LVx;;O>OdHjnUY0xK-oUvrh;p*INrZ>Ky2

delta 12
TcmX?=)04G<k7KhB=RX|)Bwht2


From a400ac3ed88abce31c369877d6af414313020d89 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 23 Mar 2015 23:18:24 +1100
Subject: [PATCH 045/331] Used proper names for GSoC students, renamed version
 SVN to GIT, and removed version numbers (to avoid confusion that e.g. Deve is
 now not listed as contributor to 0.8.1 anymore).

---
 data/CREDITS | Bin 13898 -> 13948 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index d46b149519863c6ba584dcfca64eece97a8aa336..3e64361604a2ca72d0d8b79b2fa39e5e7ff589a7 100644
GIT binary patch
delta 222
zcmW-bJqp4=5QSd~<7#UqHrop6#gvH>;}2Nm0{(;;T(giETW=u39>6n5ZlQ<p6m}Lq
zmSN$2Gw;ppOa0XS)`}1#d78{^M0@6pBPgUOSQ2|Gi8(YW!-3?HC)kj4k|G7DappT2
zEr$IiXEjPrB^K0`^>Uwih-oh%m2^vl+^Lzb%vX%!(E7HVN~~<Zuuh+xFtNc7N9vS6
b%9+>fb#1MwQe4>8yjz)%J8=Bw+If3_hJi2w

delta 160
zcmey9b1G*-A8Rl}7=z!&$?0so3JjSHc?=2+1`K)(mYaXFc{0j}0tGS|N*Ib55*aFh
zPzNaO!;s2Q34}n!ldCy2*`0xMc?>C&_j0%j1~cR{<N#%gfqF6-k{MDbi*lMv=K@*9
mKvhW$RzUr(3@KnU^MR&vO}@;gE{JTg1<-QC%^NvS>i_^gx+H1<


From 7a8eaed6ed54055e8e408484771037ff0cd85f99 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 23 Mar 2015 22:52:25 +0100
Subject: [PATCH 046/331] Add up and down movement to first person camera (r/f
 keys)

---
 src/input/input_manager.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 4b88fb744..0580b5f08 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -206,6 +206,28 @@ void InputManager::handleStaticAction(int key, int value)
             cam->setLinearVelocity(vel);
             break;
         }
+        case KEY_KEY_R:
+        {
+            if (!world || !UserConfigParams::m_artist_debug_mode ||
+                UserConfigParams::m_camera_debug != 3) break;
+
+            Camera *cam = Camera::getActiveCamera();
+            core::vector3df vel(cam->getLinearVelocity());
+            vel.Y = value ? cam->getMaximumVelocity() : 0;
+            cam->setLinearVelocity(vel);
+            break;
+        }
+        case KEY_KEY_F:
+        {
+            if (!world || !UserConfigParams::m_artist_debug_mode ||
+                UserConfigParams::m_camera_debug != 3) break;
+
+            Camera *cam = Camera::getActiveCamera();
+            core::vector3df vel(cam->getLinearVelocity());
+            vel.Y = value ? -cam->getMaximumVelocity() : 0;
+            cam->setLinearVelocity(vel);
+            break;
+        }
         // Rotating the first person camera
         case KEY_KEY_Q:
         {

From 060bf2a2cfadf43d144d4120bd4b96cbebc2356c Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Tue, 24 Mar 2015 00:46:26 +0100
Subject: [PATCH 047/331] Reset rotation of first person camera when activating

---
 src/utils/debug.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index ae8ebb9f7..0fbff24ef 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -520,6 +520,10 @@ bool onEvent(const SEvent &event)
                 {
                     UserConfigParams::m_camera_debug = 3;
                     irr_driver->getDevice()->getCursorControl()->setVisible(false);
+                    // Reset camera rotation
+                    Camera *cam = Camera::getActiveCamera();
+                    cam->setDirection(vector3df(0, 0, 1));
+                    cam->setUpVector(vector3df(0, 1, 0));
                 }
                 else if (cmdID == DEBUG_GUI_CAM_NORMAL)
                 {

From 0501e35d95d03c25ead88b2a9f7b4e2f6c4e758b Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Tue, 24 Mar 2015 02:21:12 +0100
Subject: [PATCH 048/331] Prevent toppling over

---
 src/graphics/camera.cpp | 44 +++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 0416badbc..86ad95910 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -121,25 +121,36 @@ Camera::~Camera()
  */
 void Camera::applyMouseMovement (float x, float y)
 {
-    core::vector3df direction(m_target_direction);
-    core::vector3df up(m_camera->getUpVector());
+    vector3df direction(m_target_direction);
+    vector3df up(m_camera->getUpVector());
 
     // Set local values if the camera is attached to the kart
     if (m_attached)
         up = m_local_up;
 
-    core::vector3df side(direction.crossProduct(up));
-
     direction.normalize();
     up.normalize();
-    core::quaternion quat;
-    quat.fromAngleAxis(x, up);
 
-    core::quaternion quat_y;
-    quat_y.fromAngleAxis(y, side);
-    quat *= quat_y;
+    vector3df side(direction.crossProduct(up));
+    side.normalize();
+    core::quaternion quat;
+    quat.fromAngleAxis(y, side);
+
+    core::quaternion quat_x;
+    quat_x.fromAngleAxis(x, up);
+    quat *= quat_x;
 
     direction = quat * direction;
+    // Try to prevent toppling over
+    // If the camera would topple over with the next movement, the vertical
+    // movement gets reset close to the up vector
+    if ((direction - up).getLengthSQ() + (m_target_direction - up).getLengthSQ()
+        <= (direction - m_target_direction).getLengthSQ())
+        direction = quat_x * ((m_target_direction - up).setLength(0.02f) + up);
+    // Prevent toppling under
+    else if ((direction + up).getLengthSQ() + (m_target_direction + up).getLengthSQ()
+        <= (direction - m_target_direction).getLengthSQ())
+        direction = quat_x * ((m_target_direction + up).setLength(0.02f) - up);
     m_target_direction = direction;
 
     // Don't do that because it looks ugly and is bad to handle ;)
@@ -534,10 +545,10 @@ void Camera::update(float dt)
     // Update the first person camera
     else if (UserConfigParams::m_camera_debug == 3)
     {
-        core::vector3df direction(m_camera->getTarget() - m_camera->getPosition());
-        core::vector3df up(m_camera->getUpVector());
-        core::vector3df side(direction.crossProduct(up));
-        core::vector3df pos = m_camera->getPosition();
+        vector3df direction(m_camera->getTarget() - m_camera->getPosition());
+        vector3df up(m_camera->getUpVector());
+        vector3df side(direction.crossProduct(up));
+        vector3df pos = m_camera->getPosition();
 
         // Set local values if the camera is attached to the kart
         if (m_attached)
@@ -615,9 +626,12 @@ void Camera::update(float dt)
         up.normalize();
         side.normalize();
 
+        // Top vector is the real up vector, not the one used by the camera
+        vector3df top(side.crossProduct(direction));
+
         // Move camera
-        core::vector3df movement(direction * m_lin_velocity.Z +
-            up * m_lin_velocity.Y + side * m_lin_velocity.X);
+        vector3df movement(direction * m_lin_velocity.Z +
+            top * m_lin_velocity.Y + side * m_lin_velocity.X);
         pos = pos + movement * dt;
 
         if (m_attached)

From 366b5aadb5723c011cfd3c6bd513762bf849f5ba Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 24 Mar 2015 21:17:25 +1100
Subject: [PATCH 049/331] Updated todo list.

---
 TODO.md | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/TODO.md b/TODO.md
index fecc2019d..5ed25b4ce 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,5 @@
 ##TODO
 
-THIS IS A 2nd TEST.
-THIS IS A TEST.
-
 SuperTuxKart is looking for additional man power to make this
 one of the best free linux games out there :) We need (in 
 no particular order):
@@ -15,17 +12,13 @@ no particular order):
    - Create additional art work for tracks,
      background images
 3. Developers
-   - See todo list below - it's rather long at the moment :)
-4. Web master
+   - Check our bug and enhancement request tracker on
+     https://github.com/supertuxkart/stk-code/issues
    - Extend the current web page, keep it up to date
-5. Tester
+4. Tester
    - For just about everything
-   - Esp. different platforms
-6. Package creators
-   - Create packages for 
-     - most common Linux distributions
-     - Windows
-7. Writers
+   - Esp. different platforms and graphics cards
+5. Writers
    - Write documentation, ranging from man page, to
      a description for the web, to a design document, ...
 

From 4e9ab3e78671f84e36d9c1d8ace709e86b0df240 Mon Sep 17 00:00:00 2001
From: samuncle <samuncle06@gmail.com>
Date: Tue, 24 Mar 2015 17:59:03 +0100
Subject: [PATCH 050/331] Improved sparks for flame

---
 data/gfx/gfx_sparkFire_a.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/gfx/gfx_sparkFire_a.xml b/data/gfx/gfx_sparkFire_a.xml
index af9f4d14d..eae403120 100644
--- a/data/gfx/gfx_sparkFire_a.xml
+++ b/data/gfx/gfx_sparkFire_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <!-- For sky particles, the size of the box is ignored -->
-<particles emitter="box" box_x="0.1" box_y="0.5" box_z="0.1">
+<particles emitter="sphere" radius="0.5">
 
-    <spreading angle="30"           />
+    <spreading angle="5"           />
     
     <velocity  x="-0.000"
                y="0.002"
@@ -16,7 +16,7 @@
                max="50"           />
     
     <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
-    <lifetime  min="3000"
+    <lifetime  min="1000"
                max="3000"          />
     
     <!-- Size of the particles -->

From df656fbf6427abf33f6ea784f6ec4608918a9c4a Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Wed, 25 Mar 2015 09:16:15 +0100
Subject: [PATCH 051/331] Allow to compile project using cygwin. Note that you
 need to have all dependencies in cygwin directory (can be easily installed).
 Atm. wiimote and joystick events are disabled.

---
 CMakeLists.txt                               | 4 ++--
 lib/irrlicht/CMakeLists.txt                  | 4 ++++
 lib/irrlicht/source/Irrlicht/COSOperator.cpp | 2 +-
 src/utils/translation.hpp                    | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b30e1ec..4f9ca20ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 project(SuperTuxKart)
 set(PROJECT_VERSION "0.8.1")
 
-cmake_minimum_required(VERSION 2.8.1)
+cmake_minimum_required(VERSION 2.8.4)
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
   cmake_policy(SET CMP0043 OLD)
 endif()
@@ -32,7 +32,7 @@ else()
     set(WIIUSE_BUILD ON)
 endif()
 
-if(MINGW)
+if(MINGW OR CYGWIN)
     set(USE_WIIUSE OFF)
 endif()
 
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 9c9429dc1..8fcd23c92 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -35,6 +35,10 @@ if(UNIX AND USE_XRANDR)
     add_definitions(-D_IRR_LINUX_X11_RANDR_)
 endif()
 
+if(CYGWIN)
+    add_definitions(-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
+endif()
+
 set(IRRLICHT_SOURCES
 source/Irrlicht/CGUIListBox.cpp
 source/Irrlicht/CZBuffer.cpp
diff --git a/lib/irrlicht/source/Irrlicht/COSOperator.cpp b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
index 0899d1dd0..5ade8a5b4 100644
--- a/lib/irrlicht/source/Irrlicht/COSOperator.cpp
+++ b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
@@ -11,7 +11,7 @@
 #else
 #include <string.h>
 #include <unistd.h>
-#ifndef _IRR_SOLARIS_PLATFORM_
+#if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
diff --git a/src/utils/translation.hpp b/src/utils/translation.hpp
index 1067264d5..aecfe18c9 100644
--- a/src/utils/translation.hpp
+++ b/src/utils/translation.hpp
@@ -28,6 +28,7 @@
 
 #  define _(String, ...)        (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String), ##__VA_ARGS__)))
 #undef _C
+#undef _P
 #  define _C(Ctx, String, ...)  (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String, Ctx), ##__VA_ARGS__)))
 #  define _P(Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num), Num, ##__VA_ARGS__)))
 #  define _CP(Ctx, Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num, Ctx), Num, ##__VA_ARGS__)))

From 5828dddde8360a2a5131f41a16f0a329b469c0a9 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 25 Mar 2015 18:53:09 +0100
Subject: [PATCH 052/331] Allow to disable popup messages about too old drivers
 in config.xml

---
 src/config/user_config.hpp |  3 +++
 src/main.cpp               | 31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 4b75e1e23..7b4454a12 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -482,6 +482,9 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam        m_esm
         PARAM_DEFAULT(BoolUserConfigParam(false, "enable_esm",
         &m_video_group, "Enable Exponential Shadow Map (better but slower)"));
+    PARAM_PREFIX BoolUserConfigParam        m_old_driver_popup
+        PARAM_DEFAULT(BoolUserConfigParam(true, "old_driver_popup",
+        &m_video_group, "Determines if popup message about too old drivers should be displayed."));
 
     // ---- Debug - not saved to config file
     /** If gamepad debugging is enabled. */
diff --git a/src/main.cpp b/src/main.cpp
index 4b43fc2fb..853a2ae86 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1361,21 +1361,24 @@ int main(int argc, char *argv[] )
             exit(0);
         }
 
-        if (!ProfileWorld::isNoGraphics() && GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
+        if (UserConfigParams::m_old_driver_popup)
         {
-            MessageDialog *dialog =
-                new MessageDialog(_("Your driver version is too old. Please install "
-                "the latest video drivers."),
-                /*from queue*/ true);
-            GUIEngine::DialogQueue::get()->pushDialog(dialog);
-        }
-        else if (!CVS->isGLSL())
-        {
-            MessageDialog *dialog =
-                new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
-                "if an update for your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."),
-                /*from queue*/ true);
-            GUIEngine::DialogQueue::get()->pushDialog(dialog);
+            if (!ProfileWorld::isNoGraphics() && GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
+            {
+                MessageDialog *dialog =
+                    new MessageDialog(_("Your driver version is too old. Please install "
+                    "the latest video drivers."),
+                    /*from queue*/ true);
+                GUIEngine::DialogQueue::get()->pushDialog(dialog);
+            }
+            else if (!CVS->isGLSL())
+            {
+                MessageDialog *dialog =
+                    new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
+                    "if an update for your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."),
+                    /*from queue*/ true);
+                GUIEngine::DialogQueue::get()->pushDialog(dialog);
+            }
         }
 
         // Note that on the very first run of STK internet status is set to

From a0bd9db4964d10eb2a9773534996343d8884fd1b Mon Sep 17 00:00:00 2001
From: samuncle <samuncle06@gmail.com>
Date: Thu, 26 Mar 2015 00:46:52 +0100
Subject: [PATCH 053/331] Add more particle effect

---
 data/gfx/gfx_bubble_a.xml        | 32 +++++++++++++++++++++++++++++
 data/gfx/gfx_fireworkSmoke_a.xml | 35 ++++++++++++++++++++++++++++++++
 data/gfx/gfx_firework_a.xml      | 35 ++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 data/gfx/gfx_bubble_a.xml
 create mode 100644 data/gfx/gfx_fireworkSmoke_a.xml
 create mode 100644 data/gfx/gfx_firework_a.xml

diff --git a/data/gfx/gfx_bubble_a.xml b/data/gfx/gfx_bubble_a.xml
new file mode 100644
index 000000000..3c44ccda5
--- /dev/null
+++ b/data/gfx/gfx_bubble_a.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="box" box_x="0.5" box_y="0.5" box_z="0.5">
+
+    <spreading angle="45"      />
+    
+    <velocity  x="0.000"
+               y="0.005"
+               z="0.000"         />
+    
+    <material  file="gfx_bubble_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="3"
+               max="6"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="3000"
+               max="6000"         />
+    
+    <!-- Size of the particles -->
+   <size min="1.1"
+         max="1.5"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>
diff --git a/data/gfx/gfx_fireworkSmoke_a.xml b/data/gfx/gfx_fireworkSmoke_a.xml
new file mode 100644
index 000000000..ca6de1aae
--- /dev/null
+++ b/data/gfx/gfx_fireworkSmoke_a.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="5"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="smoke.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="5"
+               max="10"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="100"
+               max="300"          />
+    
+    <!-- Size of the particles -->
+    <size min="0.2"
+         max="0.5"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" /> 
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+
+</particles>
diff --git a/data/gfx/gfx_firework_a.xml b/data/gfx/gfx_firework_a.xml
new file mode 100644
index 000000000..a93a58f21
--- /dev/null
+++ b/data/gfx/gfx_firework_a.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="5"           />
+    
+    <velocity  x="-0.000"
+               y="0.002"
+               z="-0.000"             />
+    
+    <material  file="gfx_sparkFire_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="400"
+               max="500"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.2"
+               max="0.3"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

From 27dec2fbf8a4e722d841afb0e96ef049e632ce99 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 26 Mar 2015 11:28:22 +1100
Subject: [PATCH 054/331] Added attribute to irrlicht's driver to enable
 automatic resize of images that are too big. This is then used to
 automatically resize any textures (except fonts, background screen) to be
 automatically resized to 512x512 if they are bigger.

---
 lib/irrlicht/include/IAttributes.h            |  4 ++--
 lib/irrlicht/include/IVideoDriver.h           |  2 ++
 lib/irrlicht/source/Irrlicht/CAttributes.cpp  |  4 ++--
 lib/irrlicht/source/Irrlicht/CAttributes.h    |  4 ++--
 lib/irrlicht/source/Irrlicht/CNullDriver.cpp  |  5 ++++
 lib/irrlicht/source/Irrlicht/CNullDriver.h    |  3 +++
 .../source/Irrlicht/COpenGLTexture.cpp        | 12 ++++++++++
 src/graphics/2dutils.cpp                      |  2 +-
 src/graphics/irr_driver.cpp                   | 15 +++++++++++-
 src/graphics/irr_driver.hpp                   |  2 +-
 src/guiengine/scalable_font.cpp               | 24 +++++++++++++------
 src/main.cpp                                  |  4 ++++
 12 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/lib/irrlicht/include/IAttributes.h b/lib/irrlicht/include/IAttributes.h
index f1376358e..0361ea125 100644
--- a/lib/irrlicht/include/IAttributes.h
+++ b/lib/irrlicht/include/IAttributes.h
@@ -501,11 +501,11 @@ public:
 	//! Gets an attribute as dimension2d
 	//! \param attributeName: Name of the attribute to get.
 	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName) = 0;
+	virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName) const = 0;
 
 	//! Gets an attribute as dimension2d
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) = 0;
+	virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) const = 0;
 
 	//! Sets an attribute as dimension2d
 	virtual void setAttribute(s32 index, core::dimension2d<u32> v) = 0;
diff --git a/lib/irrlicht/include/IVideoDriver.h b/lib/irrlicht/include/IVideoDriver.h
index 79b1b2002..3f3851425 100644
--- a/lib/irrlicht/include/IVideoDriver.h
+++ b/lib/irrlicht/include/IVideoDriver.h
@@ -324,6 +324,8 @@ namespace video
 		AntiAlias (int) Number of Samples the driver uses for each pixel. 0 and 1 means anti aliasing is off, typical values are 2,4,8,16,32
 		*/
 		virtual const io::IAttributes& getDriverAttributes() const=0;
+        //! Non-const version (with a different name to avoid involuntary mistakes). */
+        virtual io::IAttributes& getNonConstDriverAttributes() = 0;
 
 		//! Check if the driver was recently reset.
 		/** For d3d devices you will need to recreate the RTTs if the
diff --git a/lib/irrlicht/source/Irrlicht/CAttributes.cpp b/lib/irrlicht/source/Irrlicht/CAttributes.cpp
index 21ebe1f1c..71068ca60 100644
--- a/lib/irrlicht/source/Irrlicht/CAttributes.cpp
+++ b/lib/irrlicht/source/Irrlicht/CAttributes.cpp
@@ -429,7 +429,7 @@ void CAttributes::setAttribute(const c8* attributeName, core::dimension2d<u32> v
 //! Gets an attribute as dimension2d
 //! \param attributeName: Name of the attribute to get.
 //! \return Returns value of the attribute previously set by setAttribute()
-core::dimension2d<u32> CAttributes::getAttributeAsDimension2d(const c8* attributeName)
+core::dimension2d<u32> CAttributes::getAttributeAsDimension2d(const c8* attributeName) const
 {
 	IAttribute* att = getAttributeP(attributeName);
 	if (att)
@@ -737,7 +737,7 @@ core::rect<s32>  CAttributes::getAttributeAsRect(s32 index)
 
 //! Gets an attribute as dimension2d
 //! \param index: Index value, must be between 0 and getAttributeCount()-1.
-core::dimension2d<u32>  CAttributes::getAttributeAsDimension2d(s32 index)
+core::dimension2d<u32>  CAttributes::getAttributeAsDimension2d(s32 index) const
 {
 	if ((u32)index < Attributes.size())
 		return Attributes[index]->getDimension2d();
diff --git a/lib/irrlicht/source/Irrlicht/CAttributes.h b/lib/irrlicht/source/Irrlicht/CAttributes.h
index 1675a3ab3..3e597a47b 100644
--- a/lib/irrlicht/source/Irrlicht/CAttributes.h
+++ b/lib/irrlicht/source/Irrlicht/CAttributes.h
@@ -465,11 +465,11 @@ public:
 	//! Gets an attribute as dimension2d
 	//! \param attributeName: Name of the attribute to get.
 	//! \return Returns value of the attribute previously set by setAttribute()
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName);
+	virtual core::dimension2d<u32> getAttributeAsDimension2d(const c8* attributeName) const;
 
 	//! Gets an attribute as dimension2d
 	//! \param index: Index value, must be between 0 and getAttributeCount()-1.
-	virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index);
+	virtual core::dimension2d<u32> getAttributeAsDimension2d(s32 index) const;
 
 	//! Sets an attribute as dimension2d
 	virtual void setAttribute(s32 index, core::dimension2d<u32> v);
diff --git a/lib/irrlicht/source/Irrlicht/CNullDriver.cpp b/lib/irrlicht/source/Irrlicht/CNullDriver.cpp
index 11144c114..4ef9c44de 100644
--- a/lib/irrlicht/source/Irrlicht/CNullDriver.cpp
+++ b/lib/irrlicht/source/Irrlicht/CNullDriver.cpp
@@ -298,6 +298,11 @@ const io::IAttributes& CNullDriver::getDriverAttributes() const
 	return *DriverAttributes;
 }
 
+//! Get attributes of the actual video driver
+io::IAttributes& CNullDriver::getNonConstDriverAttributes()
+{
+    return *DriverAttributes;
+}
 
 //! sets transformation
 void CNullDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat)
diff --git a/lib/irrlicht/source/Irrlicht/CNullDriver.h b/lib/irrlicht/source/Irrlicht/CNullDriver.h
index c2fb5cc16..251062b68 100644
--- a/lib/irrlicht/source/Irrlicht/CNullDriver.h
+++ b/lib/irrlicht/source/Irrlicht/CNullDriver.h
@@ -64,6 +64,9 @@ namespace video
 		//! Get attributes of the actual video driver
 		const io::IAttributes& getDriverAttributes() const;
 
+        //! Non-const version (with a different name to avoid involuntary mistakes). */
+        virtual io::IAttributes& getNonConstDriverAttributes();
+
 		//! sets transformation
 		virtual void setTransform(E_TRANSFORMATION_STATE state, const core::matrix4& mat);
 
diff --git a/lib/irrlicht/source/Irrlicht/COpenGLTexture.cpp b/lib/irrlicht/source/Irrlicht/COpenGLTexture.cpp
index 72a750a50..ef20da830 100644
--- a/lib/irrlicht/source/Irrlicht/COpenGLTexture.cpp
+++ b/lib/irrlicht/source/Irrlicht/COpenGLTexture.cpp
@@ -11,6 +11,8 @@
 #include "COpenGLDriver.h"
 #include "os.h"
 #include "CColorConverter.h"
+#include "IAttributes.h"
+#include "IrrlichtDevice.h"
 
 #include "irrString.h"
 
@@ -314,7 +316,17 @@ void COpenGLTexture::getImageValues(IImage* image)
 		ImageSize.Width = (u32)(Driver->MaxTextureSize*ratio);
 	}
 	TextureSize=ImageSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT));
+    const core::dimension2du max_size = Driver->getDriverAttributes()
+                                 .getAttributeAsDimension2d("MAX_TEXTURE_SIZE");
 
+    if (max_size.Width> 0 && TextureSize.Width > max_size.Width)
+    {
+        TextureSize.Width = max_size.Width;
+    }
+    if (max_size.Height> 0 && TextureSize.Height > max_size.Height)
+    {
+        TextureSize.Height = max_size.Height;
+    }
 	ColorFormat = getBestColorFormat(image->getColorFormat());
 }
 
diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 537ff43b8..386f1ac24 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -206,7 +206,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
         tex_width, tex_height,
         tex_center_pos_x, tex_center_pos_y;
 
-    getSize(texture->getOriginalSize().Width, texture->getOriginalSize().Height, texture->isRenderTarget(),
+    getSize(texture->getSize().Width, texture->getSize().Height, texture->isRenderTarget(),
         destRect, sourceRect, width, height, center_pos_x, center_pos_y,
         tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
 
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 3db7aebb3..e8a6b7232 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -592,10 +592,23 @@ void IrrDriver::initDevice()
     m_pointer_shown = true;
 }   // initDevice
 
+// ----------------------------------------------------------------------------
+void IrrDriver::setMaxTextureSize()
+{
+    if( (UserConfigParams::m_high_definition_textures & 0x01) == 0)
+    {
+        io::IAttributes &att = m_video_driver->getNonConstDriverAttributes();
+        att.setAttribute("MAX_TEXTURE_SIZE", core::dimension2du(512, 512));
+    }
+}   // setMaxTextureSize
+
+// ----------------------------------------------------------------------------
 void IrrDriver::cleanSunInterposer()
 {
     delete m_sun_interposer;
-}
+}   // cleanSunInterposer
+
+// ----------------------------------------------------------------------------
 void IrrDriver::createSunInterposer()
 {
     scene::IMesh * sphere = m_scene_manager->getGeometryCreator()->createSphereMesh(1, 16, 16);
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index b04b380bc..6d9097b83 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -36,7 +36,6 @@
 #include <SColor.h>
 #include "IrrlichtDevice.h"
 #include "ISkinnedMesh.h"
-//#include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
@@ -354,6 +353,7 @@ public:
         ~IrrDriver();
     void initDevice();
     void reset();
+    void setMaxTextureSize();
     void getOpenGLData(std::string *vendor, std::string *renderer,
                        std::string *version);
 
diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 980fcd836..381abdb06 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -4,16 +4,17 @@
 
 #include "guiengine/scalable_font.hpp"
 
-#include <IGUIEnvironment.h>
-#include <IXMLReader.h>
-#include <IReadFile.h>
-#include <IVideoDriver.h>
-#include <IGUISpriteBank.h>
-
+#include "graphics/2dutils.hpp"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
 #include "utils/translation.hpp"
-#include "graphics/2dutils.hpp"
+
+#include <IAttributes.h>
+#include <IGUIEnvironment.h>
+#include <IGUISpriteBank.h>
+#include <IReadFile.h>
+#include <IVideoDriver.h>
+#include <IXMLReader.h>
 
 namespace irr
 {
@@ -732,7 +733,16 @@ void ScalableFont::lazyLoadTexture(int texID)
 
     // load texture
     assert(m_texture_files[texID].m_file_name.size() > 0);
+
+    // Font textures can not be resized (besides the impact on quality in
+    // this case, the indices in the xml files would become wrong).
+    core::dimension2du old_max_size = Driver->getDriverAttributes()
+                                     .getAttributeAsDimension2d("MAX_TEXTURE_SIZE");
+    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE",
+                                                       core::dimension2du(0, 0));
+
     SpriteBank->setTexture(texID, Driver->getTexture( m_texture_files[texID].m_file_name ));
+    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE", old_max_size);
 
     // set previous mip-map+filter state
     //Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, mipmap);
diff --git a/src/main.cpp b/src/main.cpp
index 4b43fc2fb..01b8ed5fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1128,6 +1128,10 @@ void initRest()
     powerup_manager         = new PowerupManager       ();
     attachment_manager      = new AttachmentManager    ();
     highscore_manager       = new HighscoreManager     ();
+
+    // The maximum texture size can not be set earlier, since
+    // e.g. the background image needs to be loaded in high res.
+    irr_driver->setMaxTextureSize();
     KartPropertiesManager::addKartSearchDir(
                  file_manager->getAddonsFile("karts/"));
     track_manager->addTrackSearchDir(

From 262eeca87f8e4797814f6e6734c8726beaa0f5f6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 25 Mar 2015 20:53:05 -0400
Subject: [PATCH 055/331] Update configuration of HD textures in GUI,
 especially through presets

---
 src/states_screens/options_screen_video.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index 2e144d697..887fb5d69 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -62,6 +62,7 @@ struct GFXPreset
     bool dof;
     bool global_illumination;
     bool degraded_ibl;
+    int hd_textures;
 };
 
 static GFXPreset GFX_PRESETS[] =
@@ -70,35 +71,35 @@ static GFXPreset GFX_PRESETS[] =
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
         false /* animatedScenery */, 0 /* animatedCharacters */, 0 /* anisotropy */,
-        false /* depth of field */, false /* global illumination */, true /* degraded IBL */
+        false /* depth of field */, false /* global illumination */, true /* degraded IBL */, 0 /* hd_textures */
     },
 
     {
         false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, false /* weather */,
         true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */,
-        false /* depth of field */, false /* global illumination */, true /* degraded IBL */
+        false /* depth of field */, false /* global illumination */, true /* degraded IBL */, 0 /* hd_textures */
     },
 
     {
         true /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
         false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */, true /* weather */,
         true /* animatedScenery */, 1 /* animatedCharacters */, 4 /* anisotropy */,
-        false /* depth of field */, false /* global illumination */, true /* degraded IBL */
+        false /* depth of field */, false /* global illumination */, true /* degraded IBL */, 1 /* hd_textures */
     },
 
     {
         true /* light */, 0 /* shadow */, false /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, false /* ssao */, true /* weather */,
         true /* animatedScenery */, 1 /* animatedCharacters */, 8 /* anisotropy */,
-        false /* depth of field */, false /* global illumination */, false /* degraded IBL */
+        false /* depth of field */, false /* global illumination */, false /* degraded IBL */, 1 /* hd_textures */
     },
 
     {
         true /* light */, 1024 /* shadow */, true /* bloom */, true /* motionblur */,
         true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */, true /* weather */,
         true /* animatedScenery */, 2 /* animatedCharacters */, 16 /* anisotropy */,
-        true /* depth of field */, true /* global illumination */, false /* degraded IBL */
+        true /* depth of field */, true /* global illumination */, false /* degraded IBL */, 1 /* hd_textures */
     }
 };
 
@@ -397,7 +398,8 @@ void OptionsScreenVideo::updateGfxSlider()
             GFX_PRESETS[l].weather == UserConfigParams::m_weather_effects &&
             GFX_PRESETS[l].dof == UserConfigParams::m_dof &&
             GFX_PRESETS[l].global_illumination == UserConfigParams::m_gi &&
-            GFX_PRESETS[l].degraded_ibl == UserConfigParams::m_degraded_IBL)
+            GFX_PRESETS[l].degraded_ibl == UserConfigParams::m_degraded_IBL &&
+            GFX_PRESETS[l].hd_textures == (UserConfigParams::m_high_definition_textures & 0x01))
         {
             gfx->setValue(l + 1);
             found = true;
@@ -488,7 +490,11 @@ void OptionsScreenVideo::updateTooltip()
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Global illumination : %s",
         UserConfigParams::m_gi ? enabled : disabled);
-
+    
+    //I18N: in graphical options
+    tooltip = tooltip + L"\n" + _("Use high definition textures") + L" : " +
+        ((UserConfigParams::m_high_definition_textures & 0x1) == 0 ? disabled : enabled);
+    
     gfx->setTooltip(tooltip);
 }   // updateTooltip
 
@@ -570,6 +576,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
         UserConfigParams::m_dof = GFX_PRESETS[level].dof;
         UserConfigParams::m_gi = GFX_PRESETS[level].global_illumination;
         UserConfigParams::m_degraded_IBL = GFX_PRESETS[level].degraded_ibl;
+        UserConfigParams::m_high_definition_textures = 0x02 | GFX_PRESETS[level].hd_textures;
 
         updateGfxSlider();
     }

From 02d5b43d867c6a59139580ebbed5b3cae1accd5d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 26 Mar 2015 17:12:51 +1100
Subject: [PATCH 056/331] Replaced all texture->getOriginalSize() with
 texture->getSize() to take potentially resized textures properly into
 account.

---
 src/graphics/2dutils.cpp                  |  2 +-
 src/graphics/render_skybox.cpp            |  8 ++++----
 src/guiengine/CGUISpriteBank.cpp          |  4 ++--
 src/states_screens/race_gui.cpp           |  8 ++++----
 src/states_screens/race_gui_base.cpp      | 22 +++++++++++-----------
 src/states_screens/race_gui_overworld.cpp |  6 +++---
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 386f1ac24..afebe54ed 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -117,7 +117,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
         tex_width, tex_height,
         tex_center_pos_x, tex_center_pos_y;
 
-    getSize(texture->getOriginalSize().Width, texture->getOriginalSize().Height, texture->isRenderTarget(),
+    getSize(texture->getSize().Width, texture->getSize().Height, texture->isRenderTarget(),
         destRect, sourceRect, width, height, center_pos_x, center_pos_y,
         tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
 
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 967e756b8..30baf03ac 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -226,8 +226,8 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
     unsigned size = 0;
     for (unsigned i = 0; i < 6; i++)
     {
-        size = MAX2(size, textures[i]->getOriginalSize().Width);
-        size = MAX2(size, textures[i]->getOriginalSize().Height);
+        size = MAX2(size, textures[i]->getSize().Width);
+        size = MAX2(size, textures[i]->getSize().Height);
     }
 
     const unsigned texture_permutation[] = { 2, 3, 0, 1, 5, 4 };
@@ -299,8 +299,8 @@ void IrrDriver::generateDiffuseCoefficients()
 
         for (unsigned i = 0; i < 6; i++)
         {
-            sh_w = MAX2(sh_w, SphericalHarmonicsTextures[i]->getOriginalSize().Width);
-            sh_h = MAX2(sh_h, SphericalHarmonicsTextures[i]->getOriginalSize().Height);
+            sh_w = MAX2(sh_w, SphericalHarmonicsTextures[i]->getSize().Width);
+            sh_h = MAX2(sh_h, SphericalHarmonicsTextures[i]->getSize().Height);
         }
 
         for (unsigned i = 0; i < 6; i++)
diff --git a/src/guiengine/CGUISpriteBank.cpp b/src/guiengine/CGUISpriteBank.cpp
index 19150fc2f..d255309e5 100644
--- a/src/guiengine/CGUISpriteBank.cpp
+++ b/src/guiengine/CGUISpriteBank.cpp
@@ -151,8 +151,8 @@ s32 STKModifiedSpriteBank::addTextureAsSprite(video::ITexture* texture)
 
     u32 rectangleIndex = Rectangles.size();
     Rectangles.push_back( core::rect<s32>(0,0,
-                                          texture->getOriginalSize().Width,
-                                          texture->getOriginalSize().Height) );
+                                          texture->getSize().Width,
+                                          texture->getSize().Height) );
 
     SGUISprite sprite;
     sprite.frameTime = 0;
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index ad5143cd7..55dc87ed7 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -268,7 +268,7 @@ void RaceGUI::drawScores()
                                      offsetX + (int)(m_minimap_player_size/1.25f),
                                      offsetY + (int)(m_minimap_player_size/1.25f));
         core::rect<s32> sourceRect(core::position2d<s32>(0,0),
-                                                   team_icon->getOriginalSize());
+                                                   team_icon->getSize());
         draw2DImage(team_icon,indicatorPos,sourceRect,
             NULL,NULL,true);
         numLeader++;
@@ -357,7 +357,7 @@ void RaceGUI::drawGlobalMiniMap()
     if (old_rtt_mini_map != NULL)
     {
         core::rect<s32> source(core::position2di(0, 0),
-                               old_rtt_mini_map->getOriginalSize());
+                               old_rtt_mini_map->getSize());
         draw2DImage(old_rtt_mini_map, dest, source,
                     NULL, NULL, true);
     }
@@ -380,7 +380,7 @@ void RaceGUI::drawGlobalMiniMap()
 
         video::ITexture* icon = kart->getKartProperties()->getMinimapIcon();
 
-        // int marker_height = m_marker->getOriginalSize().Height;
+        // int marker_height = m_marker->getSize().Height;
         core::rect<s32> source(core::position2di(0, 0), icon->getSize());
         int marker_half_size = (kart->getController()->isPlayerController()
                                 ? m_minimap_player_size
@@ -720,7 +720,7 @@ void RaceGUI::drawSpeedEnergyRank(const AbstractKart* kart,
                                     (int)offset.Y);
     video::ITexture *meter_texture = m_speed_meter_icon->getTexture();
     const core::rect<s32> meter_texture_coords(core::position2d<s32>(0,0),
-                                               meter_texture->getOriginalSize());
+                                               meter_texture->getSize());
     draw2DImage(meter_texture, meter_pos, meter_texture_coords, NULL,
                        NULL, true);
     // TODO: temporary workaround, shouldn't have to use
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index db54885ae..4465b8ffc 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -327,7 +327,7 @@ void RaceGUIBase::drawPowerupIcons(const AbstractKart* kart,
     assert(powerup->getIcon() != NULL);
     video::ITexture *t=powerup->getIcon()->getTexture();
     assert(t != NULL);
-    core::rect<s32> rect(core::position2di(0, 0), t->getOriginalSize());
+    core::rect<s32> rect(core::position2di(0, 0), t->getSize());
 
     for ( int i = 0 ; i < n ; i++ )
     {
@@ -588,7 +588,7 @@ void RaceGUIBase::drawGlobalMusicDescription()
                          noteX+iconSizeX/2+20,
                          noteY+iconSizeY/2+ICON_SIZE/2);
     const core::rect<s32> source(core::position2d<s32>(0,0),
-                                 t->getOriginalSize());
+                                 t->getSize());
 
     draw2DImage(t, dest, source,
                                               NULL, NULL, true);
@@ -855,7 +855,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
                                    100+(int)(100*cos(M_PI/2*i+World::getWorld()->getTime()*2)));
             }
             const core::rect<s32> rect(core::position2d<s32>(0,0),
-                                       m_icons_frame->getTexture()->getOriginalSize());
+                                       m_icons_frame->getTexture()->getSize());
             draw2DImage(
                                                       m_icons_frame->getTexture(), pos, rect,NULL, colors, true);
         }
@@ -864,7 +864,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
         if (icon  && !kart->getKartAnimation() && !kart->isSquashed())
         {
             const core::rect<s32> rect(core::position2d<s32>(0,0),
-                                       icon->getOriginalSize());
+                                       icon->getSize());
             draw2DImage(icon, pos, rect,
                                                       NULL, NULL, true);
         }
@@ -877,7 +877,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             float t = kart->getKartAnimation()->getAnimationTimer();
             float t_anim=100*sin(0.5f*M_PI*t);
             const core::rect<s32> rect1(core::position2d<s32>(0,0),
-                                        icon->getOriginalSize());
+                                        icon->getSize());
             const core::rect<s32> pos1((int)(x-t_anim), y,
                                        (int)(x+w-t_anim), y+w);
             draw2DImage(icon, pos1, rect1,
@@ -890,7 +890,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             const core::rect<s32> destRect(core::position2d<s32>(x,y+w/4),
                                            core::position2d<s32>(x+w,y+w*3/4));
             const core::rect<s32> sourceRect(core::position2d<s32>(0,0),
-                                             icon->getOriginalSize());
+                                             icon->getSize());
             draw2DImage(icon, destRect,
                                                       sourceRect, NULL, NULL,
                                                       true);
@@ -902,8 +902,8 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             //exploses into 4 parts
             float t = kart->getKartAnimation()->getAnimationTimer();
             float t_anim=50.0f*sin(0.5f*M_PI*t);
-            u16 icon_size_x=icon->getOriginalSize().Width;
-            u16 icon_size_y=icon->getOriginalSize().Height;
+            u16 icon_size_x=icon->getSize().Width;
+            u16 icon_size_y=icon->getSize().Height;
 
             const core::rect<s32> rect1(0, 0, icon_size_x/2,icon_size_y/2);
             const core::rect<s32> pos1((int)(x-t_anim), (int)(y-t_anim),
@@ -940,7 +940,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             if (icon_plunger != NULL)
             {
                 const core::rect<s32> rect(core::position2d<s32>(0,0),
-                                           icon_plunger->getOriginalSize());
+                                           icon_plunger->getSize());
                 const core::rect<s32> pos1(x+10, y-10, x+w+10, y+w-10);
                 draw2DImage(icon_plunger, pos1,
                                                           rect, NULL, NULL,
@@ -956,7 +956,7 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
             if (icon_attachment != NULL)
             {
                 const core::rect<s32> rect(core::position2d<s32>(0,0),
-                                           icon_attachment->getOriginalSize());
+                                           icon_attachment->getSize());
                 const core::rect<s32> pos1(x-20, y-10, x+w-20, y+w-10);
                 draw2DImage(icon_attachment,
                                                           pos1, rect, NULL,
@@ -1054,7 +1054,7 @@ void RaceGUIBase::drawPlungerInFace(const Camera *camera, float dt)
                          plunger_x+plunger_size, offset_y+plunger_size);
 
     const core::rect<s32> source(core::position2d<s32>(0,0),
-                                 t->getOriginalSize());
+                                 t->getSize());
 
     draw2DImage(t, dest, source,
                                               &viewport /* clip */,
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index a77839be4..b6242217c 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -330,7 +330,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
 
     if (old_rtt_mini_map != NULL)
     {
-        core::rect<s32> source(core::position2di(0, 0), old_rtt_mini_map->getOriginalSize());
+        core::rect<s32> source(core::position2di(0, 0), old_rtt_mini_map->getSize());
         draw2DImage(old_rtt_mini_map, dest, source, 0, 0, true);
     }
     else if (new_rtt_mini_map != NULL)
@@ -381,7 +381,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
                     colors[i]=kart->getKartProperties()->getColor();
                 }
                 const core::rect<s32> rect(core::position2d<s32>(0,0),
-                                           m_icons_frame->getTexture()->getOriginalSize());
+                                           m_icons_frame->getTexture()->getSize());
 
                 draw2DImage(m_icons_frame->getTexture(), position,
                                                           rect, NULL, colors, true);
@@ -410,7 +410,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
         else if (c->isSolved(RaceManager::DIFFICULTY_EASY))   state = COMPLETED_EASY;
 
         const core::rect<s32> source(core::position2d<s32>(0,0),
-                                     m_icons[state]->getOriginalSize());
+                                     m_icons[state]->getSize());
 
         int marker_size = m_minimap_challenge_size;
         core::position2di mouse = irr_driver->getMouseLocation();

From 6c57ce8507a03e15bfec3741c0de21f00e2d3999 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 27 Mar 2015 08:05:55 +1100
Subject: [PATCH 057/331] Disable texture cache for resized textures (which are
 all in lower res compared what we use now that we resize _every_ big
 texture).

---
 src/tracks/track.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 36f567a00..7df8d8191 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -963,6 +963,8 @@ bool Track::loadMainTrack(const XMLNode &root)
     // and configure the path to them before loading the mesh.
     if ( (UserConfigParams::m_high_definition_textures & 0x01) == 0x00)
     {
+#undef USE_RESIZE_CACHE
+#ifdef USE_RESIZE_CACHE
         std::string cached_textures_dir =
             irr_driver->generateSmallerTextures(m_root);
 
@@ -972,10 +974,11 @@ bool Track::loadMainTrack(const XMLNode &root)
         std::string texture_default_path =
             scene_params->getAttributeAsString(scene::B3D_TEXTURE_PATH).c_str();
         scene_params->setAttribute(scene::B3D_TEXTURE_PATH, cached_textures_dir.c_str());
-
+#endif
         mesh = irr_driver->getMesh(full_path);
-
+#ifdef USE_RESIZE_CACHE
         scene_params->setAttribute(scene::B3D_TEXTURE_PATH, texture_default_path.c_str());
+#endif
     }
     else // Load mesh with default (hd) textures
     {
@@ -1637,6 +1640,10 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
     file_manager->pushTextureSearchPath(m_root);
     file_manager->pushModelSearchPath  (m_root);
 
+    // For now ignore the resize cache, since atm it only handles texturs in
+    // the track directory.
+#undef USE_RESIZE_CACHE
+#ifdef USE_RESIZE_CACHE
     // If the hd texture option is disabled, we generate smaller textures
     // and we also add the cache directory to the texture search path
     if ( (UserConfigParams::m_high_definition_textures & 0x01) == 0x00)
@@ -1645,7 +1652,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
             irr_driver->generateSmallerTextures(m_root);
         file_manager->pushTextureSearchPath(cached_textures_dir);
     }
-
+#endif
     // First read the temporary materials.xml file if it exists
     try
     {
@@ -1823,10 +1830,12 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
         World::getWorld()->setClearbackBufferColor(m_sky_color);
     }
 
+#ifdef USE_RESIZE_CACHE
     if (!UserConfigParams::m_high_definition_textures)
     {
         file_manager->popTextureSearchPath();
     }
+#endif
     file_manager->popTextureSearchPath();
     file_manager->popModelSearchPath  ();
 

From f81f684b3481fd9f5dc11ee40ac52875aad04869 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 26 Mar 2015 19:37:17 -0400
Subject: [PATCH 058/331] Improve timings used for audio status. Could be more
 precise but is good enough for the moment. See #2049

---
 src/audio/sfx_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index f729c0f39..7973e8254 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -365,7 +365,7 @@ void* SFXManager::mainLoop(void *obj)
             // Wait some time to let other threads run, then queue an
             // update event to keep music playing.
             StkTime::sleep(1);
-            me->queue(SFX_UPDATE, (SFXBase*)NULL, 0.01f);
+            me->queue(SFX_UPDATE, (SFXBase*)NULL, 0.001f);
         }
         me->m_sfx_commands.lock();
 

From 0c6f3eb3dd9bf82e0edc002df9b9a879c15fd31d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 27 Mar 2015 11:07:38 +1100
Subject: [PATCH 059/331] Tried to increase accuracy by measuing the sleeping
 time exactly.

---
 src/audio/sfx_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index 7973e8254..e6975bbb8 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -364,7 +364,9 @@ void* SFXManager::mainLoop(void *obj)
         {
             // Wait some time to let other threads run, then queue an
             // update event to keep music playing.
+            double t = StkTime::getRealTime();
             StkTime::sleep(1);
+            t = StkTime::getRealTime() - t;
             me->queue(SFX_UPDATE, (SFXBase*)NULL, 0.001f);
         }
         me->m_sfx_commands.lock();

From efcfdcced7bf585a9f39239acd342a478c80d4cd Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 27 Mar 2015 11:14:34 +1100
Subject: [PATCH 060/331] Oops - fixed typo in previous commit ... where I
 ignored the nicely computed 'accurate' values in the end :)

---
 src/audio/sfx_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index e6975bbb8..b484d3eb1 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -367,7 +367,7 @@ void* SFXManager::mainLoop(void *obj)
             double t = StkTime::getRealTime();
             StkTime::sleep(1);
             t = StkTime::getRealTime() - t;
-            me->queue(SFX_UPDATE, (SFXBase*)NULL, 0.001f);
+            me->queue(SFX_UPDATE, (SFXBase*)NULL, float(t));
         }
         me->m_sfx_commands.lock();
 

From 26bd5a89a00a3fdd43d3460e508d45e1c62b0744 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 26 Mar 2015 20:49:36 -0400
Subject: [PATCH 061/331] Use accurate timing for sounds. Fixes #2049

---
 src/audio/sfx_manager.cpp | 16 +++++++++++++---
 src/audio/sfx_manager.hpp |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index b484d3eb1..d026b559f 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -74,6 +74,7 @@ SFXManager::SFXManager()
     // The sound manager initialises OpenAL
     m_initialized = music_manager->initialized();
     m_master_gain = UserConfigParams::m_sfx_volume;
+    m_last_update_time = -1.0f;
     // Init position, since it can be used before positionListener is called.
     // No need to use lock here, since the thread will be created later.
     m_listener_position.getData() = Vec3(0, 0, 0);
@@ -669,9 +670,9 @@ void SFXManager::deleteSFXMapping(const std::string &name)
  *  adds an update command for the music manager.
  *  \param dt Time step size.
  */
-void SFXManager::update(float dt)
+void SFXManager::update()
 {
-    queue(SFX_UPDATE, (SFXBase*)NULL, dt);
+    queue(SFX_UPDATE, (SFXBase*)NULL);
     // Wake up the sfx thread to handle all queued up audio commands.
     pthread_cond_signal(&m_cond_request);
 }   // update
@@ -683,8 +684,17 @@ void SFXManager::update(float dt)
 */
 void SFXManager::reallyUpdateNow(SFXCommand *current)
 {
+    if (m_last_update_time < 0.0)
+    {
+        // first time
+        m_last_update_time = StkTime::getRealTime();
+    }
+
+    double previous_update_time = m_last_update_time;
+    m_last_update_time = StkTime::getRealTime();
+    double dt = m_last_update_time - previous_update_time;
+
     assert(current->m_command==SFX_UPDATE);
-    float dt = current->m_parameter.getX();
     if (music_manager->getCurrentMusic())
         music_manager->getCurrentMusic()->update(dt);
     m_all_sfx.lock();
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index 08e939179..a05b0df35 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -200,6 +200,8 @@ private:
     /** Thread id of the thread running in this object. */
     Synchronised<pthread_t *> m_thread_id;
 
+    double                    m_last_update_time;
+
     /** A conditional variable to wake up the main loop. */
     pthread_cond_t            m_cond_request;
 
@@ -253,7 +255,7 @@ public:
     void                     reallyPauseAllNow();
     void                     resumeAll();
     void                     reallyResumeAllNow();
-    void                     update(float dt);
+    void                     update();
     void                     reallyUpdateNow(SFXCommand *current);
     bool                     soundExist(const std::string &name);
     void                     setMasterSFXVolume(float gain);

From 3d4509b863c23d5b5a83c9e21e838acfbc77158f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 27 Mar 2015 11:53:25 +1100
Subject: [PATCH 062/331] Add a log statement about outdated drivers or opengl
 version to the log file (even if the popup for those issues is disabled).

---
 src/main.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ddd563750..0ca99d288 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1365,9 +1365,10 @@ int main(int argc, char *argv[] )
             exit(0);
         }
 
-        if (UserConfigParams::m_old_driver_popup)
+        if (!ProfileWorld::isNoGraphics() &&
+            GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
         {
-            if (!ProfileWorld::isNoGraphics() && GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_DRIVER_RECENT_ENOUGH))
+            if (UserConfigParams::m_old_driver_popup)
             {
                 MessageDialog *dialog =
                     new MessageDialog(_("Your driver version is too old. Please install "
@@ -1375,7 +1376,11 @@ int main(int argc, char *argv[] )
                     /*from queue*/ true);
                 GUIEngine::DialogQueue::get()->pushDialog(dialog);
             }
-            else if (!CVS->isGLSL())
+            Log::warn("OpenGL", "Driver is too old!");
+        }
+        else if (!CVS->isGLSL())
+        {
+            if (UserConfigParams::m_old_driver_popup)
             {
                 MessageDialog *dialog =
                     new MessageDialog(_("Your OpenGL version appears to be too old. Please verify "
@@ -1383,6 +1388,7 @@ int main(int argc, char *argv[] )
                     /*from queue*/ true);
                 GUIEngine::DialogQueue::get()->pushDialog(dialog);
             }
+            Log::warn("OpenGL", "OpenGL version is too old!");
         }
 
         // Note that on the very first run of STK internet status is set to

From 80de98f40a18d80478465eb7b89004a4048d83f2 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 26 Mar 2015 21:26:51 -0400
Subject: [PATCH 063/331] Fix build

---
 src/main_loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index cc1d4e37a..1b9d458e3 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -155,7 +155,7 @@ void MainLoop::run()
             // can use as many threads as possible without interfering
             // with audia
             PROFILER_PUSH_CPU_MARKER("Music/input/GUI", 0x7F, 0x00, 0x00);
-            SFXManager::get()->update(dt);
+            SFXManager::get()->update();
             PROFILER_POP_CPU_MARKER();
 
             PROFILER_PUSH_CPU_MARKER("Protocol manager update", 0x7F, 0x00, 0x7F);

From 17039141e4761cec733b46ce8851ba8501b19c43 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 28 Mar 2015 01:30:42 +1100
Subject: [PATCH 064/331] Fix #2051 by keeping a copy of the timer in the
 SktTimer class.

---
 src/main.cpp       |  1 +
 src/utils/time.cpp | 20 +++++++++++++++++++-
 src/utils/time.hpp | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 0ca99d288..57c6c5b11 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1085,6 +1085,7 @@ void initRest()
     stk_config->load(file_manager->getAsset("stk_config.xml"));
 
     irr_driver = new IrrDriver();
+    StkTime::init();   // grabs the timer object from the irrlicht device
 
     // Now create the actual non-null device in the irrlicht driver
     irr_driver->initDevice();
diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index 68a0e24b2..921389842 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -22,13 +22,31 @@
 
 #include <ctime>
 
+irr::ITimer *StkTime::m_timer = NULL;
+
+/** Init function for the timer. It grabs a copy of the timer of the
+ *  current irrlicht device (which is the NULL device). This way the
+ *  irrlicht time routine can be used even if no device exists. This
+ *  situation can happen when the window resolution is changed - if the
+ *  sfx manager (in a separate thread) would access the timer while the
+ *  device does not exist, stk crashes.
+ */
+void StkTime::init()
+{
+    assert(!m_timer);
+    m_timer = irr_driver->getDevice()->getTimer();
+    m_timer->grab();
+}   // init
+
+// ----------------------------------------------------------------------------
 /** Returns a time based on an arbitrary 'epoch' (e.g. could be start
  *  time of the application, 1.1.1970, ...).
  *  The value is a double precision floating point value in seconds.
  */
 double StkTime::getRealTime(long startAt)
 {
-    return irr_driver->getRealTime()/1000.0;
+    assert(m_timer);
+    return m_timer->getRealTime()/1000.0;
 }   // getTimeSinceEpoch
 
 // ----------------------------------------------------------------------------
diff --git a/src/utils/time.hpp b/src/utils/time.hpp
index ea4b3222e..7dae2b734 100644
--- a/src/utils/time.hpp
+++ b/src/utils/time.hpp
@@ -18,6 +18,9 @@
 
 #ifndef HEADER_TIME_HPP
 #define HEADER_TIME_HPP
+
+#include "ITimer.h"
+
 #include <stdexcept>
 
 #ifdef WIN32
@@ -36,9 +39,16 @@
 
 class StkTime
 {
+private:
+    /** This objects keeps a copy of irrlicht's null-device timer. This is
+    *  important otherwise we can't get the time when resolution is switched
+    *  (and the sfx threads needs real time at that time). */
+    static irr::ITimer *m_timer;
+
 public:
     typedef time_t TimeType;
 
+    static void init();
     static void getDate(int *day=NULL, int *month=NULL, int *year=NULL);
 
         /** Converts the time in this object to a human readable string. */

From e65b3414b9e8b38c69cc2bc7f444a3d04b60392d Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 27 Mar 2015 20:04:39 -0400
Subject: [PATCH 065/331] Tweak cocoa challenge. Further testing welcome

---
 data/challenges/jungle.challenge | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/challenges/jungle.challenge b/data/challenges/jungle.challenge
index b6345dbb5..cc069c478 100644
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@@ -6,14 +6,14 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="161"/>
+        <requirements position="1" time="170"/>
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="177"/>
+        <requirements time="220"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="240"/>
+        <requirements time="300"/>
     </easy>
 </challenge>

From cedb7e7123df3511eb77f8946abfda6850a19861 Mon Sep 17 00:00:00 2001
From: Tobias Markus <tobbi.bugs@googlemail.com>
Date: Sat, 28 Mar 2015 16:56:51 +0100
Subject: [PATCH 066/331] Fix glVertexAttribDivisor redefinition warning

---
 src/graphics/gl_headers.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 2542fa7a6..0e18a316d 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -13,6 +13,9 @@ extern "C" {
 #    include <OpenGL/gl3.h>
 #    define OGL32CTX
 #    ifdef GL_ARB_instanced_arrays
+#        ifdef glVertexAttribDivisor
+#            undef glVertexAttribDivisor
+#        endif
 #        define glVertexAttribDivisor glVertexAttribDivisorARB
 #    endif
 #    ifndef GL_TEXTURE_SWIZZLE_RGBA

From 7c697e76e5a1cb214bde8b96c66979f6a829deb7 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 28 Mar 2015 22:30:10 +0100
Subject: [PATCH 067/331] Fix motion blur in multiplayer

---
 src/graphics/camera.cpp          |  1 +
 src/graphics/camera.hpp          | 15 +++++++++++++--
 src/graphics/irr_driver.hpp      |  5 ++---
 src/graphics/post_processing.cpp | 20 ++++++++++----------
 src/graphics/render.cpp          |  2 ++
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 86ad95910..c71cffcf1 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -55,6 +55,7 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
     m_index         = camera_index;
     m_original_kart = kart;
     m_camera        = irr_driver->addCameraSceneNode();
+    m_previous_pv_matrix = core::matrix4();
 
 #ifdef DEBUG
     if (kart != NULL)
diff --git a/src/graphics/camera.hpp b/src/graphics/camera.hpp
index deca13935..2b1811828 100644
--- a/src/graphics/camera.hpp
+++ b/src/graphics/camera.hpp
@@ -28,9 +28,10 @@
 #include "utils/log.hpp"
 #include "utils/vec3.hpp"
 
+#include "matrix4.h"
+#include "rect.h"
 #include "SColor.h"
 #include "vector2d.h"
-#include "rect.h"
 
 #include <vector>
 
@@ -64,6 +65,8 @@ private:
 
     /** The camera scene node. */
     scene::ICameraSceneNode *m_camera;
+    /** The project-view matrix of the previous frame, used for the blur shader. */
+    core::matrix4 m_previous_pv_matrix;
 
     /** Camera's mode. */
     Mode            m_mode;
@@ -272,7 +275,15 @@ public:
     void setInitialTransform();
     void activate(bool alsoActivateInIrrlicht=true);
     void update            (float dt);
-    void setKart           (AbstractKart *new_kart);
+    void setKart(AbstractKart *new_kart);
+
+    // ------------------------------------------------------------------------
+    /** Returns the project-view matrix of the previous frame. */
+    core::matrix4 getPreviousPVMatrix() const { return m_previous_pv_matrix; }
+
+    // ------------------------------------------------------------------------
+    /** Returns the project-view matrix of the previous frame. */
+    void setPreviousPVMatrix(core::matrix4 mat) { m_previous_pv_matrix = mat; }
 
     // ------------------------------------------------------------------------
     /** Returns the kart to which this camera is attached. */
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 6d9097b83..320cb106d 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -218,7 +218,7 @@ private:
     core::array<video::IRenderTarget> m_mrt;
 
     /** Matrixes used in several places stored here to avoid recomputation. */
-    core::matrix4 m_ViewMatrix, m_InvViewMatrix, m_ProjMatrix, m_InvProjMatrix, m_ProjViewMatrix, m_previousProjViewMatrix, m_InvProjViewMatrix;
+    core::matrix4 m_ViewMatrix, m_InvViewMatrix, m_ProjMatrix, m_InvProjMatrix, m_ProjViewMatrix, m_InvProjViewMatrix;
 
     std::vector<video::ITexture *> SkyboxTextures;
     std::vector<video::ITexture *> SphericalHarmonicsTextures;
@@ -678,8 +678,7 @@ public:
     void setProjMatrix(core::matrix4 matrix) { m_ProjMatrix = matrix; matrix.getInverse(m_InvProjMatrix); }
     const core::matrix4 &getProjMatrix() const { return m_ProjMatrix; }
     const core::matrix4 &getInvProjMatrix() const { return m_InvProjMatrix; }
-    void genProjViewMatrix() { m_previousProjViewMatrix = m_ProjViewMatrix; m_ProjViewMatrix = m_ProjMatrix * m_ViewMatrix; m_InvProjViewMatrix = m_ProjViewMatrix; m_InvProjViewMatrix.makeInverse(); }
-    const core::matrix4 & getPreviousPVMatrix() { return m_previousProjViewMatrix; }
+    void genProjViewMatrix() { m_ProjViewMatrix = m_ProjMatrix * m_ViewMatrix; m_InvProjViewMatrix = m_ProjViewMatrix; m_InvProjViewMatrix.makeInverse(); }
     const core::matrix4 &getProjViewMatrix() const { return m_ProjViewMatrix; }
     const core::matrix4 &getInvProjViewMatrix() const { return m_InvProjViewMatrix; }
     const core::vector2df &getCurrentScreenSize() const { return m_current_screen_size; }
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a04c69aa0..3ef55f656 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -520,25 +520,25 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffe
 {
     MotionBlurProvider * const cb = (MotionBlurProvider *)irr_driver->
         getCallback(ES_MOTIONBLUR);
-    unsigned cam = Camera::getActiveCamera()->getIndex();
+    Camera *cam = Camera::getActiveCamera();
+    unsigned camID = cam->getIndex();
 
-    scene::ICameraSceneNode * const camnode =
-        Camera::getCamera(cam)->getCameraSceneNode();
+    scene::ICameraSceneNode * const camnode = cam->getCameraSceneNode();
 
     // Calculate the kart's Y position on screen
-    if (Camera::getCamera(cam)->getKart())
+    if (cam->getKart())
     {
-        const core::vector3df pos = Camera::getCamera(cam)->getKart()->getNode()->getPosition();
+        const core::vector3df pos = cam->getKart()->getNode()->getPosition();
         float ndc[4];
         core::matrix4 trans = camnode->getProjectionMatrix();
         trans *= camnode->getViewMatrix();
 
         trans.transformVect(ndc, pos);
         const float karty = (ndc[1] / ndc[3]) * 0.5f + 0.5f;
-        setMotionBlurCenterY(cam, karty);
+        setMotionBlurCenterY(camID, karty);
     }
     else
-        setMotionBlurCenterY(cam, 0.5f);
+        setMotionBlurCenterY(camID, 0.5f);
 
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
@@ -546,9 +546,9 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffe
     FullScreenShader::MotionBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::MotionBlurShader>(
                                   // Todo : use a previousPVMatrix per cam, not global
-                                  irr_driver->getPreviousPVMatrix(),
+                                  cam->getPreviousPVMatrix(),
                                   core::vector2df(0.5, 0.5),
-                                  cb->getBoostTime(Camera::getActiveCamera()->getIndex()) * 10, // Todo : should be framerate dependent
+                                  cb->getBoostTime(cam->getIndex()) * 10, // Todo : should be framerate dependent
                                   0.15f);
 }
 
@@ -730,7 +730,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             // Downsample
             FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_BLOOM_256), GL_COLOR_BUFFER_BIT, GL_LINEAR);
             FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_BLOOM_128), GL_COLOR_BUFFER_BIT, GL_LINEAR);
-			
+
 			// Copy for lens flare
 			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_LENS_512), GL_COLOR_BUFFER_BIT, GL_LINEAR);
 			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_LENS_256), GL_COLOR_BUFFER_BIT, GL_LINEAR);
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index e1fab4cf7..c01fb6bd3 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -276,6 +276,8 @@ void IrrDriver::renderGLSL(float dt)
                 glDisable(GL_FRAMEBUFFER_SRGB);
             }
         }
+        // Save projection-view matrix for the next frame
+        camera->setPreviousPVMatrix(m_ProjViewMatrix);
 
         PROFILER_POP_CPU_MARKER();
     }   // for i<world->getNumKarts()

From f2d0b4d7e03a9deb3be55bf0e7c16d2d40b144de Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 28 Mar 2015 18:19:27 -0400
Subject: [PATCH 068/331] Some challenge tweaks, more coming. See #2052

---
 data/challenges/mines.challenge     | 2 +-
 data/challenges/sandtrack.challenge | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/challenges/mines.challenge b/data/challenges/mines.challenge
index b50d24143..9d577f030 100644
--- a/data/challenges/mines.challenge
+++ b/data/challenges/mines.challenge
@@ -14,6 +14,6 @@
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="215"/>
+        <requirements time="255"/>
     </easy>
 </challenge>
diff --git a/data/challenges/sandtrack.challenge b/data/challenges/sandtrack.challenge
index 9010c3732..ba178bfef 100644
--- a/data/challenges/sandtrack.challenge
+++ b/data/challenges/sandtrack.challenge
@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="15" time="185"/>
+        <requirements energy="15" time="190"/>
     </medium>
     <easy>
         <karts number="1"/>
-        <requirements energy="10" time="220"/>
+        <requirements energy="10" time="260"/>
     </easy>
 </challenge>

From 8deac178d0ebf9cf433ab642138af171e9a9c182 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 28 Mar 2015 18:20:28 -0400
Subject: [PATCH 069/331] Attempt fix for 2055. Committed in a branch for now
 until we can test it better.

---
 src/tracks/track.cpp                     | 39 ++++++++++++++++--------
 src/tracks/track.hpp                     | 12 +++++++-
 src/tracks/track_object_manager.cpp      | 24 ---------------
 src/tracks/track_object_presentation.cpp | 18 +++++++++--
 4 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 7df8d8191..2dfeb6afe 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -142,7 +142,7 @@ Track::Track(const std::string &filename)
     m_startup_run = false;
     m_default_number_of_laps= 3;
     m_all_nodes.clear();
-    m_all_physics_only_nodes.clear();
+    m_static_physics_only_nodes.clear();
     m_all_cached_meshes.clear();
     loadTrackInfo();
 }   // Track
@@ -293,7 +293,7 @@ void Track::cleanup()
         irr_driver->removeNode(m_all_nodes[i]);
     }
     m_all_nodes.clear();
-    m_all_physics_only_nodes.clear();
+    m_static_physics_only_nodes.clear();
 
     m_all_emitters.clearAndDeleteAll();
 
@@ -302,6 +302,12 @@ void Track::cleanup()
     delete m_track_object_manager;
     m_track_object_manager = NULL;
 
+    for (unsigned int i = 0; i < m_object_physics_only_nodes.size(); i++)
+    {
+        m_object_physics_only_nodes[i]->drop();
+    }
+    m_object_physics_only_nodes.clear();
+
     irr_driver->removeNode(m_sun);
 
     delete m_track_mesh;
@@ -720,6 +726,24 @@ void Track::createPhysicsModel(unsigned int main_track_count)
         return;
     }
 
+
+    // Now convert all objects that are only used for the physics
+    // (like invisible walls).
+    for (unsigned int i = 0; i<m_static_physics_only_nodes.size(); i++)
+    {
+        convertTrackToBullet(m_static_physics_only_nodes[i]);
+        irr_driver->removeNode(m_static_physics_only_nodes[i]);
+    }
+    m_static_physics_only_nodes.clear();
+
+    for (unsigned int i = 0; i<m_object_physics_only_nodes.size(); i++)
+    {
+        convertTrackToBullet(m_object_physics_only_nodes[i]);
+        m_object_physics_only_nodes[i]->setVisible(false);
+        m_object_physics_only_nodes[i]->grab();
+        irr_driver->removeNode(m_object_physics_only_nodes[i]);
+    }
+
     m_track_mesh->removeAll();
     m_gfx_effect_mesh->removeAll();
     for(unsigned int i=main_track_count; i<m_all_nodes.size(); i++)
@@ -1377,7 +1401,7 @@ bool Track::loadMainTrack(const XMLNode &root)
             else
             {
                 if(interaction=="physics-only")
-                    m_all_physics_only_nodes.push_back( scene_node );
+                    m_static_physics_only_nodes.push_back(scene_node);
                 else
                     m_all_nodes.push_back( scene_node );
             }
@@ -1391,15 +1415,6 @@ bool Track::loadMainTrack(const XMLNode &root)
         convertTrackToBullet(m_all_nodes[i]);
     }
 
-    // Now convert all objects that are only used for the physics
-    // (like invisible walls).
-    for(unsigned int i=0; i<m_all_physics_only_nodes.size(); i++)
-    {
-        convertTrackToBullet(m_all_physics_only_nodes[i]);
-        irr_driver->removeNode(m_all_physics_only_nodes[i]);
-    }
-    m_all_physics_only_nodes.clear();
-
     if (m_track_mesh == NULL)
     {
         Log::fatal("track", "m_track_mesh == NULL, cannot loadMainTrack\n");
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index 635d913f6..e4da819de 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -184,7 +184,12 @@ private:
 
     /** The list of all nodes that are to be converted into physics,
      *  but not to be drawn (e.g. invisible walls). */
-    std::vector<scene::ISceneNode*> m_all_physics_only_nodes;
+    std::vector<scene::ISceneNode*> m_static_physics_only_nodes;
+
+    /** Same concept but for track objects. stored separately due to different
+      * memory management.
+      */
+    std::vector<scene::ISceneNode*> m_object_physics_only_nodes;
 
     /** The list of all meshes that are loaded from disk, which means
      *  that those meshes are being cached by irrlicht, and need to be freed. */
@@ -651,6 +656,11 @@ public:
     // ------------------------------------------------------------------------
     void addNode(scene::ISceneNode* node) { m_all_nodes.push_back(node); }
     // ------------------------------------------------------------------------
+    void addPhysicsOnlyNode(scene::ISceneNode* node)
+    {
+        m_object_physics_only_nodes.push_back(node);
+    }
+    // ------------------------------------------------------------------------
     float getDisplacementSpeed() const { return m_displacement_speed;    }
     // ------------------------------------------------------------------------
     float getCausticsSpeed() const { return m_caustics_speed;        }
diff --git a/src/tracks/track_object_manager.cpp b/src/tracks/track_object_manager.cpp
index 8545ebc32..e2f940ffd 100644
--- a/src/tracks/track_object_manager.cpp
+++ b/src/tracks/track_object_manager.cpp
@@ -42,13 +42,6 @@ TrackObjectManager::~TrackObjectManager()
 // ----------------------------------------------------------------------------
 /** Adds an object to the track object manager. The type to add is specified
  *  in the xml_node.
- * \note If you add add any objects with LOD, don't forget to call
- *       TrackObjectManager::assingLodNodes after everything is loaded
- *       to finalize their creation.
- *
- * FIXME: all of this is horrible, just make the exporter write LOD definitions
- *        in a separate section that's read before everything and remove all this
- *        crap
  */
 void TrackObjectManager::add(const XMLNode &xml_node, scene::ISceneNode* parent,
                              ModelDefinitionLoader& model_def_loader)
@@ -351,21 +344,4 @@ void TrackObjectManager::removeObject(TrackObject* obj)
 
 // ----------------------------------------------------------------------------
 
-/*
-void TrackObjectManager::assingLodNodes(const std::vector<LODNode*>& lod_nodes)
-{
-    for (unsigned int n=0; n<lod_nodes.size(); n++)
-    {
-        std::vector<const XMLNode*>& queue = m_lod_objects[ lod_nodes[n]->getGroupName() ];
-        assert( queue.size() > 0 );
-        const XMLNode* xml = queue[ queue.size() - 1 ];
 
-        TrackObject* obj = new TrackObject(*xml, lod_nodes[n]->getParent(), lod_nodes[n]);
-        queue.erase( queue.end() - 1 );
-
-        m_all_objects.push_back(obj);
-    }
-
-    m_lod_objects.clear();
-}
-*/
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 55a20c61e..e6557c100 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -384,14 +384,28 @@ void TrackObjectPresentationMesh::init(const XMLNode* xml_node,
     bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects ||
              World::getWorld()->getIdent() == IDENT_CUTSCENE);
     bool displacing = false;
-    if(xml_node)
+    std::string interaction;
+    if (xml_node)
+    {
         xml_node->get("displacing", &displacing);
+        xml_node->get("interaction", &interaction);
+    }
     animated &= !displacing;
 
     m_mesh->grab();
     irr_driver->grabAllTextures(m_mesh);
 
-    if (m_is_in_skybox)
+    if (interaction == "physicsonly")
+    {
+        m_node = irr_driver->addMesh(m_mesh, m_model_file, parent);
+        enabled = false;
+        m_frame_start = 0;
+        m_frame_end = 0;
+
+        if (World::getWorld() && World::getWorld()->getTrack() && xml_node)
+            World::getWorld()->getTrack()->addPhysicsOnlyNode(m_node);
+    }
+    else if (m_is_in_skybox)
     {
         // Tell the driver that this mesh is a part of the background
         scene::IMeshSceneNode * const node =

From dda3bb0f31a2d1b5bb2096811ff81714e17ed7ef Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 28 Mar 2015 19:21:48 -0400
Subject: [PATCH 070/331] Tweak more challenges

---
 data/challenges/lighthouse.challenge   | 4 ++--
 data/challenges/snowmountain.challenge | 4 ++--
 data/challenges/xr591.challenge        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/challenges/lighthouse.challenge b/data/challenges/lighthouse.challenge
index 326588621..8303cb977 100644
--- a/data/challenges/lighthouse.challenge
+++ b/data/challenges/lighthouse.challenge
@@ -10,11 +10,11 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="125"/>
+        <requirements time="145" position="1"/>
     </medium>
     <easy>
         <karts number="3"/>
-        <requirements time="145"/>
+        <requirements time="185"/>
     </easy>
 </challenge>
 
diff --git a/data/challenges/snowmountain.challenge b/data/challenges/snowmountain.challenge
index e4ac0c61e..db4319738 100644
--- a/data/challenges/snowmountain.challenge
+++ b/data/challenges/snowmountain.challenge
@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="187"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="220"/>
+        <requirements time="250"/>
     </easy>
 </challenge>
diff --git a/data/challenges/xr591.challenge b/data/challenges/xr591.challenge
index 4f8bc4b0b..44efb0539 100644
--- a/data/challenges/xr591.challenge
+++ b/data/challenges/xr591.challenge
@@ -6,15 +6,15 @@
     
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="135"/>
+        <requirements energy="18" time="120"/>
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="15" time="155"/>
+        <requirements energy="15" time="135"/>
     </medium>
     <easy>
         <karts number="1"/>
-        <requirements energy="12" time="170"/>
+        <requirements energy="12" time="180"/>
     </easy>
 </challenge>
 

From 19fd2f6361ecea6763c1b7c6edf42d8c83b03b0d Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 29 Mar 2015 00:57:05 +0100
Subject: [PATCH 071/331] Allocate memory dynamically in fribidize

---
 src/utils/translation.cpp | 66 +++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 38113bf01..29396e336 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -283,26 +283,22 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
 #if ENABLE_BIDI
     if(this->isRTLLanguage())
     {
-        const int FRIBIDI_BUFFER_SIZE = 512;
-        FriBidiChar fribidiInput[FRIBIDI_BUFFER_SIZE];
-        int len = 0;
-        int n = 0;
-        //std::cout << "fribidi input : ";
-        for (n = 0; ; n++)
-        {
-            fribidiInput[n] = in_ptr[n];
-            //std::cout << (int)fribidiInput[n] << " ";
-            len++;
+        std::size_t length = wcslen(in_ptr);
+        FriBidiChar *fribidiInput;
 
-            if (n == FRIBIDI_BUFFER_SIZE-1) // prevent buffeoverflows
-            {
-                Log::warn("Translations::fribidize", "translated string too long, truncating");
-                fribidiInput[n] = 0;
-                break;
-            }
-            if (fribidiInput[n] == 0) break; // stop on '\0'
+        if (sizeof(wchar_t) == sizeof(FriBidiChar))
+            fribidiInput = (FriBidiChar*) in_ptr;
+        else
+        {
+            // On windows FriBidiChar is 4 bytes, but wchar_t is 2 bytes.
+            // So we simply copy the characters over here (note that this
+            // is technically incorrect, all characters we use/support fit
+            // in 16 bits, which is what irrlicht supports atm).
+            fribidiInput = new FriBidiChar[length + 1];
+            std::memset(fribidiInput, 0, (length + 1) * sizeof(FriBidiChar));
+            for (std::size_t i = 0; i <= length; i++)
+                fribidiInput[i] = in_ptr[i];
         }
-        //std::cout << " (len=" << len << ")\n";
 
         // Assume right to left as start direction.
 #if FRIBIDI_MINOR_VERSION==10
@@ -314,37 +310,39 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
         FriBidiCharType pbase_dir = FRIBIDI_PAR_ON;
 #endif
 
-        static FriBidiChar fribidiOutput[FRIBIDI_BUFFER_SIZE];
-        for (n = 0; n < 512 ; n++)  { fribidiOutput[n] = 0; }
+        FriBidiChar *fribidiOutput = new FriBidiChar[length + 1];
+        std::memset(fribidiOutput, 0, (length + 1) * sizeof(FriBidiChar));
         fribidi_boolean result = fribidi_log2vis(fribidiInput,
-                                                 len-1,
+                                                 length,
                                                  &pbase_dir,
                                                  fribidiOutput,
               /* gint   *position_L_to_V_list */ NULL,
               /* gint   *position_V_to_L_list */ NULL,
               /* gint8  *embedding_level_list */ NULL
                                                                );
+        delete[] fribidiInput;
 
         if (!result)
         {
+            delete[] fribidiOutput;
             Log::error("Translations::fribidize", "Fribidi failed in 'fribidi_log2vis' =(");
             m_converted_string = core::stringw(in_ptr);
             return m_converted_string.c_str();
         }
 
-#ifdef WIN32
-        // On windows FriBidiChar is 4 bytes, but wchar_t is 2 bytes.
-        // So we simply copy the characters over here (note that this
-        // is technically incorrect, all characters we use/support fit
-        // in 16 bits, which is what irrlicht supports atm).
-        static wchar_t out[FRIBIDI_BUFFER_SIZE];
-        for(int i=0; i<len; i++)
-            out[i]=fribidiOutput[i];
-        out[len]=0;
-        return out;
-#else
-        return (const wchar_t*)fribidiOutput;
-#endif //WIND32
+        if (sizeof(wchar_t) == sizeof(FriBidiChar))
+            m_converted_string = core::stringw((wchar_t*) fribidiOutput);
+        else
+        {
+            // Copy back to wchar_t array
+            wchar_t *out = new wchar_t[length + 1];
+            for (std::size_t i = 0; i <= length; i++)
+                out[i] = fribidiOutput[i];
+            m_converted_string = core::stringw(out);
+            delete[] out;
+        }
+        delete[] fribidiOutput;
+        return m_converted_string.c_str();
     }
 
 #endif // ENABLE_BIDI

From e1eec44d1a3545de86c06deb213d8f19416f6a1f Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 28 Mar 2015 20:16:37 -0400
Subject: [PATCH 072/331] Tweak challenges

---
 data/challenges/hacienda.challenge  | 2 +-
 data/challenges/jungle.challenge    | 2 +-
 data/challenges/mansion.challenge   | 2 +-
 data/challenges/sandtrack.challenge | 2 +-
 data/challenges/snowpeak.challenge  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/challenges/hacienda.challenge b/data/challenges/hacienda.challenge
index c92c72108..c351d98b6 100644
--- a/data/challenges/hacienda.challenge
+++ b/data/challenges/hacienda.challenge
@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="190"/>
+        <requirements time="185"/>
     </medium>
     <easy>
         <karts number="4"/>
diff --git a/data/challenges/jungle.challenge b/data/challenges/jungle.challenge
index cc069c478..46ec0a924 100644
--- a/data/challenges/jungle.challenge
+++ b/data/challenges/jungle.challenge
@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="220"/>
+        <requirements time="210"/>
     </medium>
     <easy>
         <karts number="4"/>
diff --git a/data/challenges/mansion.challenge b/data/challenges/mansion.challenge
index 06cc9795e..662a15879 100644
--- a/data/challenges/mansion.challenge
+++ b/data/challenges/mansion.challenge
@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="145"/>
+        <requirements time="130"/>
     </medium>
     <easy>
         <karts number="4"/>
diff --git a/data/challenges/sandtrack.challenge b/data/challenges/sandtrack.challenge
index ba178bfef..189418b8e 100644
--- a/data/challenges/sandtrack.challenge
+++ b/data/challenges/sandtrack.challenge
@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="1"/>
-        <requirements energy="15" time="190"/>
+        <requirements energy="15" time="195"/>
     </medium>
     <easy>
         <karts number="1"/>
diff --git a/data/challenges/snowpeak.challenge b/data/challenges/snowpeak.challenge
index e9e1aa4da..e6c05e284 100644
--- a/data/challenges/snowpeak.challenge
+++ b/data/challenges/snowpeak.challenge
@@ -10,7 +10,7 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="170"/>
     </medium>
     <easy>
         <karts number="4"/>

From 100060eafd3b1ad73c0efc23dad7aa21d0ded2e0 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 29 Mar 2015 01:43:02 +0100
Subject: [PATCH 073/331] Don't delete the array on linux and remove a useless
 memset

---
 src/utils/translation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 29396e336..cda9463c0 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -295,7 +295,6 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
             // is technically incorrect, all characters we use/support fit
             // in 16 bits, which is what irrlicht supports atm).
             fribidiInput = new FriBidiChar[length + 1];
-            std::memset(fribidiInput, 0, (length + 1) * sizeof(FriBidiChar));
             for (std::size_t i = 0; i <= length; i++)
                 fribidiInput[i] = in_ptr[i];
         }
@@ -320,7 +319,8 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
               /* gint   *position_V_to_L_list */ NULL,
               /* gint8  *embedding_level_list */ NULL
                                                                );
-        delete[] fribidiInput;
+        if (sizeof(wchar_t) != sizeof(FriBidiChar))
+            delete[] fribidiInput;
 
         if (!result)
         {

From ded789de18a67bd75a1abcbcdbd374c7c0df6886 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 29 Mar 2015 23:17:14 +0200
Subject: [PATCH 074/331] Add option to fribidize everything

---
 src/utils/translation.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index cda9463c0..8e5d6853f 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -47,6 +47,8 @@
 
 // set to 1 to debug i18n
 #define TRANSLATE_VERBOSE 0
+// Define TEST_BIDI to force right-to-left style for all languages
+//#define TEST_BIDI
 
 using namespace tinygettext;
 
@@ -274,6 +276,9 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
             break;
         }
     }
+#ifdef TEST_BIDI
+    m_rtl = true;
+#endif
 }   // Translations
 
 // ----------------------------------------------------------------------------
@@ -298,6 +303,12 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
             for (std::size_t i = 0; i <= length; i++)
                 fribidiInput[i] = in_ptr[i];
         }
+#ifdef TEST_BIDI
+        FriBidiChar *tmp = fribidiInput;
+        fribidiInput = new FriBidiChar[++length + 1];
+        std::memcpy(fribidiInput + 1, tmp, length * sizeof(FriBidiChar));
+        fribidiInput[0] = L'\u202E';
+#endif
 
         // Assume right to left as start direction.
 #if FRIBIDI_MINOR_VERSION==10
@@ -319,6 +330,11 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
               /* gint   *position_V_to_L_list */ NULL,
               /* gint8  *embedding_level_list */ NULL
                                                                );
+#ifdef TEST_BIDI
+        delete[] fribidiInput;
+        fribidiInput = tmp;
+#endif
+
         if (sizeof(wchar_t) != sizeof(FriBidiChar))
             delete[] fribidiInput;
 

From b041d0d79ee9aa8625f4be06bdb9bde96ad64440 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 29 Mar 2015 23:53:36 +0200
Subject: [PATCH 075/331] Challenge points were not displayed at the right
 position for RTL languages

---
 src/graphics/stk_text_billboard.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index aeabe147b..24276bc1e 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -46,7 +46,8 @@ void STKTextBillboard::updateAbsolutePosition()
 
 scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, gui::ScalableFont* font)
 {
-    font->doDraw(text, core::rect<s32>(0, 0, 1000, 1000), video::SColor(255,255,255,255),
+    core::dimension2du size = font->getDimension(text.c_str());
+    font->doDraw(text, core::rect<s32>(0, 0, size.Width, size.Height), video::SColor(255,255,255,255),
         false, false, NULL, this);
 
     const float scale = 0.018f;

From 1971254a7f86b4e0a4541bbf25e906273296cc80 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 30 Mar 2015 09:12:00 +1100
Subject: [PATCH 076/331] Fixed compiler warning.

---
 src/audio/sfx_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index d026b559f..fc89bc5d5 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -692,7 +692,7 @@ void SFXManager::reallyUpdateNow(SFXCommand *current)
 
     double previous_update_time = m_last_update_time;
     m_last_update_time = StkTime::getRealTime();
-    double dt = m_last_update_time - previous_update_time;
+    float dt = float(m_last_update_time - previous_update_time);
 
     assert(current->m_command==SFX_UPDATE);
     if (music_manager->getCurrentMusic())

From c579eba6db70dceb7ebaba8ca355a8ea11d7cd9f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 30 Mar 2015 09:57:39 +1100
Subject: [PATCH 077/331] Removed empty file.

---
 sources.cmake         | 2 +-
 src/network/types.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/network/types.cpp

diff --git a/sources.cmake b/sources.cmake
index c16c9c60c..ddc029d4f 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.      
+# This will then trigger a new cmake run automatically.
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/network/types.cpp b/src/network/types.cpp
deleted file mode 100644
index 27a5d4fea..000000000
--- a/src/network/types.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "network/types.hpp"

From 06c8089dfc8504880ecf8054e6c6b747ee286a07 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 30 Mar 2015 00:38:59 +0200
Subject: [PATCH 078/331] Fribidize more strings

---
 src/achievements/achievement.cpp                | 2 +-
 src/challenges/challenge_data.cpp               | 6 ++----
 src/input/input_manager.cpp                     | 2 +-
 src/modes/world.cpp                             | 2 +-
 src/states_screens/dialogs/select_challenge.cpp | 4 ++--
 src/states_screens/edit_gp_screen.cpp           | 5 +++--
 src/states_screens/edit_track_screen.cpp        | 2 +-
 src/states_screens/gp_info_screen.cpp           | 4 ++--
 src/states_screens/grand_prix_editor_screen.cpp | 2 +-
 src/states_screens/race_gui_overworld.cpp       | 5 +++--
 src/states_screens/track_info_screen.cpp        | 2 +-
 src/tracks/track.cpp                            | 2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
index 74ae97ff3..739b681b4 100644
--- a/src/achievements/achievement.cpp
+++ b/src/achievements/achievement.cpp
@@ -200,7 +200,7 @@ void Achievement::check()
     {
         //show achievement
         core::stringw s = _("Completed achievement \"%s\".", 
-                            m_achievement_info->getName().c_str());
+                            m_achievement_info->getName());
         MessageQueue::add(MessageQueue::MT_ACHIEVEMENT, s);
 
         // Sends a confirmation to the server that an achievement has been
diff --git a/src/challenges/challenge_data.cpp b/src/challenges/challenge_data.cpp
index 6d0d0514a..ee0f8e011 100644
--- a/src/challenges/challenge_data.cpp
+++ b/src/challenges/challenge_data.cpp
@@ -483,8 +483,7 @@ const irr::core::stringw
             // shouldn't happen but let's avoid crashes as much as possible...
             if (track == NULL) return irr::core::stringw( L"????" );
 
-            return _("New track '%s' now available",
-                     core::stringw(track->getName()));
+            return _("New track '%s' now available", track->getName());
             break;
         }
         case UNLOCK_MODE:
@@ -513,8 +512,7 @@ const irr::core::stringw
             // shouldn't happen but let's avoid crashes as much as possible...
             if (kp == NULL) return irr::core::stringw( L"????" );
 
-            return _("New kart '%s' now available",
-                      core::stringw(kp->getName()));
+            return _("New kart '%s' now available", kp->getName());
         }
         default:
             assert(false);
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 0580b5f08..47885a0b8 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -749,7 +749,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
                         // is not associated to any player
                         GUIEngine::showMessage(
                             _("Ignoring '%s', you needed to join earlier to play!",
-                            irr::core::stringw(gp->getName().c_str()).c_str())      );
+                            core::stringw(gp->getName().c_str())));
                     }
                 }
                 return;
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 7a76ea5df..b5870958f 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -1145,7 +1145,7 @@ void World::eliminateKart(int kart_id, bool notify_of_elimination)
                                        2.0f);
             else
                 m_race_gui->addMessage(_("'%s' has been eliminated.",
-                                       core::stringw(kart->getName())),
+                                       kart->getName()),
                                        camera->getKart(),
                                        2.0f);
         }  // for i < number of cameras
diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp
index 7ec264700..3c2cc7041 100644
--- a/src/states_screens/dialogs/select_challenge.cpp
+++ b/src/states_screens/dialogs/select_challenge.cpp
@@ -131,13 +131,13 @@ SelectChallengeDialog::SelectChallengeDialog(const float percentWidth,
     if (c->getData()->isGrandPrix())
     {
         const GrandPrixData* gp = grand_prix_manager->getGrandPrix(c->getData()->getGPId());
-        getWidget<LabelWidget>("title")->setText( gp->getName(), true );
+        getWidget<LabelWidget>("title")->setText(translations->fribidize(gp->getName()), true);
     }
     else
     {
         const core::stringw track_name =
             track_manager->getTrack(c->getData()->getTrackId())->getName();
-        getWidget<LabelWidget>("title")->setText( track_name, true );
+        getWidget<LabelWidget>("title")->setText(translations->fribidize(track_name), true);
     }
 
     LabelWidget* typeLbl = getWidget<LabelWidget>("race_type_val");
diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index 92f9eeeb1..68199d986 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -155,7 +155,7 @@ void EditGPScreen::init()
     {
         LabelWidget* header = getWidget<LabelWidget>("title");
         assert(header != NULL);
-        header->setText(m_gp->getName(), true);
+        header->setText(translations->fribidize(m_gp->getName()), true);
 
         IconButtonWidget* button = getWidget<IconButtonWidget>("save");
         assert(button != NULL);
@@ -281,7 +281,8 @@ void EditGPScreen::setModified(const bool modified)
 
     LabelWidget* header = getWidget<LabelWidget>("title");
     assert(header != NULL);
-    header->setText(m_gp->getName() + (modified ? L" (+)" : L""), true);
+    //I18N: Indicate that the grand prix is modified and not saved
+    header->setText(modified ? _(L"%s (+)", m_gp->getName()) : L"", true);
 
     enableButtons();
 }
diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index c7dcd0d2a..4e3946ef0 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -223,7 +223,7 @@ void EditTrackScreen::selectTrack(const std::string& id)
     if (m_track != NULL)
     {
         tracks->setSelection(m_track->getIdent(), PLAYER_ID_GAME_MASTER, true);
-        selected_track->setText(m_track->getName(), true);
+        selected_track->setText(translations->fribidize(m_track->getName()), true);
 
         laps->setValue(m_laps);
 
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 42eab4068..faff5444b 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -215,11 +215,11 @@ void GPInfoScreen::init()
         m_gp.createRandomGP(m_num_tracks_spinner->getValue(),
                             m_group_name, getReverse(), true);
 
-        getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
+        getWidget<LabelWidget>("name")->setText(translations->fribidize(m_gp.getName()), false);
     }
     else
     {
-        getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
+        getWidget<LabelWidget>("name")->setText(translations->fribidize(m_gp.getName()), false);
         m_gp.checkConsistency();
     }
 
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 06405e217..1292202e4 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -168,7 +168,7 @@ void GrandPrixEditorScreen::setSelection (const GrandPrixData* gpdata)
     else
     {
         m_selection = grand_prix_manager->editGrandPrix(gpdata->getId());
-        gpname_widget->setText (gpdata->getName(), true);
+        gpname_widget->setText(translations->fribidize(gpdata->getName()), true);
         gplist_widget->setSelection(m_selection->getId(), PLAYER_ID_GAME_MASTER, true);
         loadTrackList (gpdata->getId());
     }
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index b6242217c..f29a735eb 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -490,7 +490,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
                 }
 
                 gui::ScalableFont* font = GUIEngine::getTitleFont();
-                font->draw(gp->getName(), pos, video::SColor(255,255,255,255),
+                font->draw(translations->fribidize(gp->getName()), pos, video::SColor(255,255,255,255),
                            false, true /* vcenter */, NULL);
 
                 core::rect<s32> pos(15,
@@ -515,7 +515,8 @@ void RaceGUIOverworld::drawGlobalMiniMap()
                 }
 
                 gui::ScalableFont* font = GUIEngine::getTitleFont();
-                font->draw(track->getName(), pos, video::SColor(255,255,255,255),
+                font->draw(translations->fribidize(track->getName()),
+                           pos, video::SColor(255, 255, 255, 255),
                            false, true /* vcenter */, NULL);
             }
 
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 21bf33586..d6a78e7a4 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -100,7 +100,7 @@ void TrackInfoScreen::init()
     const bool has_laps       = race_manager->modeHasLaps();
     const bool has_highscores = race_manager->modeHasHighscores();
 
-    getWidget<LabelWidget>("name")->setText(m_track->getName(), false);
+    getWidget<LabelWidget>("name")->setText(translations->fribidize(m_track->getName()), false);
 
     //I18N: when showing who is the author of track '%s'
     //I18N: (place %s where the name of the author should appear)
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 7df8d8191..0df6418a4 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -182,7 +182,7 @@ bool Track::operator<(const Track &other) const
     \note this is the LTR name, invoke fribidi as needed. */
 core::stringw Track::getName() const
 {
-    core::stringw translated = translations->w_gettext(m_name.c_str());
+    core::stringw translated = _LTR(m_name.c_str());
     int index = translated.find("|");
     if(index>-1)
     {

From 9417b80a5c31005e0cbb8d0aa37287d3047eb948 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 30 Mar 2015 01:11:23 +0200
Subject: [PATCH 079/331] Fix FPS display

---
 src/graphics/irr_driver.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index e8a6b7232..3f283f3d8 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1745,15 +1745,13 @@ video::SColorf IrrDriver::getAmbientLight() const
 void IrrDriver::displayFPS()
 {
     gui::IGUIFont* font = GUIEngine::getSmallFont();
+    core::rect<s32> position;
 
-    if(UserConfigParams::m_artist_debug_mode)
-    {
-        GL32_draw2DRectangle(video::SColor(150, 96, 74, 196),core::rect< s32 >(75,0,1100,40),NULL);
-    }
+    if (UserConfigParams::m_artist_debug_mode)
+        position = core::rect<s32>(75, 0, 1100, 40);
     else
-    {
-        GL32_draw2DRectangle(video::SColor(150, 96, 74, 196),core::rect< s32 >(75,0,900,40),NULL);
-    }
+        position = core::rect<s32>(75, 0, 900, 40);
+    GL32_draw2DRectangle(video::SColor(150, 96, 74, 196), position, NULL);
     // We will let pass some time to let things settle before trusting FPS counter
     // even if we also ignore fps = 1, which tends to happen in first checks
     const int NO_TRUST_COUNT = 200;
@@ -1805,7 +1803,7 @@ void IrrDriver::displayFPS()
 
     if (UserConfigParams::m_artist_debug_mode)
     {
-        fpsString = StringUtils::insertValues(_("FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"),
+        fpsString = _("FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d",
             min, fps, max, poly_count[SOLID_NORMAL_AND_DEPTH_PASS], poly_count[SHADOW_PASS], m_last_light_bucket_distance);
         poly_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
         poly_count[SHADOW_PASS] = 0;
@@ -1814,11 +1812,11 @@ void IrrDriver::displayFPS()
         object_count[TRANSPARENT_PASS] = 0;
     }
     else
-        fpsString = StringUtils::insertValues(_("FPS: %d/%d/%d - %d KTris"), min, fps, max, (int)roundf(kilotris));
+        fpsString = _("FPS: %d/%d/%d - %d KTris", min, fps, max, (int)roundf(kilotris));
 
     static video::SColor fpsColor = video::SColor(255, 0, 0, 0);
 
-    font->draw( fpsString.c_str(), core::rect< s32 >(100,0,400,50), fpsColor, false );
+    font->draw( fpsString.c_str(), position, fpsColor, false );
 }   // updateFPS
 
 // ----------------------------------------------------------------------------

From 114644233a5fef8b85418ee323e4a3805f94605f Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 30 Mar 2015 01:17:12 +0200
Subject: [PATCH 080/331] Improve RTL display of track names in story mode

---
 src/states_screens/race_gui_overworld.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index f29a735eb..938844a26 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -435,7 +435,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
     // ---- Draw nearby challenge if any
     core::rect<s32> pos(15,
                         10,
-                        15 + irr_driver->getActualScreenSize().Width/2,
+                        irr_driver->getActualScreenSize().Width - 200,
                         10 + GUIEngine::getTitleFontHeight());
 
     m_close_to_a_challenge = false;
@@ -493,13 +493,12 @@ void RaceGUIOverworld::drawGlobalMiniMap()
                 font->draw(translations->fribidize(gp->getName()), pos, video::SColor(255,255,255,255),
                            false, true /* vcenter */, NULL);
 
-                core::rect<s32> pos(15,
-                                    20 + GUIEngine::getTitleFontHeight(),
-                                    15 + irr_driver->getActualScreenSize().Width/2,
-                                    20 + 2*GUIEngine::getTitleFontHeight());
+                core::rect<s32> pos2(pos);
+                pos2.UpperLeftCorner.Y += 10 + GUIEngine::getTitleFontHeight();
+                pos2.LowerRightCorner.Y += 10 + GUIEngine::getTitleFontHeight();
 
                 //just below GP name
-                font->draw(_("Type: Grand Prix"), pos, video::SColor(255,255,255,255),
+                font->draw(_("Type: Grand Prix"), pos2, video::SColor(255,255,255,255),
                            false, true /* vcenter */, NULL);
             }
             else

From bcd9654a86674f003dd348ebaa120b4302106118 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 30 Mar 2015 10:02:57 +1100
Subject: [PATCH 081/331] Added missing GPL license.

---
 src/graphics/2dutils.cpp                      | 17 +++++++++++++++++
 src/graphics/2dutils.hpp                      | 17 +++++++++++++++++
 src/graphics/IBL.cpp                          | 17 +++++++++++++++++
 src/graphics/IBL.hpp                          | 17 +++++++++++++++++
 src/graphics/callbacks.cpp                    |  1 +
 src/graphics/callbacks.hpp                    |  1 +
 src/graphics/central_settings.cpp             | 17 +++++++++++++++++
 src/graphics/central_settings.hpp             | 17 +++++++++++++++++
 src/graphics/explosion.hpp                    |  1 +
 src/graphics/gl_headers.hpp                   | 17 +++++++++++++++++
 src/graphics/glwrap.cpp                       | 17 +++++++++++++++++
 src/graphics/glwrap.hpp                       | 17 +++++++++++++++++
 src/graphics/gpuparticles.cpp                 | 17 +++++++++++++++++
 src/graphics/gpuparticles.hpp                 | 17 +++++++++++++++++
 src/graphics/irr_driver.cpp                   |  1 -
 src/graphics/mlaa_areamap.hpp                 | 17 +++++++++++++++++
 src/graphics/render_geometry.cpp              | 17 +++++++++++++++++
 src/graphics/render_lighting.cpp              | 18 ++++++++++++++++++
 src/graphics/render_skybox.cpp                | 17 +++++++++++++++++
 src/graphics/rtts.hpp                         |  1 +
 src/graphics/screenquad.cpp                   |  1 +
 src/graphics/screenquad.hpp                   |  1 +
 src/graphics/shaders.cpp                      |  1 +
 src/graphics/shaders.hpp                      |  1 +
 src/graphics/shaders_util.hpp                 | 17 +++++++++++++++++
 src/graphics/shadow_matrixes.cpp              | 18 ++++++++++++++++++
 src/graphics/stk_text_billboard.cpp           | 17 +++++++++++++++++
 src/graphics/stk_text_billboard.hpp           | 17 +++++++++++++++++
 src/graphics/stkanimatedmesh.cpp              | 17 +++++++++++++++++
 src/graphics/stkanimatedmesh.hpp              | 17 +++++++++++++++++
 src/graphics/stkbillboard.cpp                 | 17 +++++++++++++++++
 src/graphics/stkbillboard.hpp                 | 17 +++++++++++++++++
 src/graphics/stkmesh.cpp                      | 17 +++++++++++++++++
 src/graphics/stkmesh.hpp                      | 18 ++++++++++++++++++
 src/graphics/stkmeshscenenode.cpp             | 17 +++++++++++++++++
 src/graphics/stkmeshscenenode.hpp             | 17 +++++++++++++++++
 src/graphics/stkscenemanager.cpp              | 17 +++++++++++++++++
 src/graphics/stkscenemanager.hpp              | 18 ++++++++++++++++++
 src/graphics/texturemanager.cpp               | 17 +++++++++++++++++
 src/graphics/texturemanager.hpp               | 18 ++++++++++++++++++
 src/graphics/vaomanager.cpp                   | 17 +++++++++++++++++
 src/graphics/vaomanager.hpp                   | 17 +++++++++++++++++
 src/graphics/wind.cpp                         |  1 +
 src/graphics/wind.hpp                         |  1 +
 src/network/network_string.cpp                | 16 ++++++++++++++++
 src/network/race_config.cpp                   | 17 +++++++++++++++++
 src/network/race_config.hpp                   | 17 +++++++++++++++++
 src/scriptengine/scriptarray.cpp              | 17 +++++++++++++++++
 src/scriptengine/scriptarray.hpp              | 17 +++++++++++++++++
 src/scriptengine/scriptstdstring.cpp          | 17 +++++++++++++++++
 src/scriptengine/scriptstdstring.hpp          | 17 +++++++++++++++++
 src/scriptengine/scriptstdstring_utils.cpp    | 17 +++++++++++++++++
 src/states_screens/network_kart_selection.cpp | 17 +++++++++++++++++
 src/states_screens/network_kart_selection.hpp | 17 +++++++++++++++++
 src/states_screens/offline_kart_selection.cpp | 17 +++++++++++++++++
 src/states_screens/offline_kart_selection.hpp | 17 +++++++++++++++++
 src/utils/cpp2011.hpp                         | 17 +++++++++++++++++
 src/utils/tuple.hpp                           | 17 +++++++++++++++++
 src/utils/vs.hpp                              | 17 +++++++++++++++++
 59 files changed, 830 insertions(+), 1 deletion(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index afebe54ed..27fe497eb 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "2dutils.hpp"
 #include "central_settings.hpp"
 #include "glwrap.hpp"
diff --git a/src/graphics/2dutils.hpp b/src/graphics/2dutils.hpp
index 47b0b1ef5..3ecffceeb 100644
--- a/src/graphics/2dutils.hpp
+++ b/src/graphics/2dutils.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef UTILS2D_HPP
 #define UTILS2D_HPP
 
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index ef22186d8..98e54ea40 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "IBL.hpp"
 #include "gl_headers.hpp"
 #include "shaders.hpp"
diff --git a/src/graphics/IBL.hpp b/src/graphics/IBL.hpp
index 24cdac36e..f5f97e068 100644
--- a/src/graphics/IBL.hpp
+++ b/src/graphics/IBL.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef IBL_HPP
 #define IBL_HPP
 
diff --git a/src/graphics/callbacks.cpp b/src/graphics/callbacks.cpp
index 357a4d9a0..e85e246c5 100644
--- a/src/graphics/callbacks.cpp
+++ b/src/graphics/callbacks.cpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/callbacks.hpp b/src/graphics/callbacks.hpp
index 922e6e76a..306cb6d7a 100644
--- a/src/graphics/callbacks.hpp
+++ b/src/graphics/callbacks.hpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index b4b7bc888..8a5d61ee2 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "modes/profile_world.hpp"
 #include "gl_headers.hpp"
diff --git a/src/graphics/central_settings.hpp b/src/graphics/central_settings.hpp
index b7b774541..6e3885dcd 100644
--- a/src/graphics/central_settings.hpp
+++ b/src/graphics/central_settings.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef CENTRAL_SETTINGS_HPP
 #define CENTRAL_SETTINGS_HPP
 
diff --git a/src/graphics/explosion.hpp b/src/graphics/explosion.hpp
index 584adfb7c..251bb6735 100644
--- a/src/graphics/explosion.hpp
+++ b/src/graphics/explosion.hpp
@@ -1,6 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
 //  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 2542fa7a6..e48b76c03 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef GL_HEADER_HPP
 #define GL_HEADER_HPP
 
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 842ca1c76..74297a009 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index f3c0016cd..8aec2cdf5 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef GLWRAP_HEADER_H
 #define GLWRAP_HEADER_H
 
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index cb0bdfb98..43d832a75 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/irr_driver.hpp"
 #include "graphics/glwrap.hpp"
 #include "gpuparticles.hpp"
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index be6b39d4e..8225beb36 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef GPUPARTICLES_H
 #define GPUPARTICLES_H
 
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 3f283f3d8..3ac26bdd5 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1,4 +1,3 @@
-//
 //  SuperTuxKart - a fun racing game with go-kart
 //  Copyright (C) 2009-2013 Joerg Henrichs
 //
diff --git a/src/graphics/mlaa_areamap.hpp b/src/graphics/mlaa_areamap.hpp
index f5c636f68..d63eaa48d 100644
--- a/src/graphics/mlaa_areamap.hpp
+++ b/src/graphics/mlaa_areamap.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef AREAMAP_H
 #define AREAMAP_H
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 727c251c3..1d40d8410 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/irr_driver.hpp"
 #include "central_settings.hpp"
 #include "config/user_config.hpp"
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index cf74eea07..031b6d04e 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -1,3 +1,21 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 #include "graphics/irr_driver.hpp"
 #include "central_settings.hpp"
 #include "config/user_config.hpp"
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 30baf03ac..236b810c8 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "graphics/IBL.hpp"
 #include "graphics/irr_driver.hpp"
diff --git a/src/graphics/rtts.hpp b/src/graphics/rtts.hpp
index 3be79d37a..f0e428175 100644
--- a/src/graphics/rtts.hpp
+++ b/src/graphics/rtts.hpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/screenquad.cpp b/src/graphics/screenquad.cpp
index c332339ec..c855a283c 100644
--- a/src/graphics/screenquad.cpp
+++ b/src/graphics/screenquad.cpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/screenquad.hpp b/src/graphics/screenquad.hpp
index dc2d7b2b2..87c11dfce 100644
--- a/src/graphics/screenquad.hpp
+++ b/src/graphics/screenquad.hpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index c3e50ef32..22da14162 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 9661278b1..7fff167bd 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 24b2df7f6..31339b4df 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef SHADERS_UTIL_HPP
 #define SHADERS_UTIL_HPP
 
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index c9683e6e3..e973ce79e 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -1,3 +1,21 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 #include <limits>
 #include <ICameraSceneNode.h>
 #include <SViewFrustum.h>
diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index 24276bc1e..7299e108a 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/stk_text_billboard.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/shaders.hpp"
diff --git a/src/graphics/stk_text_billboard.hpp b/src/graphics/stk_text_billboard.hpp
index 9f3d80925..090f6166e 100644
--- a/src/graphics/stk_text_billboard.hpp
+++ b/src/graphics/stk_text_billboard.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef STK_TEXT_BILLBOARD_HPP
 #define STK_TEXT_BILLBOARD_HPP
 
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index a91811c9a..59092ee01 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/stkanimatedmesh.hpp"
diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stkanimatedmesh.hpp
index 6c76a32c4..6eb23ac0c 100644
--- a/src/graphics/stkanimatedmesh.hpp
+++ b/src/graphics/stkanimatedmesh.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef STKANIMATEDMESH_HPP
 #define STKANIMATEDMESH_HPP
 
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 1753acd94..90c42572b 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/stkbillboard.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/shaders.hpp"
diff --git a/src/graphics/stkbillboard.hpp b/src/graphics/stkbillboard.hpp
index 294bc2625..f4f2cbdd2 100644
--- a/src/graphics/stkbillboard.hpp
+++ b/src/graphics/stkbillboard.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef STKBILLBOARD_HPP
 #define STKBILLBOARD_HPP
 
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index df71a7c8c..fc264fccf 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index 1495ecdf2..b350fbb44 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -1,3 +1,21 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 #ifndef STKMESH_H
 #define STKMESH_H
 
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index fbd3a76e8..bf4176402 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "stkmeshscenenode.hpp"
 #include "stkmesh.hpp"
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stkmeshscenenode.hpp
index bdebe8788..a9cb78aed 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stkmeshscenenode.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef STKMESHSCENENODE_H
 #define STKMESHSCENENODE_H
 
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index e68da0f7f..cefb212f6 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "graphics/glwrap.hpp"
 #include "graphics/stkscenemanager.hpp"
 #include "graphics/stkmesh.hpp"
diff --git a/src/graphics/stkscenemanager.hpp b/src/graphics/stkscenemanager.hpp
index a25ac34ff..bec913066 100644
--- a/src/graphics/stkscenemanager.hpp
+++ b/src/graphics/stkscenemanager.hpp
@@ -1,3 +1,21 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 // Not really a scene manager yet but hold algorithm that
 // rework scene manager output
 
diff --git a/src/graphics/texturemanager.cpp b/src/graphics/texturemanager.cpp
index ddff55794..4afe417d0 100644
--- a/src/graphics/texturemanager.cpp
+++ b/src/graphics/texturemanager.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "central_settings.hpp"
 #include "texturemanager.hpp"
 #include <fstream>
diff --git a/src/graphics/texturemanager.hpp b/src/graphics/texturemanager.hpp
index 89489d8c1..f0d314fbb 100644
--- a/src/graphics/texturemanager.hpp
+++ b/src/graphics/texturemanager.hpp
@@ -1,3 +1,21 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 #ifndef MEMORYMANAGER_HPP
 #define MEMORYMANAGER_HPP
 
diff --git a/src/graphics/vaomanager.cpp b/src/graphics/vaomanager.cpp
index 4d4ee1d41..bf3360f9d 100644
--- a/src/graphics/vaomanager.cpp
+++ b/src/graphics/vaomanager.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "vaomanager.hpp"
 #include "irr_driver.hpp"
 #include "stkmesh.hpp"
diff --git a/src/graphics/vaomanager.hpp b/src/graphics/vaomanager.hpp
index af86bcc6e..2008f315e 100644
--- a/src/graphics/vaomanager.hpp
+++ b/src/graphics/vaomanager.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef VAOMANAGER_HPP
 #define VAOMANAGER_HPP
 
diff --git a/src/graphics/wind.cpp b/src/graphics/wind.cpp
index 5bddd4a15..1ac0cae6d 100644
--- a/src/graphics/wind.cpp
+++ b/src/graphics/wind.cpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/wind.hpp b/src/graphics/wind.hpp
index afa011d43..9fe12a8a2 100644
--- a/src/graphics/wind.hpp
+++ b/src/graphics/wind.hpp
@@ -1,4 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_string.cpp b/src/network/network_string.cpp
index 251c98fb5..597b13078 100644
--- a/src/network/network_string.cpp
+++ b/src/network/network_string.cpp
@@ -1,3 +1,19 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "network/network_string.hpp"
 
 NetworkString operator+(NetworkString const& a, NetworkString const& b)
diff --git a/src/network/race_config.cpp b/src/network/race_config.cpp
index a60af9015..9a459ed1b 100644
--- a/src/network/race_config.cpp
+++ b/src/network/race_config.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "network/race_config.hpp"
 
 #include "race/race_manager.hpp"
diff --git a/src/network/race_config.hpp b/src/network/race_config.hpp
index 64829972a..f721e5064 100644
--- a/src/network/race_config.hpp
+++ b/src/network/race_config.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef RACE_CONFIG_HPP
 #define RACE_CONFIG_HPP
 
diff --git a/src/scriptengine/scriptarray.cpp b/src/scriptengine/scriptarray.cpp
index 86efaa25f..edb2bcd1c 100644
--- a/src/scriptengine/scriptarray.cpp
+++ b/src/scriptengine/scriptarray.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <new>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/scriptengine/scriptarray.hpp b/src/scriptengine/scriptarray.hpp
index 3b8287084..42a13510f 100644
--- a/src/scriptengine/scriptarray.hpp
+++ b/src/scriptengine/scriptarray.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef SCRIPTARRAY_H
 #define SCRIPTARRAY_H
 
diff --git a/src/scriptengine/scriptstdstring.cpp b/src/scriptengine/scriptstdstring.cpp
index b74ce3d85..1cd595867 100644
--- a/src/scriptengine/scriptstdstring.cpp
+++ b/src/scriptengine/scriptstdstring.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "scriptstdstring.hpp"
 #include <assert.h> // assert()
 #include <sstream>  // std::stringstream
diff --git a/src/scriptengine/scriptstdstring.hpp b/src/scriptengine/scriptstdstring.hpp
index 8ac0115b3..5bf26ae8f 100644
--- a/src/scriptengine/scriptstdstring.hpp
+++ b/src/scriptengine/scriptstdstring.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 //
 // Script std::string
 //
diff --git a/src/scriptengine/scriptstdstring_utils.cpp b/src/scriptengine/scriptstdstring_utils.cpp
index f5021ccf7..27ba927c1 100644
--- a/src/scriptengine/scriptstdstring_utils.cpp
+++ b/src/scriptengine/scriptstdstring_utils.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <assert.h>
 #include "scriptstdstring.hpp"
 #include "scriptarray.hpp"
diff --git a/src/states_screens/network_kart_selection.cpp b/src/states_screens/network_kart_selection.cpp
index b5da42da8..23e82ff6a 100644
--- a/src/states_screens/network_kart_selection.cpp
+++ b/src/states_screens/network_kart_selection.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "states_screens/network_kart_selection.hpp"
 
 #include "audio/sfx_manager.hpp"
diff --git a/src/states_screens/network_kart_selection.hpp b/src/states_screens/network_kart_selection.hpp
index 524fb433c..57b2e9fbc 100644
--- a/src/states_screens/network_kart_selection.hpp
+++ b/src/states_screens/network_kart_selection.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef NETWORK_KART_SELECTION_HPP
 #define NETWORK_KART_SELECTION_HPP
 
diff --git a/src/states_screens/offline_kart_selection.cpp b/src/states_screens/offline_kart_selection.cpp
index 296678360..9bba1771e 100644
--- a/src/states_screens/offline_kart_selection.cpp
+++ b/src/states_screens/offline_kart_selection.cpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include "states_screens/offline_kart_selection.hpp"
 
 DEFINE_SCREEN_SINGLETON( OfflineKartSelectionScreen );
diff --git a/src/states_screens/offline_kart_selection.hpp b/src/states_screens/offline_kart_selection.hpp
index 5cfe747fb..cbde2e40b 100644
--- a/src/states_screens/offline_kart_selection.hpp
+++ b/src/states_screens/offline_kart_selection.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef OFFLINE_KART_SELECTION_HPP
 #define OFFLINE_KART_SELECTION_HPP
 
diff --git a/src/utils/cpp2011.hpp b/src/utils/cpp2011.hpp
index cd4f4704d..621834fa2 100644
--- a/src/utils/cpp2011.hpp
+++ b/src/utils/cpp2011.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef CPP2011_HPP
 #define CPP2011_HPP
 #include <vector>
diff --git a/src/utils/tuple.hpp b/src/utils/tuple.hpp
index d79fb498f..799061388 100644
--- a/src/utils/tuple.hpp
+++ b/src/utils/tuple.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __STK_TUPLE_HPP__
 #define __STK_TUPLE_HPP__
 
diff --git a/src/utils/vs.hpp b/src/utils/vs.hpp
index 017f07400..341985193 100644
--- a/src/utils/vs.hpp
+++ b/src/utils/vs.hpp
@@ -1,3 +1,20 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 /** Visual studio workarounds in one place
  *  Note that Visual Studio 2013 does have the maths functions defined,
  *  so we define the work arounds only for compiler versions before 18.00

From 8d07d26c256838497d5d74804957c929ab11924b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 30 Mar 2015 11:31:42 +1100
Subject: [PATCH 082/331] Updated (c) year to include 2015.

---
 src/achievements/achievement.cpp              |    4 +-
 src/achievements/achievement.hpp              |    4 +-
 src/achievements/achievement_info.cpp         |    4 +-
 src/achievements/achievement_info.hpp         |    5 +-
 src/achievements/achievements_manager.cpp     |    4 +-
 src/achievements/achievements_manager.hpp     |    2 +-
 src/achievements/achievements_status.cpp      |    4 +-
 src/achievements/achievements_status.hpp      |    4 +-
 src/addons/addon.cpp                          |    2 +-
 src/addons/addon.hpp                          |    2 +-
 src/addons/addons_manager.cpp                 |    2 +-
 src/addons/addons_manager.hpp                 |    2 +-
 src/addons/news_manager.cpp                   |    2 +-
 src/addons/news_manager.hpp                   |    2 +-
 src/addons/zip.cpp                            |    2 +-
 src/addons/zip.hpp                            |    2 +-
 src/animations/animation_base.cpp             |    2 +-
 src/animations/animation_base.hpp             |    2 +-
 src/animations/ipo.cpp                        |    2 +-
 src/animations/ipo.hpp                        |    2 +-
 src/animations/three_d_animation.cpp          |    2 +-
 src/animations/three_d_animation.hpp          |    2 +-
 src/audio/dummy_sfx.hpp                       |    4 +-
 src/audio/music.hpp                           |    2 +-
 src/audio/music_dummy.hpp                     |    2 +-
 src/audio/music_information.cpp               |    2 +-
 src/audio/music_information.hpp               |    2 +-
 src/audio/music_manager.cpp                   |    4 +-
 src/audio/music_manager.hpp                   |    4 +-
 src/audio/music_ogg.cpp                       |    2 +-
 src/audio/music_ogg.hpp                       |    2 +-
 src/audio/sfx_base.hpp                        |    4 +-
 src/audio/sfx_buffer.cpp                      |    2 +-
 src/audio/sfx_buffer.hpp                      |    2 +-
 src/audio/sfx_manager.cpp                     |    2 +-
 src/audio/sfx_manager.hpp                     |    2 +-
 src/audio/sfx_openal.cpp                      |    6 +-
 src/audio/sfx_openal.hpp                      |    2 +-
 src/challenges/challenge_data.cpp             |    2 +-
 src/challenges/challenge_data.hpp             |    2 +-
 src/challenges/challenge_status.cpp           |    2 +-
 src/challenges/challenge_status.hpp           |    2 +-
 src/challenges/story_mode_status.cpp          |    2 +-
 src/challenges/story_mode_status.hpp          |    2 +-
 src/challenges/unlock_manager.cpp             |    2 +-
 src/challenges/unlock_manager.hpp             |    2 +-
 src/config/hardware_stats.cpp                 |    8 +-
 src/config/hardware_stats.hpp                 |    2 +-
 src/config/player_manager.cpp                 |    2 +-
 src/config/player_manager.hpp                 |    2 +-
 src/config/player_profile.cpp                 |    2 +-
 src/config/player_profile.hpp                 |    2 +-
 src/config/saved_grand_prix.cpp               |    2 +-
 src/config/saved_grand_prix.hpp               |    2 +-
 src/config/stk_config.cpp                     |    2 +-
 src/config/stk_config.hpp                     |    2 +-
 src/config/user_config.cpp                    |    2 +-
 src/config/user_config.hpp                    |    2 +-
 src/graphics/2dutils.hpp                      |    2 +-
 src/graphics/IBL.cpp                          |    2 +-
 src/graphics/IBL.hpp                          |    2 +-
 src/graphics/camera.cpp                       |    4 +-
 src/graphics/camera.hpp                       |    4 +-
 src/graphics/central_settings.cpp             |    2 +-
 src/graphics/central_settings.hpp             |    2 +-
 src/graphics/explosion.cpp                    |    2 +-
 src/graphics/explosion.hpp                    |    2 +-
 src/graphics/glwrap.cpp                       |    2 +-
 src/graphics/graphics_restrictions.cpp        | 1024 ++++++++---------
 src/graphics/graphics_restrictions.hpp        |    2 +-
 src/graphics/hit_effect.hpp                   |    2 +-
 src/graphics/hit_sfx.cpp                      |    2 +-
 src/graphics/hit_sfx.hpp                      |    2 +-
 src/graphics/irr_driver.cpp                   |    2 +-
 src/graphics/irr_driver.hpp                   |    2 +-
 src/graphics/large_mesh_buffer.hpp            |    2 +-
 src/graphics/light.cpp                        |    2 +-
 src/graphics/light.hpp                        |    2 +-
 src/graphics/lod_node.cpp                     |    2 +-
 src/graphics/lod_node.hpp                     |    2 +-
 src/graphics/material.cpp                     |    4 +-
 src/graphics/material.hpp                     |    4 +-
 src/graphics/material_manager.cpp             |    4 +-
 src/graphics/material_manager.hpp             |    4 +-
 src/graphics/mesh_tools.cpp                   |    2 +-
 src/graphics/mesh_tools.hpp                   |    2 +-
 src/graphics/moving_texture.cpp               |    2 +-
 src/graphics/moving_texture.hpp               |    2 +-
 src/graphics/particle_emitter.cpp             |    2 +-
 src/graphics/particle_emitter.hpp             |    2 +-
 src/graphics/particle_kind.cpp                |    2 +-
 src/graphics/particle_kind.hpp                |    2 +-
 src/graphics/particle_kind_manager.cpp        |    2 +-
 src/graphics/particle_kind_manager.hpp        |    2 +-
 src/graphics/per_camera_node.cpp              |    2 +-
 src/graphics/per_camera_node.hpp              |    2 +-
 src/graphics/post_processing.cpp              |    2 +-
 src/graphics/post_processing.hpp              |    2 +-
 src/graphics/referee.cpp                      |    2 +-
 src/graphics/referee.hpp                      |    2 +-
 src/graphics/render.cpp                       |    2 +-
 src/graphics/rtts.cpp                         |    2 +-
 src/graphics/shaders_util.hpp                 |    2 +-
 src/graphics/show_curve.cpp                   |    2 +-
 src/graphics/show_curve.hpp                   |    2 +-
 src/graphics/skid_marks.cpp                   |    4 +-
 src/graphics/skid_marks.hpp                   |    4 +-
 src/graphics/slip_stream.cpp                  |    2 +-
 src/graphics/slip_stream.hpp                  |    2 +-
 src/graphics/stars.cpp                        |    2 +-
 src/graphics/stars.hpp                        |    2 +-
 src/graphics/stkscenemanager.cpp              |    2 +-
 src/graphics/sun.cpp                          |    2 +-
 src/graphics/sun.hpp                          |    2 +-
 src/graphics/texturemanager.cpp               |    2 +-
 src/graphics/texturemanager.hpp               |    2 +-
 src/graphics/vaomanager.hpp                   |    2 +-
 src/graphics/water.cpp                        |    2 +-
 src/graphics/water.hpp                        |    2 +-
 src/graphics/weather.cpp                      |    2 +-
 src/graphics/weather.hpp                      |    2 +-
 src/guiengine/CGUISpriteBank.cpp              |    2 +-
 src/guiengine/CGUISpriteBank.hpp              |    2 +-
 src/guiengine/abstract_state_manager.cpp      |    2 +-
 src/guiengine/abstract_state_manager.hpp      |    2 +-
 .../abstract_top_level_container.cpp          |    2 +-
 .../abstract_top_level_container.hpp          |    2 +-
 src/guiengine/dialog_queue.cpp                |    2 +-
 src/guiengine/dialog_queue.hpp                |    2 +-
 src/guiengine/engine.cpp                      |    2 +-
 src/guiengine/engine.hpp                      |    2 +-
 src/guiengine/event_handler.cpp               |    2 +-
 src/guiengine/event_handler.hpp               |    2 +-
 src/guiengine/layout_manager.cpp              |    2 +-
 src/guiengine/layout_manager.hpp              |    2 +-
 src/guiengine/message_queue.cpp               |    2 +-
 src/guiengine/message_queue.hpp               |    2 +-
 src/guiengine/modaldialog.cpp                 |    2 +-
 src/guiengine/modaldialog.hpp                 |    2 +-
 src/guiengine/scalable_font.cpp               |   12 +-
 src/guiengine/scalable_font.hpp               |    2 +-
 src/guiengine/screen.cpp                      |    2 +-
 src/guiengine/screen.hpp                      |    2 +-
 src/guiengine/screen_loader.cpp               |    2 +-
 src/guiengine/skin.cpp                        |    2 +-
 src/guiengine/skin.hpp                        |    2 +-
 src/guiengine/widget.cpp                      |    2 +-
 src/guiengine/widget.hpp                      |    2 +-
 src/guiengine/widgets.hpp                     |    2 +-
 src/guiengine/widgets/CGUIEditBox.cpp         |    2 +-
 src/guiengine/widgets/CGUIEditBox.hpp         |    2 +-
 src/guiengine/widgets/CGUISTKListBox.cpp      |    2 +-
 src/guiengine/widgets/CGUISTKListBox.hpp      |    2 +-
 src/guiengine/widgets/bubble_widget.cpp       |    2 +-
 src/guiengine/widgets/bubble_widget.hpp       |    2 +-
 src/guiengine/widgets/button_widget.cpp       |    2 +-
 src/guiengine/widgets/button_widget.hpp       |    2 +-
 src/guiengine/widgets/check_box_widget.cpp    |    2 +-
 src/guiengine/widgets/check_box_widget.hpp    |    2 +-
 .../widgets/dynamic_ribbon_widget.cpp         |    2 +-
 .../widgets/dynamic_ribbon_widget.hpp         |    2 +-
 src/guiengine/widgets/icon_button_widget.cpp  |    2 +-
 src/guiengine/widgets/icon_button_widget.hpp  |    2 +-
 src/guiengine/widgets/kart_stats_widget.cpp   |    2 +-
 src/guiengine/widgets/kart_stats_widget.hpp   |    2 +-
 src/guiengine/widgets/label_widget.cpp        |    2 +-
 src/guiengine/widgets/label_widget.hpp        |    2 +-
 src/guiengine/widgets/list_widget.cpp         |    2 +-
 src/guiengine/widgets/list_widget.hpp         |    2 +-
 src/guiengine/widgets/model_view_widget.cpp   |    2 +-
 src/guiengine/widgets/model_view_widget.hpp   |    2 +-
 src/guiengine/widgets/player_kart_widget.cpp  |    2 +-
 src/guiengine/widgets/player_kart_widget.hpp  |    2 +-
 src/guiengine/widgets/player_name_spinner.cpp |    2 +-
 src/guiengine/widgets/player_name_spinner.hpp |    2 +-
 src/guiengine/widgets/progress_bar_widget.cpp |    2 +-
 src/guiengine/widgets/progress_bar_widget.hpp |    2 +-
 src/guiengine/widgets/rating_bar_widget.cpp   |    2 +-
 src/guiengine/widgets/rating_bar_widget.hpp   |    2 +-
 src/guiengine/widgets/ribbon_widget.cpp       |    2 +-
 src/guiengine/widgets/ribbon_widget.hpp       |    2 +-
 src/guiengine/widgets/skill_level_widget.cpp  |    2 +-
 src/guiengine/widgets/skill_level_widget.hpp  |    2 +-
 src/guiengine/widgets/spinner_widget.cpp      |    2 +-
 src/guiengine/widgets/spinner_widget.hpp      |    2 +-
 src/guiengine/widgets/text_box_widget.cpp     |    2 +-
 src/guiengine/widgets/text_box_widget.hpp     |    2 +-
 src/input/binding.cpp                         |    2 +-
 src/input/binding.hpp                         |    2 +-
 src/input/device_config.cpp                   |    2 +-
 src/input/device_config.hpp                   |    2 +-
 src/input/device_manager.cpp                  |    2 +-
 src/input/device_manager.hpp                  |    2 +-
 src/input/gamepad_config.cpp                  |    2 +-
 src/input/gamepad_config.hpp                  |    2 +-
 src/input/gamepad_device.cpp                  |    4 +-
 src/input/gamepad_device.hpp                  |    2 +-
 src/input/input.hpp                           |    4 +-
 src/input/input_device.cpp                    |    2 +-
 src/input/input_device.hpp                    |    2 +-
 src/input/input_manager.cpp                   |    2 +-
 src/input/input_manager.hpp                   |    4 +-
 src/input/keyboard_config.cpp                 |    2 +-
 src/input/keyboard_config.hpp                 |    2 +-
 src/input/keyboard_device.cpp                 |    4 +-
 src/input/keyboard_device.hpp                 |    4 +-
 src/input/wiimote.cpp                         |    2 +-
 src/input/wiimote.hpp                         |    2 +-
 src/input/wiimote_manager.cpp                 |    2 +-
 src/input/wiimote_manager.hpp                 |    2 +-
 src/io/file_manager.cpp                       |    4 +-
 src/io/file_manager.hpp                       |    4 +-
 src/io/utf_writer.cpp                         |    2 +-
 src/io/utf_writer.hpp                         |    2 +-
 src/io/xml_node.cpp                           |    2 +-
 src/io/xml_node.hpp                           |    2 +-
 src/items/attachment.cpp                      |    2 +-
 src/items/attachment.hpp                      |    2 +-
 src/items/attachment_manager.cpp              |    2 +-
 src/items/attachment_manager.hpp              |    2 +-
 src/items/attachment_plugin.hpp               |    2 +-
 src/items/bowling.cpp                         |    2 +-
 src/items/bowling.hpp                         |    2 +-
 src/items/cake.cpp                            |    4 +-
 src/items/cake.hpp                            |    4 +-
 src/items/flyable.cpp                         |    4 +-
 src/items/flyable.hpp                         |    4 +-
 src/items/item.cpp                            |    4 +-
 src/items/item.hpp                            |    4 +-
 src/items/item_manager.cpp                    |    2 +-
 src/items/item_manager.hpp                    |    2 +-
 src/items/plunger.cpp                         |    4 +-
 src/items/plunger.hpp                         |    4 +-
 src/items/powerup.cpp                         |    2 +-
 src/items/powerup.hpp                         |    2 +-
 src/items/powerup_manager.cpp                 |    2 +-
 src/items/powerup_manager.hpp                 |    2 +-
 src/items/projectile_manager.cpp              |    2 +-
 src/items/projectile_manager.hpp              |    2 +-
 src/items/rubber_ball.cpp                     |    2 +-
 src/items/rubber_ball.hpp                     |    2 +-
 src/items/rubber_band.cpp                     |    2 +-
 src/items/rubber_band.hpp                     |    2 +-
 src/items/swatter.cpp                         |    2 +-
 src/items/swatter.hpp                         |    2 +-
 src/karts/abstract_kart.cpp                   |    2 +-
 src/karts/abstract_kart.hpp                   |    2 +-
 src/karts/abstract_kart_animation.cpp         |    2 +-
 src/karts/abstract_kart_animation.hpp         |    2 +-
 src/karts/cannon_animation.cpp                |    2 +-
 src/karts/cannon_animation.hpp                |    2 +-
 src/karts/controller/ai_base_controller.cpp   |    4 +-
 src/karts/controller/ai_base_controller.hpp   |    2 +-
 src/karts/controller/ai_properties.cpp        |    2 +-
 src/karts/controller/ai_properties.hpp        |    2 +-
 src/karts/controller/controller.cpp           |    2 +-
 src/karts/controller/controller.hpp           |    2 +-
 src/karts/controller/end_controller.cpp       |    6 +-
 src/karts/controller/end_controller.hpp       |    6 +-
 src/karts/controller/kart_control.hpp         |    2 +-
 src/karts/controller/player_controller.cpp    |    4 +-
 src/karts/controller/player_controller.hpp    |    4 +-
 src/karts/controller/skidding_ai.cpp          |    6 +-
 src/karts/controller/skidding_ai.hpp          |    6 +-
 src/karts/explosion_animation.cpp             |    2 +-
 src/karts/explosion_animation.hpp             |    2 +-
 src/karts/ghost_kart.cpp                      |    2 +-
 src/karts/ghost_kart.hpp                      |    2 +-
 src/karts/kart.cpp                            |    4 +-
 src/karts/kart.hpp                            |    4 +-
 src/karts/kart_gfx.cpp                        |    2 +-
 src/karts/kart_gfx.hpp                        |    2 +-
 src/karts/kart_model.cpp                      |    2 +-
 src/karts/kart_model.hpp                      |    2 +-
 src/karts/kart_properties.cpp                 |    2 +-
 src/karts/kart_properties.hpp                 |    2 +-
 src/karts/kart_properties_manager.cpp         |    4 +-
 src/karts/kart_properties_manager.hpp         |    4 +-
 src/karts/kart_with_stats.cpp                 |    2 +-
 src/karts/kart_with_stats.hpp                 |    2 +-
 src/karts/max_speed.cpp                       |    2 +-
 src/karts/max_speed.hpp                       |    2 +-
 src/karts/moveable.cpp                        |    4 +-
 src/karts/moveable.hpp                        |    4 +-
 src/karts/player_difficulty.cpp               |    2 +-
 src/karts/player_difficulty.hpp               |    2 +-
 src/karts/rescue_animation.cpp                |    2 +-
 src/karts/rescue_animation.hpp                |    2 +-
 src/karts/skidding.cpp                        |    2 +-
 src/karts/skidding.hpp                        |    2 +-
 src/karts/skidding_properties.cpp             |    2 +-
 src/karts/skidding_properties.hpp             |    2 +-
 src/main.cpp                                  |    4 +-
 src/main_loop.cpp                             |    4 +-
 src/main_loop.hpp                             |    4 +-
 src/modes/cutscene_world.cpp                  |    2 +-
 src/modes/cutscene_world.hpp                  |    2 +-
 src/modes/demo_world.cpp                      |    2 +-
 src/modes/demo_world.hpp                      |    2 +-
 src/modes/easter_egg_hunt.cpp                 |    2 +-
 src/modes/easter_egg_hunt.hpp                 |    2 +-
 src/modes/follow_the_leader.cpp               |    2 +-
 src/modes/follow_the_leader.hpp               |    2 +-
 src/modes/linear_world.cpp                    |    2 +-
 src/modes/linear_world.hpp                    |    2 +-
 src/modes/overworld.cpp                       |    2 +-
 src/modes/overworld.hpp                       |    2 +-
 src/modes/profile_world.cpp                   |    2 +-
 src/modes/profile_world.hpp                   |    2 +-
 src/modes/soccer_world.cpp                    |    2 +-
 src/modes/soccer_world.hpp                    |    2 +-
 src/modes/standard_race.cpp                   |    2 +-
 src/modes/standard_race.hpp                   |    2 +-
 src/modes/three_strikes_battle.cpp            |    2 +-
 src/modes/three_strikes_battle.hpp            |    2 +-
 src/modes/tutorial_world.cpp                  |    2 +-
 src/modes/tutorial_world.hpp                  |    2 +-
 src/modes/world.cpp                           |    2 +-
 src/modes/world.hpp                           |    2 +-
 src/modes/world_status.cpp                    |    2 +-
 src/modes/world_status.hpp                    |    2 +-
 src/modes/world_with_rank.cpp                 |    2 +-
 src/modes/world_with_rank.hpp                 |    2 +-
 src/network/client_network_manager.cpp        |    2 +-
 src/network/client_network_manager.hpp        |    2 +-
 src/network/event.cpp                         |    2 +-
 src/network/event.hpp                         |    2 +-
 src/network/game_setup.cpp                    |    2 +-
 src/network/game_setup.hpp                    |    2 +-
 src/network/network_interface.cpp             |    2 +-
 src/network/network_interface.hpp             |    2 +-
 src/network/network_manager.cpp               |    2 +-
 src/network/network_manager.hpp               |    2 +-
 src/network/network_string.hpp                |    2 +-
 src/network/network_world.hpp                 |    2 +-
 src/network/protocol.cpp                      |    2 +-
 src/network/protocol.hpp                      |    2 +-
 src/network/protocol_manager.cpp              |    2 +-
 src/network/protocol_manager.hpp              |    2 +-
 .../protocols/client_lobby_room_protocol.cpp  |    2 +-
 src/network/protocols/connect_to_peer.cpp     |    2 +-
 src/network/protocols/connect_to_peer.hpp     |    2 +-
 src/network/protocols/connect_to_server.cpp   |    2 +-
 src/network/protocols/connect_to_server.hpp   |    2 +-
 src/network/protocols/get_peer_address.cpp    |    2 +-
 src/network/protocols/get_peer_address.hpp    |    2 +-
 src/network/protocols/get_public_address.cpp  |    2 +-
 src/network/protocols/get_public_address.hpp  |    2 +-
 src/network/protocols/hide_public_address.cpp |    2 +-
 src/network/protocols/hide_public_address.hpp |    2 +-
 src/network/protocols/lobby_room_protocol.cpp |    2 +-
 src/network/protocols/lobby_room_protocol.hpp |    2 +-
 src/network/protocols/ping_protocol.cpp       |    2 +-
 src/network/protocols/quick_join_protocol.cpp |    2 +-
 src/network/protocols/request_connection.cpp  |    2 +-
 .../protocols/server_lobby_room_protocol.cpp  |    2 +-
 src/network/protocols/show_public_address.cpp |    2 +-
 src/network/protocols/show_public_address.hpp |    2 +-
 src/network/protocols/start_server.cpp        |    2 +-
 src/network/protocols/stop_server.cpp         |    2 +-
 src/network/remote_kart_info.hpp              |    2 +-
 src/network/server_network_manager.cpp        |    2 +-
 src/network/server_network_manager.hpp        |    2 +-
 src/network/stk_host.cpp                      |    2 +-
 src/network/stk_host.hpp                      |    2 +-
 src/network/stk_peer.cpp                      |    2 +-
 src/network/stk_peer.hpp                      |    2 +-
 src/network/types.hpp                         |    2 +-
 src/online/http_request.cpp                   |    2 +-
 src/online/http_request.hpp                   |    2 +-
 src/online/online_player_profile.cpp          |    2 +-
 src/online/online_player_profile.hpp          |    2 +-
 src/online/online_profile.cpp                 |    2 +-
 src/online/online_profile.hpp                 |    2 +-
 src/online/profile_manager.cpp                |    2 +-
 src/online/profile_manager.hpp                |    2 +-
 src/online/request.cpp                        |    2 +-
 src/online/request.hpp                        |    2 +-
 src/online/request_manager.cpp                |    6 +-
 src/online/request_manager.hpp                |    6 +-
 src/online/server.cpp                         |    2 +-
 src/online/server.hpp                         |    2 +-
 src/online/servers_manager.cpp                |    2 +-
 src/online/servers_manager.hpp                |    2 +-
 src/online/xml_request.cpp                    |    2 +-
 src/online/xml_request.hpp                    |    2 +-
 src/physics/btKart.cpp                        |    2 +-
 src/physics/btKart.hpp                        |    2 +-
 src/physics/btKartRaycast.cpp                 |    2 +-
 src/physics/btKartRaycast.hpp                 |    2 +-
 src/physics/irr_debug_drawer.cpp              |    2 +-
 src/physics/irr_debug_drawer.hpp              |    2 +-
 src/physics/kart_motion_state.hpp             |    2 +-
 src/physics/physical_object.cpp               |    2 +-
 src/physics/physical_object.hpp               |    2 +-
 src/physics/physics.cpp                       |    2 +-
 src/physics/physics.hpp                       |    2 +-
 src/physics/stk_dynamics_world.hpp            |    2 +-
 src/physics/triangle_mesh.cpp                 |    2 +-
 src/physics/triangle_mesh.hpp                 |    2 +-
 src/physics/user_pointer.hpp                  |    2 +-
 src/race/grand_prix_data.cpp                  |    4 +-
 src/race/grand_prix_data.hpp                  |    4 +-
 src/race/grand_prix_manager.cpp               |    2 +-
 src/race/grand_prix_manager.hpp               |    2 +-
 src/race/highscore_manager.cpp                |    2 +-
 src/race/highscore_manager.hpp                |    2 +-
 src/race/highscores.cpp                       |    2 +-
 src/race/highscores.hpp                       |    2 +-
 src/race/history.cpp                          |    2 +-
 src/race/history.hpp                          |    2 +-
 src/race/race_manager.cpp                     |    2 +-
 src/race/race_manager.hpp                     |    2 +-
 src/replay/replay_base.cpp                    |    2 +-
 src/replay/replay_base.hpp                    |    2 +-
 src/replay/replay_play.cpp                    |    2 +-
 src/replay/replay_play.hpp                    |    2 +-
 src/replay/replay_recorder.cpp                |    2 +-
 src/replay/replay_recorder.hpp                |    2 +-
 src/scriptengine/script_engine.cpp            |   24 +-
 src/scriptengine/script_engine.hpp            |    2 +-
 src/scriptengine/script_kart.cpp              |    2 +-
 src/scriptengine/script_kart.hpp              |    2 +-
 src/scriptengine/script_physics.cpp           |    2 +-
 src/scriptengine/script_physics.hpp           |    2 +-
 src/scriptengine/script_track.cpp             |    2 +-
 src/scriptengine/script_track.hpp             |    2 +-
 src/scriptengine/scriptvec3.cpp               |    2 +-
 src/scriptengine/scriptvec3.hpp               |    2 +-
 src/states_screens/addons_screen.cpp          |    2 +-
 src/states_screens/addons_screen.hpp          |    2 +-
 src/states_screens/arenas_screen.cpp          |    2 +-
 src/states_screens/arenas_screen.hpp          |    2 +-
 src/states_screens/create_server_screen.cpp   |    2 +-
 src/states_screens/create_server_screen.hpp   |    2 +-
 src/states_screens/credits.cpp                |    2 +-
 src/states_screens/credits.hpp                |    2 +-
 src/states_screens/cutscene_gui.cpp           |    2 +-
 src/states_screens/cutscene_gui.hpp           |    2 +-
 .../dialogs/add_device_dialog.cpp             |    2 +-
 .../dialogs/add_device_dialog.hpp             |    2 +-
 src/states_screens/dialogs/addons_loading.cpp |    2 +-
 src/states_screens/dialogs/addons_loading.hpp |    2 +-
 .../dialogs/change_password_dialog.cpp        |    2 +-
 .../dialogs/change_password_dialog.hpp        |    2 +-
 .../dialogs/confirm_resolution_dialog.cpp     |    2 +-
 .../dialogs/confirm_resolution_dialog.hpp     |    2 +-
 .../dialogs/custom_video_settings.cpp         |    2 +-
 .../dialogs/custom_video_settings.hpp         |    2 +-
 src/states_screens/dialogs/debug_slider.cpp   |    2 +-
 src/states_screens/dialogs/debug_slider.hpp   |    2 +-
 .../dialogs/enter_gp_name_dialog.cpp          |    4 +-
 .../dialogs/enter_gp_name_dialog.hpp          |    2 +-
 src/states_screens/dialogs/gp_info_dialog.cpp |    2 +-
 src/states_screens/dialogs/gp_info_dialog.hpp |    2 +-
 src/states_screens/dialogs/message_dialog.cpp |    2 +-
 src/states_screens/dialogs/message_dialog.hpp |    2 +-
 .../dialogs/press_a_key_dialog.cpp            |    2 +-
 .../dialogs/press_a_key_dialog.hpp            |    2 +-
 .../dialogs/race_paused_dialog.cpp            |    2 +-
 .../dialogs/race_paused_dialog.hpp            |    2 +-
 .../dialogs/recovery_dialog.cpp               |    2 +-
 .../dialogs/recovery_dialog.hpp               |    2 +-
 .../dialogs/registration_dialog.cpp           |    2 +-
 .../dialogs/registration_dialog.hpp           |    2 +-
 .../dialogs/select_challenge.cpp              |    2 +-
 .../dialogs/select_challenge.hpp              |    2 +-
 .../dialogs/server_info_dialog.cpp            |    2 +-
 .../dialogs/server_info_dialog.hpp            |    2 +-
 .../dialogs/tutorial_message_dialog.cpp       |    2 +-
 .../dialogs/tutorial_message_dialog.hpp       |    2 +-
 .../dialogs/user_info_dialog.cpp              |    2 +-
 .../dialogs/user_info_dialog.hpp              |    2 +-
 src/states_screens/dialogs/vote_dialog.cpp    |    2 +-
 src/states_screens/dialogs/vote_dialog.hpp    |    2 +-
 src/states_screens/easter_egg_screen.cpp      |    2 +-
 src/states_screens/easter_egg_screen.hpp      |    2 +-
 src/states_screens/edit_gp_screen.cpp         |    2 +-
 src/states_screens/edit_gp_screen.hpp         |    2 +-
 src/states_screens/edit_track_screen.cpp      |    2 +-
 src/states_screens/edit_track_screen.hpp      |    2 +-
 src/states_screens/feature_unlocked.cpp       |    2 +-
 src/states_screens/feature_unlocked.hpp       |    2 +-
 src/states_screens/gp_info_screen.cpp         |    4 +-
 src/states_screens/gp_info_screen.hpp         |    4 +-
 src/states_screens/grand_prix_cutscene.cpp    |    2 +-
 src/states_screens/grand_prix_cutscene.hpp    |    2 +-
 .../grand_prix_editor_screen.cpp              |    2 +-
 .../grand_prix_editor_screen.hpp              |    2 +-
 src/states_screens/grand_prix_lose.cpp        |    2 +-
 src/states_screens/grand_prix_lose.hpp        |    2 +-
 src/states_screens/grand_prix_win.cpp         |    2 +-
 src/states_screens/grand_prix_win.hpp         |    2 +-
 src/states_screens/help_screen_1.cpp          |    2 +-
 src/states_screens/help_screen_1.hpp          |    2 +-
 src/states_screens/help_screen_2.cpp          |    2 +-
 src/states_screens/help_screen_2.hpp          |    2 +-
 src/states_screens/help_screen_3.cpp          |    2 +-
 src/states_screens/help_screen_3.hpp          |    2 +-
 src/states_screens/help_screen_4.cpp          |    2 +-
 src/states_screens/help_screen_4.hpp          |    2 +-
 src/states_screens/kart_selection.cpp         |    2 +-
 src/states_screens/kart_selection.hpp         |    2 +-
 src/states_screens/main_menu_screen.cpp       |    2 +-
 src/states_screens/main_menu_screen.hpp       |    2 +-
 src/states_screens/networking_lobby.cpp       |    2 +-
 src/states_screens/networking_lobby.hpp       |    2 +-
 .../online_profile_achievements.cpp           |    2 +-
 .../online_profile_achievements.hpp           |    2 +-
 src/states_screens/online_profile_base.cpp    |    2 +-
 src/states_screens/online_profile_base.hpp    |    2 +-
 src/states_screens/online_profile_friends.cpp |    2 +-
 src/states_screens/online_profile_friends.hpp |    2 +-
 .../online_profile_settings.cpp               |    2 +-
 .../online_profile_settings.hpp               |    2 +-
 src/states_screens/online_screen.cpp          |    2 +-
 src/states_screens/online_screen.hpp          |    2 +-
 src/states_screens/online_user_search.cpp     |    2 +-
 src/states_screens/online_user_search.hpp     |    2 +-
 src/states_screens/options_screen_audio.cpp   |    2 +-
 src/states_screens/options_screen_audio.hpp   |    2 +-
 src/states_screens/options_screen_input.cpp   |    2 +-
 src/states_screens/options_screen_input.hpp   |    2 +-
 src/states_screens/options_screen_input2.cpp  |    2 +-
 src/states_screens/options_screen_input2.hpp  |    2 +-
 src/states_screens/options_screen_ui.cpp      |    2 +-
 src/states_screens/options_screen_ui.hpp      |    2 +-
 src/states_screens/options_screen_video.cpp   |    2 +-
 src/states_screens/options_screen_video.hpp   |    2 +-
 src/states_screens/race_gui.cpp               |    4 +-
 src/states_screens/race_gui.hpp               |    4 +-
 src/states_screens/race_gui_base.cpp          |    4 +-
 src/states_screens/race_gui_base.hpp          |    2 +-
 src/states_screens/race_gui_overworld.cpp     |    4 +-
 src/states_screens/race_gui_overworld.hpp     |    4 +-
 src/states_screens/race_result_gui.cpp        |    2 +-
 src/states_screens/race_result_gui.hpp        |    2 +-
 src/states_screens/race_setup_screen.cpp      |    2 +-
 src/states_screens/race_setup_screen.hpp      |    2 +-
 src/states_screens/register_screen.cpp        |    2 +-
 src/states_screens/register_screen.hpp        |    2 +-
 src/states_screens/server_selection.cpp       |    2 +-
 src/states_screens/server_selection.hpp       |    2 +-
 src/states_screens/soccer_setup_screen.cpp    |    2 +-
 src/states_screens/soccer_setup_screen.hpp    |    2 +-
 src/states_screens/state_manager.cpp          |    2 +-
 src/states_screens/state_manager.hpp          |    2 +-
 src/states_screens/track_info_screen.cpp      |    4 +-
 src/states_screens/track_info_screen.hpp      |    4 +-
 src/states_screens/tracks_screen.cpp          |    2 +-
 src/states_screens/tracks_screen.hpp          |    2 +-
 src/states_screens/user_screen.cpp            |    2 +-
 src/states_screens/user_screen.hpp            |    2 +-
 src/tinygettext/dictionary.cpp                |    2 +-
 src/tinygettext/dictionary.hpp                |    2 +-
 src/tinygettext/dictionary_manager.cpp        |    2 +-
 src/tinygettext/dictionary_manager.hpp        |    2 +-
 src/tinygettext/file_system.hpp               |    2 +-
 src/tinygettext/iconv.cpp                     |    2 +-
 src/tinygettext/iconv.hpp                     |    2 +-
 src/tinygettext/language.cpp                  |    2 +-
 src/tinygettext/language.hpp                  |    2 +-
 src/tinygettext/log_stream.hpp                |    2 +-
 src/tinygettext/plural_forms.cpp              |    2 +-
 src/tinygettext/plural_forms.hpp              |    2 +-
 src/tinygettext/po_parser.cpp                 |    2 +-
 src/tinygettext/po_parser.hpp                 |    2 +-
 src/tinygettext/stk_file_system.cpp           |    2 +-
 src/tinygettext/stk_file_system.hpp           |    2 +-
 src/tinygettext/tgt_log.cpp                   |    2 +-
 src/tinygettext/tgt_log.hpp                   |    2 +-
 src/tinygettext/tinygettext.cpp               |    2 +-
 src/tinygettext/tinygettext.hpp               |    2 +-
 src/tracks/ambient_light_sphere.cpp           |    2 +-
 src/tracks/ambient_light_sphere.hpp           |    2 +-
 src/tracks/bezier_curve.cpp                   |    2 +-
 src/tracks/bezier_curve.hpp                   |    2 +-
 src/tracks/check_cannon.cpp                   |    2 +-
 src/tracks/check_cannon.hpp                   |    2 +-
 src/tracks/check_goal.cpp                     |    2 +-
 src/tracks/check_goal.hpp                     |    2 +-
 src/tracks/check_lap.cpp                      |    2 +-
 src/tracks/check_lap.hpp                      |    2 +-
 src/tracks/check_line.cpp                     |    2 +-
 src/tracks/check_line.hpp                     |    2 +-
 src/tracks/check_manager.cpp                  |    2 +-
 src/tracks/check_manager.hpp                  |    2 +-
 src/tracks/check_sphere.cpp                   |    2 +-
 src/tracks/check_sphere.hpp                   |    2 +-
 src/tracks/check_structure.cpp                |    2 +-
 src/tracks/check_structure.hpp                |    2 +-
 src/tracks/graph_node.cpp                     |    2 +-
 src/tracks/graph_node.hpp                     |    2 +-
 src/tracks/model_definition_loader.cpp        |    2 +-
 src/tracks/model_definition_loader.hpp        |    2 +-
 src/tracks/quad.cpp                           |    2 +-
 src/tracks/quad.hpp                           |    2 +-
 src/tracks/quad_graph.cpp                     |    2 +-
 src/tracks/quad_graph.hpp                     |    2 +-
 src/tracks/quad_set.cpp                       |    2 +-
 src/tracks/quad_set.hpp                       |    2 +-
 src/tracks/terrain_info.cpp                   |    2 +-
 src/tracks/terrain_info.hpp                   |    2 +-
 src/tracks/track.cpp                          |    4 +-
 src/tracks/track.hpp                          |    4 +-
 src/tracks/track_manager.cpp                  |    2 +-
 src/tracks/track_manager.hpp                  |    2 +-
 src/tracks/track_object.cpp                   |    2 +-
 src/tracks/track_object.hpp                   |    2 +-
 src/tracks/track_object_manager.cpp           |    2 +-
 src/tracks/track_object_manager.hpp           |    2 +-
 src/tracks/track_object_presentation.cpp      |    2 +-
 src/tracks/track_object_presentation.hpp      |    2 +-
 src/tracks/track_sector.cpp                   |    2 +-
 src/tracks/track_sector.hpp                   |    2 +-
 src/utils/aligned_array.hpp                   |    2 +-
 src/utils/can_be_deleted.hpp                  |    2 +-
 src/utils/command_line.cpp                    |    2 +-
 src/utils/command_line.hpp                    |    2 +-
 src/utils/constants.cpp                       |    2 +-
 src/utils/constants.hpp                       |    4 +-
 src/utils/crash_reporting.cpp                 |    2 +-
 src/utils/crash_reporting.hpp                 |    2 +-
 src/utils/debug.cpp                           |    2 +-
 src/utils/debug.hpp                           |    2 +-
 src/utils/helpers.cpp                         |    6 +-
 src/utils/helpers.hpp                         |    2 +-
 src/utils/interpolation_array.hpp             |    2 +-
 src/utils/leak_check.cpp                      |    2 +-
 src/utils/leak_check.hpp                      |    2 +-
 src/utils/log.cpp                             |    2 +-
 src/utils/log.hpp                             |    2 +-
 src/utils/no_copy.hpp                         |    2 +-
 src/utils/profiler.cpp                        |    2 +-
 src/utils/profiler.hpp                        |    2 +-
 src/utils/ptr_vector.hpp                      |    2 +-
 src/utils/random_generator.cpp                |    2 +-
 src/utils/random_generator.hpp                |    2 +-
 src/utils/singleton.hpp                       |    2 +-
 src/utils/string_utils.cpp                    |    6 +-
 src/utils/string_utils.hpp                    |    6 +-
 src/utils/synchronised.hpp                    |    2 +-
 src/utils/time.cpp                            |    2 +-
 src/utils/time.hpp                            |    2 +-
 src/utils/translation.cpp                     |    2 +-
 src/utils/translation.hpp                     |    2 +-
 src/utils/types.hpp                           |    2 +-
 src/utils/vec3.cpp                            |    2 +-
 src/utils/vec3.hpp                            |    2 +-
 tools/update_copyright.sh                     |    4 +-
 650 files changed, 1262 insertions(+), 1263 deletions(-)
 mode change 100755 => 100644 src/guiengine/message_queue.cpp
 mode change 100755 => 100644 src/utils/can_be_deleted.hpp

diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
index 739b681b4..f9e66d045 100644
--- a/src/achievements/achievement.cpp
+++ b/src/achievements/achievement.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievement.hpp b/src/achievements/achievement.hpp
index b127af293..a1618a2d4 100644
--- a/src/achievements/achievement.hpp
+++ b/src/achievements/achievement.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievement_info.cpp b/src/achievements/achievement_info.cpp
index d10e8e056..d732abe83 100644
--- a/src/achievements/achievement_info.cpp
+++ b/src/achievements/achievement_info.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievement_info.hpp b/src/achievements/achievement_info.hpp
index 677170b17..d79caa2d0 100644
--- a/src/achievements/achievement_info.hpp
+++ b/src/achievements/achievement_info.hpp
@@ -1,8 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
-
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievements_manager.cpp b/src/achievements/achievements_manager.cpp
index de51c1e78..b5194854a 100644
--- a/src/achievements/achievements_manager.cpp
+++ b/src/achievements/achievements_manager.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievements_manager.hpp b/src/achievements/achievements_manager.hpp
index a9c8ab90a..c0520e154 100644
--- a/src/achievements/achievements_manager.hpp
+++ b/src/achievements/achievements_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievements_status.cpp b/src/achievements/achievements_status.cpp
index 4f59a3c17..bccf443d2 100644
--- a/src/achievements/achievements_status.cpp
+++ b/src/achievements/achievements_status.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/achievements/achievements_status.hpp b/src/achievements/achievements_status.hpp
index faf234fc7..34852fa26 100644
--- a/src/achievements/achievements_status.hpp
+++ b/src/achievements/achievements_status.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2014 Glenn De Jonghe
-//                     2014 Joerg Henrichs
+//  Copyright (C) 2013-2015 Glenn De Jonghe
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/addon.cpp b/src/addons/addon.cpp
index 6f17829a9..2cb6ac259 100644
--- a/src/addons/addon.cpp
+++ b/src/addons/addon.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/addon.hpp b/src/addons/addon.hpp
index 4a8b166e8..65ab7735d 100644
--- a/src/addons/addon.hpp
+++ b/src/addons/addon.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/addons_manager.cpp b/src/addons/addons_manager.cpp
index f5f7e8d5f..add5fc813 100644
--- a/src/addons/addons_manager.cpp
+++ b/src/addons/addons_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin
+//  Copyright (C) 2010-2015 Lucas Baudin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/addons_manager.hpp b/src/addons/addons_manager.hpp
index f78ce5bd9..2aa096e2d 100644
--- a/src/addons/addons_manager.hpp
+++ b/src/addons/addons_manager.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/news_manager.cpp b/src/addons/news_manager.cpp
index 697ff211e..c89c84cef 100644
--- a/src/addons/news_manager.cpp
+++ b/src/addons/news_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/news_manager.hpp b/src/addons/news_manager.hpp
index 264d7936a..e249a83a8 100644
--- a/src/addons/news_manager.hpp
+++ b/src/addons/news_manager.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/zip.cpp b/src/addons/zip.cpp
index 9b4fd5ff8..a0cca0983 100644
--- a/src/addons/zip.cpp
+++ b/src/addons/zip.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin
+//  Copyright (C) 2010-2015 Lucas Baudin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/addons/zip.hpp b/src/addons/zip.hpp
index e78f515cc..dd2c20585 100644
--- a/src/addons/zip.hpp
+++ b/src/addons/zip.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin
+//  Copyright (C) 2010-2015 Lucas Baudin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/animation_base.cpp b/src/animations/animation_base.cpp
index 74f987d39..6936583f8 100644
--- a/src/animations/animation_base.cpp
+++ b/src/animations/animation_base.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/animation_base.hpp b/src/animations/animation_base.hpp
index 926f0578f..140738014 100644
--- a/src/animations/animation_base.hpp
+++ b/src/animations/animation_base.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/ipo.cpp b/src/animations/ipo.cpp
index 8e4331893..c810a024d 100644
--- a/src/animations/ipo.cpp
+++ b/src/animations/ipo.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/ipo.hpp b/src/animations/ipo.hpp
index a0a93eff4..fadff2028 100644
--- a/src/animations/ipo.hpp
+++ b/src/animations/ipo.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/three_d_animation.cpp b/src/animations/three_d_animation.cpp
index 324b392d5..5ec43df29 100644
--- a/src/animations/three_d_animation.cpp
+++ b/src/animations/three_d_animation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/animations/three_d_animation.hpp b/src/animations/three_d_animation.hpp
index 8d8bfe5e1..4ed22c08f 100644
--- a/src/animations/three_d_animation.hpp
+++ b/src/animations/three_d_animation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/dummy_sfx.hpp b/src/audio/dummy_sfx.hpp
index 578eded7b..0b3c4ab46 100644
--- a/src/audio/dummy_sfx.hpp
+++ b/src/audio/dummy_sfx.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
-//  Copyright (C) 2008-2013 Joerg Henrichs, Patrick Ammann
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2008-2015 Joerg Henrichs, Patrick Ammann
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music.hpp b/src/audio/music.hpp
index 8908d9e1e..a848fb6e5 100644
--- a/src/audio/music.hpp
+++ b/src/audio/music.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_dummy.hpp b/src/audio/music_dummy.hpp
index b88202847..c2a9dd70b 100644
--- a/src/audio/music_dummy.hpp
+++ b/src/audio/music_dummy.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_information.cpp b/src/audio/music_information.cpp
index c18a8ba01..a568880c2 100644
--- a/src/audio/music_information.cpp
+++ b/src/audio/music_information.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_information.hpp b/src/audio/music_information.hpp
index 7203451bc..868510d03 100644
--- a/src/audio/music_information.hpp
+++ b/src/audio/music_information.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_manager.cpp b/src/audio/music_manager.cpp
index db3cb3b9a..d009df0ac 100644
--- a/src/audio/music_manager.cpp
+++ b/src/audio/music_manager.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
-//  Copyright (C) 2008-2013 Patrick Ammann <pammann@aro.ch>, Joerg Henrichs
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2008-2015 Patrick Ammann <pammann@aro.ch>, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_manager.hpp b/src/audio/music_manager.hpp
index a4c858b36..a66d15976 100644
--- a/src/audio/music_manager.hpp
+++ b/src/audio/music_manager.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
-//  Copyright (C) 2008-2013 Patrick Ammann <pammann@aro.ch>, Joerg Henrichs
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2008-2015 Patrick Ammann <pammann@aro.ch>, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_ogg.cpp b/src/audio/music_ogg.cpp
index 77f5c6e0d..e184b4aea 100644
--- a/src/audio/music_ogg.cpp
+++ b/src/audio/music_ogg.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Damien Morel <divdams@free.fr>
+//  Copyright (C) 2007-2015 Damien Morel <divdams@free.fr>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/music_ogg.hpp b/src/audio/music_ogg.hpp
index 55127790c..822728584 100644
--- a/src/audio/music_ogg.hpp
+++ b/src/audio/music_ogg.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Damien Morel <divdams@free.fr>
+//  Copyright (C) 2007-2015 Damien Morel <divdams@free.fr>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_base.hpp b/src/audio/sfx_base.hpp
index eedc85b59..c95511bb6 100644
--- a/src/audio/sfx_base.hpp
+++ b/src/audio/sfx_base.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
-//  Copyright (C) 2008-2013 Joerg Henrichs, Patrick Ammann
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2008-2015 Joerg Henrichs, Patrick Ammann
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_buffer.cpp b/src/audio/sfx_buffer.cpp
index 3efa72e0d..070a76af7 100644
--- a/src/audio/sfx_buffer.cpp
+++ b/src/audio/sfx_buffer.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_buffer.hpp b/src/audio/sfx_buffer.hpp
index e0583b67c..d2dd1f726 100644
--- a/src/audio/sfx_buffer.hpp
+++ b/src/audio/sfx_buffer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index fc89bc5d5..31ba9f2d1 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index a05b0df35..31447f546 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
index 2368185e5..3395b2333 100644
--- a/src/audio/sfx_openal.cpp
+++ b/src/audio/sfx_openal.cpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C)      2014 Joerg Henrichs
-//  Copyright (C) 2006-2014 Patrick Ammann <pammann@aro.ch>
-//  Copyright (C) 2009-2014 Marianne Gagnon
+//  Copyright (C) 2014-2015 Joerg Henrichs
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/audio/sfx_openal.hpp b/src/audio/sfx_openal.hpp
index 1642970b5..19d3adabb 100644
--- a/src/audio/sfx_openal.hpp
+++ b/src/audio/sfx_openal.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Patrick Ammann <pammann@aro.ch>
+//  Copyright (C) 2006-2015 Patrick Ammann <pammann@aro.ch>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/challenge_data.cpp b/src/challenges/challenge_data.cpp
index ee0f8e011..0301d0435 100644
--- a/src/challenges/challenge_data.cpp
+++ b/src/challenges/challenge_data.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/challenge_data.hpp b/src/challenges/challenge_data.hpp
index 59e065b0a..5c9889f1f 100644
--- a/src/challenges/challenge_data.hpp
+++ b/src/challenges/challenge_data.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/challenge_status.cpp b/src/challenges/challenge_status.cpp
index 71ce2548c..7b41e7b5f 100644
--- a/src/challenges/challenge_status.cpp
+++ b/src/challenges/challenge_status.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/challenge_status.hpp b/src/challenges/challenge_status.hpp
index aa3ea0c42..9e69e73a9 100644
--- a/src/challenges/challenge_status.hpp
+++ b/src/challenges/challenge_status.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/story_mode_status.cpp b/src/challenges/story_mode_status.cpp
index 73769d1d3..fcefad1dd 100644
--- a/src/challenges/story_mode_status.cpp
+++ b/src/challenges/story_mode_status.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/story_mode_status.hpp b/src/challenges/story_mode_status.hpp
index 784a43605..dab906b87 100644
--- a/src/challenges/story_mode_status.hpp
+++ b/src/challenges/story_mode_status.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/unlock_manager.cpp b/src/challenges/unlock_manager.cpp
index 2f4fb4d92..5a6501991 100644
--- a/src/challenges/unlock_manager.cpp
+++ b/src/challenges/unlock_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/challenges/unlock_manager.hpp b/src/challenges/unlock_manager.hpp
index d5834fbbd..781379ec7 100644
--- a/src/challenges/unlock_manager.hpp
+++ b/src/challenges/unlock_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/hardware_stats.cpp b/src/config/hardware_stats.cpp
index 900733b64..91c07f56c 100644
--- a/src/config/hardware_stats.cpp
+++ b/src/config/hardware_stats.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ namespace HardwareStats
 
 // ----------------------------------------------------------------------------
 /** Returns the amount of RAM in MB.
- *  (C) 2014 by Wildfire Games (0 A.D.), ported by Joerg Henrichs
+ *  (C) 2014-2015 Wildfire Games (0 A.D.), ported by Joerg Henrichs
  */
 int getRAM()
 {
@@ -98,7 +98,7 @@ int getRAM()
 
 // ----------------------------------------------------------------------------
 /** Returns the number of processors on the system.
- *  (C) 2014 by Wildfire Games (0 A.D.), ported by Joerg Henrichs
+ *  (C) 2014-2015 Wildfire Games (0 A.D.), ported by Joerg Henrichs
  */
 int getNumProcessors()
 {
@@ -204,7 +204,7 @@ void determineOSVersion()
 #endif
 
 #ifdef WIN32
-    //  (C) 2014 by Wildfire Games (0 A.D.), ported by Joerg Henrichs.
+    //  (C) 2014-2015 Wildfire Games (0 A.D.), ported by Joerg Henrichs.
 
     HKEY hKey;
     if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
diff --git a/src/config/hardware_stats.hpp b/src/config/hardware_stats.hpp
index 4c5ef321f..d2dfd0044 100644
--- a/src/config/hardware_stats.hpp
+++ b/src/config/hardware_stats.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/player_manager.cpp b/src/config/player_manager.cpp
index f1b84a52c..1495ff4e6 100644
--- a/src/config/player_manager.cpp
+++ b/src/config/player_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2014 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/player_manager.hpp b/src/config/player_manager.hpp
index a4a6e1f22..f11912534 100644
--- a/src/config/player_manager.hpp
+++ b/src/config/player_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2014 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/player_profile.cpp b/src/config/player_profile.cpp
index e5df0c1ba..c934ee6d7 100644
--- a/src/config/player_profile.cpp
+++ b/src/config/player_profile.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/player_profile.hpp b/src/config/player_profile.hpp
index 94868d35a..8cef55762 100644
--- a/src/config/player_profile.hpp
+++ b/src/config/player_profile.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/saved_grand_prix.cpp b/src/config/saved_grand_prix.cpp
index 0f808e642..779204f45 100644
--- a/src/config/saved_grand_prix.cpp
+++ b/src/config/saved_grand_prix.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/saved_grand_prix.hpp b/src/config/saved_grand_prix.hpp
index 84b494067..effb10190 100644
--- a/src/config/saved_grand_prix.hpp
+++ b/src/config/saved_grand_prix.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/stk_config.cpp b/src/config/stk_config.cpp
index 64ca6a914..1f5f756a0 100644
--- a/src/config/stk_config.cpp
+++ b/src/config/stk_config.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/stk_config.hpp b/src/config/stk_config.hpp
index ba3f45acf..c1825822a 100644
--- a/src/config/stk_config.hpp
+++ b/src/config/stk_config.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/config/user_config.cpp b/src/config/user_config.cpp
index a6c8b1988..40554f8b8 100644
--- a/src/config/user_config.cpp
+++ b/src/config/user_config.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //  Modelled after Supertux's configfile.cpp
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 7b4454a12..4ea5da5b7 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //  Modelled after Supertux's configfile.h
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/2dutils.hpp b/src/graphics/2dutils.hpp
index 3ecffceeb..52f65f819 100644
--- a/src/graphics/2dutils.hpp
+++ b/src/graphics/2dutils.hpp
@@ -47,4 +47,4 @@ void draw2DVertexPrimitiveList(irr::video::ITexture *t, const void* vertices,
 void GL32_draw2DRectangle(irr::video::SColor color, const irr::core::rect<irr::s32>& position,
     const irr::core::rect<irr::s32>* clip = 0);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 98e54ea40..5a733f21d 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -385,4 +385,4 @@ GLuint generateSpecularCubemap(GLuint probe)
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glDeleteFramebuffers(1, &fbo);
     return cubemap_texture;
-}
\ No newline at end of file
+}
diff --git a/src/graphics/IBL.hpp b/src/graphics/IBL.hpp
index f5f97e068..f9461dd7e 100644
--- a/src/graphics/IBL.hpp
+++ b/src/graphics/IBL.hpp
@@ -35,4 +35,4 @@ using the cubemap provided by CubemapFace.
 void SphericalHarmonics(Color *CubemapFace[6], size_t edge_size, float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff);
 
 GLuint generateSpecularCubemap(GLuint probe);
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index c71cffcf1..058469486 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/camera.hpp b/src/graphics/camera.hpp
index 2b1811828..830b3b598 100644
--- a/src/graphics/camera.hpp
+++ b/src/graphics/camera.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index 8a5d61ee2..ede01d4d7 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -341,4 +341,4 @@ bool CentralVideoSettings::isESMEnabled() const
 bool CentralVideoSettings::isDefferedEnabled() const
 {
     return UserConfigParams::m_dynamic_lights && !GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_ADVANCED_PIPELINE);
-}
\ No newline at end of file
+}
diff --git a/src/graphics/central_settings.hpp b/src/graphics/central_settings.hpp
index 6e3885dcd..dbde9c656 100644
--- a/src/graphics/central_settings.hpp
+++ b/src/graphics/central_settings.hpp
@@ -90,4 +90,4 @@ public:
 
 extern CentralVideoSettings* CVS;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/explosion.cpp b/src/graphics/explosion.cpp
index 3706d770d..eba0951ac 100644
--- a/src/graphics/explosion.cpp
+++ b/src/graphics/explosion.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/explosion.hpp b/src/graphics/explosion.hpp
index 251bb6735..4dbf2fdb3 100644
--- a/src/graphics/explosion.hpp
+++ b/src/graphics/explosion.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
 //  Copyright (C) 2014-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 74297a009..c1e308bab 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -361,7 +361,7 @@ const std::string getGLExtensions()
 
 // ----------------------------------------------------------------------------
 /** Adds GL limits to the json data structure.
- *  (C) 2014 by Wildfire Games (0 A.D.), ported by Joerg Henrichs
+ *  (C) 2014-2015 Wildfire Games (0 A.D.), ported by Joerg Henrichs
  */
 void getGLLimits(HardwareStats::Json *json)
 {
diff --git a/src/graphics/graphics_restrictions.cpp b/src/graphics/graphics_restrictions.cpp
index d656267c1..ac6e72031 100644
--- a/src/graphics/graphics_restrictions.cpp
+++ b/src/graphics/graphics_restrictions.cpp
@@ -1,512 +1,512 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "graphics/graphics_restrictions.hpp"
-
-#include "io/file_manager.hpp"
-#include "io/xml_node.hpp"
-#include "utils/log.hpp"
-#include "utils/no_copy.hpp"
-#include "utils/string_utils.hpp"
-#include "utils/types.hpp"
-
-#include <algorithm>
-
-namespace GraphicsRestrictions
-{
-
-    class Rule;
-    namespace Private
-    {
-        /** Stores for each grpahics restriction if it's enabled or not. */
-        std::vector<bool> m_all_graphics_restriction;
-
-        /** The list of names used in the XML file for the graphics
-         *  restriction types. They must be in the same order as the types. */
-
-        char *m_names_of_restrictions[] = {
-            "UniformBufferObject",
-            "GeometryShader4",
-            "DrawIndirect",
-            "TextureView",
-            "TextureStorage",
-            "ImageLoadStore",
-            "BaseInstance",
-            "ComputeShader",
-            "ShaderStorageBufferObject",
-            "MultiDrawIndirect",
-            "ShaderAtomicCounters",
-            "BufferStorage",
-            "BindlessTexture",
-            "TextureCompressionS3TC",
-            "AMDVertexShaderLayer",
-            "DriverRecentEnough",
-            "HighDefinitionTextures",
-            "AdvancedPipeline",
-            "FramebufferSRGBWorking",
-            "GI",
-        };
-    }   // namespace Private
-    using namespace Private;
-
-    /** Returns the graphics restrictions type for a string, or
-     *  GR_COUNT if the name is not found. */
-GraphicsRestrictionsType getTypeForName(const std::string &name)
-{
-    unsigned int i = 0;
-    while (m_names_of_restrictions[i] != NULL)
-    {
-        if (name == m_names_of_restrictions[i])
-            return (GraphicsRestrictionsType)i;
-        i++;
-    }
-    return GR_COUNT;
-}   // getTypeForName
-
-// ============================================================================
-/** A small utility class to manage and compare version tuples.
- */
-class Version
-{
-private:
-    /** The array containing the version number. */
-    std::vector<uint32_t> m_version;
-
-    // ----------------------------------------------------------------------------
-    /** Searches for the first number in the string, then converts the rest of the
-     *  string into a tuple. E.g. "Build 12.34.56" --> [12,34,56].
-     */
-    void convertVersionString(const std::string &version)
-    {
-        std::string s = version;
-        std::string::iterator p = s.begin();
-        while( (p !=s.end()) && ((*p<'0') || (*p>'9')) )
-            p++;
-        s.erase(s.begin(), p);
-        m_version = StringUtils::splitToUInt(s, '.');
-    }   // convertVersionString
-
-public:
-    // ------------------------------------------------------------------------
-    /** Dummy default constructor. */
-    Version() {}
-    // ------------------------------------------------------------------------
-    /** Simple constructor which takes a string with "." separated numbers.
-     */
-    Version(const std::string &version)
-    {
-        convertVersionString(version);
-    }   // Version(std::string)
-
-    // ------------------------------------------------------------------------
-    /** Create a version instance from the driver and car name. For example for
-     *  an Intel HD3000 card the string is "3.1.0 - Build 9.17.10.3517" it would
-     *  create [9,17,10,3517] - i.e. it takes the vendor info into account.
-     *  \param driver_version The GL_VERSION string (i.e. opengl and version
-     *         number).
-     *  \param card_name The GL_RENDERER string (i.e. graphics card).
-     */
-    Version(const std::string &driver_version, const std::string &card_name)
-    {
-        m_version.clear();
-
-        // Mesa needs to be tested first, otherwise (if testing for card name
-        // further down) it would be detected as a non-mesa driver.
-        if (driver_version.find("Mesa") != std::string::npos)
-        {
-            std::string driver;
-            // Try to force the driver name to be in a standard way by removing
-            // optional strings
-            driver = StringUtils::replace(driver_version, "-devel",         "");
-            driver = StringUtils::replace(driver,         "(Core Profile) ", "");
-            std::vector<std::string> l = StringUtils::split(driver, ' ');
-            if (l.size() > 2)
-            {
-                // driver can be: "1.4 (3.0 Mesa 10.1.0)" --> l[3] must be used
-                if (l[2] != "Mesa")
-                    convertVersionString(l[2]);
-                else
-                    convertVersionString(l[3]);
-                return;
-            }
-        }
-
-        // Intel card: driver version = "3.1.0 - Build 9.17.10.3517"
-        // ---------------------------------------------------------
-        if (StringUtils::startsWith(card_name, "Intel"))
-        {
-            std::vector<std::string> s = StringUtils::split(driver_version, '-');
-            if (s.size() == 2)
-            {
-                convertVersionString(s[1]);
-                return;
-            }
-        }
-
-        // Nvidia: driver_version = "4.3.0 NVIDIA 340.58"
-        // ----------------------------------------------
-        if (driver_version.find("NVIDIA") != std::string::npos)
-        {
-            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
-            if (s.size() == 3)
-            {
-                convertVersionString(s[2]);
-                return;
-            }
-
-        }
-
-        // ATI: some drivers use e.g.: "4.1 ATI-1.24.38"
-        if (driver_version.find("ATI-") != std::string::npos)
-        {
-            std::string driver;
-            // Try to force the driver name to be in a standard way by removing
-            // optional strings
-            driver = StringUtils::replace(driver_version, "ATI-", "");
-            std::vector<std::string> s = StringUtils::split(driver, ' ');
-            convertVersionString(s[1]);
-            return;
-        }
-
-        // AMD: driver_version = "4.3.13283 Core Profile/Debug Context 14.501.1003.0"
-        // ----------------------------------------------
-        if (card_name.find("AMD") != std::string::npos)
-        {
-            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
-            if (s.size() == 5)
-            {
-                convertVersionString(s[4]);
-                return;
-            }
-
-        }
-
-        // ATI: other drivers use "4.0.10188 Core Profile Context"
-        if (card_name.find("ATI") != std::string::npos)
-        {
-            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
-            convertVersionString(s[0]);
-            return;
-        }
-
-        Log::warn("Graphics", "Can not find version for '%s' '%s' - ignored.",
-            driver_version.c_str(), card_name.c_str());
-
-    }   // Version
-
-    // ------------------------------------------------------------------------
-    /** Compares two version numbers. Equal returns true if the elements are
-     *  identical.
-     */
-    bool operator== (const Version &other) const
-    {
-        if (m_version.size() != other.m_version.size()) return false;
-        for(unsigned int i=0; i<m_version.size(); i++)
-            if(other.m_version[i]!=m_version[i]) return false;
-        return true;
-    }   // operator==
-    // ------------------------------------------------------------------------
-    /** Compares two version numbers. Equal returns true if the elements are
-    *  identical.
-    */
-    bool operator!= (const Version &other) const
-    {
-        return !this->operator==(other);
-    }   // operator!=
-        // ------------------------------------------------------------------------
-    /** If *this < other. */
-    bool operator< (const Version &other) const
-    {
-        unsigned int min_n = std::min(m_version.size(), other.m_version.size());
-        for (unsigned int i = 0; i<min_n; i++)
-        {
-            if (m_version[i] > other.m_version[i]) return false;
-            if (m_version[i] < other.m_version[i]) return true;
-        }
-        if (m_version.size() >= other.m_version.size())
-            return false;
-        else
-            return true;
-    }   // operator<
-    // ------------------------------------------------------------------------
-    /** If *this <= other. */
-    bool operator<= (const Version &other) const
-    {
-        unsigned int min_n = std::min(m_version.size(), other.m_version.size());
-        for (unsigned int i = 0; i<min_n; i++)
-        {
-            if (m_version[i] > other.m_version[i]) return false;
-            if (m_version[i] < other.m_version[i]) return true;
-        }
-        if (m_version.size() > other.m_version.size())
-            return false;
-        else
-            return true;
-    }   // operator<=
-
-};   // class Version
-// ============================================================================
-class Rule : public NoCopy
-{
-private:
-    /** Operators to test for a card. */
-    enum {CARD_IS, CARD_CONTAINS} m_card_test;
-
-    /** Name of the card for which this rule applies. */
-    std::string m_card_name;
-
-    /** Operators to test version numbers with. */
-    enum {VERSION_IGNORE, VERSION_EQUAL, VERSION_LESS, 
-          VERSION_LESS_EQUAL}  m_version_test;
-
-    /** Driver version for which this rule applies. */
-    Version m_driver_version;
-
-    /** For which OS this rule applies. */
-    std::string m_os;
-
-    /** Which options to disable. */
-    std::vector<std::string> m_disable_options;
-public:
-    Rule(const XMLNode *rule)
-    {
-        m_version_test = VERSION_IGNORE;
-        if(rule->get("is", &m_card_name))
-        {
-            m_card_test = CARD_IS;
-        }
-        else if(rule->get("contains", &m_card_name))
-        {
-            m_card_test = CARD_CONTAINS;
-        }
-
-        rule->get("os", &m_os);
-
-        std::string s;
-        if(rule->get("version", &s) && s.size()>1)
-        {
-            if(s.substr(0, 2)=="<=")
-            {
-                m_version_test = VERSION_LESS_EQUAL;
-                s = s.substr(2, s.size());
-            }
-            else if(s[0]=='<')
-            {
-                m_version_test = VERSION_LESS;
-                s.erase(s.begin());
-            }
-            else if(s[0]=='=')
-            {
-                m_version_test = VERSION_EQUAL;
-                s.erase(s.begin());
-            }
-            else
-            {
-                Log::warn("Graphics", "Invalid verison '%s' found - ignored.",
-                          s.c_str());
-            }
-            m_driver_version = Version(s);
-        }   // has version
-
-        if(rule->get("disable", &s))
-            m_disable_options = StringUtils::split(s, ' ');
-    }   // Rule
-    // ------------------------------------------------------------------------
-    bool applies(const std::string &card, const Version &version) const
-    {
-        // Test for OS
-        // -----------
-        if(m_os.size()>0)
-        {
-#ifdef __linux__
-            if(m_os!="linux") return false;
-#endif
-#ifdef WIN32
-            if(m_os!="windows") return false;
-#endif
-#ifdef __APPLE__
-            if(m_os!="osx") return false;
-#endif
-#ifdef BSD
-            if(m_os!="bsd") return false;
-#endif
-        }   // m_os.size()>0
-
-        // Test for card
-        // -------------
-        switch(m_card_test)
-        {
-        case CARD_IS:
-            if(card!=m_card_name) return false;
-            break;
-        case CARD_CONTAINS: 
-            if(card.find(m_card_name)==std::string::npos)
-                return false;
-            break;
-        }   // switch m_card_test
-
-        // Test for driver version
-        // -----------------------
-        switch(m_version_test)
-        {
-        case VERSION_IGNORE: break;   // always true
-        case VERSION_EQUAL: if(!(version==m_driver_version)) return false;
-            break;
-        case VERSION_LESS_EQUAL:
-            if (!(version <= m_driver_version)) return false;
-            break;
-        case VERSION_LESS:
-            if (!(version < m_driver_version )) return false;
-            break;
-        }   // switch m_version_test
-        return true;
-        // -----------------------------------------------
-    }   // applies
-
-    // ------------------------------------------------------------------------
-    /** Returns a list of options to disable. */
-    const std::vector<std::string>& getRestrictions() const
-    {
-        return m_disable_options;
-    }   // getRestrictions
-    // ------------------------------------------------------------------------
-};   // class Rule
-
-// ============================================================================
-/** Very rudimentary and brute unit testing. Better than nothing :P
- */
-void unitTesting()
-{
-    assert(Version("1")     == Version("1"));
-    assert(Version("1")     != Version("2"));
-    assert(Version("1")     <= Version("2"));
-    assert(Version("1")     <  Version("2"));
-    assert(Version("1.2.3") <  Version("2"));
-    assert(Version("1.2.3") <  Version("1.3"));
-    assert(Version("1.2.3") <  Version("1.2.4"));
-    assert(Version("1.2.3") <  Version("1.2.3.1"));
-    assert(Version("1.2.3") <= Version("2"));
-    assert(Version("1.2.3") <= Version("1.3"));
-    assert(Version("1.2.3") <= Version("1.2.4"));
-    assert(Version("1.2.3") <= Version("1.2.3.1"));
-    assert(Version("1.2.3") <= Version("1.2.3"));
-    assert(Version("1.2.3") == Version("1.2.3"));
-    assert(Version("10.3")  <  Version("10.3.2"));
-    assert(Version("10.3") <=  Version("10.3.2"));
-    assert(!(Version("10.3.2") <  Version("10.3")));
-    assert(!(Version("10.3.2") <= Version("10.3")));
-    assert(Version("3.3 NVIDIA-10.0.19 310.90.10.05b1", 
-                   "NVIDIA GeForce GTX 680MX OpenGL Engine")
-           == Version("310.90.10.5")                                    );
-
-    assert(Version("4.1 NVIDIA-10.0.43 310.41.05f01",
-                    "NVIDIA GeForce GTX 780M OpenGL Engine")
-        == Version("310.41.05"));
-
-    assert(Version("3.1 (Core Profile) Mesa 10.3.0",
-                  "Mesa DRI Mobile Intel\u00ae GM45 Express Chipset")
-           == Version("10.3.0")                                         );
-    assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel", 
-                   "Gallium 0.4 on NVC1")
-           == Version("10.5.0")                                         );
-    assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel",
-                   "Mesa DRI Intel(R) Sandybridge Mobile")
-           == Version("10.5.0")                                         );
-    assert(Version("2.1 Mesa 10.5.0-devel (git-82e919d)",
-                   "Gallium 0.4 on i915 (chipse)")
-           == Version("10.5.0")                                         );
-    assert(Version("1.4 (3.0 Mesa 10.1.0)",
-                   "Mesa DRI Intel(R) Ivybridge Mobile")
-           == Version("10.1.0"));
-    assert(Version("4.3.13283 Core Profile Context 14.501.1003.0",
-                   "AMD Radeon R9 200 Series")
-        == Version("14.501.1003.0"));
-    assert(Version("4.0.10188 Core Profile Context",
-                   "ATI Radeon HD 5400 Series")
-        == Version("4.0.10188"));
-    assert(Version("4.1 ATI-1.24.38", "AMD Radeon HD 6970M OpenGL Engine") 
-        == Version("1.24.38"));
-
-}   // unitTesting
-
-// ----------------------------------------------------------------------------
-/** Reads in the graphical restriction file.
- *  \param driver_version The GL_VERSION string (i.e. opengl and version
- *         number).
- *  \param card_name The GL_RENDERER string (i.e. graphics card).
- */
-void init(const std::string &driver_version,
-          const std::string &card_name)
-{
-    for (unsigned int i = 0; i < GR_COUNT; i++)
-        m_all_graphics_restriction.push_back(false);
-
-    std::string filename =
-        file_manager->getUserConfigFile("graphical_restrictions.xml");
-    if (!file_manager->fileExists(filename))
-        filename = file_manager->getAsset("graphical_restrictions.xml");
-    const XMLNode *rules = file_manager->createXMLTree(filename);
-    if (!rules)
-    {
-        Log::warn("Graphics", "Could not find graphical_restrictions.xm");
-        return;
-    }
-    if (rules->getName() != "graphical-restrictions")
-    {
-        delete rules;
-        Log::warn("Graphics", "'%s' did not contain graphical-restrictions tag",
-            filename.c_str());
-        return;
-    }
-
-    Version version(driver_version, card_name);
-    for (unsigned int i = 0; i<rules->getNumNodes(); i++)
-    {
-        const XMLNode *xml_rule = rules->getNode(i);
-        if (xml_rule->getName() != "card")
-        {
-            Log::warn("Graphics", "Incorrect node '%s' found in '%s' - ignored.",
-                      xml_rule->getName().c_str(), filename.c_str());
-            continue;
-        }
-        Rule rule(xml_rule);
-        if (rule.applies(card_name, version))
-        {
-            std::vector<std::string> restrictions = rule.getRestrictions();
-            std::vector<std::string>::iterator p;
-            for (p = restrictions.begin(); p != restrictions.end(); p++)
-            {
-                GraphicsRestrictionsType t = getTypeForName(*p);
-                if (t != GR_COUNT)
-                    m_all_graphics_restriction[t] = true;
-            }   // for p in rules
-        }   // if m_all_rules[i].applies()
-    }
-    delete rules;
-}   // init
-
-// ----------------------------------------------------------------------------
-/** Returns if the specified graphics restriction is defined.
- *  \param type The graphical restriction to tes.t
- */
-bool isDisabled(GraphicsRestrictionsType type)
-{
-    return m_all_graphics_restriction[type];
-}   // isDisabled
-
-}   // namespace HardwareStats
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/graphics_restrictions.hpp"
+
+#include "io/file_manager.hpp"
+#include "io/xml_node.hpp"
+#include "utils/log.hpp"
+#include "utils/no_copy.hpp"
+#include "utils/string_utils.hpp"
+#include "utils/types.hpp"
+
+#include <algorithm>
+
+namespace GraphicsRestrictions
+{
+
+    class Rule;
+    namespace Private
+    {
+        /** Stores for each grpahics restriction if it's enabled or not. */
+        std::vector<bool> m_all_graphics_restriction;
+
+        /** The list of names used in the XML file for the graphics
+         *  restriction types. They must be in the same order as the types. */
+
+        char *m_names_of_restrictions[] = {
+            "UniformBufferObject",
+            "GeometryShader4",
+            "DrawIndirect",
+            "TextureView",
+            "TextureStorage",
+            "ImageLoadStore",
+            "BaseInstance",
+            "ComputeShader",
+            "ShaderStorageBufferObject",
+            "MultiDrawIndirect",
+            "ShaderAtomicCounters",
+            "BufferStorage",
+            "BindlessTexture",
+            "TextureCompressionS3TC",
+            "AMDVertexShaderLayer",
+            "DriverRecentEnough",
+            "HighDefinitionTextures",
+            "AdvancedPipeline",
+            "FramebufferSRGBWorking",
+            "GI",
+        };
+    }   // namespace Private
+    using namespace Private;
+
+    /** Returns the graphics restrictions type for a string, or
+     *  GR_COUNT if the name is not found. */
+GraphicsRestrictionsType getTypeForName(const std::string &name)
+{
+    unsigned int i = 0;
+    while (m_names_of_restrictions[i] != NULL)
+    {
+        if (name == m_names_of_restrictions[i])
+            return (GraphicsRestrictionsType)i;
+        i++;
+    }
+    return GR_COUNT;
+}   // getTypeForName
+
+// ============================================================================
+/** A small utility class to manage and compare version tuples.
+ */
+class Version
+{
+private:
+    /** The array containing the version number. */
+    std::vector<uint32_t> m_version;
+
+    // ----------------------------------------------------------------------------
+    /** Searches for the first number in the string, then converts the rest of the
+     *  string into a tuple. E.g. "Build 12.34.56" --> [12,34,56].
+     */
+    void convertVersionString(const std::string &version)
+    {
+        std::string s = version;
+        std::string::iterator p = s.begin();
+        while( (p !=s.end()) && ((*p<'0') || (*p>'9')) )
+            p++;
+        s.erase(s.begin(), p);
+        m_version = StringUtils::splitToUInt(s, '.');
+    }   // convertVersionString
+
+public:
+    // ------------------------------------------------------------------------
+    /** Dummy default constructor. */
+    Version() {}
+    // ------------------------------------------------------------------------
+    /** Simple constructor which takes a string with "." separated numbers.
+     */
+    Version(const std::string &version)
+    {
+        convertVersionString(version);
+    }   // Version(std::string)
+
+    // ------------------------------------------------------------------------
+    /** Create a version instance from the driver and car name. For example for
+     *  an Intel HD3000 card the string is "3.1.0 - Build 9.17.10.3517" it would
+     *  create [9,17,10,3517] - i.e. it takes the vendor info into account.
+     *  \param driver_version The GL_VERSION string (i.e. opengl and version
+     *         number).
+     *  \param card_name The GL_RENDERER string (i.e. graphics card).
+     */
+    Version(const std::string &driver_version, const std::string &card_name)
+    {
+        m_version.clear();
+
+        // Mesa needs to be tested first, otherwise (if testing for card name
+        // further down) it would be detected as a non-mesa driver.
+        if (driver_version.find("Mesa") != std::string::npos)
+        {
+            std::string driver;
+            // Try to force the driver name to be in a standard way by removing
+            // optional strings
+            driver = StringUtils::replace(driver_version, "-devel",         "");
+            driver = StringUtils::replace(driver,         "(Core Profile) ", "");
+            std::vector<std::string> l = StringUtils::split(driver, ' ');
+            if (l.size() > 2)
+            {
+                // driver can be: "1.4 (3.0 Mesa 10.1.0)" --> l[3] must be used
+                if (l[2] != "Mesa")
+                    convertVersionString(l[2]);
+                else
+                    convertVersionString(l[3]);
+                return;
+            }
+        }
+
+        // Intel card: driver version = "3.1.0 - Build 9.17.10.3517"
+        // ---------------------------------------------------------
+        if (StringUtils::startsWith(card_name, "Intel"))
+        {
+            std::vector<std::string> s = StringUtils::split(driver_version, '-');
+            if (s.size() == 2)
+            {
+                convertVersionString(s[1]);
+                return;
+            }
+        }
+
+        // Nvidia: driver_version = "4.3.0 NVIDIA 340.58"
+        // ----------------------------------------------
+        if (driver_version.find("NVIDIA") != std::string::npos)
+        {
+            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
+            if (s.size() == 3)
+            {
+                convertVersionString(s[2]);
+                return;
+            }
+
+        }
+
+        // ATI: some drivers use e.g.: "4.1 ATI-1.24.38"
+        if (driver_version.find("ATI-") != std::string::npos)
+        {
+            std::string driver;
+            // Try to force the driver name to be in a standard way by removing
+            // optional strings
+            driver = StringUtils::replace(driver_version, "ATI-", "");
+            std::vector<std::string> s = StringUtils::split(driver, ' ');
+            convertVersionString(s[1]);
+            return;
+        }
+
+        // AMD: driver_version = "4.3.13283 Core Profile/Debug Context 14.501.1003.0"
+        // ----------------------------------------------
+        if (card_name.find("AMD") != std::string::npos)
+        {
+            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
+            if (s.size() == 5)
+            {
+                convertVersionString(s[4]);
+                return;
+            }
+
+        }
+
+        // ATI: other drivers use "4.0.10188 Core Profile Context"
+        if (card_name.find("ATI") != std::string::npos)
+        {
+            std::vector<std::string> s = StringUtils::split(driver_version, ' ');
+            convertVersionString(s[0]);
+            return;
+        }
+
+        Log::warn("Graphics", "Can not find version for '%s' '%s' - ignored.",
+            driver_version.c_str(), card_name.c_str());
+
+    }   // Version
+
+    // ------------------------------------------------------------------------
+    /** Compares two version numbers. Equal returns true if the elements are
+     *  identical.
+     */
+    bool operator== (const Version &other) const
+    {
+        if (m_version.size() != other.m_version.size()) return false;
+        for(unsigned int i=0; i<m_version.size(); i++)
+            if(other.m_version[i]!=m_version[i]) return false;
+        return true;
+    }   // operator==
+    // ------------------------------------------------------------------------
+    /** Compares two version numbers. Equal returns true if the elements are
+    *  identical.
+    */
+    bool operator!= (const Version &other) const
+    {
+        return !this->operator==(other);
+    }   // operator!=
+        // ------------------------------------------------------------------------
+    /** If *this < other. */
+    bool operator< (const Version &other) const
+    {
+        unsigned int min_n = std::min(m_version.size(), other.m_version.size());
+        for (unsigned int i = 0; i<min_n; i++)
+        {
+            if (m_version[i] > other.m_version[i]) return false;
+            if (m_version[i] < other.m_version[i]) return true;
+        }
+        if (m_version.size() >= other.m_version.size())
+            return false;
+        else
+            return true;
+    }   // operator<
+    // ------------------------------------------------------------------------
+    /** If *this <= other. */
+    bool operator<= (const Version &other) const
+    {
+        unsigned int min_n = std::min(m_version.size(), other.m_version.size());
+        for (unsigned int i = 0; i<min_n; i++)
+        {
+            if (m_version[i] > other.m_version[i]) return false;
+            if (m_version[i] < other.m_version[i]) return true;
+        }
+        if (m_version.size() > other.m_version.size())
+            return false;
+        else
+            return true;
+    }   // operator<=
+
+};   // class Version
+// ============================================================================
+class Rule : public NoCopy
+{
+private:
+    /** Operators to test for a card. */
+    enum {CARD_IS, CARD_CONTAINS} m_card_test;
+
+    /** Name of the card for which this rule applies. */
+    std::string m_card_name;
+
+    /** Operators to test version numbers with. */
+    enum {VERSION_IGNORE, VERSION_EQUAL, VERSION_LESS, 
+          VERSION_LESS_EQUAL}  m_version_test;
+
+    /** Driver version for which this rule applies. */
+    Version m_driver_version;
+
+    /** For which OS this rule applies. */
+    std::string m_os;
+
+    /** Which options to disable. */
+    std::vector<std::string> m_disable_options;
+public:
+    Rule(const XMLNode *rule)
+    {
+        m_version_test = VERSION_IGNORE;
+        if(rule->get("is", &m_card_name))
+        {
+            m_card_test = CARD_IS;
+        }
+        else if(rule->get("contains", &m_card_name))
+        {
+            m_card_test = CARD_CONTAINS;
+        }
+
+        rule->get("os", &m_os);
+
+        std::string s;
+        if(rule->get("version", &s) && s.size()>1)
+        {
+            if(s.substr(0, 2)=="<=")
+            {
+                m_version_test = VERSION_LESS_EQUAL;
+                s = s.substr(2, s.size());
+            }
+            else if(s[0]=='<')
+            {
+                m_version_test = VERSION_LESS;
+                s.erase(s.begin());
+            }
+            else if(s[0]=='=')
+            {
+                m_version_test = VERSION_EQUAL;
+                s.erase(s.begin());
+            }
+            else
+            {
+                Log::warn("Graphics", "Invalid verison '%s' found - ignored.",
+                          s.c_str());
+            }
+            m_driver_version = Version(s);
+        }   // has version
+
+        if(rule->get("disable", &s))
+            m_disable_options = StringUtils::split(s, ' ');
+    }   // Rule
+    // ------------------------------------------------------------------------
+    bool applies(const std::string &card, const Version &version) const
+    {
+        // Test for OS
+        // -----------
+        if(m_os.size()>0)
+        {
+#ifdef __linux__
+            if(m_os!="linux") return false;
+#endif
+#ifdef WIN32
+            if(m_os!="windows") return false;
+#endif
+#ifdef __APPLE__
+            if(m_os!="osx") return false;
+#endif
+#ifdef BSD
+            if(m_os!="bsd") return false;
+#endif
+        }   // m_os.size()>0
+
+        // Test for card
+        // -------------
+        switch(m_card_test)
+        {
+        case CARD_IS:
+            if(card!=m_card_name) return false;
+            break;
+        case CARD_CONTAINS: 
+            if(card.find(m_card_name)==std::string::npos)
+                return false;
+            break;
+        }   // switch m_card_test
+
+        // Test for driver version
+        // -----------------------
+        switch(m_version_test)
+        {
+        case VERSION_IGNORE: break;   // always true
+        case VERSION_EQUAL: if(!(version==m_driver_version)) return false;
+            break;
+        case VERSION_LESS_EQUAL:
+            if (!(version <= m_driver_version)) return false;
+            break;
+        case VERSION_LESS:
+            if (!(version < m_driver_version )) return false;
+            break;
+        }   // switch m_version_test
+        return true;
+        // -----------------------------------------------
+    }   // applies
+
+    // ------------------------------------------------------------------------
+    /** Returns a list of options to disable. */
+    const std::vector<std::string>& getRestrictions() const
+    {
+        return m_disable_options;
+    }   // getRestrictions
+    // ------------------------------------------------------------------------
+};   // class Rule
+
+// ============================================================================
+/** Very rudimentary and brute unit testing. Better than nothing :P
+ */
+void unitTesting()
+{
+    assert(Version("1")     == Version("1"));
+    assert(Version("1")     != Version("2"));
+    assert(Version("1")     <= Version("2"));
+    assert(Version("1")     <  Version("2"));
+    assert(Version("1.2.3") <  Version("2"));
+    assert(Version("1.2.3") <  Version("1.3"));
+    assert(Version("1.2.3") <  Version("1.2.4"));
+    assert(Version("1.2.3") <  Version("1.2.3.1"));
+    assert(Version("1.2.3") <= Version("2"));
+    assert(Version("1.2.3") <= Version("1.3"));
+    assert(Version("1.2.3") <= Version("1.2.4"));
+    assert(Version("1.2.3") <= Version("1.2.3.1"));
+    assert(Version("1.2.3") <= Version("1.2.3"));
+    assert(Version("1.2.3") == Version("1.2.3"));
+    assert(Version("10.3")  <  Version("10.3.2"));
+    assert(Version("10.3") <=  Version("10.3.2"));
+    assert(!(Version("10.3.2") <  Version("10.3")));
+    assert(!(Version("10.3.2") <= Version("10.3")));
+    assert(Version("3.3 NVIDIA-10.0.19 310.90.10.05b1", 
+                   "NVIDIA GeForce GTX 680MX OpenGL Engine")
+           == Version("310.90.10.5")                                    );
+
+    assert(Version("4.1 NVIDIA-10.0.43 310.41.05f01",
+                    "NVIDIA GeForce GTX 780M OpenGL Engine")
+        == Version("310.41.05"));
+
+    assert(Version("3.1 (Core Profile) Mesa 10.3.0",
+                  "Mesa DRI Mobile Intel\u00ae GM45 Express Chipset")
+           == Version("10.3.0")                                         );
+    assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel", 
+                   "Gallium 0.4 on NVC1")
+           == Version("10.5.0")                                         );
+    assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel",
+                   "Mesa DRI Intel(R) Sandybridge Mobile")
+           == Version("10.5.0")                                         );
+    assert(Version("2.1 Mesa 10.5.0-devel (git-82e919d)",
+                   "Gallium 0.4 on i915 (chipse)")
+           == Version("10.5.0")                                         );
+    assert(Version("1.4 (3.0 Mesa 10.1.0)",
+                   "Mesa DRI Intel(R) Ivybridge Mobile")
+           == Version("10.1.0"));
+    assert(Version("4.3.13283 Core Profile Context 14.501.1003.0",
+                   "AMD Radeon R9 200 Series")
+        == Version("14.501.1003.0"));
+    assert(Version("4.0.10188 Core Profile Context",
+                   "ATI Radeon HD 5400 Series")
+        == Version("4.0.10188"));
+    assert(Version("4.1 ATI-1.24.38", "AMD Radeon HD 6970M OpenGL Engine") 
+        == Version("1.24.38"));
+
+}   // unitTesting
+
+// ----------------------------------------------------------------------------
+/** Reads in the graphical restriction file.
+ *  \param driver_version The GL_VERSION string (i.e. opengl and version
+ *         number).
+ *  \param card_name The GL_RENDERER string (i.e. graphics card).
+ */
+void init(const std::string &driver_version,
+          const std::string &card_name)
+{
+    for (unsigned int i = 0; i < GR_COUNT; i++)
+        m_all_graphics_restriction.push_back(false);
+
+    std::string filename =
+        file_manager->getUserConfigFile("graphical_restrictions.xml");
+    if (!file_manager->fileExists(filename))
+        filename = file_manager->getAsset("graphical_restrictions.xml");
+    const XMLNode *rules = file_manager->createXMLTree(filename);
+    if (!rules)
+    {
+        Log::warn("Graphics", "Could not find graphical_restrictions.xm");
+        return;
+    }
+    if (rules->getName() != "graphical-restrictions")
+    {
+        delete rules;
+        Log::warn("Graphics", "'%s' did not contain graphical-restrictions tag",
+            filename.c_str());
+        return;
+    }
+
+    Version version(driver_version, card_name);
+    for (unsigned int i = 0; i<rules->getNumNodes(); i++)
+    {
+        const XMLNode *xml_rule = rules->getNode(i);
+        if (xml_rule->getName() != "card")
+        {
+            Log::warn("Graphics", "Incorrect node '%s' found in '%s' - ignored.",
+                      xml_rule->getName().c_str(), filename.c_str());
+            continue;
+        }
+        Rule rule(xml_rule);
+        if (rule.applies(card_name, version))
+        {
+            std::vector<std::string> restrictions = rule.getRestrictions();
+            std::vector<std::string>::iterator p;
+            for (p = restrictions.begin(); p != restrictions.end(); p++)
+            {
+                GraphicsRestrictionsType t = getTypeForName(*p);
+                if (t != GR_COUNT)
+                    m_all_graphics_restriction[t] = true;
+            }   // for p in rules
+        }   // if m_all_rules[i].applies()
+    }
+    delete rules;
+}   // init
+
+// ----------------------------------------------------------------------------
+/** Returns if the specified graphics restriction is defined.
+ *  \param type The graphical restriction to tes.t
+ */
+bool isDisabled(GraphicsRestrictionsType type)
+{
+    return m_all_graphics_restriction[type];
+}   // isDisabled
+
+}   // namespace HardwareStats
diff --git a/src/graphics/graphics_restrictions.hpp b/src/graphics/graphics_restrictions.hpp
index 908a0e03f..ab44ce92f 100644
--- a/src/graphics/graphics_restrictions.hpp
+++ b/src/graphics/graphics_restrictions.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/hit_effect.hpp b/src/graphics/hit_effect.hpp
index e2ec5966a..cf07a7bb5 100644
--- a/src/graphics/hit_effect.hpp
+++ b/src/graphics/hit_effect.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/hit_sfx.cpp b/src/graphics/hit_sfx.cpp
index 1a1f45c58..5fe15a6e1 100644
--- a/src/graphics/hit_sfx.cpp
+++ b/src/graphics/hit_sfx.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/hit_sfx.hpp b/src/graphics/hit_sfx.hpp
index d7f7e2e5a..3386777a8 100644
--- a/src/graphics/hit_sfx.hpp
+++ b/src/graphics/hit_sfx.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 3ac26bdd5..92608912a 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 320cb106d..cc28d14ee 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/large_mesh_buffer.hpp b/src/graphics/large_mesh_buffer.hpp
index 034ef7b4e..0350b6c17 100644
--- a/src/graphics/large_mesh_buffer.hpp
+++ b/src/graphics/large_mesh_buffer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/graphics/light.cpp b/src/graphics/light.cpp
index 068809995..f3e7f1d5a 100644
--- a/src/graphics/light.cpp
+++ b/src/graphics/light.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/light.hpp b/src/graphics/light.hpp
index c3a830e30..c27cdff57 100644
--- a/src/graphics/light.hpp
+++ b/src/graphics/light.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp
index 8f94368c2..03be0ef1b 100644
--- a/src/graphics/lod_node.cpp
+++ b/src/graphics/lod_node.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon
+//  Copyright (C) 2011-2015 Marianne Gagnon
 //  based on code Copyright 2002-2010 Nikolaus Gebhardt
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/lod_node.hpp b/src/graphics/lod_node.hpp
index 8c349eb67..a9297fc4f 100644
--- a/src/graphics/lod_node.hpp
+++ b/src/graphics/lod_node.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon
+//  Copyright (C) 2011-2015 Marianne Gagnon
 //  based on code Copyright 2002-2010 Nikolaus Gebhardt
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp
index f6fbc3d00..bd0fcf3ca 100644
--- a/src/graphics/material.cpp
+++ b/src/graphics/material.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2010-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2010-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/material.hpp b/src/graphics/material.hpp
index bc7d08df5..692adfb57 100644
--- a/src/graphics/material.hpp
+++ b/src/graphics/material.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2010-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2010-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/material_manager.cpp b/src/graphics/material_manager.cpp
index c84a83e0a..7d63ce869 100644
--- a/src/graphics/material_manager.cpp
+++ b/src/graphics/material_manager.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2010-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2010-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/material_manager.hpp b/src/graphics/material_manager.hpp
index f49af51aa..d791c9dcb 100644
--- a/src/graphics/material_manager.hpp
+++ b/src/graphics/material_manager.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2010-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2010-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/mesh_tools.cpp b/src/graphics/mesh_tools.cpp
index 06ac222ba..0375677a5 100644
--- a/src/graphics/mesh_tools.cpp
+++ b/src/graphics/mesh_tools.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/mesh_tools.hpp b/src/graphics/mesh_tools.hpp
index 84bfa5555..e1e28076e 100644
--- a/src/graphics/mesh_tools.hpp
+++ b/src/graphics/mesh_tools.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/moving_texture.cpp b/src/graphics/moving_texture.cpp
index bb94203c6..71e1cdd7b 100644
--- a/src/graphics/moving_texture.cpp
+++ b/src/graphics/moving_texture.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/moving_texture.hpp b/src/graphics/moving_texture.hpp
index dbce82e90..b3f7a15be 100644
--- a/src/graphics/moving_texture.hpp
+++ b/src/graphics/moving_texture.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index 4a5e9f126..ecad6ece1 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_emitter.hpp b/src/graphics/particle_emitter.hpp
index 4e360d5c9..c4842660d 100644
--- a/src/graphics/particle_emitter.hpp
+++ b/src/graphics/particle_emitter.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_kind.cpp b/src/graphics/particle_kind.cpp
index a6f90301d..0833a55c8 100644
--- a/src/graphics/particle_kind.cpp
+++ b/src/graphics/particle_kind.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_kind.hpp b/src/graphics/particle_kind.hpp
index 796d1b885..b708e1c8e 100644
--- a/src/graphics/particle_kind.hpp
+++ b/src/graphics/particle_kind.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_kind_manager.cpp b/src/graphics/particle_kind_manager.cpp
index dfc6ccf30..e6406c935 100644
--- a/src/graphics/particle_kind_manager.cpp
+++ b/src/graphics/particle_kind_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/particle_kind_manager.hpp b/src/graphics/particle_kind_manager.hpp
index ef7b7a2f5..55f55eac2 100644
--- a/src/graphics/particle_kind_manager.hpp
+++ b/src/graphics/particle_kind_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon
+//  Copyright (C) 2011-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/per_camera_node.cpp b/src/graphics/per_camera_node.cpp
index 6bccd7f41..ae8d71e3c 100644
--- a/src/graphics/per_camera_node.cpp
+++ b/src/graphics/per_camera_node.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon
+//  Copyright (C) 2011-2015 Marianne Gagnon
 //  based on code Copyright 2002-2010 Nikolaus Gebhardt
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/per_camera_node.hpp b/src/graphics/per_camera_node.hpp
index 1a7542af6..a0eff639b 100644
--- a/src/graphics/per_camera_node.hpp
+++ b/src/graphics/per_camera_node.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon
+//  Copyright (C) 2011-2015 Marianne Gagnon
 //  based on code Copyright 2002-2010 Nikolaus Gebhardt
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 3ef55f656..ca27d13e7 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 the SuperTuxKart-Team
+//  Copyright (C) 2011-2015 the SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/post_processing.hpp b/src/graphics/post_processing.hpp
index 8933ae552..c5df89ff9 100644
--- a/src/graphics/post_processing.hpp
+++ b/src/graphics/post_processing.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 the SuperTuxKart-Team
+//  Copyright (C) 2011-2015 the SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/referee.cpp b/src/graphics/referee.cpp
index d4c0d85ff..4b60ddf53 100644
--- a/src/graphics/referee.cpp
+++ b/src/graphics/referee.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/referee.hpp b/src/graphics/referee.hpp
index 754d5ef86..c5348e5f1 100644
--- a/src/graphics/referee.hpp
+++ b/src/graphics/referee.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index c01fb6bd3..7f81098c5 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 4af6d1d3c..7f0cf23c2 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 31339b4df..533ac1626 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -617,4 +617,4 @@ public:
         SetTextureHandles_impl<0>(ids...);
     }
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/show_curve.cpp b/src/graphics/show_curve.cpp
index 92b2f27a6..0d1860528 100644
--- a/src/graphics/show_curve.cpp
+++ b/src/graphics/show_curve.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/show_curve.hpp b/src/graphics/show_curve.hpp
index d3b63bf70..1c05f0e09 100644
--- a/src/graphics/show_curve.hpp
+++ b/src/graphics/show_curve.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp
index d6c7d602d..228ca3ad9 100644
--- a/src/graphics/skid_marks.cpp
+++ b/src/graphics/skid_marks.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2013-2013 Joerg Henrichs
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2013-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/skid_marks.hpp b/src/graphics/skid_marks.hpp
index 3f94e720d..0f92b491c 100644
--- a/src/graphics/skid_marks.hpp
+++ b/src/graphics/skid_marks.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2013-2013 Joerg Henrichs
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2013-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/slip_stream.cpp b/src/graphics/slip_stream.cpp
index 8c0b66022..57a9c61f3 100644
--- a/src/graphics/slip_stream.cpp
+++ b/src/graphics/slip_stream.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/slip_stream.hpp b/src/graphics/slip_stream.hpp
index a51238057..0aa94a16a 100644
--- a/src/graphics/slip_stream.hpp
+++ b/src/graphics/slip_stream.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/stars.cpp b/src/graphics/stars.cpp
index eabe7944d..e28095e4b 100644
--- a/src/graphics/stars.cpp
+++ b/src/graphics/stars.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013  SuperTuxKart-Team
+//  Copyright (C) 2012-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/stars.hpp b/src/graphics/stars.hpp
index a100ee518..89cd33a2f 100644
--- a/src/graphics/stars.hpp
+++ b/src/graphics/stars.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013  SuperTuxKart-Team
+//  Copyright (C) 2012-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index cefb212f6..0b76b8d6e 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -854,4 +854,4 @@ PROFILER_POP_CPU_MARKER();
 
     if (CVS->supportsAsyncInstanceUpload())
         glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
-}
\ No newline at end of file
+}
diff --git a/src/graphics/sun.cpp b/src/graphics/sun.cpp
index 2e257c71b..9481d760d 100644
--- a/src/graphics/sun.cpp
+++ b/src/graphics/sun.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/sun.hpp b/src/graphics/sun.hpp
index bac4a570f..245450e46 100644
--- a/src/graphics/sun.hpp
+++ b/src/graphics/sun.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/texturemanager.cpp b/src/graphics/texturemanager.cpp
index 4afe417d0..6a567f9f6 100644
--- a/src/graphics/texturemanager.cpp
+++ b/src/graphics/texturemanager.cpp
@@ -213,4 +213,4 @@ video::ITexture* getUnicolorTexture(const video::SColor &c)
         img->drop();
         return tex;
     }
-}
\ No newline at end of file
+}
diff --git a/src/graphics/texturemanager.hpp b/src/graphics/texturemanager.hpp
index f0d314fbb..afa82a4e5 100644
--- a/src/graphics/texturemanager.hpp
+++ b/src/graphics/texturemanager.hpp
@@ -30,4 +30,4 @@ void compressTexture(irr::video::ITexture *tex, bool srgb, bool premul_alpha = f
 bool loadCompressedTexture(const std::string& compressed_tex);
 void saveCompressedTexture(const std::string& compressed_tex);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/vaomanager.hpp b/src/graphics/vaomanager.hpp
index 2008f315e..e82235841 100644
--- a/src/graphics/vaomanager.hpp
+++ b/src/graphics/vaomanager.hpp
@@ -185,4 +185,4 @@ public:
     ~VAOManager();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/graphics/water.cpp b/src/graphics/water.cpp
index 3ac11d981..03f23bb35 100644
--- a/src/graphics/water.cpp
+++ b/src/graphics/water.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/water.hpp b/src/graphics/water.hpp
index de378dab8..fe6f60b59 100644
--- a/src/graphics/water.hpp
+++ b/src/graphics/water.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/weather.cpp b/src/graphics/weather.cpp
index f0f1310b2..539b2bb32 100644
--- a/src/graphics/weather.cpp
+++ b/src/graphics/weather.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/graphics/weather.hpp b/src/graphics/weather.hpp
index d6fb1b135..139e9bbf5 100644
--- a/src/graphics/weather.hpp
+++ b/src/graphics/weather.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2011-2015  Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/CGUISpriteBank.cpp b/src/guiengine/CGUISpriteBank.cpp
index d255309e5..45b30070f 100644
--- a/src/guiengine/CGUISpriteBank.cpp
+++ b/src/guiengine/CGUISpriteBank.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2013 Nikolaus Gebhardt, modified by Marianne Gagnon
+// Copyright (C) 2002-2015 Nikolaus Gebhardt, modified by Marianne Gagnon
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/guiengine/CGUISpriteBank.hpp b/src/guiengine/CGUISpriteBank.hpp
index 28a87fc3d..82ec6011e 100644
--- a/src/guiengine/CGUISpriteBank.hpp
+++ b/src/guiengine/CGUISpriteBank.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2009 Nikolaus Gebhardt, modified by Marianne Gagnon
+// Copyright (C) 2002-2015 Nikolaus Gebhardt, modified by Marianne Gagnon
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/guiengine/abstract_state_manager.cpp b/src/guiengine/abstract_state_manager.cpp
index ae9f1a2ed..52cd17ec6 100644
--- a/src/guiengine/abstract_state_manager.cpp
+++ b/src/guiengine/abstract_state_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/abstract_state_manager.hpp b/src/guiengine/abstract_state_manager.hpp
index 5198eb30d..cd5d4d5e4 100644
--- a/src/guiengine/abstract_state_manager.hpp
+++ b/src/guiengine/abstract_state_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/abstract_top_level_container.cpp b/src/guiengine/abstract_top_level_container.cpp
index 332a45b40..cd504059f 100644
--- a/src/guiengine/abstract_top_level_container.cpp
+++ b/src/guiengine/abstract_top_level_container.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/abstract_top_level_container.hpp b/src/guiengine/abstract_top_level_container.hpp
index 15a278528..29bd8dea0 100644
--- a/src/guiengine/abstract_top_level_container.hpp
+++ b/src/guiengine/abstract_top_level_container.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/dialog_queue.cpp b/src/guiengine/dialog_queue.cpp
index 0a390f224..29f57174a 100644
--- a/src/guiengine/dialog_queue.cpp
+++ b/src/guiengine/dialog_queue.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/dialog_queue.hpp b/src/guiengine/dialog_queue.hpp
index 1a8a51271..0ff1553bc 100644
--- a/src/guiengine/dialog_queue.hpp
+++ b/src/guiengine/dialog_queue.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp
index 37406b954..659afa306 100644
--- a/src/guiengine/engine.cpp
+++ b/src/guiengine/engine.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/engine.hpp b/src/guiengine/engine.hpp
index a1c869bd3..daca2333e 100644
--- a/src/guiengine/engine.hpp
+++ b/src/guiengine/engine.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
index 17125c82e..58b316b7b 100644
--- a/src/guiengine/event_handler.cpp
+++ b/src/guiengine/event_handler.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/event_handler.hpp b/src/guiengine/event_handler.hpp
index be31df84f..221701897 100644
--- a/src/guiengine/event_handler.hpp
+++ b/src/guiengine/event_handler.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp
index 458c17b7d..c91ec10be 100644
--- a/src/guiengine/layout_manager.cpp
+++ b/src/guiengine/layout_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/layout_manager.hpp b/src/guiengine/layout_manager.hpp
index 4d338e864..d6b297ef1 100644
--- a/src/guiengine/layout_manager.hpp
+++ b/src/guiengine/layout_manager.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/message_queue.cpp b/src/guiengine/message_queue.cpp
old mode 100755
new mode 100644
index 10554595e..ebe684fda
--- a/src/guiengine/message_queue.cpp
+++ b/src/guiengine/message_queue.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/message_queue.hpp b/src/guiengine/message_queue.hpp
index 8a06d41f0..3abeb5874 100644
--- a/src/guiengine/message_queue.hpp
+++ b/src/guiengine/message_queue.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/modaldialog.cpp b/src/guiengine/modaldialog.cpp
index 544f4c012..970a49843 100644
--- a/src/guiengine/modaldialog.cpp
+++ b/src/guiengine/modaldialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/modaldialog.hpp b/src/guiengine/modaldialog.hpp
index 4ffddfbb7..37519b1db 100644
--- a/src/guiengine/modaldialog.hpp
+++ b/src/guiengine/modaldialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 381abdb06..f3a525a44 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2013 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
@@ -736,13 +736,13 @@ void ScalableFont::lazyLoadTexture(int texID)
 
     // Font textures can not be resized (besides the impact on quality in
     // this case, the indices in the xml files would become wrong).
-    core::dimension2du old_max_size = Driver->getDriverAttributes()
-                                     .getAttributeAsDimension2d("MAX_TEXTURE_SIZE");
-    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE",
-                                                       core::dimension2du(0, 0));
+    core::dimension2du old_max_size = Driver->getDriverAttributes()
+                                     .getAttributeAsDimension2d("MAX_TEXTURE_SIZE");
+    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE",
+                                                       core::dimension2du(0, 0));
 
     SpriteBank->setTexture(texID, Driver->getTexture( m_texture_files[texID].m_file_name ));
-    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE", old_max_size);
+    Driver->getNonConstDriverAttributes().setAttribute("MAX_TEXTURE_SIZE", old_max_size);
 
     // set previous mip-map+filter state
     //Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, mipmap);
diff --git a/src/guiengine/scalable_font.hpp b/src/guiengine/scalable_font.hpp
index 612536a99..034c1b6db 100644
--- a/src/guiengine/scalable_font.hpp
+++ b/src/guiengine/scalable_font.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2013 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/guiengine/screen.cpp b/src/guiengine/screen.cpp
index 7f4064b84..0f64a42cf 100644
--- a/src/guiengine/screen.cpp
+++ b/src/guiengine/screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/screen.hpp b/src/guiengine/screen.hpp
index 25963496a..3df7fc712 100644
--- a/src/guiengine/screen.hpp
+++ b/src/guiengine/screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/screen_loader.cpp b/src/guiengine/screen_loader.cpp
index 4126806cc..eab6163eb 100644
--- a/src/guiengine/screen_loader.cpp
+++ b/src/guiengine/screen_loader.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 71a99f5a5..fd75fca0d 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/skin.hpp b/src/guiengine/skin.hpp
index efa26f23d..208a2ad21 100644
--- a/src/guiengine/skin.hpp
+++ b/src/guiengine/skin.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index 4a92b30b3..932a3f5f7 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp
index 95cc43905..ca3ca8a2c 100644
--- a/src/guiengine/widget.hpp
+++ b/src/guiengine/widget.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets.hpp b/src/guiengine/widgets.hpp
index 749cf2f0c..cbabe95a6 100644
--- a/src/guiengine/widgets.hpp
+++ b/src/guiengine/widgets.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/CGUIEditBox.cpp b/src/guiengine/widgets/CGUIEditBox.cpp
index 9bac16163..c9044fe40 100644
--- a/src/guiengine/widgets/CGUIEditBox.cpp
+++ b/src/guiengine/widgets/CGUIEditBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2013 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/guiengine/widgets/CGUIEditBox.hpp b/src/guiengine/widgets/CGUIEditBox.hpp
index d9555bbf3..790e440ff 100644
--- a/src/guiengine/widgets/CGUIEditBox.hpp
+++ b/src/guiengine/widgets/CGUIEditBox.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2011 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
index 0ce2cb155..cc1de8b5a 100644
--- a/src/guiengine/widgets/CGUISTKListBox.cpp
+++ b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 //               2013 Glenn De Jonghe
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
diff --git a/src/guiengine/widgets/CGUISTKListBox.hpp b/src/guiengine/widgets/CGUISTKListBox.hpp
index 7b2c2a72a..1974c0a87 100644
--- a/src/guiengine/widgets/CGUISTKListBox.hpp
+++ b/src/guiengine/widgets/CGUISTKListBox.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// Copyright (C) 2002-2015 Nikolaus Gebhardt
 //               2013 Glenn De Jonghe
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
diff --git a/src/guiengine/widgets/bubble_widget.cpp b/src/guiengine/widgets/bubble_widget.cpp
index 82fd4fbbb..3536fbecd 100644
--- a/src/guiengine/widgets/bubble_widget.cpp
+++ b/src/guiengine/widgets/bubble_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/bubble_widget.hpp b/src/guiengine/widgets/bubble_widget.hpp
index ee3f1e92f..82bbdceaa 100644
--- a/src/guiengine/widgets/bubble_widget.hpp
+++ b/src/guiengine/widgets/bubble_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/button_widget.cpp b/src/guiengine/widgets/button_widget.cpp
index 01016b2be..92c5be297 100644
--- a/src/guiengine/widgets/button_widget.cpp
+++ b/src/guiengine/widgets/button_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/button_widget.hpp b/src/guiengine/widgets/button_widget.hpp
index 95bc227b0..5f7330e63 100644
--- a/src/guiengine/widgets/button_widget.hpp
+++ b/src/guiengine/widgets/button_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/check_box_widget.cpp b/src/guiengine/widgets/check_box_widget.cpp
index 35ee7308f..cd0307f3d 100644
--- a/src/guiengine/widgets/check_box_widget.cpp
+++ b/src/guiengine/widgets/check_box_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/check_box_widget.hpp b/src/guiengine/widgets/check_box_widget.hpp
index a5bf1d529..efbc137e5 100644
--- a/src/guiengine/widgets/check_box_widget.hpp
+++ b/src/guiengine/widgets/check_box_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index f233a5d46..3149e1138 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -1,5 +1,5 @@
 //  Supertuxkart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.hpp b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
index 520bde76e..8f1ec47a3 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.hpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index 9f155a3f7..d15110f06 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/icon_button_widget.hpp b/src/guiengine/widgets/icon_button_widget.hpp
index 9c8221a87..b673e8f95 100644
--- a/src/guiengine/widgets/icon_button_widget.hpp
+++ b/src/guiengine/widgets/icon_button_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/kart_stats_widget.cpp b/src/guiengine/widgets/kart_stats_widget.cpp
index 3fc6884ac..6de73a0d1 100644
--- a/src/guiengine/widgets/kart_stats_widget.cpp
+++ b/src/guiengine/widgets/kart_stats_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/kart_stats_widget.hpp b/src/guiengine/widgets/kart_stats_widget.hpp
index 8091c1a11..e78aa4555 100644
--- a/src/guiengine/widgets/kart_stats_widget.hpp
+++ b/src/guiengine/widgets/kart_stats_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp
index c27ec1d22..f27c8e39b 100644
--- a/src/guiengine/widgets/label_widget.cpp
+++ b/src/guiengine/widgets/label_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/label_widget.hpp b/src/guiengine/widgets/label_widget.hpp
index 34e4cf8b4..b8d914945 100644
--- a/src/guiengine/widgets/label_widget.hpp
+++ b/src/guiengine/widgets/label_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index 24ffc1cdd..9ac3b5b51 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index 4bbfe5c0c..bdbad90ee 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/model_view_widget.cpp b/src/guiengine/widgets/model_view_widget.cpp
index 3493ad9f9..d6ade0fde 100644
--- a/src/guiengine/widgets/model_view_widget.cpp
+++ b/src/guiengine/widgets/model_view_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/model_view_widget.hpp b/src/guiengine/widgets/model_view_widget.hpp
index 2752905d4..3090a1688 100644
--- a/src/guiengine/widgets/model_view_widget.hpp
+++ b/src/guiengine/widgets/model_view_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index e9218761f..d9d0a6115 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/player_kart_widget.hpp b/src/guiengine/widgets/player_kart_widget.hpp
index da86bc9a8..47baecb65 100644
--- a/src/guiengine/widgets/player_kart_widget.hpp
+++ b/src/guiengine/widgets/player_kart_widget.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/player_name_spinner.cpp b/src/guiengine/widgets/player_name_spinner.cpp
index 9361af7e8..93fbbf26f 100644
--- a/src/guiengine/widgets/player_name_spinner.cpp
+++ b/src/guiengine/widgets/player_name_spinner.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/player_name_spinner.hpp b/src/guiengine/widgets/player_name_spinner.hpp
index 3cdc90df6..9b32c2e01 100644
--- a/src/guiengine/widgets/player_name_spinner.hpp
+++ b/src/guiengine/widgets/player_name_spinner.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/progress_bar_widget.cpp b/src/guiengine/widgets/progress_bar_widget.cpp
index 2acd17d6e..0b08d7b2b 100644
--- a/src/guiengine/widgets/progress_bar_widget.cpp
+++ b/src/guiengine/widgets/progress_bar_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/progress_bar_widget.hpp b/src/guiengine/widgets/progress_bar_widget.hpp
index 142f09fb3..9bab6789a 100644
--- a/src/guiengine/widgets/progress_bar_widget.hpp
+++ b/src/guiengine/widgets/progress_bar_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/rating_bar_widget.cpp b/src/guiengine/widgets/rating_bar_widget.cpp
index 2a58cccdd..1625b852b 100644
--- a/src/guiengine/widgets/rating_bar_widget.cpp
+++ b/src/guiengine/widgets/rating_bar_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/rating_bar_widget.hpp b/src/guiengine/widgets/rating_bar_widget.hpp
index 0a14c5d26..592f5bfd8 100644
--- a/src/guiengine/widgets/rating_bar_widget.hpp
+++ b/src/guiengine/widgets/rating_bar_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //                2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index fe7397682..8177826df 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/ribbon_widget.hpp b/src/guiengine/widgets/ribbon_widget.hpp
index 8e37403f0..5960568fb 100644
--- a/src/guiengine/widgets/ribbon_widget.hpp
+++ b/src/guiengine/widgets/ribbon_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/skill_level_widget.cpp b/src/guiengine/widgets/skill_level_widget.cpp
index eb1cd00eb..d3d8a602d 100644
--- a/src/guiengine/widgets/skill_level_widget.cpp
+++ b/src/guiengine/widgets/skill_level_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/skill_level_widget.hpp b/src/guiengine/widgets/skill_level_widget.hpp
index 88a02ab38..0fecf8598 100644
--- a/src/guiengine/widgets/skill_level_widget.hpp
+++ b/src/guiengine/widgets/skill_level_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 568bd5958..f49d9f581 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 2347ab3d0..4f1c4a841 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/text_box_widget.cpp b/src/guiengine/widgets/text_box_widget.cpp
index 461f1692b..0a55d4aac 100644
--- a/src/guiengine/widgets/text_box_widget.cpp
+++ b/src/guiengine/widgets/text_box_widget.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/guiengine/widgets/text_box_widget.hpp b/src/guiengine/widgets/text_box_widget.hpp
index a3b5f081d..97a61971c 100644
--- a/src/guiengine/widgets/text_box_widget.hpp
+++ b/src/guiengine/widgets/text_box_widget.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/binding.cpp b/src/input/binding.cpp
index 44c24da16..083a6b3ae 100644
--- a/src/input/binding.cpp
+++ b/src/input/binding.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/binding.hpp b/src/input/binding.hpp
index 8d970bdb3..78a82ec66 100644
--- a/src/input/binding.hpp
+++ b/src/input/binding.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/device_config.cpp b/src/input/device_config.cpp
index 59ff0b2c5..04b6cc8ff 100644
--- a/src/input/device_config.cpp
+++ b/src/input/device_config.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/device_config.hpp b/src/input/device_config.hpp
index 71b06174f..844eb6c01 100644
--- a/src/input/device_config.hpp
+++ b/src/input/device_config.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp
index 2f884ad1c..c547f2be1 100644
--- a/src/input/device_manager.cpp
+++ b/src/input/device_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/device_manager.hpp b/src/input/device_manager.hpp
index 4bdd3af4f..e7a053a51 100644
--- a/src/input/device_manager.hpp
+++ b/src/input/device_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp
index 751158145..2dacb758a 100644
--- a/src/input/gamepad_config.cpp
+++ b/src/input/gamepad_config.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/gamepad_config.hpp b/src/input/gamepad_config.hpp
index a6cf827cc..42a8fb478 100644
--- a/src/input/gamepad_config.hpp
+++ b/src/input/gamepad_config.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/gamepad_device.cpp b/src/input/gamepad_device.cpp
index 30a204839..c554c0c1b 100644
--- a/src/input/gamepad_device.cpp
+++ b/src/input/gamepad_device.cpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/gamepad_device.hpp b/src/input/gamepad_device.hpp
index c430c3832..d5907b35a 100644
--- a/src/input/gamepad_device.hpp
+++ b/src/input/gamepad_device.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/input.hpp b/src/input/input.hpp
index 8932a2bc2..20930a064 100644
--- a/src/input/input.hpp
+++ b/src/input/input.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Robert Schuster <robertschuster@fsfe.org>
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2007-2015 Robert Schuster <robertschuster@fsfe.org>
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/input_device.cpp b/src/input/input_device.cpp
index a90ff3152..a9a9be510 100644
--- a/src/input/input_device.cpp
+++ b/src/input/input_device.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/input_device.hpp b/src/input/input_device.hpp
index 3fce8586e..a367263ff 100644
--- a/src/input/input_device.hpp
+++ b/src/input/input_device.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 47885a0b8..636703ffa 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/input_manager.hpp b/src/input/input_manager.hpp
index 3c3518a09..2ffff2ea4 100644
--- a/src/input/input_manager.hpp
+++ b/src/input/input_manager.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2006 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/keyboard_config.cpp b/src/input/keyboard_config.cpp
index 87ffcf3c0..8ae975a45 100644
--- a/src/input/keyboard_config.cpp
+++ b/src/input/keyboard_config.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/keyboard_config.hpp b/src/input/keyboard_config.hpp
index 3ca9be870..7d3dc264e 100644
--- a/src/input/keyboard_config.hpp
+++ b/src/input/keyboard_config.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/keyboard_device.cpp b/src/input/keyboard_device.cpp
index 011b59777..6dfbe5ad2 100644
--- a/src/input/keyboard_device.cpp
+++ b/src/input/keyboard_device.cpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/keyboard_device.hpp b/src/input/keyboard_device.hpp
index 29ded6585..faf77e7a5 100644
--- a/src/input/keyboard_device.hpp
+++ b/src/input/keyboard_device.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2014 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/wiimote.cpp b/src/input/wiimote.cpp
index f9de58a1e..a69d2fcd5 100644
--- a/src/input/wiimote.cpp
+++ b/src/input/wiimote.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/wiimote.hpp b/src/input/wiimote.hpp
index 60e29eab5..d6e65830b 100644
--- a/src/input/wiimote.hpp
+++ b/src/input/wiimote.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/wiimote_manager.cpp b/src/input/wiimote_manager.cpp
index f3fc3868f..a5d81fab2 100644
--- a/src/input/wiimote_manager.cpp
+++ b/src/input/wiimote_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/input/wiimote_manager.hpp b/src/input/wiimote_manager.hpp
index d76778d5a..810537151 100644
--- a/src/input/wiimote_manager.hpp
+++ b/src/input/wiimote_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index eb15ceca9..1989fcbb7 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2008-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2008-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index 8ae5792bc..18d6e1949 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2008-2013 Steve Baker, Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2008-2015 Steve Baker, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/utf_writer.cpp b/src/io/utf_writer.cpp
index b5d3d7b76..4232f20ab 100644
--- a/src/io/utf_writer.cpp
+++ b/src/io/utf_writer.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Marianne Gagnon
+//  Copyright (C) 2010-2015  Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/utf_writer.hpp b/src/io/utf_writer.hpp
index cc7ef30a0..02f8ebcd7 100644
--- a/src/io/utf_writer.hpp
+++ b/src/io/utf_writer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Marianne Gagnon
+//  Copyright (C) 2010-2015  Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/xml_node.cpp b/src/io/xml_node.cpp
index 6180e9cd4..cbc8dc21a 100644
--- a/src/io/xml_node.cpp
+++ b/src/io/xml_node.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/io/xml_node.hpp b/src/io/xml_node.hpp
index 675e68b0c..ed990dab4 100644
--- a/src/io/xml_node.hpp
+++ b/src/io/xml_node.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/attachment.cpp b/src/items/attachment.cpp
index 0be47c80c..b1eb41199 100644
--- a/src/items/attachment.cpp
+++ b/src/items/attachment.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/attachment.hpp b/src/items/attachment.hpp
index 6fa469562..825db163f 100644
--- a/src/items/attachment.hpp
+++ b/src/items/attachment.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/attachment_manager.cpp b/src/items/attachment_manager.cpp
index d7f9d0561..8c3c54cc3 100644
--- a/src/items/attachment_manager.cpp
+++ b/src/items/attachment_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/attachment_manager.hpp b/src/items/attachment_manager.hpp
index 92bc6cba9..ec4b4a296 100644
--- a/src/items/attachment_manager.hpp
+++ b/src/items/attachment_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/attachment_plugin.hpp b/src/items/attachment_plugin.hpp
index 1b90a6ef1..a6c792819 100644
--- a/src/items/attachment_plugin.hpp
+++ b/src/items/attachment_plugin.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/bowling.cpp b/src/items/bowling.cpp
index 4d0b8c935..e0f37d5dc 100644
--- a/src/items/bowling.cpp
+++ b/src/items/bowling.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/bowling.hpp b/src/items/bowling.hpp
index 8b84c3f3b..600a21947 100644
--- a/src/items/bowling.hpp
+++ b/src/items/bowling.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2007-2015 Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/cake.cpp b/src/items/cake.cpp
index 7f802dcbb..aa1ce12ba 100644
--- a/src/items/cake.cpp
+++ b/src/items/cake.cpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Physics improvements and linear intersection algorithm by
-//  Copyright (C) 2009-2013 David Mikos.
+//  Copyright (C) 2009-2015 David Mikos.
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/cake.hpp b/src/items/cake.hpp
index 626a671e6..d22b71679 100644
--- a/src/items/cake.hpp
+++ b/src/items/cake.hpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Physics improvements and linear intersection algorithm by
-//  Copyright (C) 2009-2013 David Mikos.
+//  Copyright (C) 2009-2015 David Mikos.
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/flyable.cpp b/src/items/flyable.cpp
index 8db602671..2088c5adc 100644
--- a/src/items/flyable.cpp
+++ b/src/items/flyable.cpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Linear item-kart intersection function written by
-//  Copyright (C) 2009-2013 David Mikos
+//  Copyright (C) 2009-2015 David Mikos
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/flyable.hpp b/src/items/flyable.hpp
index b15884f0e..89aa4cb07 100644
--- a/src/items/flyable.hpp
+++ b/src/items/flyable.hpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Linear item-kart intersection function written by
-//  Copyright (C) 2009-2013 David Mikos.
+//  Copyright (C) 2009-2015 David Mikos.
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/item.cpp b/src/items/item.cpp
index 8ada22f57..b9115fdb4 100644
--- a/src/items/item.cpp
+++ b/src/items/item.cpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/item.hpp b/src/items/item.hpp
index df6125197..583f8322e 100644
--- a/src/items/item.hpp
+++ b/src/items/item.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/item_manager.cpp b/src/items/item_manager.cpp
index 0503dc99c..21cc23fa8 100644
--- a/src/items/item_manager.cpp
+++ b/src/items/item_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/item_manager.hpp b/src/items/item_manager.hpp
index 09e3af587..dfba939f4 100644
--- a/src/items/item_manager.hpp
+++ b/src/items/item_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/plunger.cpp b/src/items/plunger.cpp
index 29d55dc44..778edc473 100644
--- a/src/items/plunger.cpp
+++ b/src/items/plunger.cpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Physics improvements and linear intersection algorithm by
-//  Copyright (C) 2009-2013 David Mikos.
+//  Copyright (C) 2009-2015 David Mikos.
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/plunger.hpp b/src/items/plunger.hpp
index 5ac873241..e8cdb7815 100644
--- a/src/items/plunger.hpp
+++ b/src/items/plunger.hpp
@@ -1,9 +1,9 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  Physics improvements and linear intersection algorithm by
-//  Copyright (C) 2009-2013 David Mikos.
+//  Copyright (C) 2009-2015 David Mikos.
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/powerup.cpp b/src/items/powerup.cpp
index d8ae4203f..b354b7aff 100644
--- a/src/items/powerup.cpp
+++ b/src/items/powerup.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/powerup.hpp b/src/items/powerup.hpp
index a21335342..aa4e117e9 100644
--- a/src/items/powerup.hpp
+++ b/src/items/powerup.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/powerup_manager.cpp b/src/items/powerup_manager.cpp
index 83e794d4d..153e444dd 100644
--- a/src/items/powerup_manager.cpp
+++ b/src/items/powerup_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/powerup_manager.hpp b/src/items/powerup_manager.hpp
index 4bb3d69d5..c42904191 100644
--- a/src/items/powerup_manager.hpp
+++ b/src/items/powerup_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/projectile_manager.cpp b/src/items/projectile_manager.cpp
index 091c64f97..709ca4135 100644
--- a/src/items/projectile_manager.cpp
+++ b/src/items/projectile_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/projectile_manager.hpp b/src/items/projectile_manager.hpp
index 0ef2c1e0d..8fcdb0c4e 100644
--- a/src/items/projectile_manager.hpp
+++ b/src/items/projectile_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/rubber_ball.cpp b/src/items/rubber_ball.cpp
index b9ca9a3f7..af2d09d62 100644
--- a/src/items/rubber_ball.cpp
+++ b/src/items/rubber_ball.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/rubber_ball.hpp b/src/items/rubber_ball.hpp
index a84d0348b..5b7506666 100644
--- a/src/items/rubber_ball.hpp
+++ b/src/items/rubber_ball.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/rubber_band.cpp b/src/items/rubber_band.cpp
index 38099b475..88625d26e 100644
--- a/src/items/rubber_band.cpp
+++ b/src/items/rubber_band.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/rubber_band.hpp b/src/items/rubber_band.hpp
index 9b8496a20..40b59aabb 100644
--- a/src/items/rubber_band.hpp
+++ b/src/items/rubber_band.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/swatter.cpp b/src/items/swatter.cpp
index 9a72cb592..326b47cbd 100644
--- a/src/items/swatter.cpp
+++ b/src/items/swatter.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/items/swatter.hpp b/src/items/swatter.hpp
index 5dd42a8e6..5454552d0 100644
--- a/src/items/swatter.hpp
+++ b/src/items/swatter.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/abstract_kart.cpp b/src/karts/abstract_kart.cpp
index 28fa7995a..a88741718 100644
--- a/src/karts/abstract_kart.cpp
+++ b/src/karts/abstract_kart.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/abstract_kart.hpp b/src/karts/abstract_kart.hpp
index e47285daf..565d8f3bd 100644
--- a/src/karts/abstract_kart.hpp
+++ b/src/karts/abstract_kart.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/abstract_kart_animation.cpp b/src/karts/abstract_kart_animation.cpp
index 7062c3f7a..f51e28f84 100644
--- a/src/karts/abstract_kart_animation.cpp
+++ b/src/karts/abstract_kart_animation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/abstract_kart_animation.hpp b/src/karts/abstract_kart_animation.hpp
index 14f318e82..5dbfd9873 100644
--- a/src/karts/abstract_kart_animation.hpp
+++ b/src/karts/abstract_kart_animation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/cannon_animation.cpp b/src/karts/cannon_animation.cpp
index a44ee3f22..e89478af6 100644
--- a/src/karts/cannon_animation.cpp
+++ b/src/karts/cannon_animation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/cannon_animation.hpp b/src/karts/cannon_animation.hpp
index 7a58cc414..bb8022c25 100644
--- a/src/karts/cannon_animation.hpp
+++ b/src/karts/cannon_animation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/ai_base_controller.cpp b/src/karts/controller/ai_base_controller.cpp
index a192eb5ba..bbc95d5d4 100644
--- a/src/karts/controller/ai_base_controller.cpp
+++ b/src/karts/controller/ai_base_controller.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013  Eduardo Hernandez Munoz
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2006-2015  Eduardo Hernandez Munoz
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/ai_base_controller.hpp b/src/karts/controller/ai_base_controller.hpp
index d27143833..72cbb8269 100644
--- a/src/karts/controller/ai_base_controller.hpp
+++ b/src/karts/controller/ai_base_controller.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013      Joerg Henrichs
+//  Copyright (C) 2010-2015      Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/ai_properties.cpp b/src/karts/controller/ai_properties.cpp
index 720fc5a77..e60da3cf9 100644
--- a/src/karts/controller/ai_properties.cpp
+++ b/src/karts/controller/ai_properties.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/ai_properties.hpp b/src/karts/controller/ai_properties.hpp
index aadad7c07..ccdcf8d8b 100644
--- a/src/karts/controller/ai_properties.hpp
+++ b/src/karts/controller/ai_properties.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/controller.cpp b/src/karts/controller/controller.cpp
index 334e2bf08..1f9d8f71f 100644
--- a/src/karts/controller/controller.cpp
+++ b/src/karts/controller/controller.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013      Joerg Henrichs
+//  Copyright (C) 2010-2015      Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/controller.hpp b/src/karts/controller/controller.hpp
index 556d3b699..689972bb6 100644
--- a/src/karts/controller/controller.hpp
+++ b/src/karts/controller/controller.hpp
@@ -1,7 +1,7 @@
 
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/end_controller.cpp b/src/karts/controller/end_controller.cpp
index 5ab334a47..8855ccd88 100644
--- a/src/karts/controller/end_controller.cpp
+++ b/src/karts/controller/end_controller.cpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Eduardo Hernandez Munoz
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Eduardo Hernandez Munoz
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/end_controller.hpp b/src/karts/controller/end_controller.hpp
index 72b979dd4..463305674 100644
--- a/src/karts/controller/end_controller.hpp
+++ b/src/karts/controller/end_controller.hpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Eduardo Hernandez Munoz
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Eduardo Hernandez Munoz
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/kart_control.hpp b/src/karts/controller/kart_control.hpp
index f820796c6..82d31544a 100644
--- a/src/karts/controller/kart_control.hpp
+++ b/src/karts/controller/kart_control.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013  Joerg Henrichs
+//  Copyright (C) 2008-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/player_controller.cpp b/src/karts/controller/player_controller.cpp
index e396d3e4e..f45a47857 100644
--- a/src/karts/controller/player_controller.cpp
+++ b/src/karts/controller/player_controller.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/player_controller.hpp b/src/karts/controller/player_controller.hpp
index 9f90da39b..4431a0f19 100644
--- a/src/karts/controller/player_controller.hpp
+++ b/src/karts/controller/player_controller.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/skidding_ai.cpp b/src/karts/controller/skidding_ai.cpp
index c50c275da..74f40a84d 100644
--- a/src/karts/controller/skidding_ai.cpp
+++ b/src/karts/controller/skidding_ai.cpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Eduardo Hernandez Munoz
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Eduardo Hernandez Munoz
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/controller/skidding_ai.hpp b/src/karts/controller/skidding_ai.hpp
index 28a8e548f..7363c46a1 100644
--- a/src/karts/controller/skidding_ai.hpp
+++ b/src/karts/controller/skidding_ai.hpp
@@ -1,9 +1,9 @@
 
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013  Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013  Eduardo Hernandez Munoz
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2004-2015  Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015  Eduardo Hernandez Munoz
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/explosion_animation.cpp b/src/karts/explosion_animation.cpp
index 24796e1b4..81799dd8d 100644
--- a/src/karts/explosion_animation.cpp
+++ b/src/karts/explosion_animation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/explosion_animation.hpp b/src/karts/explosion_animation.hpp
index 457f6dcda..a75d893df 100644
--- a/src/karts/explosion_animation.hpp
+++ b/src/karts/explosion_animation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/ghost_kart.cpp b/src/karts/ghost_kart.cpp
index d284e37dc..099116399 100644
--- a/src/karts/ghost_kart.cpp
+++ b/src/karts/ghost_kart.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/ghost_kart.hpp b/src/karts/ghost_kart.hpp
index 9fb66dbea..f08742a1a 100644
--- a/src/karts/ghost_kart.hpp
+++ b/src/karts/ghost_kart.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 03ef993f1..7ec9b2645 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team, Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team, Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 5c0b2d5ae..30a5dcb34 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team, Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team, Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 160cfd381..3cc52a6e1 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp
index 9438eaec9..2eda04d45 100644
--- a/src/karts/kart_gfx.hpp
+++ b/src/karts/kart_gfx.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index c047376d9..71527258c 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
index 454a66427..249ea51a7 100644
--- a/src/karts/kart_model.hpp
+++ b/src/karts/kart_model.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index 5e687d47f..d47ae7ac7 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp
index d0b6ba628..f8268eb36 100644
--- a/src/karts/kart_properties.hpp
+++ b/src/karts/kart_properties.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_properties_manager.cpp b/src/karts/kart_properties_manager.cpp
index efba7b5a6..f8d2554d7 100644
--- a/src/karts/kart_properties_manager.cpp
+++ b/src/karts/kart_properties_manager.cpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_properties_manager.hpp b/src/karts/kart_properties_manager.hpp
index fbc05f79e..bcaedf8e6 100644
--- a/src/karts/kart_properties_manager.hpp
+++ b/src/karts/kart_properties_manager.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_with_stats.cpp b/src/karts/kart_with_stats.cpp
index a916b2255..22f9a39b4 100644
--- a/src/karts/kart_with_stats.cpp
+++ b/src/karts/kart_with_stats.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs
+//  Copyright (C) 2011-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/kart_with_stats.hpp b/src/karts/kart_with_stats.hpp
index 84b6161a7..a85870a84 100644
--- a/src/karts/kart_with_stats.hpp
+++ b/src/karts/kart_with_stats.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs
+//  Copyright (C) 2011-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/max_speed.cpp b/src/karts/max_speed.cpp
index eb1b7feb3..c044f77d4 100644
--- a/src/karts/max_speed.cpp
+++ b/src/karts/max_speed.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/max_speed.hpp b/src/karts/max_speed.hpp
index 8c9d76bff..4470e6029 100644
--- a/src/karts/max_speed.hpp
+++ b/src/karts/max_speed.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/moveable.cpp b/src/karts/moveable.cpp
index 84f5d17e0..76aa5212d 100644
--- a/src/karts/moveable.cpp
+++ b/src/karts/moveable.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/moveable.hpp b/src/karts/moveable.hpp
index 42d82217a..4a0599dad 100644
--- a/src/karts/moveable.hpp
+++ b/src/karts/moveable.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/player_difficulty.cpp b/src/karts/player_difficulty.cpp
index aa985b01b..d674b7e41 100644
--- a/src/karts/player_difficulty.cpp
+++ b/src/karts/player_difficulty.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/player_difficulty.hpp b/src/karts/player_difficulty.hpp
index c7197fbdc..00d8b5b50 100644
--- a/src/karts/player_difficulty.hpp
+++ b/src/karts/player_difficulty.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/rescue_animation.cpp b/src/karts/rescue_animation.cpp
index d06c3097f..c88273a80 100644
--- a/src/karts/rescue_animation.cpp
+++ b/src/karts/rescue_animation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/rescue_animation.hpp b/src/karts/rescue_animation.hpp
index 89df1cf03..bc37e0602 100644
--- a/src/karts/rescue_animation.hpp
+++ b/src/karts/rescue_animation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/skidding.cpp b/src/karts/skidding.cpp
index a1014adff..9c7de0521 100644
--- a/src/karts/skidding.cpp
+++ b/src/karts/skidding.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/skidding.hpp b/src/karts/skidding.hpp
index 83afb927e..9e74723a1 100644
--- a/src/karts/skidding.hpp
+++ b/src/karts/skidding.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/skidding_properties.cpp b/src/karts/skidding_properties.cpp
index 1bf1a246e..0f2f28d6b 100644
--- a/src/karts/skidding_properties.cpp
+++ b/src/karts/skidding_properties.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/karts/skidding_properties.hpp b/src/karts/skidding_properties.hpp
index 9f8416d2e..be9fe790a 100644
--- a/src/karts/skidding_properties.hpp
+++ b/src/karts/skidding_properties.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/main.cpp b/src/main.cpp
index 57c6c5b11..98b88bcad 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,8 @@
 
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2011-2013 Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2011-2015 Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/main_loop.cpp b/src/main_loop.cpp
index 1b9d458e3..d001cb534 100644
--- a/src/main_loop.cpp
+++ b/src/main_loop.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/main_loop.hpp b/src/main_loop.hpp
index 2743110af..41d051cd3 100644
--- a/src/main_loop.hpp
+++ b/src/main_loop.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/cutscene_world.cpp b/src/modes/cutscene_world.cpp
index 1354c97de..a10ec95af 100644
--- a/src/modes/cutscene_world.cpp
+++ b/src/modes/cutscene_world.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/cutscene_world.hpp b/src/modes/cutscene_world.hpp
index 30b882287..e85da3ad2 100644
--- a/src/modes/cutscene_world.hpp
+++ b/src/modes/cutscene_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/demo_world.cpp b/src/modes/demo_world.cpp
index be4170cc6..00baf633c 100644
--- a/src/modes/demo_world.cpp
+++ b/src/modes/demo_world.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/demo_world.hpp b/src/modes/demo_world.hpp
index a31811e67..a2d047a2f 100644
--- a/src/modes/demo_world.hpp
+++ b/src/modes/demo_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/easter_egg_hunt.cpp b/src/modes/easter_egg_hunt.cpp
index 7ee0c0ee2..25b1a65c0 100644
--- a/src/modes/easter_egg_hunt.cpp
+++ b/src/modes/easter_egg_hunt.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/easter_egg_hunt.hpp b/src/modes/easter_egg_hunt.hpp
index e3460c783..00eb70db5 100644
--- a/src/modes/easter_egg_hunt.hpp
+++ b/src/modes/easter_egg_hunt.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/follow_the_leader.cpp b/src/modes/follow_the_leader.cpp
index f9c4b2f94..711e1d1ab 100644
--- a/src/modes/follow_the_leader.cpp
+++ b/src/modes/follow_the_leader.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/follow_the_leader.hpp b/src/modes/follow_the_leader.hpp
index 5af95c780..ff29fc727 100644
--- a/src/modes/follow_the_leader.hpp
+++ b/src/modes/follow_the_leader.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index d8bd33c07..22b2ad891 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/linear_world.hpp b/src/modes/linear_world.hpp
index cce0da377..928a83256 100644
--- a/src/modes/linear_world.hpp
+++ b/src/modes/linear_world.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/overworld.cpp b/src/modes/overworld.cpp
index 9097c4add..725fc3c17 100644
--- a/src/modes/overworld.cpp
+++ b/src/modes/overworld.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/overworld.hpp b/src/modes/overworld.hpp
index ef7807101..4001f0faa 100644
--- a/src/modes/overworld.hpp
+++ b/src/modes/overworld.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/profile_world.cpp b/src/modes/profile_world.cpp
index c6cb4ba0c..0fef5edc7 100644
--- a/src/modes/profile_world.cpp
+++ b/src/modes/profile_world.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/profile_world.hpp b/src/modes/profile_world.hpp
index 95e23bbeb..6a0977ebc 100644
--- a/src/modes/profile_world.hpp
+++ b/src/modes/profile_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/soccer_world.cpp b/src/modes/soccer_world.cpp
index 9453cd3d8..dcba80e8c 100644
--- a/src/modes/soccer_world.cpp
+++ b/src/modes/soccer_world.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/soccer_world.hpp b/src/modes/soccer_world.hpp
index 25eb1d11e..d33f1dd74 100644
--- a/src/modes/soccer_world.hpp
+++ b/src/modes/soccer_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/standard_race.cpp b/src/modes/standard_race.cpp
index 3f546e6e6..b3a88d325 100644
--- a/src/modes/standard_race.cpp
+++ b/src/modes/standard_race.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/standard_race.hpp b/src/modes/standard_race.hpp
index ddfc6efc5..d94933183 100644
--- a/src/modes/standard_race.hpp
+++ b/src/modes/standard_race.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp
index abdc9c4e6..aa95da191 100644
--- a/src/modes/three_strikes_battle.cpp
+++ b/src/modes/three_strikes_battle.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/three_strikes_battle.hpp b/src/modes/three_strikes_battle.hpp
index aa144a666..46a18674c 100644
--- a/src/modes/three_strikes_battle.hpp
+++ b/src/modes/three_strikes_battle.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/tutorial_world.cpp b/src/modes/tutorial_world.cpp
index 5113dc64d..8bf0eec48 100644
--- a/src/modes/tutorial_world.cpp
+++ b/src/modes/tutorial_world.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/tutorial_world.hpp b/src/modes/tutorial_world.hpp
index 4f7088ec4..a62f74637 100644
--- a/src/modes/tutorial_world.hpp
+++ b/src/modes/tutorial_world.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index b5870958f..d7d71b0f4 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world.hpp b/src/modes/world.hpp
index cfe341a13..fef41591b 100644
--- a/src/modes/world.hpp
+++ b/src/modes/world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world_status.cpp b/src/modes/world_status.cpp
index c19ae0cd3..578f13a0e 100644
--- a/src/modes/world_status.cpp
+++ b/src/modes/world_status.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world_status.hpp b/src/modes/world_status.hpp
index ccc2ac866..270ca5a44 100644
--- a/src/modes/world_status.hpp
+++ b/src/modes/world_status.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world_with_rank.cpp b/src/modes/world_with_rank.cpp
index 2f64b3d3d..bbad420c0 100644
--- a/src/modes/world_with_rank.cpp
+++ b/src/modes/world_with_rank.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/modes/world_with_rank.hpp b/src/modes/world_with_rank.hpp
index d51bf9352..0914f27d8 100644
--- a/src/modes/world_with_rank.hpp
+++ b/src/modes/world_with_rank.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/client_network_manager.cpp b/src/network/client_network_manager.cpp
index 00f672484..b2379256f 100644
--- a/src/network/client_network_manager.cpp
+++ b/src/network/client_network_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/client_network_manager.hpp b/src/network/client_network_manager.hpp
index 1c54d62dc..5e5b11683 100644
--- a/src/network/client_network_manager.hpp
+++ b/src/network/client_network_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/event.cpp b/src/network/event.cpp
index 1266654ae..60689271b 100644
--- a/src/network/event.cpp
+++ b/src/network/event.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/event.hpp b/src/network/event.hpp
index cf5bf6a6f..86634b436 100644
--- a/src/network/event.hpp
+++ b/src/network/event.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/game_setup.cpp b/src/network/game_setup.cpp
index 1cbdbc0b4..fa966ef45 100644
--- a/src/network/game_setup.cpp
+++ b/src/network/game_setup.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/game_setup.hpp b/src/network/game_setup.hpp
index b8c670623..106f10893 100644
--- a/src/network/game_setup.hpp
+++ b/src/network/game_setup.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_interface.cpp b/src/network/network_interface.cpp
index 262083330..ba7c69553 100644
--- a/src/network/network_interface.cpp
+++ b/src/network/network_interface.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_interface.hpp b/src/network/network_interface.hpp
index 4da28b430..180fd9e49 100644
--- a/src/network/network_interface.hpp
+++ b/src/network/network_interface.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_manager.cpp b/src/network/network_manager.cpp
index 71201d484..501f6dde3 100644
--- a/src/network/network_manager.cpp
+++ b/src/network/network_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_manager.hpp b/src/network/network_manager.hpp
index 13ae87f15..ada420fab 100644
--- a/src/network/network_manager.hpp
+++ b/src/network/network_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_string.hpp b/src/network/network_string.hpp
index 188455725..dc56c8e06 100644
--- a/src/network/network_string.hpp
+++ b/src/network/network_string.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/network_world.hpp b/src/network/network_world.hpp
index f9b4f820f..31b8db125 100644
--- a/src/network/network_world.hpp
+++ b/src/network/network_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocol.cpp b/src/network/protocol.cpp
index d71d8c265..64603cdcd 100644
--- a/src/network/protocol.cpp
+++ b/src/network/protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocol.hpp b/src/network/protocol.hpp
index 4fab04112..b7e63ad4f 100644
--- a/src/network/protocol.hpp
+++ b/src/network/protocol.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocol_manager.cpp b/src/network/protocol_manager.cpp
index 75b623a82..8fcff847a 100644
--- a/src/network/protocol_manager.cpp
+++ b/src/network/protocol_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocol_manager.hpp b/src/network/protocol_manager.hpp
index b54b5d0e2..12840515a 100644
--- a/src/network/protocol_manager.hpp
+++ b/src/network/protocol_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/client_lobby_room_protocol.cpp b/src/network/protocols/client_lobby_room_protocol.cpp
index 308439e8a..be3cf93ad 100644
--- a/src/network/protocols/client_lobby_room_protocol.cpp
+++ b/src/network/protocols/client_lobby_room_protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/connect_to_peer.cpp b/src/network/protocols/connect_to_peer.cpp
index e130a2d1b..166f27d62 100644
--- a/src/network/protocols/connect_to_peer.cpp
+++ b/src/network/protocols/connect_to_peer.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/connect_to_peer.hpp b/src/network/protocols/connect_to_peer.hpp
index 97bad8327..7c30d738d 100644
--- a/src/network/protocols/connect_to_peer.hpp
+++ b/src/network/protocols/connect_to_peer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/connect_to_server.cpp b/src/network/protocols/connect_to_server.cpp
index 1f66313fb..f89a27a44 100644
--- a/src/network/protocols/connect_to_server.cpp
+++ b/src/network/protocols/connect_to_server.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/connect_to_server.hpp b/src/network/protocols/connect_to_server.hpp
index 7f95a512a..093a21819 100644
--- a/src/network/protocols/connect_to_server.hpp
+++ b/src/network/protocols/connect_to_server.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/get_peer_address.cpp b/src/network/protocols/get_peer_address.cpp
index e0e6a09a3..3bb90f437 100644
--- a/src/network/protocols/get_peer_address.cpp
+++ b/src/network/protocols/get_peer_address.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/get_peer_address.hpp b/src/network/protocols/get_peer_address.hpp
index 6dac695a1..e9bce5dc0 100644
--- a/src/network/protocols/get_peer_address.hpp
+++ b/src/network/protocols/get_peer_address.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/get_public_address.cpp b/src/network/protocols/get_public_address.cpp
index 503875743..7034217df 100644
--- a/src/network/protocols/get_public_address.cpp
+++ b/src/network/protocols/get_public_address.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/get_public_address.hpp b/src/network/protocols/get_public_address.hpp
index 408a031ba..0e7f80b7a 100644
--- a/src/network/protocols/get_public_address.hpp
+++ b/src/network/protocols/get_public_address.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/hide_public_address.cpp b/src/network/protocols/hide_public_address.cpp
index f320ddf5f..2207c2149 100644
--- a/src/network/protocols/hide_public_address.cpp
+++ b/src/network/protocols/hide_public_address.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/hide_public_address.hpp b/src/network/protocols/hide_public_address.hpp
index e1c5c800a..f2279390c 100644
--- a/src/network/protocols/hide_public_address.hpp
+++ b/src/network/protocols/hide_public_address.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/lobby_room_protocol.cpp b/src/network/protocols/lobby_room_protocol.cpp
index 46be6df03..28ea342bd 100644
--- a/src/network/protocols/lobby_room_protocol.cpp
+++ b/src/network/protocols/lobby_room_protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/lobby_room_protocol.hpp b/src/network/protocols/lobby_room_protocol.hpp
index d132359dd..82213150c 100644
--- a/src/network/protocols/lobby_room_protocol.hpp
+++ b/src/network/protocols/lobby_room_protocol.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/ping_protocol.cpp b/src/network/protocols/ping_protocol.cpp
index 7fd5232ed..045062668 100644
--- a/src/network/protocols/ping_protocol.cpp
+++ b/src/network/protocols/ping_protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/quick_join_protocol.cpp b/src/network/protocols/quick_join_protocol.cpp
index 3788dc8d9..2f7006f15 100644
--- a/src/network/protocols/quick_join_protocol.cpp
+++ b/src/network/protocols/quick_join_protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/request_connection.cpp b/src/network/protocols/request_connection.cpp
index 44b300487..d62dc5a65 100644
--- a/src/network/protocols/request_connection.cpp
+++ b/src/network/protocols/request_connection.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/server_lobby_room_protocol.cpp b/src/network/protocols/server_lobby_room_protocol.cpp
index 438b2de3a..9de64c6a8 100644
--- a/src/network/protocols/server_lobby_room_protocol.cpp
+++ b/src/network/protocols/server_lobby_room_protocol.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/show_public_address.cpp b/src/network/protocols/show_public_address.cpp
index 8cbe0bbcd..451e149a5 100644
--- a/src/network/protocols/show_public_address.cpp
+++ b/src/network/protocols/show_public_address.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/show_public_address.hpp b/src/network/protocols/show_public_address.hpp
index e1dae5387..acfa50961 100644
--- a/src/network/protocols/show_public_address.hpp
+++ b/src/network/protocols/show_public_address.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/start_server.cpp b/src/network/protocols/start_server.cpp
index 8291d5841..da8899777 100644
--- a/src/network/protocols/start_server.cpp
+++ b/src/network/protocols/start_server.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/protocols/stop_server.cpp b/src/network/protocols/stop_server.cpp
index 0524d4291..f2358f391 100644
--- a/src/network/protocols/stop_server.cpp
+++ b/src/network/protocols/stop_server.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/remote_kart_info.hpp b/src/network/remote_kart_info.hpp
index d3d23e328..72af75d1d 100644
--- a/src/network/remote_kart_info.hpp
+++ b/src/network/remote_kart_info.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/server_network_manager.cpp b/src/network/server_network_manager.cpp
index f433b43ef..784c61324 100644
--- a/src/network/server_network_manager.cpp
+++ b/src/network/server_network_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/server_network_manager.hpp b/src/network/server_network_manager.hpp
index 460cf6031..6afc16c81 100644
--- a/src/network/server_network_manager.hpp
+++ b/src/network/server_network_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/stk_host.cpp b/src/network/stk_host.cpp
index 75bea642b..9983410e8 100644
--- a/src/network/stk_host.cpp
+++ b/src/network/stk_host.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/stk_host.hpp b/src/network/stk_host.hpp
index 788aa6717..d293a603e 100644
--- a/src/network/stk_host.hpp
+++ b/src/network/stk_host.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/stk_peer.cpp b/src/network/stk_peer.cpp
index 35ad08860..8a04d96c2 100644
--- a/src/network/stk_peer.cpp
+++ b/src/network/stk_peer.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/stk_peer.hpp b/src/network/stk_peer.hpp
index 4603da143..7f5abd967 100644
--- a/src/network/stk_peer.hpp
+++ b/src/network/stk_peer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/network/types.hpp b/src/network/types.hpp
index ad594d37e..7b9c2432a 100644
--- a/src/network/types.hpp
+++ b/src/network/types.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/http_request.cpp b/src/online/http_request.cpp
index c3d2a340f..80354f513 100644
--- a/src/online/http_request.cpp
+++ b/src/online/http_request.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 //  as published by the Free Software Foundation; either version 3
diff --git a/src/online/http_request.hpp b/src/online/http_request.hpp
index 7383b047f..70a5b5d60 100644
--- a/src/online/http_request.hpp
+++ b/src/online/http_request.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //                2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp
index f2a6d6472..611844d66 100644
--- a/src/online/online_player_profile.cpp
+++ b/src/online/online_player_profile.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/online_player_profile.hpp b/src/online/online_player_profile.hpp
index 06d9b6551..cef45820c 100644
--- a/src/online/online_player_profile.hpp
+++ b/src/online/online_player_profile.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/online_profile.cpp b/src/online/online_profile.cpp
index 9909d6b96..e3c0f99fb 100644
--- a/src/online/online_profile.cpp
+++ b/src/online/online_profile.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/online_profile.hpp b/src/online/online_profile.hpp
index 675168ca1..acded73bb 100644
--- a/src/online/online_profile.hpp
+++ b/src/online/online_profile.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/profile_manager.cpp b/src/online/profile_manager.cpp
index 2f160e70f..156c6a54f 100644
--- a/src/online/profile_manager.cpp
+++ b/src/online/profile_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/profile_manager.hpp b/src/online/profile_manager.hpp
index 512f5755e..474f32bc4 100644
--- a/src/online/profile_manager.hpp
+++ b/src/online/profile_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/request.cpp b/src/online/request.cpp
index 7ffb1a981..2de86ee8f 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 //  as published by the Free Software Foundation; either version 3
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 7443583bc..e4ccb7342 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //                2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/online/request_manager.cpp b/src/online/request_manager.cpp
index ee873aca5..740c5c643 100644
--- a/src/online/request_manager.cpp
+++ b/src/online/request_manager.cpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2014 Lucas Baudin
-//                2011-2014 Joerg Henrichs
-//                2013-2014 Glenn De Jonghe
+//  Copyright (C) 2010-2015 Lucas Baudin
+//            (C) 2014-2015 Joerg Henrichs
+//            (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/request_manager.hpp b/src/online/request_manager.hpp
index 313240f21..5457fffc7 100644
--- a/src/online/request_manager.hpp
+++ b/src/online/request_manager.hpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2014 Lucas Baudin
-//                2011-2014 Joerg Henrichs
-//                2013-2014 Glenn De Jonghe
+//  Copyright (C) 2010-2015 Lucas Baudin
+//            (C) 2011-2015 Joerg Henrichs
+//            (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/server.cpp b/src/online/server.cpp
index f716da58a..9ac730bcb 100644
--- a/src/online/server.cpp
+++ b/src/online/server.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/server.hpp b/src/online/server.hpp
index f9576056a..b35b6cf3c 100644
--- a/src/online/server.hpp
+++ b/src/online/server.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index 7e4c93048..f36b93ebb 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index fe0c8f76b..525b48c3f 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/xml_request.cpp b/src/online/xml_request.cpp
index 4154ff1f7..89c8d9bba 100644
--- a/src/online/xml_request.cpp
+++ b/src/online/xml_request.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
 //  as published by the Free Software Foundation; either version 3
diff --git a/src/online/xml_request.hpp b/src/online/xml_request.hpp
index 1e2f6089d..9f8d06957 100644
--- a/src/online/xml_request.hpp
+++ b/src/online/xml_request.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //                2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index 02d2c98d5..24d52bbfc 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Erwin Coumans http://continuousphysics.com/Bullet/
+ * Copyright (C) 2005-2015 Erwin Coumans http://continuousphysics.com/Bullet/
  *
  * Permission to use, copy, modify, distribute and sell this software
  * and its documentation for any purpose is hereby granted without fee,
diff --git a/src/physics/btKart.hpp b/src/physics/btKart.hpp
index a799f0575..62b2c61c4 100644
--- a/src/physics/btKart.hpp
+++ b/src/physics/btKart.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Erwin Coumans http://continuousphysics.com/Bullet/
+ * Copyright (C) 2005-2015 Erwin Coumans http://continuousphysics.com/Bullet/
  *
  * Permission to use, copy, modify, distribute and sell this software
  * and its documentation for any purpose is hereby granted without fee,
diff --git a/src/physics/btKartRaycast.cpp b/src/physics/btKartRaycast.cpp
index 856f83826..c9b13b647 100644
--- a/src/physics/btKartRaycast.cpp
+++ b/src/physics/btKartRaycast.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Erwin Coumans http://continuousphysics.com/Bullet/
+ * Copyright (C) 2005-2015 Erwin Coumans http://continuousphysics.com/Bullet/
  *
  * Permission to use, copy, modify, distribute and sell this software
  * and its documentation for any purpose is hereby granted without fee,
diff --git a/src/physics/btKartRaycast.hpp b/src/physics/btKartRaycast.hpp
index f9c7faa16..0fcb4ac5a 100644
--- a/src/physics/btKartRaycast.hpp
+++ b/src/physics/btKartRaycast.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Erwin Coumans http://continuousphysics.com/Bullet/
+ * Copyright (C) 2005-2015 Erwin Coumans http://continuousphysics.com/Bullet/
  *
  * Permission to use, copy, modify, distribute and sell this software
  * and its documentation for any purpose is hereby granted without fee,
diff --git a/src/physics/irr_debug_drawer.cpp b/src/physics/irr_debug_drawer.cpp
index f5fd5ce6f..5fffd2a1d 100644
--- a/src/physics/irr_debug_drawer.cpp
+++ b/src/physics/irr_debug_drawer.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/irr_debug_drawer.hpp b/src/physics/irr_debug_drawer.hpp
index 6dc54d4ed..6086473fb 100644
--- a/src/physics/irr_debug_drawer.hpp
+++ b/src/physics/irr_debug_drawer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/kart_motion_state.hpp b/src/physics/kart_motion_state.hpp
index 8e0fa80e0..734449e6f 100644
--- a/src/physics/kart_motion_state.hpp
+++ b/src/physics/kart_motion_state.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index cfa014e32..7ed9c7d49 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 408d19a2f..7d4dd1158 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 2da99af70..7935282f3 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/physics.hpp b/src/physics/physics.hpp
index cd8b54e5e..ac0cf77f7 100644
--- a/src/physics/physics.hpp
+++ b/src/physics/physics.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/stk_dynamics_world.hpp b/src/physics/stk_dynamics_world.hpp
index d0f2f49d0..633a83ee1 100644
--- a/src/physics/stk_dynamics_world.hpp
+++ b/src/physics/stk_dynamics_world.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/triangle_mesh.cpp b/src/physics/triangle_mesh.cpp
index e6dd840ca..ca28aa623 100644
--- a/src/physics/triangle_mesh.cpp
+++ b/src/physics/triangle_mesh.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/triangle_mesh.hpp b/src/physics/triangle_mesh.hpp
index 7bef215a9..5557ed4a7 100644
--- a/src/physics/triangle_mesh.hpp
+++ b/src/physics/triangle_mesh.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/physics/user_pointer.hpp b/src/physics/user_pointer.hpp
index b9f6612df..0aea034da 100644
--- a/src/physics/user_pointer.hpp
+++ b/src/physics/user_pointer.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp
index 51ae5768f..e0516fa33 100644
--- a/src/race/grand_prix_data.cpp
+++ b/src/race/grand_prix_data.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013  Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013  Joerg Henrichs
+//  Copyright (C) 2004-2015  Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp
index 947de389c..b720a7d3a 100644
--- a/src/race/grand_prix_data.hpp
+++ b/src/race/grand_prix_data.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013  Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013  Joerg Henrichs
+//  Copyright (C) 2004-2015  Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/grand_prix_manager.cpp b/src/race/grand_prix_manager.cpp
index f4376b441..793874dc3 100644
--- a/src/race/grand_prix_manager.cpp
+++ b/src/race/grand_prix_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/grand_prix_manager.hpp b/src/race/grand_prix_manager.hpp
index 78af06010..4159b5213 100644
--- a/src/race/grand_prix_manager.hpp
+++ b/src/race/grand_prix_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/highscore_manager.cpp b/src/race/highscore_manager.cpp
index 0d38d91ed..92eff9094 100644
--- a/src/race/highscore_manager.cpp
+++ b/src/race/highscore_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/highscore_manager.hpp b/src/race/highscore_manager.hpp
index a87b00a31..898716479 100644
--- a/src/race/highscore_manager.hpp
+++ b/src/race/highscore_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/highscores.cpp b/src/race/highscores.cpp
index 00fdcf623..bc5a4f2c5 100644
--- a/src/race/highscores.cpp
+++ b/src/race/highscores.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/highscores.hpp b/src/race/highscores.hpp
index 02bb2412f..94bd6fc95 100644
--- a/src/race/highscores.hpp
+++ b/src/race/highscores.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/history.cpp b/src/race/history.cpp
index 2f4736ec0..ec65911f8 100644
--- a/src/race/history.cpp
+++ b/src/race/history.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/history.hpp b/src/race/history.hpp
index 02f0570e3..62a13c463 100644
--- a/src/race/history.hpp
+++ b/src/race/history.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index ea8bc119f..17814d3e5 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/race/race_manager.hpp b/src/race/race_manager.hpp
index 050e043ee..c553bdab4 100644
--- a/src/race/race_manager.hpp
+++ b/src/race/race_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_base.cpp b/src/replay/replay_base.cpp
index b92fd034f..6efda19c5 100644
--- a/src/replay/replay_base.cpp
+++ b/src/replay/replay_base.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_base.hpp b/src/replay/replay_base.hpp
index 761689a13..6b48bdc24 100644
--- a/src/replay/replay_base.hpp
+++ b/src/replay/replay_base.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_play.cpp b/src/replay/replay_play.cpp
index 4eede7e6b..3a9c5fc83 100644
--- a/src/replay/replay_play.cpp
+++ b/src/replay/replay_play.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_play.hpp b/src/replay/replay_play.hpp
index 681d0bffb..cc479982f 100644
--- a/src/replay/replay_play.hpp
+++ b/src/replay/replay_play.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_recorder.cpp b/src/replay/replay_recorder.cpp
index 449aa4c1d..07a5c1e9a 100644
--- a/src/replay/replay_recorder.cpp
+++ b/src/replay/replay_recorder.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/replay/replay_recorder.hpp b/src/replay/replay_recorder.hpp
index 33ea58493..c77c2015c 100644
--- a/src/replay/replay_recorder.hpp
+++ b/src/replay/replay_recorder.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 05db7ff15..2d6bf293b 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -39,15 +39,15 @@ namespace Scripting
 
 
 //Line Callback
-void MessageCallback(const asSMessageInfo *msg, void *param)
-{
-    const char *type = "ERR ";
-    if (msg->type == asMSGTYPE_WARNING)
-        type = "WARN";
-    else if (msg->type == asMSGTYPE_INFORMATION)
-        type = "INFO";
-
-    printf("%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
+void MessageCallback(const asSMessageInfo *msg, void *param)
+{
+    const char *type = "ERR ";
+    if (msg->type == asMSGTYPE_WARNING)
+        type = "WARN";
+    else if (msg->type == asMSGTYPE_INFORMATION)
+        type = "INFO";
+
+    printf("%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
 }
 
 
@@ -60,8 +60,8 @@ ScriptEngine::ScriptEngine()
     {
         std::cout << "Failed to create script engine." << std::endl;
     }
-
-    // The script compiler will write any compiler messages to the callback.
+
+    // The script compiler will write any compiler messages to the callback.
     //m_engine->SetMessageCallback(asFUNCTION(MessageCallback), 0, asCALL_CDECL);
 
     // Configure the script engine with all the functions, 
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 3334a86a4..6d742ccc5 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index 8aae258c1..458168e4f 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_kart.hpp b/src/scriptengine/script_kart.hpp
index b214e7d1e..5ddca0e09 100644
--- a/src/scriptengine/script_kart.hpp
+++ b/src/scriptengine/script_kart.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_physics.cpp b/src/scriptengine/script_physics.cpp
index 657665b68..7f33d7617 100644
--- a/src/scriptengine/script_physics.cpp
+++ b/src/scriptengine/script_physics.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_physics.hpp b/src/scriptengine/script_physics.hpp
index ff52c29f9..d6f47534d 100644
--- a/src/scriptengine/script_physics.hpp
+++ b/src/scriptengine/script_physics.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 7b66c31f3..26db06ce8 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/script_track.hpp b/src/scriptengine/script_track.hpp
index c4d29c9c6..ddea74408 100644
--- a/src/scriptengine/script_track.hpp
+++ b/src/scriptengine/script_track.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index 02dc3c62f..0f7bc9306 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/scriptengine/scriptvec3.hpp b/src/scriptengine/scriptvec3.hpp
index 468fc3237..0aae113e9 100644
--- a/src/scriptengine/scriptvec3.hpp
+++ b/src/scriptengine/scriptvec3.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014  SuperTuxKart Team
+//  Copyright (C) 2014-2015  SuperTuxKart Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index c7c851ec7..aa87e1866 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/addons_screen.hpp b/src/states_screens/addons_screen.hpp
index 460543aa5..63c0f3371 100644
--- a/src/states_screens/addons_screen.hpp
+++ b/src/states_screens/addons_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/arenas_screen.cpp b/src/states_screens/arenas_screen.cpp
index 10a3dc412..974052c85 100644
--- a/src/states_screens/arenas_screen.cpp
+++ b/src/states_screens/arenas_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/arenas_screen.hpp b/src/states_screens/arenas_screen.hpp
index 898538e3e..097e3c3e1 100644
--- a/src/states_screens/arenas_screen.hpp
+++ b/src/states_screens/arenas_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
index 408bc0ba8..283857fb8 100644
--- a/src/states_screens/create_server_screen.cpp
+++ b/src/states_screens/create_server_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/create_server_screen.hpp b/src/states_screens/create_server_screen.hpp
index f701b0cdd..d960cec53 100644
--- a/src/states_screens/create_server_screen.hpp
+++ b/src/states_screens/create_server_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/credits.cpp b/src/states_screens/credits.cpp
index 38c9f1084..4592f729d 100644
--- a/src/states_screens/credits.cpp
+++ b/src/states_screens/credits.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/credits.hpp b/src/states_screens/credits.hpp
index 237ffdf6e..7c594bf6c 100644
--- a/src/states_screens/credits.hpp
+++ b/src/states_screens/credits.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/cutscene_gui.cpp b/src/states_screens/cutscene_gui.cpp
index 4d4399e5e..de5f7581c 100644
--- a/src/states_screens/cutscene_gui.cpp
+++ b/src/states_screens/cutscene_gui.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/cutscene_gui.hpp b/src/states_screens/cutscene_gui.hpp
index 2b166a812..d71a501b8 100644
--- a/src/states_screens/cutscene_gui.hpp
+++ b/src/states_screens/cutscene_gui.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/add_device_dialog.cpp b/src/states_screens/dialogs/add_device_dialog.cpp
index a5d422a8d..96a21121f 100644
--- a/src/states_screens/dialogs/add_device_dialog.cpp
+++ b/src/states_screens/dialogs/add_device_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/add_device_dialog.hpp b/src/states_screens/dialogs/add_device_dialog.hpp
index 8bac559ff..39858b3cb 100644
--- a/src/states_screens/dialogs/add_device_dialog.hpp
+++ b/src/states_screens/dialogs/add_device_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/addons_loading.cpp b/src/states_screens/dialogs/addons_loading.cpp
index 9b7269d5c..b90a65a32 100644
--- a/src/states_screens/dialogs/addons_loading.cpp
+++ b/src/states_screens/dialogs/addons_loading.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon, Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/addons_loading.hpp b/src/states_screens/dialogs/addons_loading.hpp
index 27f52a431..9f025f78a 100644
--- a/src/states_screens/dialogs/addons_loading.hpp
+++ b/src/states_screens/dialogs/addons_loading.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Lucas Baudin
+//  Copyright (C) 2010-2015 Lucas Baudin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/change_password_dialog.cpp b/src/states_screens/dialogs/change_password_dialog.cpp
index 6104d997d..e4aa34a11 100644
--- a/src/states_screens/dialogs/change_password_dialog.cpp
+++ b/src/states_screens/dialogs/change_password_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/change_password_dialog.hpp b/src/states_screens/dialogs/change_password_dialog.hpp
index 396031979..e1eaaa14e 100644
--- a/src/states_screens/dialogs/change_password_dialog.hpp
+++ b/src/states_screens/dialogs/change_password_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.cpp b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
index 591dcd815..a418b577e 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.cpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.hpp b/src/states_screens/dialogs/confirm_resolution_dialog.hpp
index dc3ad1605..9d8b97b48 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.hpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index 5a35cfd70..cbbab6121 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/custom_video_settings.hpp b/src/states_screens/dialogs/custom_video_settings.hpp
index 7ab896056..a80c6eca2 100644
--- a/src/states_screens/dialogs/custom_video_settings.hpp
+++ b/src/states_screens/dialogs/custom_video_settings.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/debug_slider.cpp b/src/states_screens/dialogs/debug_slider.cpp
index 2e16c817e..464977cb3 100644
--- a/src/states_screens/dialogs/debug_slider.cpp
+++ b/src/states_screens/dialogs/debug_slider.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/debug_slider.hpp b/src/states_screens/dialogs/debug_slider.hpp
index ea3dcf011..2a8be11cf 100644
--- a/src/states_screens/dialogs/debug_slider.hpp
+++ b/src/states_screens/dialogs/debug_slider.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.cpp b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
index c2aaa10c7..d78da0278 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.cpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -144,4 +144,4 @@ void EnterGPNameDialog::validateName()
         m_self_destroy = true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.hpp b/src/states_screens/dialogs/enter_gp_name_dialog.hpp
index 99e729a06..a1f268514 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.hpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/gp_info_dialog.cpp b/src/states_screens/dialogs/gp_info_dialog.cpp
index 464e9af30..712126929 100644
--- a/src/states_screens/dialogs/gp_info_dialog.cpp
+++ b/src/states_screens/dialogs/gp_info_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/gp_info_dialog.hpp b/src/states_screens/dialogs/gp_info_dialog.hpp
index 93158162e..7b4874c6c 100644
--- a/src/states_screens/dialogs/gp_info_dialog.hpp
+++ b/src/states_screens/dialogs/gp_info_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/message_dialog.cpp b/src/states_screens/dialogs/message_dialog.cpp
index ecf24646c..f3fa7a2b3 100644
--- a/src/states_screens/dialogs/message_dialog.cpp
+++ b/src/states_screens/dialogs/message_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/message_dialog.hpp b/src/states_screens/dialogs/message_dialog.hpp
index 62bbe5b06..5164d4bee 100644
--- a/src/states_screens/dialogs/message_dialog.hpp
+++ b/src/states_screens/dialogs/message_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/press_a_key_dialog.cpp b/src/states_screens/dialogs/press_a_key_dialog.cpp
index 464b09fa5..c765484ed 100644
--- a/src/states_screens/dialogs/press_a_key_dialog.cpp
+++ b/src/states_screens/dialogs/press_a_key_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/press_a_key_dialog.hpp b/src/states_screens/dialogs/press_a_key_dialog.hpp
index 090cf929a..953bd1e1a 100644
--- a/src/states_screens/dialogs/press_a_key_dialog.hpp
+++ b/src/states_screens/dialogs/press_a_key_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp
index 219665645..1a4d2e442 100644
--- a/src/states_screens/dialogs/race_paused_dialog.cpp
+++ b/src/states_screens/dialogs/race_paused_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/race_paused_dialog.hpp b/src/states_screens/dialogs/race_paused_dialog.hpp
index efefda4be..3b9c16d65 100644
--- a/src/states_screens/dialogs/race_paused_dialog.hpp
+++ b/src/states_screens/dialogs/race_paused_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/recovery_dialog.cpp b/src/states_screens/dialogs/recovery_dialog.cpp
index b08545700..0298dc353 100644
--- a/src/states_screens/dialogs/recovery_dialog.cpp
+++ b/src/states_screens/dialogs/recovery_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/recovery_dialog.hpp b/src/states_screens/dialogs/recovery_dialog.hpp
index 5920bb4a2..65fc861e7 100644
--- a/src/states_screens/dialogs/recovery_dialog.hpp
+++ b/src/states_screens/dialogs/recovery_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index c876fc910..1ec7b325f 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index a1cef727b..abd05fc78 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp
index 3c2cc7041..ea8583a9c 100644
--- a/src/states_screens/dialogs/select_challenge.cpp
+++ b/src/states_screens/dialogs/select_challenge.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/select_challenge.hpp b/src/states_screens/dialogs/select_challenge.hpp
index 2a39a17e1..e35dcc5e7 100644
--- a/src/states_screens/dialogs/select_challenge.hpp
+++ b/src/states_screens/dialogs/select_challenge.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Marianne Gagnon
+//  Copyright (C) 2012-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 094a2be9c..439a7b40a 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 9e8f91f8e..31381bbfe 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/tutorial_message_dialog.cpp b/src/states_screens/dialogs/tutorial_message_dialog.cpp
index 3eda7e0cb..0e53155f1 100644
--- a/src/states_screens/dialogs/tutorial_message_dialog.cpp
+++ b/src/states_screens/dialogs/tutorial_message_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/tutorial_message_dialog.hpp b/src/states_screens/dialogs/tutorial_message_dialog.hpp
index 6bfcfdfb7..743300465 100644
--- a/src/states_screens/dialogs/tutorial_message_dialog.hpp
+++ b/src/states_screens/dialogs/tutorial_message_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Marianne Gagnon
+//  Copyright (C) 2010-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp
index 872062fe1..e43d4c21b 100644
--- a/src/states_screens/dialogs/user_info_dialog.cpp
+++ b/src/states_screens/dialogs/user_info_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/user_info_dialog.hpp b/src/states_screens/dialogs/user_info_dialog.hpp
index 63c6a2e65..0726fd4e5 100644
--- a/src/states_screens/dialogs/user_info_dialog.hpp
+++ b/src/states_screens/dialogs/user_info_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/vote_dialog.cpp b/src/states_screens/dialogs/vote_dialog.cpp
index 89a4df154..5433f3bb7 100644
--- a/src/states_screens/dialogs/vote_dialog.cpp
+++ b/src/states_screens/dialogs/vote_dialog.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/dialogs/vote_dialog.hpp b/src/states_screens/dialogs/vote_dialog.hpp
index 32fed5570..511b31288 100644
--- a/src/states_screens/dialogs/vote_dialog.hpp
+++ b/src/states_screens/dialogs/vote_dialog.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/easter_egg_screen.cpp b/src/states_screens/easter_egg_screen.cpp
index 2a593d2cf..b88bb6555 100644
--- a/src/states_screens/easter_egg_screen.cpp
+++ b/src/states_screens/easter_egg_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/easter_egg_screen.hpp b/src/states_screens/easter_egg_screen.hpp
index 605fa526c..fca29858d 100644
--- a/src/states_screens/easter_egg_screen.hpp
+++ b/src/states_screens/easter_egg_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index 68199d986..243553de0 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/edit_gp_screen.hpp b/src/states_screens/edit_gp_screen.hpp
index 35adeb591..5f3941437 100644
--- a/src/states_screens/edit_gp_screen.hpp
+++ b/src/states_screens/edit_gp_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index 4e3946ef0..b5a5f8db3 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/edit_track_screen.hpp b/src/states_screens/edit_track_screen.hpp
index a5edb982b..1d9d753c4 100644
--- a/src/states_screens/edit_track_screen.hpp
+++ b/src/states_screens/edit_track_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index 2e9f32b0f..2bd737ff9 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/feature_unlocked.hpp b/src/states_screens/feature_unlocked.hpp
index 70589ab05..606ad58e2 100644
--- a/src/states_screens/feature_unlocked.hpp
+++ b/src/states_screens/feature_unlocked.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index faff5444b..12c9f07f0 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2014  Marianne Gagnon
-//                2014       Joerg Henrichs, konstin
+//  Copyright (C) 2009-2015  Marianne Gagnon
+//            (C) 2014-2015  Joerg Henrichs, konstin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/gp_info_screen.hpp b/src/states_screens/gp_info_screen.hpp
index 3e579bfc8..25a08d9c8 100644
--- a/src/states_screens/gp_info_screen.hpp
+++ b/src/states_screens/gp_info_screen.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2014 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index f4851de81..6a53d417a 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 konstin
+//  Copyright (C) 2014-2015 konstin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_cutscene.hpp b/src/states_screens/grand_prix_cutscene.hpp
index d85834b7b..adf8b129a 100644
--- a/src/states_screens/grand_prix_cutscene.hpp
+++ b/src/states_screens/grand_prix_cutscene.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 konstin
+//  Copyright (C) 2014-2015 konstin
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 1292202e4..3366057df 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_editor_screen.hpp b/src/states_screens/grand_prix_editor_screen.hpp
index 1c329dfd9..f24f5ed6a 100644
--- a/src/states_screens/grand_prix_editor_screen.hpp
+++ b/src/states_screens/grand_prix_editor_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Marc Coll
+//  Copyright (C) 2014-2015 Marc Coll
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp
index 9a3db63c0..0120499ae 100644
--- a/src/states_screens/grand_prix_lose.cpp
+++ b/src/states_screens/grand_prix_lose.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp
index a1cd0d6a4..ba49685b3 100644
--- a/src/states_screens/grand_prix_lose.hpp
+++ b/src/states_screens/grand_prix_lose.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp
index 36ccc122c..a66abf995 100644
--- a/src/states_screens/grand_prix_win.cpp
+++ b/src/states_screens/grand_prix_win.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp
index 06e999d12..d5ecdfd2d 100644
--- a/src/states_screens/grand_prix_win.hpp
+++ b/src/states_screens/grand_prix_win.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 SuperTuxKart-Team
+//  Copyright (C) 2010-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_1.cpp b/src/states_screens/help_screen_1.cpp
index 4280202fc..83dcdeeb0 100644
--- a/src/states_screens/help_screen_1.cpp
+++ b/src/states_screens/help_screen_1.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_1.hpp b/src/states_screens/help_screen_1.hpp
index 6677c6001..e517f721c 100644
--- a/src/states_screens/help_screen_1.hpp
+++ b/src/states_screens/help_screen_1.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_2.cpp b/src/states_screens/help_screen_2.cpp
index b2b08a0a1..a5707f964 100644
--- a/src/states_screens/help_screen_2.cpp
+++ b/src/states_screens/help_screen_2.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_2.hpp b/src/states_screens/help_screen_2.hpp
index d7a1d75ad..87ebfe963 100644
--- a/src/states_screens/help_screen_2.hpp
+++ b/src/states_screens/help_screen_2.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_3.cpp b/src/states_screens/help_screen_3.cpp
index a8a7cb4f6..9118a37cb 100644
--- a/src/states_screens/help_screen_3.cpp
+++ b/src/states_screens/help_screen_3.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_3.hpp b/src/states_screens/help_screen_3.hpp
index 74a5e2258..a0b1e3f4f 100644
--- a/src/states_screens/help_screen_3.hpp
+++ b/src/states_screens/help_screen_3.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_4.cpp b/src/states_screens/help_screen_4.cpp
index c271467db..aceb1e5c5 100644
--- a/src/states_screens/help_screen_4.cpp
+++ b/src/states_screens/help_screen_4.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/help_screen_4.hpp b/src/states_screens/help_screen_4.hpp
index 8142b4540..b7d55e096 100644
--- a/src/states_screens/help_screen_4.hpp
+++ b/src/states_screens/help_screen_4.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 1c8ff4b6c..05269388b 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/kart_selection.hpp b/src/states_screens/kart_selection.hpp
index 0ef09a451..028720c18 100644
--- a/src/states_screens/kart_selection.hpp
+++ b/src/states_screens/kart_selection.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index da0dd1916..914af70d6 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/main_menu_screen.hpp b/src/states_screens/main_menu_screen.hpp
index 141415859..0da2a18df 100644
--- a/src/states_screens/main_menu_screen.hpp
+++ b/src/states_screens/main_menu_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 37ed2a886..33279759c 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp
index d864fd27d..d98595253 100644
--- a/src/states_screens/networking_lobby.hpp
+++ b/src/states_screens/networking_lobby.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_achievements.cpp b/src/states_screens/online_profile_achievements.cpp
index 39d8478bb..0cddada26 100644
--- a/src/states_screens/online_profile_achievements.cpp
+++ b/src/states_screens/online_profile_achievements.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_achievements.hpp b/src/states_screens/online_profile_achievements.hpp
index 963fbb8fe..a25aa5e73 100644
--- a/src/states_screens/online_profile_achievements.hpp
+++ b/src/states_screens/online_profile_achievements.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_base.cpp b/src/states_screens/online_profile_base.cpp
index 3a414d5d4..605c09984 100644
--- a/src/states_screens/online_profile_base.cpp
+++ b/src/states_screens/online_profile_base.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_base.hpp b/src/states_screens/online_profile_base.hpp
index 2a57567ad..0285edb4b 100644
--- a/src/states_screens/online_profile_base.hpp
+++ b/src/states_screens/online_profile_base.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_friends.cpp b/src/states_screens/online_profile_friends.cpp
index 822e53ded..a7dd2a9d5 100644
--- a/src/states_screens/online_profile_friends.cpp
+++ b/src/states_screens/online_profile_friends.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_friends.hpp b/src/states_screens/online_profile_friends.hpp
index 319f97a7e..a8dd9bb36 100644
--- a/src/states_screens/online_profile_friends.hpp
+++ b/src/states_screens/online_profile_friends.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_settings.cpp b/src/states_screens/online_profile_settings.cpp
index 06abe7bde..1231b2c16 100644
--- a/src/states_screens/online_profile_settings.cpp
+++ b/src/states_screens/online_profile_settings.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010 Glenn De Jonghe
+//  Copyright (C) 2010-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_profile_settings.hpp b/src/states_screens/online_profile_settings.hpp
index 36fbd2669..6ed75ec8c 100644
--- a/src/states_screens/online_profile_settings.hpp
+++ b/src/states_screens/online_profile_settings.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index cea7b4fe2..6f1d26624 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index 472e23deb..12af003a7 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_user_search.cpp b/src/states_screens/online_user_search.cpp
index 872f7fcb3..5c9953471 100644
--- a/src/states_screens/online_user_search.cpp
+++ b/src/states_screens/online_user_search.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/online_user_search.hpp b/src/states_screens/online_user_search.hpp
index 4bc1082e9..5ec93db07 100644
--- a/src/states_screens/online_user_search.hpp
+++ b/src/states_screens/online_user_search.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_audio.cpp b/src/states_screens/options_screen_audio.cpp
index e5bbaf8b3..734c12a2d 100644
--- a/src/states_screens/options_screen_audio.cpp
+++ b/src/states_screens/options_screen_audio.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_audio.hpp b/src/states_screens/options_screen_audio.hpp
index 2b6468de0..fd48973ed 100644
--- a/src/states_screens/options_screen_audio.hpp
+++ b/src/states_screens/options_screen_audio.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options_screen_input.cpp
index 1d9b34041..b92880471 100644
--- a/src/states_screens/options_screen_input.cpp
+++ b/src/states_screens/options_screen_input.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_input.hpp b/src/states_screens/options_screen_input.hpp
index 02fcfc598..9d0ff1094 100644
--- a/src/states_screens/options_screen_input.hpp
+++ b/src/states_screens/options_screen_input.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_input2.cpp b/src/states_screens/options_screen_input2.cpp
index 0f60f181e..a9031dcd1 100644
--- a/src/states_screens/options_screen_input2.cpp
+++ b/src/states_screens/options_screen_input2.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_input2.hpp b/src/states_screens/options_screen_input2.hpp
index ee2c7fbd0..bc3ea8abc 100644
--- a/src/states_screens/options_screen_input2.hpp
+++ b/src/states_screens/options_screen_input2.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options_screen_ui.cpp
index f885987b7..fe089e73c 100644
--- a/src/states_screens/options_screen_ui.cpp
+++ b/src/states_screens/options_screen_ui.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_ui.hpp b/src/states_screens/options_screen_ui.hpp
index 91d419413..959cc9723 100644
--- a/src/states_screens/options_screen_ui.hpp
+++ b/src/states_screens/options_screen_ui.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index 887fb5d69..3d293d0de 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/options_screen_video.hpp b/src/states_screens/options_screen_video.hpp
index 14c2dfca5..745863b2c 100644
--- a/src/states_screens/options_screen_video.hpp
+++ b/src/states_screens/options_screen_video.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 55dc87ed7..92ff1649c 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui.hpp b/src/states_screens/race_gui.hpp
index 8ae4d626b..fe2730b96 100644
--- a/src/states_screens/race_gui.hpp
+++ b/src/states_screens/race_gui.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index 4465b8ffc..2e00ec0b1 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui_base.hpp b/src/states_screens/race_gui_base.hpp
index 05a20beb7..cf6eaa687 100644
--- a/src/states_screens/race_gui_base.hpp
+++ b/src/states_screens/race_gui_base.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index 938844a26..d222b5857 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_gui_overworld.hpp b/src/states_screens/race_gui_overworld.hpp
index 950c2d9bd..7a3a9535f 100644
--- a/src/states_screens/race_gui_overworld.hpp
+++ b/src/states_screens/race_gui_overworld.hpp
@@ -1,7 +1,7 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2006-2013 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2006-2015 Joerg Henrichs, SuperTuxKart-Team, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 80f5cbbbc..3e6e57046 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_result_gui.hpp b/src/states_screens/race_result_gui.hpp
index 4e365b114..09ccb4531 100644
--- a/src/states_screens/race_result_gui.hpp
+++ b/src/states_screens/race_result_gui.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_setup_screen.cpp b/src/states_screens/race_setup_screen.cpp
index bef5316c2..cc9780e10 100644
--- a/src/states_screens/race_setup_screen.cpp
+++ b/src/states_screens/race_setup_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/race_setup_screen.hpp b/src/states_screens/race_setup_screen.hpp
index 3569a6cc2..60ca8bfe2 100644
--- a/src/states_screens/race_setup_screen.hpp
+++ b/src/states_screens/race_setup_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 383e60360..387ba9a76 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/register_screen.hpp b/src/states_screens/register_screen.hpp
index 6c73b7acc..edf935f6c 100644
--- a/src/states_screens/register_screen.hpp
+++ b/src/states_screens/register_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014 Joerg Henrichs
+//  Copyright (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index a0794da33..2689b22fc 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010 Lucas Baudin, Joerg Henrichs
+//  Copyright (C) 2010-2015 Lucas Baudin, Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
index aecd29992..408164000 100644
--- a/src/states_screens/server_selection.hpp
+++ b/src/states_screens/server_selection.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index 60286e446..dd2c13edd 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/soccer_setup_screen.hpp b/src/states_screens/soccer_setup_screen.hpp
index c8fe50a9f..7d9ddb058 100644
--- a/src/states_screens/soccer_setup_screen.hpp
+++ b/src/states_screens/soccer_setup_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/state_manager.cpp b/src/states_screens/state_manager.cpp
index a1356e7d2..a2ef65d63 100644
--- a/src/states_screens/state_manager.cpp
+++ b/src/states_screens/state_manager.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/state_manager.hpp b/src/states_screens/state_manager.hpp
index cfda60c06..f11120c01 100644
--- a/src/states_screens/state_manager.hpp
+++ b/src/states_screens/state_manager.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index d6a78e7a4..ff6887ed7 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2014 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
index c35970cb1..b4583bdd9 100644
--- a/src/states_screens/track_info_screen.hpp
+++ b/src/states_screens/track_info_screen.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2014 Marianne Gagnon
-//                2014      Joerg Henrichs
+//  Copyright (C) 2009-2015 Marianne Gagnon
+//            (C) 2014-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 17217e066..32bd92abf 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/tracks_screen.hpp b/src/states_screens/tracks_screen.hpp
index 31898b39b..c0e205844 100644
--- a/src/states_screens/tracks_screen.hpp
+++ b/src/states_screens/tracks_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/user_screen.cpp
index 2f12a5c99..3c4658c70 100644
--- a/src/states_screens/user_screen.cpp
+++ b/src/states_screens/user_screen.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/states_screens/user_screen.hpp b/src/states_screens/user_screen.hpp
index 6d21b9d05..b8257db35 100644
--- a/src/states_screens/user_screen.hpp
+++ b/src/states_screens/user_screen.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/dictionary.cpp b/src/tinygettext/dictionary.cpp
index 4873527eb..0fae1272c 100644
--- a/src/tinygettext/dictionary.cpp
+++ b/src/tinygettext/dictionary.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/dictionary.hpp b/src/tinygettext/dictionary.hpp
index dd492c17c..8a1c64b97 100644
--- a/src/tinygettext/dictionary.hpp
+++ b/src/tinygettext/dictionary.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/dictionary_manager.cpp b/src/tinygettext/dictionary_manager.cpp
index 254530042..f123d2293 100644
--- a/src/tinygettext/dictionary_manager.cpp
+++ b/src/tinygettext/dictionary_manager.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/dictionary_manager.hpp b/src/tinygettext/dictionary_manager.hpp
index 994b941ea..82f6a0d4b 100644
--- a/src/tinygettext/dictionary_manager.hpp
+++ b/src/tinygettext/dictionary_manager.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/file_system.hpp b/src/tinygettext/file_system.hpp
index 9881637b5..cc8b95032 100644
--- a/src/tinygettext/file_system.hpp
+++ b/src/tinygettext/file_system.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/iconv.cpp b/src/tinygettext/iconv.cpp
index da4d5e400..e28f7a3ac 100644
--- a/src/tinygettext/iconv.cpp
+++ b/src/tinygettext/iconv.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/iconv.hpp b/src/tinygettext/iconv.hpp
index e1e43122c..8bb2bd671 100644
--- a/src/tinygettext/iconv.hpp
+++ b/src/tinygettext/iconv.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/src/tinygettext/language.cpp b/src/tinygettext/language.cpp
index e6303cd9d..aefed84b7 100644
--- a/src/tinygettext/language.cpp
+++ b/src/tinygettext/language.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/language.hpp b/src/tinygettext/language.hpp
index 037200f59..46f47d299 100644
--- a/src/tinygettext/language.hpp
+++ b/src/tinygettext/language.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/log_stream.hpp b/src/tinygettext/log_stream.hpp
index 333c72ae5..814dad151 100644
--- a/src/tinygettext/log_stream.hpp
+++ b/src/tinygettext/log_stream.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/plural_forms.cpp b/src/tinygettext/plural_forms.cpp
index c206ca587..3ac31f43c 100644
--- a/src/tinygettext/plural_forms.cpp
+++ b/src/tinygettext/plural_forms.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/plural_forms.hpp b/src/tinygettext/plural_forms.hpp
index b51f73aa2..ce8fc3eb1 100644
--- a/src/tinygettext/plural_forms.hpp
+++ b/src/tinygettext/plural_forms.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/po_parser.cpp b/src/tinygettext/po_parser.cpp
index f63157d0c..2af6edef5 100644
--- a/src/tinygettext/po_parser.cpp
+++ b/src/tinygettext/po_parser.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/po_parser.hpp b/src/tinygettext/po_parser.hpp
index c02949e12..922e617d6 100644
--- a/src/tinygettext/po_parser.hpp
+++ b/src/tinygettext/po_parser.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/stk_file_system.cpp b/src/tinygettext/stk_file_system.cpp
index 4381548ba..496bdb5d3 100644
--- a/src/tinygettext/stk_file_system.cpp
+++ b/src/tinygettext/stk_file_system.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/stk_file_system.hpp b/src/tinygettext/stk_file_system.hpp
index 272201c20..850fc0bf0 100644
--- a/src/tinygettext/stk_file_system.hpp
+++ b/src/tinygettext/stk_file_system.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/tgt_log.cpp b/src/tinygettext/tgt_log.cpp
index 3a9bc900e..280fcd0e6 100644
--- a/src/tinygettext/tgt_log.cpp
+++ b/src/tinygettext/tgt_log.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/tgt_log.hpp b/src/tinygettext/tgt_log.hpp
index 393dbb748..0e34a5286 100644
--- a/src/tinygettext/tgt_log.hpp
+++ b/src/tinygettext/tgt_log.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/tinygettext.cpp b/src/tinygettext/tinygettext.cpp
index f0134fc24..eaf17567e 100644
--- a/src/tinygettext/tinygettext.cpp
+++ b/src/tinygettext/tinygettext.cpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tinygettext/tinygettext.hpp b/src/tinygettext/tinygettext.hpp
index 1924299db..c481112eb 100644
--- a/src/tinygettext/tinygettext.hpp
+++ b/src/tinygettext/tinygettext.hpp
@@ -1,5 +1,5 @@
 //  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2013 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/ambient_light_sphere.cpp b/src/tracks/ambient_light_sphere.cpp
index 3b1bdf9b9..806bd6f48 100644
--- a/src/tracks/ambient_light_sphere.cpp
+++ b/src/tracks/ambient_light_sphere.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/ambient_light_sphere.hpp b/src/tracks/ambient_light_sphere.hpp
index 74ae319c8..d3dd28d93 100644
--- a/src/tracks/ambient_light_sphere.hpp
+++ b/src/tracks/ambient_light_sphere.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/bezier_curve.cpp b/src/tracks/bezier_curve.cpp
index 8d45c7676..c64dab8c8 100644
--- a/src/tracks/bezier_curve.cpp
+++ b/src/tracks/bezier_curve.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/bezier_curve.hpp b/src/tracks/bezier_curve.hpp
index 2b2143f91..e41653365 100644
--- a/src/tracks/bezier_curve.hpp
+++ b/src/tracks/bezier_curve.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_cannon.cpp b/src/tracks/check_cannon.cpp
index 7effbe71b..34f30fcae 100644
--- a/src/tracks/check_cannon.cpp
+++ b/src/tracks/check_cannon.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_cannon.hpp b/src/tracks/check_cannon.hpp
index 9e3a62dea..3507195d3 100644
--- a/src/tracks/check_cannon.hpp
+++ b/src/tracks/check_cannon.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_goal.cpp b/src/tracks/check_goal.cpp
index f582f182f..5e2daaed6 100644
--- a/src/tracks/check_goal.cpp
+++ b/src/tracks/check_goal.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_goal.hpp b/src/tracks/check_goal.hpp
index 966ab3a69..3368924d4 100644
--- a/src/tracks/check_goal.hpp
+++ b/src/tracks/check_goal.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013  Joerg Henrichs
+//  Copyright (C) 2012-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_lap.cpp b/src/tracks/check_lap.cpp
index bf92b9b10..016c987d5 100644
--- a/src/tracks/check_lap.cpp
+++ b/src/tracks/check_lap.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_lap.hpp b/src/tracks/check_lap.hpp
index 0d07cb310..b6d19a78a 100644
--- a/src/tracks/check_lap.hpp
+++ b/src/tracks/check_lap.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013  Joerg Henrichs
+//  Copyright (C) 2010-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_line.cpp b/src/tracks/check_line.cpp
index 155170dc1..46d06bed3 100644
--- a/src/tracks/check_line.cpp
+++ b/src/tracks/check_line.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_line.hpp b/src/tracks/check_line.hpp
index 9b95a09eb..7d24f3a6f 100644
--- a/src/tracks/check_line.hpp
+++ b/src/tracks/check_line.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_manager.cpp b/src/tracks/check_manager.cpp
index 1281fd1cb..cc6309d19 100644
--- a/src/tracks/check_manager.cpp
+++ b/src/tracks/check_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_manager.hpp b/src/tracks/check_manager.hpp
index 20be19f2e..ecc62fb05 100644
--- a/src/tracks/check_manager.hpp
+++ b/src/tracks/check_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_sphere.cpp b/src/tracks/check_sphere.cpp
index 465b67bdb..bd07fcf24 100644
--- a/src/tracks/check_sphere.cpp
+++ b/src/tracks/check_sphere.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_sphere.hpp b/src/tracks/check_sphere.hpp
index 4d7a5fc90..4780ed681 100644
--- a/src/tracks/check_sphere.hpp
+++ b/src/tracks/check_sphere.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_structure.cpp b/src/tracks/check_structure.cpp
index e33179d17..c72421e27 100644
--- a/src/tracks/check_structure.cpp
+++ b/src/tracks/check_structure.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/check_structure.hpp b/src/tracks/check_structure.hpp
index 07382e2b2..e5e3a24c6 100644
--- a/src/tracks/check_structure.hpp
+++ b/src/tracks/check_structure.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/graph_node.cpp b/src/tracks/graph_node.cpp
index a48559830..81f5bfaa3 100644
--- a/src/tracks/graph_node.cpp
+++ b/src/tracks/graph_node.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/graph_node.hpp b/src/tracks/graph_node.hpp
index 43d1610f5..f0bc91640 100644
--- a/src/tracks/graph_node.hpp
+++ b/src/tracks/graph_node.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/model_definition_loader.cpp b/src/tracks/model_definition_loader.cpp
index 14fe029e2..21af0ffb8 100644
--- a/src/tracks/model_definition_loader.cpp
+++ b/src/tracks/model_definition_loader.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/model_definition_loader.hpp b/src/tracks/model_definition_loader.hpp
index bc4f48dcb..82a310108 100644
--- a/src/tracks/model_definition_loader.hpp
+++ b/src/tracks/model_definition_loader.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad.cpp b/src/tracks/quad.cpp
index d8757017f..729600f44 100644
--- a/src/tracks/quad.cpp
+++ b/src/tracks/quad.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad.hpp b/src/tracks/quad.hpp
index 4688ecb60..74f35abdc 100644
--- a/src/tracks/quad.hpp
+++ b/src/tracks/quad.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad_graph.cpp b/src/tracks/quad_graph.cpp
index ac061b7da..7c4e7197b 100644
--- a/src/tracks/quad_graph.cpp
+++ b/src/tracks/quad_graph.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad_graph.hpp b/src/tracks/quad_graph.hpp
index ca5850a92..b40d6ff0c 100644
--- a/src/tracks/quad_graph.hpp
+++ b/src/tracks/quad_graph.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad_set.cpp b/src/tracks/quad_set.cpp
index c262859af..0fa8d2d34 100644
--- a/src/tracks/quad_set.cpp
+++ b/src/tracks/quad_set.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/quad_set.hpp b/src/tracks/quad_set.hpp
index b7aff164c..8e646ae4e 100644
--- a/src/tracks/quad_set.hpp
+++ b/src/tracks/quad_set.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/terrain_info.cpp b/src/tracks/terrain_info.cpp
index 2347cad37..b10b367e9 100644
--- a/src/tracks/terrain_info.cpp
+++ b/src/tracks/terrain_info.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/terrain_info.hpp b/src/tracks/terrain_info.hpp
index 68301718a..4c3b7c17d 100644
--- a/src/tracks/terrain_info.hpp
+++ b/src/tracks/terrain_info.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2007-2013 Joerg Henrichs
+//  Copyright (C) 2007-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 043fbac26..dc54d4896 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013  Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2009-2013  Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015  Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2009-2015  Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index e4da819de..8eb856b2f 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2009-2013  Joerg Henrichs, Steve Baker
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2009-2015  Joerg Henrichs, Steve Baker
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_manager.cpp b/src/tracks/track_manager.cpp
index 37911fd7c..4bdbdaeae 100644
--- a/src/tracks/track_manager.cpp
+++ b/src/tracks/track_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_manager.hpp b/src/tracks/track_manager.hpp
index 7d2b86ed1..dab519dd8 100644
--- a/src/tracks/track_manager.hpp
+++ b/src/tracks/track_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 SuperTuxKart-Team
+//  Copyright (C) 2006-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index a322df919..ad8fc9da6 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2013-2015 Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index fcdcdffba..edc2e4b93 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object_manager.cpp b/src/tracks/track_object_manager.cpp
index e2f940ffd..75093f15c 100644
--- a/src/tracks/track_object_manager.cpp
+++ b/src/tracks/track_object_manager.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013 Joerg Henrichs
+//  Copyright (C) 2009-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object_manager.hpp b/src/tracks/track_object_manager.hpp
index 5585b7dbd..bb8b1ef54 100644
--- a/src/tracks/track_object_manager.hpp
+++ b/src/tracks/track_object_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2009-2013  Joerg Henrichs
+//  Copyright (C) 2009-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index e6557c100..5e2ba515a 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013-2013 Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2013-2015 Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 46f66d183..95a6ebaf8 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013-2013 Joerg Henrichs, Marianne Gagnon
+//  Copyright (C) 2013-2015 Joerg Henrichs, Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_sector.cpp b/src/tracks/track_sector.cpp
index 82d7cf09e..a87853413 100644
--- a/src/tracks/track_sector.cpp
+++ b/src/tracks/track_sector.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs
+//  Copyright (C) 2011-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/tracks/track_sector.hpp b/src/tracks/track_sector.hpp
index 57a0e7c1a..138db8e6f 100644
--- a/src/tracks/track_sector.hpp
+++ b/src/tracks/track_sector.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013  Joerg Henrichs
+//  Copyright (C) 2011-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/aligned_array.hpp b/src/utils/aligned_array.hpp
index a97e37ba3..25de1e790 100644
--- a/src/utils/aligned_array.hpp
+++ b/src/utils/aligned_array.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/can_be_deleted.hpp b/src/utils/can_be_deleted.hpp
old mode 100755
new mode 100644
index 1c0ad3555..000d9e698
--- a/src/utils/can_be_deleted.hpp
+++ b/src/utils/can_be_deleted.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/command_line.cpp b/src/utils/command_line.cpp
index 55252791e..0ac7193c6 100644
--- a/src/utils/command_line.cpp
+++ b/src/utils/command_line.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/command_line.hpp b/src/utils/command_line.hpp
index 9557762fd..399033e3f 100644
--- a/src/utils/command_line.hpp
+++ b/src/utils/command_line.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/constants.cpp b/src/utils/constants.cpp
index b740211c6..34e4e12d4 100644
--- a/src/utils/constants.cpp
+++ b/src/utils/constants.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/constants.hpp b/src/utils/constants.hpp
index 8d3b0c306..58d58a961 100644
--- a/src/utils/constants.hpp
+++ b/src/utils/constants.hpp
@@ -1,7 +1,7 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013 Steve Baker <sjbaker1@airmail.net>
-//  Copyright (C) 2012-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 Steve Baker <sjbaker1@airmail.net>
+//  Copyright (C) 2012-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/crash_reporting.cpp b/src/utils/crash_reporting.cpp
index e3dc853d8..034425aac 100644
--- a/src/utils/crash_reporting.cpp
+++ b/src/utils/crash_reporting.cpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/crash_reporting.hpp b/src/utils/crash_reporting.hpp
index 5f5b360bd..dd1804f7f 100644
--- a/src/utils/crash_reporting.hpp
+++ b/src/utils/crash_reporting.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 0fbff24ef..b40481a27 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/debug.hpp b/src/utils/debug.hpp
index 295df1ed5..3694aeb21 100644
--- a/src/utils/debug.hpp
+++ b/src/utils/debug.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013 Lionel Fuentes
+//  Copyright (C) 2013-2015 Lionel Fuentes
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/helpers.cpp b/src/utils/helpers.cpp
index c0c9ee301..5a89b8b43 100644
--- a/src/utils/helpers.cpp
+++ b/src/utils/helpers.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -51,8 +51,8 @@ u8 shash8(const u8 * const data, const u16 size) {
 
 /*
 
-Copyright (C) 2011 by Ashima Arts (Simplex noise)
-Copyright (C) 2011 by Lauri Kasanen (cpu port)
+Copyright (C) 2011 by-2015 Ashima Arts (Simplex noise)
+Copyright (C) 2011 by-2015 Lauri Kasanen (cpu port)
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/utils/helpers.hpp b/src/utils/helpers.hpp
index bdb10a1e9..6ee09be4d 100644
--- a/src/utils/helpers.hpp
+++ b/src/utils/helpers.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Lauri Kasanen
+//  Copyright (C) 2013-2015 Lauri Kasanen
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/interpolation_array.hpp b/src/utils/interpolation_array.hpp
index 884970a54..e4f0b7893 100644
--- a/src/utils/interpolation_array.hpp
+++ b/src/utils/interpolation_array.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2012-2013 Joerg Henrichs
+//  Copyright (C) 2012-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/leak_check.cpp b/src/utils/leak_check.cpp
index 5f199c6ab..2f8920ee7 100644
--- a/src/utils/leak_check.cpp
+++ b/src/utils/leak_check.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon, Joerg Henrichs
+//  Copyright (C) 2011-2015 Marianne Gagnon, Joerg Henrichs
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/leak_check.hpp b/src/utils/leak_check.hpp
index 6d461ed78..b04a6db80 100644
--- a/src/utils/leak_check.hpp
+++ b/src/utils/leak_check.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Marianne Gagnon, Joerg Henrichs
+//  Copyright (C) 2011-2015 Marianne Gagnon, Joerg Henrichs
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/log.cpp b/src/utils/log.cpp
index 345a914d9..99f0270bd 100644
--- a/src/utils/log.cpp
+++ b/src/utils/log.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 Joerg Henrichs
+//  Copyright (C) 2013-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/log.hpp b/src/utils/log.hpp
index d04f6f071..61726cb8b 100644
--- a/src/utils/log.hpp
+++ b/src/utils/log.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013-2013 Joerg Henrichs
+//  Copyright (C) 2013-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/no_copy.hpp b/src/utils/no_copy.hpp
index d23c3edf2..0f1e7573d 100644
--- a/src/utils/no_copy.hpp
+++ b/src/utils/no_copy.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-// Copyright (C) 2003 Matthias-2013 Braun <matze@braunis.de>
+// Copyright (C) 2003-2015 Matthias-2013 Braun <matze@braunis.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/src/utils/profiler.cpp b/src/utils/profiler.cpp
index 259ef77c5..6b962d917 100644
--- a/src/utils/profiler.cpp
+++ b/src/utils/profiler.cpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/profiler.hpp b/src/utils/profiler.hpp
index dd3cafa25..ce182cea3 100644
--- a/src/utils/profiler.hpp
+++ b/src/utils/profiler.hpp
@@ -1,5 +1,5 @@
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013 SuperTuxKart-Team
+//  Copyright (C) 2004-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/ptr_vector.hpp b/src/utils/ptr_vector.hpp
index 814259551..23347185b 100644
--- a/src/utils/ptr_vector.hpp
+++ b/src/utils/ptr_vector.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2009-2013 Marianne Gagnon
+//  Copyright (C) 2009-2015 Marianne Gagnon
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/random_generator.cpp b/src/utils/random_generator.cpp
index 0105e700b..6685444e3 100644
--- a/src/utils/random_generator.cpp
+++ b/src/utils/random_generator.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013  Joerg Henrichs
+//  Copyright (C) 2008-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/random_generator.hpp b/src/utils/random_generator.hpp
index c4ccd52d7..9f1805724 100644
--- a/src/utils/random_generator.hpp
+++ b/src/utils/random_generator.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013  Joerg Henrichs
+//  Copyright (C) 2008-2015  Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/singleton.hpp b/src/utils/singleton.hpp
index 96ac90023..5c04d556c 100644
--- a/src/utils/singleton.hpp
+++ b/src/utils/singleton.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013-2015 SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 3aa6f2167..3984e874d 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -1,8 +1,8 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2004-2013  Steve Baker <sjbaker1@airmail.net>,
-//  Copyright (C) 2004-2013  Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013  SuperTuxKart-Team
+//  Copyright (C) 2004-2015  Steve Baker <sjbaker1@airmail.net>,
+//  Copyright (C) 2004-2015  Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp
index 7deb7652b..ebcc28895 100644
--- a/src/utils/string_utils.hpp
+++ b/src/utils/string_utils.hpp
@@ -1,8 +1,8 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004-2013  Steve Baker <sjbaker1@airmail.net>,
-//  Copyright (C) 2004-2013  Ingo Ruhnke <grumbel@gmx.de>
-//  Copyright (C) 2006-2013  SuperTuxKart-Team
+//  Copyright (C) 2004-2015  Steve Baker <sjbaker1@airmail.net>,
+//  Copyright (C) 2004-2015  Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/synchronised.hpp b/src/utils/synchronised.hpp
index 0794e76ca..7bac32541 100644
--- a/src/utils/synchronised.hpp
+++ b/src/utils/synchronised.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2010-2013 Joerg Henrichs
+//  Copyright (C) 2010-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index 921389842..86cf7c056 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013  SuperTuxKart-Team
+//  Copyright (C) 2013-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/time.hpp b/src/utils/time.hpp
index 7dae2b734..9b36ace8b 100644
--- a/src/utils/time.hpp
+++ b/src/utils/time.hpp
@@ -1,6 +1,6 @@
 //  SuperTuxKart - a fun racing game with go-kart
 //
-//  Copyright (C) 2013  SuperTuxKart-Team
+//  Copyright (C) 2013-2015  SuperTuxKart-Team
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 8e5d6853f..fa5b81f58 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006,-2013 2007, 2008 Joerg Henrichs
+//  Copyright (C) 2006,-2015 2007, 2008 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/translation.hpp b/src/utils/translation.hpp
index aecfe18c9..3782dc2b0 100644
--- a/src/utils/translation.hpp
+++ b/src/utils/translation.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2006-2013 Joerg Henrichs
+//  Copyright (C) 2006-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/types.hpp b/src/utils/types.hpp
index c2021fcfd..082e30e08 100644
--- a/src/utils/types.hpp
+++ b/src/utils/types.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
+//  Copyright (C) 2013-2015 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/vec3.cpp b/src/utils/vec3.cpp
index 6595119ba..4fc0c3ee5 100644
--- a/src/utils/vec3.cpp
+++ b/src/utils/vec3.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2008-2013 Joerg Henrichs
+//  Copyright (C) 2008-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/utils/vec3.hpp b/src/utils/vec3.hpp
index 0d3905869..2a2e86b2b 100644
--- a/src/utils/vec3.hpp
+++ b/src/utils/vec3.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2011-2013 Joerg Henrichs
+//  Copyright (C) 2011-2015 Joerg Henrichs
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/tools/update_copyright.sh b/tools/update_copyright.sh
index 2df3e2995..f3521cd35 100755
--- a/tools/update_copyright.sh
+++ b/tools/update_copyright.sh
@@ -20,9 +20,9 @@ BEGIN   {
         }
 /\(C\)/ {
             if(index($4,"-")>0) 
-               new_years=gensub("-.*$","-2013",1,$4); 
+               new_years=gensub("-.*$","-2015",1,$4); 
 	    else
-               new_years=$4"-2013";
+               new_years=$4"-2015";
 	    line = $0;
             sub($4,new_years,line);
 	    print line;

From 9cb862f708a40b90861fc53e33b9ebc7532b9bc3 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 30 Mar 2015 11:50:12 +1100
Subject: [PATCH 083/331] Fix travis build.

---
 src/utils/translation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index fa5b81f58..677a8b9cf 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -321,7 +321,7 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
 #endif
 
         FriBidiChar *fribidiOutput = new FriBidiChar[length + 1];
-        std::memset(fribidiOutput, 0, (length + 1) * sizeof(FriBidiChar));
+        memset(fribidiOutput, 0, (length + 1) * sizeof(FriBidiChar));
         fribidi_boolean result = fribidi_log2vis(fribidiInput,
                                                  length,
                                                  &pbase_dir,

From cd67daf4a3ff2fbefe64a7eeef0c7a900889d82f Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 30 Mar 2015 20:12:25 +0200
Subject: [PATCH 084/331] MinGW: Don't show console window in release mode.

Removed unused cmake option.
---
 CMakeLists.txt | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f9ca20ee..54db8a1a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,6 @@ option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 
-if(UNIX OR MINGW)
-    option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF)
-endif()
 if(MSVC OR MINGW)
     # Normally hide the option to build wiiuse on VS, since it depends
     # on the installation of the Windows DDK (Driver Developer Kit),
@@ -172,13 +169,6 @@ if (OPENMP_FOUND)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 
-
-if(UNIX OR MINGW)
-#    if(USE_CPP2011)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-#    endif()
-endif()
-
 # OpenGL
 find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
@@ -198,12 +188,16 @@ if(UNIX AND NOT APPLE)
     endif()
 endif()
 
-
 # Set some compiler options
 if(UNIX OR MINGW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
+if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
+endif()
+
 if(WIN32)
     # By default windows.h has macros defined for min and max that screw up everything
     add_definitions(-DNOMINMAX)

From c7e785b59c10f50ac448576bcf2ec43d116fa2b0 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 31 Mar 2015 16:16:30 +1100
Subject: [PATCH 085/331] Fixed translator credits display (translators were
 repeated before). Added #undef'ed debug mode to only see translations.

---
 src/states_screens/credits.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/states_screens/credits.cpp b/src/states_screens/credits.cpp
index 4592f729d..2602ae566 100644
--- a/src/states_screens/credits.cpp
+++ b/src/states_screens/credits.cpp
@@ -170,6 +170,13 @@ void CreditsScreen::loadedFromFile()
     // let's assume the file is encoded as UTF-16
     while (getWideLine( file, &line ))
     {
+#undef DEBUG_TRANSLATIONS    // Enable to only see the translator credits
+#ifdef DEBUG_TRANSLATIONS
+        static int my_counter = 0;
+        if (my_counter > 0)
+            break;
+        my_counter++;
+#endif
         stringc cversion = line.c_str();
         //printf("CREDITS line : %s\n", cversion.c_str());
 
@@ -207,6 +214,7 @@ void CreditsScreen::loadedFromFile()
 
 
     irr::core::stringw translators_credits = _("translator-credits");
+    const int MAX_PER_SCREEN = 6;
 
     if (translators_credits != L"translator-credits")
     {
@@ -214,13 +222,13 @@ void CreditsScreen::loadedFromFile()
             StringUtils::split(translators_credits, '\n');
 
         m_sections.push_back( new CreditsSection("Translations"));
-        for(unsigned int i = 1; i < translator.size(); i = i + 4)
+        for(unsigned int i = 1; i < translator.size(); i = i + MAX_PER_SCREEN)
         {
             line = stringw(translations->getCurrentLanguageName().c_str());
             CreditsEntry entry(line);
             getCurrentSection()->addEntry( entry );
 
-            for(unsigned int j = 0; i + j < translator.size() && j < 6; j ++)
+            for(unsigned int j = 0; i + j < translator.size() && j < MAX_PER_SCREEN; j ++)
             {
                 getCurrentSection()->addSubEntry(translator[i + j]);
             }

From 5e56f8904a14b466349c03c85632456767d7817a Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 31 Mar 2015 19:27:07 +0200
Subject: [PATCH 086/331] MinGW: Allow to compile wiiuse.

Still disabled by default because it requires mingw-w64 and it may not work with other versions.
---
 CMakeLists.txt            | 2 +-
 lib/wiiuse/CMakeLists.txt | 5 +++--
 lib/wiiuse/os_win.c       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54db8a1a5..2c2f3f5c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 
-if(MSVC OR MINGW)
+if(MSVC)
     # Normally hide the option to build wiiuse on VS, since it depends
     # on the installation of the Windows DDK (Driver Developer Kit),
     # which also needs an absolute path :(
diff --git a/lib/wiiuse/CMakeLists.txt b/lib/wiiuse/CMakeLists.txt
index eabc0836e..ef6a8c788 100644
--- a/lib/wiiuse/CMakeLists.txt
+++ b/lib/wiiuse/CMakeLists.txt
@@ -38,7 +38,7 @@ if(APPLE)
     )
 endif()
 
-if(MSVC)
+if(WIN32)
     add_definitions("/DWIIUSE_STATIC")
     add_library(wiiuse STATIC ${WIIUSE_SOURCES})
 else()
@@ -81,5 +81,6 @@ if(MSVC)
     else()
         set_target_properties(wiiuse PROPERTIES STATIC_LIBRARY_FLAGS "setupapi.lib hid.lib")
     endif()
-
+elseif(MINGW)
+    target_link_libraries(wiiuse hid setupapi)
 endif()
diff --git a/lib/wiiuse/os_win.c b/lib/wiiuse/os_win.c
index 8a3de24de..156ae4d7d 100644
--- a/lib/wiiuse/os_win.c
+++ b/lib/wiiuse/os_win.c
@@ -48,7 +48,7 @@
 #	ifdef __cplusplus
 extern "C" {
 #	endif
-	WINHIDSDI BOOL WINAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG);
+	HIDAPI BOOL NTAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG);
 #	ifdef __cplusplus
 }
 #	endif

From 414522e8237351ae47f05a5831a9f27ba95fb101 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Apr 2015 09:41:37 +1100
Subject: [PATCH 087/331] First version of a simple script that adds the
 transifex authors to the list of launchpad authors in the translator-credits
 string. The latter is used to display the appropriate in-game credits.

---
 tools/update_po_authors.py | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100755 tools/update_po_authors.py

diff --git a/tools/update_po_authors.py b/tools/update_po_authors.py
new file mode 100755
index 000000000..275c465b4
--- /dev/null
+++ b/tools/update_po_authors.py
@@ -0,0 +1,64 @@
+#!/bin/env python
+
+# A simple script that adds all authors from transifex, which are
+# listed in comments at the beginning of the file, to the 
+# 'translator-credits' translations - where launchpad added them
+# and which are shown in stk.
+import re
+import sys
+
+if __name__ == "__main__":
+    if len(sys.argv)!=2:
+        print "Usage: getpo_authors.py PATH_TO_PO_FILE"
+        sys.exit(-1)
+
+    f = open(sys.argv[1], "r")
+    if not f:
+        print "Can not find", sys.argv[1]
+        exit
+    lines = f.readlines()
+
+    f.close()
+
+    authors = []
+    found   = 0
+
+    # Find all authors with a simple finite state machine:
+    contributions = -1
+    line_count    =  0
+    for i in lines:
+        line = i[:-1]   # remove \n
+        if line=="# Translators:":
+            found = 1
+        elif found and line[:2]=="# ":
+            authors.append(line[2:])
+        elif line[:5]=="msgid":
+            found = 0
+        elif line[:31]== "msgstr \"Launchpad Contributions":
+            contributions = line_count
+        line_count = line_count + 1
+
+
+    # Delete all email addresses - not sure if the authors
+    # would want them to be published
+    email=re.compile(" *<.*@.*\..*> *")   # one @ and one dot at least
+    for i in range(len(authors)):
+        g = email.search(authors[i])
+        if g:
+            authors[i] = authors[i][:g.start()]+authors[i][g.end():]
+
+    # Now append the new authors to the Launchpad string
+    if contributions==-1:
+        print "Can not find old Launchpad Contributions string."
+        sys.exit(-1)
+    else:
+        # Remove trailing "
+        s=reduce(lambda x,y: x+"\\n  "+y, authors)
+        lines[contributions] = lines[contributions][:-2]+"\\n  "+s+\
+                               lines[contributions][-2:]
+
+    f = open(sys.argv[1], "w")
+    for i in lines:
+        f.write(i)
+    f.close()
+            

From 4b735861cd526732d7172727eb7176b8a039d4f3 Mon Sep 17 00:00:00 2001
From: samuncle <samuncle06@gmail.com>
Date: Wed, 1 Apr 2015 04:30:17 +0200
Subject: [PATCH 088/331] Add a particle system

---
 data/gfx/gfx_sparkBlue_a.xml | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 data/gfx/gfx_sparkBlue_a.xml

diff --git a/data/gfx/gfx_sparkBlue_a.xml b/data/gfx/gfx_sparkBlue_a.xml
new file mode 100644
index 000000000..533b01ce8
--- /dev/null
+++ b/data/gfx/gfx_sparkBlue_a.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.2">
+
+    <spreading angle="10"           />
+    
+    <velocity  x="-0.000"
+               y="0.003"
+               z="-0.000"             />
+    
+    <material  file="gfx_sparkBlue_a.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1000"
+               max="1500"          />    
+  
+    <!-- Size of the particles -->
+    <size min="0.08"
+         max="0.15"
+         x-increase-factor="1.2"
+         y-increase-factor="1.3" /> 
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

From cbd45c26a24b31bcd137d498ddbe4c9aec147834 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Apr 2015 22:24:02 +1100
Subject: [PATCH 089/331] Merge and sort old and new translation credits. Fixed
 handling of " and some other minor fixes.

---
 tools/update_po_authors.py | 59 +++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/tools/update_po_authors.py b/tools/update_po_authors.py
index 275c465b4..e5b0b4688 100755
--- a/tools/update_po_authors.py
+++ b/tools/update_po_authors.py
@@ -4,6 +4,17 @@
 # listed in comments at the beginning of the file, to the 
 # 'translator-credits' translations - where launchpad added them
 # and which are shown in stk.
+#
+# Usage:  update_po_authors.py  PATH_TO/LANGUAGE.po
+#
+# IMPORTANT note: this script must be run on a file downloaded
+#           from transifex, not on a file on which this script had
+#           been run before (otherwise the transifex authors would
+#           be added again and again)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+# Less important note: The specified file is overwritten without
+#           a backup! Make sure the git status is unmodified.
+
 import re
 import sys
 
@@ -20,8 +31,8 @@ if __name__ == "__main__":
 
     f.close()
 
-    authors = []
-    found   = 0
+    new_authors = []
+    found        = 0
 
     # Find all authors with a simple finite state machine:
     contributions = -1
@@ -31,7 +42,7 @@ if __name__ == "__main__":
         if line=="# Translators:":
             found = 1
         elif found and line[:2]=="# ":
-            authors.append(line[2:])
+            new_authors.append(line[2:])
         elif line[:5]=="msgid":
             found = 0
         elif line[:31]== "msgstr \"Launchpad Contributions":
@@ -42,21 +53,41 @@ if __name__ == "__main__":
     # Delete all email addresses - not sure if the authors
     # would want them to be published
     email=re.compile(" *<.*@.*\..*> *")   # one @ and one dot at least
-    for i in range(len(authors)):
-        g = email.search(authors[i])
+    for i in range(len(new_authors)):
+        g = email.search(new_authors[i])
         if g:
-            authors[i] = authors[i][:g.start()]+authors[i][g.end():]
+            new_authors[i] = new_authors[i][:g.start()] \
+                           + new_authors[i][g.end():]
 
-    # Now append the new authors to the Launchpad string
-    if contributions==-1:
-        print "Can not find old Launchpad Contributions string."
-        sys.exit(-1)
+    # Get the old authors from the translator-credits string:
+    if contributions>0:
+        # Ignore the first entry, which is "msgstr ...", and the
+        # last two characters, which are the '"\n'.
+        old_authors = lines[contributions][:-2].split("\\n")[1:]
+        for i in range(len(old_authors)):
+            old_authors[i] = old_authors[i].strip()
     else:
-        # Remove trailing "
-        s=reduce(lambda x,y: x+"\\n  "+y, authors)
-        lines[contributions] = lines[contributions][:-2]+"\\n  "+s+\
-                               lines[contributions][-2:]
+        old_authors=[]
+    
+    all_authors = old_authors + new_authors;
+    all_authors = sorted(all_authors, key=lambda x: x.lower())
+    all_authors_string = reduce(lambda x,y: x+"\\n"+y, all_authors, "")
+    
+    # If no old authors exists, write a new entry:
+    if contributions==-1:
+        lines.append("\n")
+        lines.append("#: src/states_screens/credits.cpp:209\n")
+        lines.append("msgid \"translator-credits\"\n")
 
+    else:
+        # Otherwise just delete the old contribution string
+        # so that the new one can be appended below.
+        del lines[contributions]
+
+    # Append new author list
+    lines.append("msgstr \"Launchpad Contributions:\\n%s\"\n"%all_authors_string)
+
+    # Overwrite old file
     f = open(sys.argv[1], "w")
     for i in lines:
         f.write(i)

From 3f76b0c68d680c46f62f6347f97769395603f8bf Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 2 Apr 2015 10:46:30 +1100
Subject: [PATCH 090/331] Used better icon for achievements in tabs.

---
 data/gui/online/profile_achievements_tab.stkgui | 2 +-
 data/gui/online/profile_friends.stkgui          | 2 +-
 data/gui/online/profile_overview.stkgui         | 2 +-
 data/gui/online/profile_settings.stkgui         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/gui/online/profile_achievements_tab.stkgui b/data/gui/online/profile_achievements_tab.stkgui
index 33b0900d1..7d519d661 100644
--- a/data/gui/online/profile_achievements_tab.stkgui
+++ b/data/gui/online/profile_achievements_tab.stkgui
@@ -9,7 +9,7 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"
                 I18N="Section in the profile screen" text="Achievements"/>
             <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"/>
             <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui
index 50e933392..e0e49473b 100644
--- a/data/gui/online/profile_friends.stkgui
+++ b/data/gui/online/profile_friends.stkgui
@@ -9,7 +9,7 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
             <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png"
                 I18N="Section in the profile screen" text="Friends"/>
             <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
diff --git a/data/gui/online/profile_overview.stkgui b/data/gui/online/profile_overview.stkgui
index 158d95f43..eed9c717b 100644
--- a/data/gui/online/profile_overview.stkgui
+++ b/data/gui/online/profile_overview.stkgui
@@ -12,7 +12,7 @@
             <icon-button id="tab_overview" width="128" height="128" icon="gui/options_ui.png"
                 I18N="Section in the profile screen" text="Overview"/>
             <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
             <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"/>
         </tabs>
 
diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/online/profile_settings.stkgui
index d021747ba..5b86964e3 100644
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@@ -8,7 +8,7 @@
         <spacer height="25" width="10"/>
 
         <tabs id="profile_tabs" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_achievements" width="128" height="128" icon="gui/options_players.png"/>
+            <icon-button id="tab_achievements" width="128" height="128" icon="gui/gp_copy.png"/>
             <icon-button id="tab_friends" width="128" height="128" icon="gui/options_players.png" />
             <icon-button id="tab_settings" width="128" height="128" icon="gui/main_options.png"
                 I18N="Section in the profile screen" text="Account Settings"/>

From fb58e4b3b3b01f902ce590842ce97cd730f8bbda Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 2 Apr 2015 23:59:55 +1100
Subject: [PATCH 091/331] Use STK's log function in tinyugettext (so all
 errors/warnings are logged to stdout.log).

---
 sources.cmake                          |  2 +-
 src/tinygettext/dictionary.cpp         | 15 ++++--
 src/tinygettext/dictionary_manager.cpp | 13 +++--
 src/tinygettext/iconv.cpp              |  1 -
 src/tinygettext/log_stream.hpp         | 34 -------------
 src/tinygettext/po_parser.cpp          | 11 ++--
 src/tinygettext/tgt_log.cpp            | 70 --------------------------
 src/tinygettext/tgt_log.hpp            | 56 ---------------------
 8 files changed, 26 insertions(+), 176 deletions(-)
 delete mode 100644 src/tinygettext/log_stream.hpp
 delete mode 100644 src/tinygettext/tgt_log.cpp
 delete mode 100644 src/tinygettext/tgt_log.hpp

diff --git a/sources.cmake b/sources.cmake
index ddc029d4f..dfc0e3774 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.
+# This will then trigger a new cmake run automatically.  
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/tinygettext/dictionary.cpp b/src/tinygettext/dictionary.cpp
index 0fae1272c..e500c4fe2 100644
--- a/src/tinygettext/dictionary.cpp
+++ b/src/tinygettext/dictionary.cpp
@@ -16,9 +16,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <assert.h>
-#include "log_stream.hpp"
 #include "dictionary.hpp"
 
+#include "utils/log.hpp"
+
 namespace tinygettext {
 
 Dictionary::Dictionary(const std::string& charset_) :
@@ -168,8 +169,9 @@ Dictionary::add_translation(const std::string& msgid, const std::string& msgstr)
   }
   else
   {
-    log_warning << "collision in add_translation: '"
-                << msgid << "' -> '" << msgstr << "' vs '" << vec[0] << "'" << std::endl;
+    Log::warn("tinygettext",
+              "Collision in add translation: '%s' -> '%s' vs '%s'.",
+              msgid.c_str(), msgstr.c_str(), vec[0].c_str());
     vec[0] = msgstr;
   }
 }
@@ -186,7 +188,9 @@ Dictionary::add_translation(const std::string& msgctxt,
   }
   else
   {
-    log_warning << "collision in add_translation(\"" << msgctxt << "\", \"" << msgid << "\", \"" << msgid_plural << "\")" << std::endl;
+      Log::warn("tinygettext",
+          "collision in add_translation(\"%s\", \"%s\", \"%s\")",
+          msgctxt.c_str(), msgid.c_str(), msgid_plural.c_str());
     vec = msgstrs;
   }
 }
@@ -201,7 +205,8 @@ Dictionary::add_translation(const std::string& msgctxt, const std::string& msgid
   }
   else
   {
-    log_warning << "collision in add_translation(\"" << msgctxt << "\", \"" << msgid << "\")" << std::endl;
+    Log::warn("tinygettext", "collision in add_translation(\"%s\", \"%s\")",
+              msgctxt.c_str(), msgid.c_str());
     vec[0] = msgstr;
   }
 }
diff --git a/src/tinygettext/dictionary_manager.cpp b/src/tinygettext/dictionary_manager.cpp
index f123d2293..bb28c7d21 100644
--- a/src/tinygettext/dictionary_manager.cpp
+++ b/src/tinygettext/dictionary_manager.cpp
@@ -17,6 +17,8 @@
 
 #include "dictionary_manager.hpp"
 
+#include "utils/log.hpp"
+
 #include <memory>
 #include <assert.h>
 #include <stdlib.h>
@@ -24,7 +26,6 @@
 #include <fstream>
 #include <algorithm>
 
-#include "log_stream.hpp"
 #include "po_parser.hpp"
 #include "stk_file_system.hpp"
 
@@ -134,7 +135,8 @@ DictionaryManager::get_dictionary(const Language& language)
 
           if (!po_language)
           {
-            log_warning << *filename << ": warning: ignoring, unknown language" << std::endl;
+              Log::warn("tinygettext", "%s: warning: ignoring, unknown language",
+                         filename->c_str());
           }
           else
           {
@@ -157,7 +159,8 @@ DictionaryManager::get_dictionary(const Language& language)
           std::auto_ptr<std::istream> in = filesystem->open_file(pofile);
           if (!in.get())
           {
-            log_error << "error: failure opening: " << pofile << std::endl;
+              Log::error("tinygettext", "error: failure opening: '%s'.",
+                         pofile.c_str());
           }
           else
           {
@@ -166,8 +169,8 @@ DictionaryManager::get_dictionary(const Language& language)
         }
         catch(std::exception& e)
         {
-          log_error << "error: failure parsing: " << pofile << std::endl;
-          log_error << e.what() << "" << std::endl;
+          Log::error("tinygettext", "error: failure parsing: '%s'.", pofile.c_str());
+          Log::error("tinygettext", "%s", e.what());
         }
       }
     }
diff --git a/src/tinygettext/iconv.cpp b/src/tinygettext/iconv.cpp
index e28f7a3ac..a2fdbbb0c 100644
--- a/src/tinygettext/iconv.cpp
+++ b/src/tinygettext/iconv.cpp
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "iconv.hpp"
-#include "log_stream.hpp"
 
 namespace tinygettext {
 
diff --git a/src/tinygettext/log_stream.hpp b/src/tinygettext/log_stream.hpp
deleted file mode 100644
index 814dad151..000000000
--- a/src/tinygettext/log_stream.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_TINYGETTEXT_LOG_STREAM_HPP
-#define HEADER_TINYGETTEXT_LOG_STREAM_HPP
-
-#include "tgt_log.hpp"
-
-namespace tinygettext {
-
-// FIXME: very bad to have such things in the API
-#define log_error   if (!Log::log_error_callback);   else (Log(Log::log_error_callback)).get()
-#define log_warning if (!Log::log_warning_callback); else (Log(Log::log_warning_callback)).get()
-#define log_info    if (!Log::log_info_callback);    else (Log(Log::log_warning_callback)).get()
-
-} // namespace tinygettext
-
-#endif
-
-/* EOF */
diff --git a/src/tinygettext/po_parser.cpp b/src/tinygettext/po_parser.cpp
index 2af6edef5..85368510e 100644
--- a/src/tinygettext/po_parser.cpp
+++ b/src/tinygettext/po_parser.cpp
@@ -22,15 +22,17 @@
 #include <string>
 #include <istream>
 #include <string.h>
+#include <sstream>
 #include <map>
 #include <stdlib.h>
 
 #include "language.hpp"
-#include "log_stream.hpp"
 #include "iconv.hpp"
 #include "dictionary.hpp"
 #include "plural_forms.hpp"
 
+#include "utils/log.hpp"
+
 namespace tinygettext {
 
 bool POParser::pedantic = true;
@@ -65,14 +67,15 @@ POParser::~POParser()
 void
 POParser::warning(const std::string& msg)
 {
-  log_warning << filename << ":" << line_number << ": warning: " << msg << ": " << current_line << std::endl;
-  //log_warning << "Line: " << current_line << std::endl;
+    Log::warn("tinygettext", "%s line %d %s: \"%s\"",
+        filename.c_str(), line_number, msg.c_str(), current_line.c_str());
 }
 
 void
 POParser::error(const std::string& msg)
 {
-  log_error << filename << ":" << line_number << ": error: " << msg  << ": " << current_line << std::endl;
+    Log::error("tinygettext", "%s line %d %s: \"%s\"",
+        filename.c_str(), line_number, msg.c_str(), current_line.c_str());
 
   // Try to recover from an error by searching for start of another entry
   do
diff --git a/src/tinygettext/tgt_log.cpp b/src/tinygettext/tgt_log.cpp
deleted file mode 100644
index 280fcd0e6..000000000
--- a/src/tinygettext/tgt_log.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <iostream>
-#include "tgt_log.hpp"
-
-namespace tinygettext {
-
-Log::log_callback_t Log::log_info_callback    = &Log::default_log_callback;
-Log::log_callback_t Log::log_warning_callback = &Log::default_log_callback;
-Log::log_callback_t Log::log_error_callback   = &Log::default_log_callback;
-
-void
-Log::default_log_callback(const std::string& str)
-{
-  std::cerr << "tinygettext: " << str;
-}
-
-void
-Log::set_log_info_callback(log_callback_t callback)
-{
-  log_info_callback = callback;
-}
-
-void
-Log::set_log_warning_callback(log_callback_t callback)
-{
-  log_warning_callback = callback;
-}
-
-void
-Log::set_log_error_callback(log_callback_t callback)
-{
-  log_error_callback = callback;
-}
-
-Log::Log(log_callback_t callback_) :
-  callback(callback_),
-  out()
-{
-}
-
-Log::~Log()
-{
-  callback(out.str());
-}
-
-std::ostream&
-Log::get()
-{
-  return out;
-}
-
-} // namespace tinygettext
-
-/* EOF */
diff --git a/src/tinygettext/tgt_log.hpp b/src/tinygettext/tgt_log.hpp
deleted file mode 100644
index 0e34a5286..000000000
--- a/src/tinygettext/tgt_log.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_TINYGETTEXT_LOG_HPP
-#define HEADER_TINYGETTEXT_LOG_HPP
-
-#include <sstream>
-
-namespace tinygettext {
-
-class Log
-{
-public:
-  typedef void (*log_callback_t)(const std::string&);
-
-  static log_callback_t log_info_callback;
-  static log_callback_t log_warning_callback;
-  static log_callback_t log_error_callback;
-
-
-  static void default_log_callback(const std::string& str);
-
-  static void set_log_info_callback(log_callback_t callback);
-  static void set_log_warning_callback(log_callback_t callback);
-  static void set_log_error_callback(log_callback_t callback);
-
-private:
-  log_callback_t callback;
-  std::ostringstream out;
-
-public:
-  Log(log_callback_t callback);
-  ~Log();
-
-  std::ostream& get();
-};
-
-} // namespace tinygettext
-
-#endif
-
-/* EOF */

From ddcd6f9ca3245232f198cc828c4d858c52b416f3 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 3 Apr 2015 00:05:47 +1100
Subject: [PATCH 092/331] Removed empty files.

---
 sources.cmake                 |   2 +-
 src/tinygettext/iconv.cpp     | 149 ----------------------------------
 src/tinygettext/iconv.hpp     |  72 ----------------
 src/tinygettext/po_parser.cpp |   1 -
 src/tinygettext/po_parser.hpp |   2 -
 5 files changed, 1 insertion(+), 225 deletions(-)
 delete mode 100644 src/tinygettext/iconv.cpp
 delete mode 100644 src/tinygettext/iconv.hpp

diff --git a/sources.cmake b/sources.cmake
index dfc0e3774..f484b15d5 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.  
+# This will then trigger a new cmake run automatically. 
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/tinygettext/iconv.cpp b/src/tinygettext/iconv.cpp
deleted file mode 100644
index a2fdbbb0c..000000000
--- a/src/tinygettext/iconv.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2009-2015 Ingo Ruhnke <grumbel@gmx.de>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/*
-#include <ctype.h>
-#include <assert.h>
-#include <sstream>
-#include <errno.h>
-#include <stdexcept>
-#include <string.h>
-#include <stdlib.h>
-
-#include "iconv.hpp"
-
-namespace tinygettext {
-
-#ifndef tinygettext_ICONV_CONST
-#  define tinygettext_ICONV_CONST
-#endif
-
-IConv::IConv()
-  : to_charset(),
-    from_charset(),
-    cd(0)
-{}
-
-IConv::IConv(const std::string& from_charset_, const std::string& to_charset_)
-  : to_charset(),
-    from_charset(),
-    cd(0)
-{
-  set_charsets(from_charset_, to_charset_);
-}
-
-IConv::~IConv()
-{
-  if (cd)
-    tinygettext_iconv_close(cd);
-}
-
-void
-IConv::set_charsets(const std::string& from_charset_, const std::string& to_charset_)
-{
-  if (cd)
-    tinygettext_iconv_close(cd);
-
-  from_charset = from_charset_;
-  to_charset   = to_charset_;
-
-  for(std::string::iterator i = to_charset.begin(); i != to_charset.end(); ++i)
-    *i = static_cast<char>(toupper(*i));
-
-  for(std::string::iterator i = from_charset.begin(); i != from_charset.end(); ++i)
-    *i = static_cast<char>(toupper(*i));
-
-  if (to_charset == from_charset)
-  {
-    cd = 0;
-  }
-  else
-  {
-    cd = tinygettext_iconv_open(to_charset.c_str(), from_charset.c_str());
-    if (cd == reinterpret_cast<tinygettext_iconv_t>(-1))
-    {
-      if(errno == EINVAL)
-      {
-        std::ostringstream str;
-        str << "IConv construction failed: conversion from '" << from_charset
-            << "' to '" << to_charset << "' not available";
-        throw std::runtime_error(str.str());
-      }
-      else
-      {
-        std::ostringstream str;
-        str << "IConv: construction failed: " << strerror(errno);
-        throw std::runtime_error(str.str());
-      }
-    }
-  }
-}
-
-/// Convert a string from encoding to another.
-std::string
-IConv::convert(const std::string& text)
-{
-  if (!cd)
-  {
-    return text;
-  }
-  else
-  {
-    size_t inbytesleft  = text.size();
-    size_t outbytesleft = 4*inbytesleft; // Worst case scenario: ASCII -> UTF-32?
-
-    // We try to avoid to much copying around, so we write directly into
-    // a std::string
-    tinygettext_ICONV_CONST char* inbuf = const_cast<char*>(&text[0]);
-    std::string result(outbytesleft, 'X');
-    char* outbuf = &result[0];
-
-    // Try to convert the text.
-    size_t ret = tinygettext_iconv(cd, (const char**)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
-    if (ret == static_cast<size_t>(-1))
-    {
-      if (errno == EILSEQ || errno == EINVAL)
-      { // invalid multibyte sequence
-        tinygettext_iconv(cd, NULL, NULL, NULL, NULL); // reset state
-
-        // FIXME: Could try to skip the invalid byte and continue
-        log_error << "error: tinygettext:iconv: invalid multibyte sequence in:  \"" << text << "\"" << std::endl;
-      }
-      else if (errno == E2BIG)
-      { // output buffer to small
-        assert(!"tinygettext/iconv.cpp: E2BIG: This should never be reached");
-      }
-      else if (errno == EBADF)
-      {
-        assert(!"tinygettext/iconv.cpp: EBADF: This should never be reached");
-      }
-      else
-      {
-        assert(!"tinygettext/iconv.cpp: <unknown>: This should never be reached");
-      }
-    }
-
-    result.resize(4*text.size() - outbytesleft);
-
-    return result;
-  }
-}
-
-} // namespace tinygettext
-*/
-
-/* EOF */
diff --git a/src/tinygettext/iconv.hpp b/src/tinygettext/iconv.hpp
deleted file mode 100644
index 8bb2bd671..000000000
--- a/src/tinygettext/iconv.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//  tinygettext - A gettext replacement that works directly on .po files
-//  Copyright (C) 2006-2015 Ingo Ruhnke <grumbel@gmx.de>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-/*
-#ifndef HEADER_TINYGETTEXT_ICONV_HPP
-#define HEADER_TINYGETTEXT_ICONV_HPP
-
-#include <string>
-
-#ifdef HAVE_SDL
-#  include "SDL.h"
-
-#  define tinygettext_ICONV_CONST const
-#  define tinygettext_iconv_t     SDL_iconv_t
-#  define tinygettext_iconv       SDL_iconv
-#  define tinygettext_iconv_open  SDL_iconv_open
-#  define tinygettext_iconv_close SDL_iconv_close
-#else
-#  include <iconv.h>
-
-#  ifdef HAVE_ICONV_CONST
-#    define tinygettext_ICONV_CONST ICONV_CONST
-#  else
-#    define tinygettext_ICONV_CONST
-#  endif
-
-#  define tinygettext_iconv_t     iconv_t
-#  define tinygettext_iconv       iconv
-#  define tinygettext_iconv_open  iconv_open
-#  define tinygettext_iconv_close iconv_close
-#endif
-
-namespace tinygettext {
-
-class IConv
-{
-private:
-  std::string to_charset;
-  std::string from_charset;
-  tinygettext_iconv_t cd;
-
-public:
-  IConv();
-  IConv(const std::string& fromcode, const std::string& tocode);
-  ~IConv();
-
-  void set_charsets(const std::string& fromcode, const std::string& tocode);
-  std::string convert(const std::string& text);
-
-private:
-  IConv (const IConv&);
-  IConv& operator= (const IConv&);
-};
-
-} // namespace tinygettext
-
-#endif
-*/
-/* EOF */
diff --git a/src/tinygettext/po_parser.cpp b/src/tinygettext/po_parser.cpp
index 85368510e..0831c2417 100644
--- a/src/tinygettext/po_parser.cpp
+++ b/src/tinygettext/po_parser.cpp
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 
 #include "language.hpp"
-#include "iconv.hpp"
 #include "dictionary.hpp"
 #include "plural_forms.hpp"
 
diff --git a/src/tinygettext/po_parser.hpp b/src/tinygettext/po_parser.hpp
index 922e617d6..42fe8e825 100644
--- a/src/tinygettext/po_parser.hpp
+++ b/src/tinygettext/po_parser.hpp
@@ -21,8 +21,6 @@
 #include <iosfwd>
 #include <string>
 
-//#include "iconv.hpp"
-
 namespace tinygettext {
 
 class Dictionary;

From 67d5e41d2c4c8e4102702059d249f47be5f64644 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 5 Apr 2015 22:14:48 +1000
Subject: [PATCH 093/331] Try an improvement for #2073 (stk does not start if
 /data exists).

---
 src/io/file_manager.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp
index 1989fcbb7..ef193ae13 100644
--- a/src/io/file_manager.cpp
+++ b/src/io/file_manager.cpp
@@ -160,19 +160,19 @@ FileManager::FileManager()
 #ifdef __APPLE__
     else if( macSetBundlePathIfRelevant( root_dir ) ) { root_dir = root_dir + "data/"; }
 #endif
-    else if(m_file_system->existFile("data"))
+    else if(m_file_system->existFile("data/stk_config.xml"))
         root_dir = "data/" ;
-    else if(m_file_system->existFile("../data"))
+    else if(m_file_system->existFile("../data/stk_config.xml"))
         root_dir = "../data/" ;
-    else if(m_file_system->existFile("../../data"))
+    else if(m_file_system->existFile("../../data/stk_config.xml"))
         root_dir = "../../data/" ;
     // Test for old style build environment, with executable in root of stk
-    else if(m_file_system->existFile(exe_path+"data"))
+    else if(m_file_system->existFile(exe_path+"data/stk_config.xml"))
         root_dir = (exe_path+"data/").c_str();
     // Check for windows cmake style: bld/Debug/bin/supertuxkart.exe
-    else if (m_file_system->existFile(exe_path + "../../../data"))
+    else if (m_file_system->existFile(exe_path + "../../../data/stk_config.xml"))
         root_dir = (exe_path + "../../../data/").c_str();
-    else if (m_file_system->existFile(exe_path + "../data"))
+    else if (m_file_system->existFile(exe_path + "../data/stk_config.xml"))
     {
         root_dir = exe_path.c_str();
         root_dir += "../data/";

From d746ea8aa1cf74ffc05e816ec7390e92210397e2 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 7 Apr 2015 19:11:49 -0400
Subject: [PATCH 094/331] Fix #2068

---
 src/achievements/achievement.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
index f9e66d045..9fd6e6ba7 100644
--- a/src/achievements/achievement.cpp
+++ b/src/achievements/achievement.cpp
@@ -19,7 +19,7 @@
 
 
 #include "achievements/achievement.hpp"
-
+#include "achievements/achievements_manager.hpp"
 #include "achievements/achievement_info.hpp"
 #include "guiengine/message_queue.hpp"
 #include "io/utf_writer.hpp"
@@ -199,8 +199,13 @@ void Achievement::check()
     if(m_achievement_info->checkCompletion(this))
     {
         //show achievement
-        core::stringw s = _("Completed achievement \"%s\".", 
-                            m_achievement_info->getName());
+        // Note: the "name" variable is required, see issue #2068
+        // calling _("...", info->getName()) is invalid because getName also calls
+        // _() and thus the string it returns is mapped to a temporary buffer
+        // in theory, it should return a copy of the string, but clang tries to
+        // optimise away the copy
+        core::stringw name = m_achievement_info->getName();
+        core::stringw s = _("Completed achievement \"%s\".", name);
         MessageQueue::add(MessageQueue::MT_ACHIEVEMENT, s);
 
         // Sends a confirmation to the server that an achievement has been

From 66db97056461650247ec97922bf84a65369a11e6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 7 Apr 2015 19:32:55 -0400
Subject: [PATCH 095/331] Add context to help translators

---
 data/gui/options_input.stkgui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui
index e4a230d5f..ec6ed5271 100644
--- a/data/gui/options_input.stkgui
+++ b/data/gui/options_input.stkgui
@@ -30,7 +30,7 @@
 
             <button id="add_device" I18N="In the input configuration screen"  text="Add a device" align="center"/>
 
-            <label text="* Which config to use will be inferred from which 'Select' key is pressed to join the game."
+            <label I18N="In the input configuration screen" text="* Which config to use will be inferred from which 'Select' key is pressed to join the game."
                    proportion="2" word_wrap="true"/>
         </box>
     </div>

From a4536d7752fa273a0f312cf473923f3dc9c283db Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 8 Apr 2015 22:19:24 +0200
Subject: [PATCH 096/331] Disable texture compression for mesa.

---
 data/graphical_restrictions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml
index 1e1a0b5ca..e742452dc 100644
--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@@ -12,9 +12,11 @@
   <card contains="Mesa"           os="linux"    version="<10.3"    disable="BufferStorage"/>
   <card contains="Mesa"           os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
   <card contains="Mesa"           os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Mesa"           os="linux"                       disable="TextureCompressionS3TC"/>
   <card contains="Gallium"        os="linux"    version="<10.3"    disable="BufferStorage"/>
   <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
   <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
+  <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
   <card contains="Radeon"                       version="<14.300"  disable="DriverRecentEnough"/>
 </graphical-restrictions>
 

From dffd431f3c93d906c7803433c7d79b006f1e97bf Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Thu, 9 Apr 2015 01:14:56 +0200
Subject: [PATCH 097/331] Add isRTLText function

---
 src/utils/translation.cpp | 109 +++++++++++++++++++++++++++++---------
 src/utils/translation.hpp |   3 ++
 2 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 677a8b9cf..f940a995f 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -94,6 +94,61 @@ wchar_t* utf8_to_wide(const char* input)
     return &utf16line[0];
 }
 
+// ----------------------------------------------------------------------------
+/** Converts a wstring to a FriBidi-string.
+    The caller must take care to free (or not to free) the result after use.
+    Freeing should be done with freeFribidiChar().
+
+    On linux, the string doesn't need to be converted because wchar_t is
+    already UTF-32. On windows the string is converted from UTF-16 by this
+    function. */
+FriBidiChar* toFribidiChar(const wchar_t* str)
+{
+    FriBidiChar *result;
+    if (sizeof(wchar_t) == sizeof(FriBidiChar))
+        result = (FriBidiChar*) str;
+    else
+    {
+        // On windows FriBidiChar is 4 bytes, but wchar_t is 2 bytes.
+        // So we simply copy the characters over here (note that this
+        // is technically incorrect, all characters we use/support fit
+        // in 16 bits, which is what irrlicht supports atm).
+        std::size_t length = wcslen(str);
+        result = new FriBidiChar[length + 1];
+        for (std::size_t i = 0; i <= length; i++)
+            result[i] = str[i];
+    }
+    return result;
+}
+
+wchar_t* fromFribidiChar(const FriBidiChar* str)
+{
+    wchar_t *result;
+    if (sizeof(wchar_t) == sizeof(FriBidiChar))
+        result = (wchar_t*) str;
+    else
+    {
+        std::size_t length = 0;
+        while (str[length])
+            length++;
+
+        // Copy back to wchar_t array
+        result = new wchar_t[length + 1];
+        for (std::size_t i = 0; i <= length; i++)
+            result[i] = str[i];
+    }
+    return result;
+}
+
+/** Frees the memory allocated for the result of toFribidiChar() and
+    fromFribidiChar(). */
+template<typename T>
+void freeFribidiChar(T *str)
+{
+    if (sizeof(wchar_t) != sizeof(FriBidiChar))
+        delete[] str;
+}
+
 // ----------------------------------------------------------------------------
 Translations::Translations() //: m_dictionary_manager("UTF-16")
 {
@@ -289,24 +344,13 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
     if(this->isRTLLanguage())
     {
         std::size_t length = wcslen(in_ptr);
-        FriBidiChar *fribidiInput;
+        FriBidiChar *fribidiInput = toFribidiChar(in_ptr);
 
-        if (sizeof(wchar_t) == sizeof(FriBidiChar))
-            fribidiInput = (FriBidiChar*) in_ptr;
-        else
-        {
-            // On windows FriBidiChar is 4 bytes, but wchar_t is 2 bytes.
-            // So we simply copy the characters over here (note that this
-            // is technically incorrect, all characters we use/support fit
-            // in 16 bits, which is what irrlicht supports atm).
-            fribidiInput = new FriBidiChar[length + 1];
-            for (std::size_t i = 0; i <= length; i++)
-                fribidiInput[i] = in_ptr[i];
-        }
 #ifdef TEST_BIDI
         FriBidiChar *tmp = fribidiInput;
         fribidiInput = new FriBidiChar[++length + 1];
         std::memcpy(fribidiInput + 1, tmp, length * sizeof(FriBidiChar));
+        // Prepend a character that forces RTL style
         fribidiInput[0] = L'\u202E';
 #endif
 
@@ -335,8 +379,7 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
         fribidiInput = tmp;
 #endif
 
-        if (sizeof(wchar_t) != sizeof(FriBidiChar))
-            delete[] fribidiInput;
+        freeFribidiChar(fribidiInput);
 
         if (!result)
         {
@@ -346,17 +389,9 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
             return m_converted_string.c_str();
         }
 
-        if (sizeof(wchar_t) == sizeof(FriBidiChar))
-            m_converted_string = core::stringw((wchar_t*) fribidiOutput);
-        else
-        {
-            // Copy back to wchar_t array
-            wchar_t *out = new wchar_t[length + 1];
-            for (std::size_t i = 0; i <= length; i++)
-                out[i] = fribidiOutput[i];
-            m_converted_string = core::stringw(out);
-            delete[] out;
-        }
+        wchar_t *convertedString = fromFribidiChar(fribidiOutput);
+        m_converted_string = core::stringw(convertedString);
+        freeFribidiChar(convertedString);
         delete[] fribidiOutput;
         return m_converted_string.c_str();
     }
@@ -365,6 +400,28 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
     return in_ptr;
 }
 
+bool Translations::isRTLText(const wchar_t *in_ptr)
+{
+#if ENABLE_BIDI
+    if (this->isRTLLanguage())
+    {
+        std::size_t length = wcslen(in_ptr);
+        FriBidiChar *fribidiInput = toFribidiChar(in_ptr);
+
+        FriBidiCharType *types = new FriBidiCharType[length];
+        fribidi_get_bidi_types(fribidiInput, length, types);
+        freeFribidiChar(fribidiInput);
+
+        FriBidiParType type = fribidi_get_par_direction(types, length);
+        delete[] types;
+        return type == FRIBIDI_PAR_RTL;
+    }
+    return false;
+#else
+    return false;
+#endif
+}
+
 /**
  * \param original Message to translate
  * \param context  Optional, can be set to differentiate 2 strings that are identical
diff --git a/src/utils/translation.hpp b/src/utils/translation.hpp
index 3782dc2b0..eeeec161b 100644
--- a/src/utils/translation.hpp
+++ b/src/utils/translation.hpp
@@ -64,6 +64,9 @@ public:
     const wchar_t*     fribidize(const wchar_t* in_ptr);
     const wchar_t*     fribidize(const irr::core::stringw &str) { return fribidize(str.c_str()); }
 
+    bool               isRTLText(const wchar_t* in_ptr);
+    bool               isRTLText(const irr::core::stringw &str) { return isRTLText(str.c_str()); }
+
     const std::vector<std::string>* getLanguageList() const;
 
     std::string        getCurrentLanguageName();

From 66dd089902108480e3a9badccbe12fb04133554b Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Thu, 9 Apr 2015 01:20:33 +0200
Subject: [PATCH 098/331] Move rtl debug option to a more general method

---
 src/utils/translation.cpp | 56 +++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index f940a995f..da9139bbb 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -94,6 +94,25 @@ wchar_t* utf8_to_wide(const char* input)
     return &utf16line[0];
 }
 
+// ----------------------------------------------------------------------------
+/** Frees the memory allocated for the result of toFribidiChar(). */
+void freeFribidiChar(FriBidiChar *str)
+{
+#ifdef TEST_BIDI
+    delete[] str;
+#else
+    if (sizeof(wchar_t) != sizeof(FriBidiChar))
+        delete[] str;
+#endif
+}
+
+/** Frees the memory allocated for the result of fromFribidiChar(). */
+void freeFribidiChar(wchar_t *str)
+{
+    if (sizeof(wchar_t) != sizeof(FriBidiChar))
+        delete[] str;
+}
+
 // ----------------------------------------------------------------------------
 /** Converts a wstring to a FriBidi-string.
     The caller must take care to free (or not to free) the result after use.
@@ -104,6 +123,7 @@ wchar_t* utf8_to_wide(const char* input)
     function. */
 FriBidiChar* toFribidiChar(const wchar_t* str)
 {
+    std::size_t length = wcslen(str);
     FriBidiChar *result;
     if (sizeof(wchar_t) == sizeof(FriBidiChar))
         result = (FriBidiChar*) str;
@@ -113,11 +133,20 @@ FriBidiChar* toFribidiChar(const wchar_t* str)
         // So we simply copy the characters over here (note that this
         // is technically incorrect, all characters we use/support fit
         // in 16 bits, which is what irrlicht supports atm).
-        std::size_t length = wcslen(str);
         result = new FriBidiChar[length + 1];
         for (std::size_t i = 0; i <= length; i++)
             result[i] = str[i];
     }
+
+#ifdef TEST_BIDI
+    // Prepend a character that forces RTL style
+    FriBidiChar *tmp = result;
+    result = new FriBidiChar[++length + 1];
+    std::memcpy(result + 1, tmp, length * sizeof(FriBidiChar));
+    result[0] = L'\u202E';
+    freeFribidiChar(tmp);
+#endif
+
     return result;
 }
 
@@ -140,15 +169,6 @@ wchar_t* fromFribidiChar(const FriBidiChar* str)
     return result;
 }
 
-/** Frees the memory allocated for the result of toFribidiChar() and
-    fromFribidiChar(). */
-template<typename T>
-void freeFribidiChar(T *str)
-{
-    if (sizeof(wchar_t) != sizeof(FriBidiChar))
-        delete[] str;
-}
-
 // ----------------------------------------------------------------------------
 Translations::Translations() //: m_dictionary_manager("UTF-16")
 {
@@ -343,16 +363,10 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
 #if ENABLE_BIDI
     if(this->isRTLLanguage())
     {
-        std::size_t length = wcslen(in_ptr);
         FriBidiChar *fribidiInput = toFribidiChar(in_ptr);
-
-#ifdef TEST_BIDI
-        FriBidiChar *tmp = fribidiInput;
-        fribidiInput = new FriBidiChar[++length + 1];
-        std::memcpy(fribidiInput + 1, tmp, length * sizeof(FriBidiChar));
-        // Prepend a character that forces RTL style
-        fribidiInput[0] = L'\u202E';
-#endif
+        std::size_t length = 0;
+        while (fribidiInput[length])
+            length++;
 
         // Assume right to left as start direction.
 #if FRIBIDI_MINOR_VERSION==10
@@ -374,10 +388,6 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
               /* gint   *position_V_to_L_list */ NULL,
               /* gint8  *embedding_level_list */ NULL
                                                                );
-#ifdef TEST_BIDI
-        delete[] fribidiInput;
-        fribidiInput = tmp;
-#endif
 
         freeFribidiChar(fribidiInput);
 

From effe131e4a7241dd315c67f6633025bc78e485cc Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Thu, 9 Apr 2015 01:54:10 +0200
Subject: [PATCH 099/331] Dynamically test if text is rtl or not

---
 src/guiengine/screen_loader.cpp                  |  1 -
 src/guiengine/widget.cpp                         |  1 -
 src/guiengine/widget.hpp                         |  3 ---
 src/guiengine/widgets/bubble_widget.cpp          | 12 +++++-------
 src/guiengine/widgets/icon_button_widget.cpp     |  4 +---
 src/guiengine/widgets/label_widget.cpp           |  8 +++-----
 src/guiengine/widgets/ribbon_widget.cpp          |  1 +
 src/guiengine/widgets/spinner_widget.cpp         |  4 +++-
 src/states_screens/dialogs/add_device_dialog.cpp |  2 +-
 src/states_screens/dialogs/gp_info_dialog.cpp    |  4 +++-
 10 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/guiengine/screen_loader.cpp b/src/guiengine/screen_loader.cpp
index eab6163eb..373cbed45 100644
--- a/src/guiengine/screen_loader.cpp
+++ b/src/guiengine/screen_loader.cpp
@@ -229,7 +229,6 @@ if(prop_name != NULL) widget.m_properties[prop_flag] = core::stringc(prop_name).
                 if (text != NULL)
                 {
                     widget.m_text = _(text);
-                    widget.m_is_text_rtl = (translations->isRTLLanguage() && widget.m_text != text);
                 }
 
                 const wchar_t* raw_text = xml->getAttributeValue(L"raw_text");
diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index 932a3f5f7..58b7cb324 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -76,7 +76,6 @@ Widget::Widget(WidgetType type, bool reserve_id)
     m_supports_multiplayer  = false;
     m_is_bounding_box_round = false;
     m_has_tooltip           = false;
-    m_is_text_rtl           = false;
 
     m_absolute_x = m_absolute_y = m_absolute_w = m_absolute_h = -1;
     m_relative_x = m_relative_y = m_relative_w = m_relative_h = -1;
diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp
index ca3ca8a2c..e7fb8aa50 100644
--- a/src/guiengine/widget.hpp
+++ b/src/guiengine/widget.hpp
@@ -156,9 +156,6 @@ namespace GUIEngine
          *  go in the map above, which uses narrow strings */
         irr::core::stringw m_text;
 
-        /** Whether the text in m_text is right-to-left */
-        bool m_is_text_rtl;
-
         /** When true, this widget shall use a bigger and more colourful font */
         bool m_title_font;
 
diff --git a/src/guiengine/widgets/bubble_widget.cpp b/src/guiengine/widgets/bubble_widget.cpp
index 3536fbecd..65fec72a1 100644
--- a/src/guiengine/widgets/bubble_widget.cpp
+++ b/src/guiengine/widgets/bubble_widget.cpp
@@ -53,11 +53,7 @@ void BubbleWidget::add()
                                                       false, true /* word wrap */, m_parent,
                                                       (m_focusable ? getNewID() : getNewNoFocusID()));
     irrwidget->setTextRestrainedInside(false);
-
-#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
-    irrwidget->setRightToLeft( translations->isRTLLanguage() );
-#endif
-
+    irrwidget->setRightToLeft(translations->isRTLText(message));
 
     m_element = irrwidget;
     replaceText();
@@ -120,9 +116,11 @@ void BubbleWidget::replaceText()
 void BubbleWidget::setText(const irr::core::stringw &s)
 {
     Widget::setText(s);
-    //If add() has already been called (and thus m_element is set) we need to replace the text.
-    if(m_element != NULL){
+    if (m_element != NULL)
+    {
+        //If add() has already been called (and thus m_element is set) we need to replace the text.
         replaceText();
+        getIrrlichtElement<IGUIStaticText>()->setRightToLeft(translations->isRTLText(getText()));
     }
 }
 
diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp
index d15110f06..a951996ed 100644
--- a/src/guiengine/widgets/icon_button_widget.cpp
+++ b/src/guiengine/widgets/icon_button_widget.cpp
@@ -196,10 +196,8 @@ void IconButtonWidget::add()
 
         setLabelFont();
 
-#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
-        m_label->setRightToLeft( translations->isRTLLanguage() );
+        m_label->setRightToLeft(translations->isRTLText(message));
         m_label->setTextRestrainedInside(false);
-#endif
     }
 
     // ---- IDs
diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp
index f27c8e39b..18522ab08 100644
--- a/src/guiengine/widgets/label_widget.cpp
+++ b/src/guiengine/widgets/label_widget.cpp
@@ -80,13 +80,9 @@ void LabelWidget::add()
     {
         irrwidget = GUIEngine::getGUIEnv()->addStaticText(message.c_str(), widget_size,
                                                           false, word_wrap, m_parent, -1);
-#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
         irrwidget->setTextRestrainedInside(false);
-#endif
     }
-#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
-    irrwidget->setRightToLeft( m_is_text_rtl );
-#endif
+    irrwidget->setRightToLeft(translations->isRTLText(message));
 
     m_element = irrwidget;
     irrwidget->setTextAlignment( align, valign );
@@ -155,6 +151,8 @@ void LabelWidget::setText(const wchar_t *text, bool expandIfNeeded)
     }
 
     Widget::setText(text);
+    if (m_element)
+        getIrrlichtElement<IGUIStaticText>()->setRightToLeft(translations->isRTLText(getText()));
 }   // setText
 
 // ----------------------------------------------------------------------------
diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index 8177826df..6b04de7dd 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -262,6 +262,7 @@ void RibbonWidget::add()
                 label->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
                 label->setTabStop(false);
                 label->setNotClipped(true);
+                label->setRightToLeft(translations->isRTLText(message));
                 m_labels.push_back(label);
 
                 subbtn->setTabStop(false);
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index f49d9f581..034bc6c29 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -145,7 +145,8 @@ void SpinnerWidget::add()
     else
     {
         rect<s32> subsize_label = rect<s32>(m_h, 0, m_w - m_h, m_h);
-        IGUIStaticText* label = GUIEngine::getGUIEnv()->addStaticText(stringw(m_value).c_str(), subsize_label,
+        const wchar_t *text = stringw(m_value).c_str();
+        IGUIStaticText* label = GUIEngine::getGUIEnv()->addStaticText(text, subsize_label,
                                                                       false /* border */, true /* word wrap */,
                                                                       btn, getNewNoFocusID());
         m_children[1].m_element = label;
@@ -155,6 +156,7 @@ void SpinnerWidget::add()
         label->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
         label->setTabStop(false);
         label->setNotClipped(true);
+        label->setRightToLeft(translations->isRTLText(text));
 
 
         if (m_labels.size() > 0)
diff --git a/src/states_screens/dialogs/add_device_dialog.cpp b/src/states_screens/dialogs/add_device_dialog.cpp
index 96a21121f..958455601 100644
--- a/src/states_screens/dialogs/add_device_dialog.cpp
+++ b/src/states_screens/dialogs/add_device_dialog.cpp
@@ -76,7 +76,7 @@ AddDeviceDialog::AddDeviceDialog() : ModalDialog(0.90f, 0.80f)
                                               /*word wrap*/true,
                                               m_irrlicht_window);
     b->setTabStop(false);
-    b->setRightToLeft(translations->isRTLLanguage());
+    b->setRightToLeft(translations->isRTLText(msg));
     // because it looks like 'setRightToLeft' applies next time
     // setText is called only
     b->setText(msg.c_str());
diff --git a/src/states_screens/dialogs/gp_info_dialog.cpp b/src/states_screens/dialogs/gp_info_dialog.cpp
index 712126929..b70a775a0 100644
--- a/src/states_screens/dialogs/gp_info_dialog.cpp
+++ b/src/states_screens/dialogs/gp_info_dialog.cpp
@@ -79,12 +79,14 @@ GPInfoDialog::~GPInfoDialog()
 void GPInfoDialog::addTitle()
 {
     core::rect< s32 > area_top(0, 0, m_area.getWidth(), m_under_title);
+    const wchar_t *text = translations->fribidize(m_gp.getName());
     IGUIStaticText* title = GUIEngine::getGUIEnv()->addStaticText(
-        translations->fribidize(m_gp.getName()),
+        text,
         area_top, false, true, // border, word wrap
         m_irrlicht_window);
     title->setTabStop(false);
     title->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+    title->setRightToLeft(translations->isRTLText(text));
 }
 
 // ----------------------------------------------------------------------------

From cdde932908320233c1c0ce7b4b0c875f78d962b3 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 9 Apr 2015 19:58:07 -0400
Subject: [PATCH 100/331] Tentative fix for #2079

---
 src/graphics/render.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 7f81098c5..7ccba658d 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -390,7 +390,8 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
         // Bind() modifies the viewport. In order not to affect anything else,
         // the viewport is just reset here and not removed in Bind().
         const core::recti &vp = Camera::getActiveCamera()->getViewport();
-        glViewport(vp.UpperLeftCorner.X, vp.UpperLeftCorner.Y,
+        glViewport(vp.UpperLeftCorner.X,
+                   irr_driver->getActualScreenSize().Height - vp.LowerRightCorner.Y,
                    vp.LowerRightCorner.X - vp.UpperLeftCorner.X,
                    vp.LowerRightCorner.Y - vp.UpperLeftCorner.Y);
         glClear(GL_DEPTH_BUFFER_BIT);

From a4264cc063d2fe9bd1b3c80471571077bfe14d81 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 09:33:55 +1000
Subject: [PATCH 101/331] Visualise the (interpolated) normal at the points
 where the wheels touch the ground.

---
 src/physics/btKart.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index 24d52bbfc..dc1904740 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -996,6 +996,10 @@ void btKart::debugDraw(btIDebugDraw* debugDrawer)
         debugDrawer->drawLine(wheelPosWS,
                               getWheelInfo(v).m_raycastInfo.m_contactPointWS,
                               wheelColor);
+        // Draw the (interpolated) normal of the ground at the wheel position
+        debugDrawer->drawLine(getWheelInfo(v).m_raycastInfo.m_contactPointWS,
+                              getWheelInfo(v).m_raycastInfo.m_contactPointWS+getWheelInfo(v).m_raycastInfo.m_contactNormalWS,
+            btVector3(0, 0, 1));
 
     }   // for i < getNumWheels
     btVector3 yellow(1.0f, 1.0f, 0.0f);

From 2c44bd12019eea0b22f2725a1e17e9ebae3b7c24 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 16:21:43 +1000
Subject: [PATCH 102/331] Removed unnecessary copy, precompue area of triangle
 to reduce work when smoothing normals.

---
 src/physics/btKart.cpp        |  2 +-
 src/physics/triangle_mesh.cpp | 21 ++++++++++++---------
 src/physics/triangle_mesh.hpp | 30 ++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index dc1904740..c21737e0c 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -999,7 +999,7 @@ void btKart::debugDraw(btIDebugDraw* debugDrawer)
         // Draw the (interpolated) normal of the ground at the wheel position
         debugDrawer->drawLine(getWheelInfo(v).m_raycastInfo.m_contactPointWS,
                               getWheelInfo(v).m_raycastInfo.m_contactPointWS+getWheelInfo(v).m_raycastInfo.m_contactNormalWS,
-            btVector3(0, 0, 1));
+            btVector3(0.5f, 0.5f, 0.5f));
 
     }   // for i < getNumWheels
     btVector3 yellow(1.0f, 1.0f, 0.0f);
diff --git a/src/physics/triangle_mesh.cpp b/src/physics/triangle_mesh.cpp
index ca28aa623..d0d0f4617 100644
--- a/src/physics/triangle_mesh.cpp
+++ b/src/physics/triangle_mesh.cpp
@@ -77,6 +77,11 @@ void TriangleMesh::addTriangle(const btVector3 &t1, const btVector3 &t2,
     m_normals.push_back( normal.angle(n3)>stk_config->m_smooth_angle_limit
                          ? normal : n3                                     );
     m_mesh.addTriangle(t1, t2, t3);
+
+    // Area of triangle ABC
+    btVector3 edge1 = t2 - t1;
+    btVector3 edge2 = t3 - t1;
+    m_p1p2p3.push_back(edge1.cross(edge2).length2());
 }   // addTriangle
 
 // -----------------------------------------------------------------------------
@@ -228,24 +233,22 @@ void TriangleMesh::removeAll()
 btVector3 TriangleMesh::getInterpolatedNormal(unsigned int index,
                                               const btVector3 &position) const
 {
-    btVector3 p1, p2, p3;
+    btVector3 *p1, *p2, *p3;
     getTriangle(index, &p1, &p2, &p3);
-    btVector3 n1, n2, n3;
+    const btVector3 *n1, *n2, *n3;
     getNormals(index, &n1, &n2, &n3);
 
     // Compute the Barycentric coordinates of position inside  triangle
     // p1, p2, p3.
-    btVector3 edge1 = p2 - p1;
-    btVector3 edge2 = p3 - p1;
 
-    // Area of triangle ABC
-    btScalar p1p2p3 = edge1.cross(edge2).length2();
+    btScalar p1p2p3 = getP1P2P3(index);
 
     // Area of BCP
-    btScalar p2p3p = (p3 - p2).cross(position - p2).length2();
+    btScalar p2p3p = (*p3 - *p2).cross(position - *p2).length2();
 
     // Area of CAP
-    btScalar p3p1p = edge2.cross(position - p3).length2();
+    btVector3 edge2 = *p3 - *p1;
+    btScalar p3p1p = edge2.cross(position - *p3).length2();
     btScalar s = btSqrt(p2p3p / p1p2p3);
     btScalar t = btSqrt(p3p1p / p1p2p3);
     btScalar w = 1.0f - s - t;
@@ -266,7 +269,7 @@ btVector3 TriangleMesh::getInterpolatedNormal(unsigned int index,
     }
 #endif
 
-    return s*n1 + t*n2 + w*n3;
+    return s*(*n1) + t*(*n2) + w*(*n3);
 }   // getInterpolatedNormal
 
 // ----------------------------------------------------------------------------
diff --git a/src/physics/triangle_mesh.hpp b/src/physics/triangle_mesh.hpp
index 5557ed4a7..bd297755c 100644
--- a/src/physics/triangle_mesh.hpp
+++ b/src/physics/triangle_mesh.hpp
@@ -47,6 +47,8 @@ private:
     btCollisionShape            *m_collision_shape;
     /** The three normals for each triangle. */
     AlignedArray<btVector3>      m_normals;
+    /** Pre-compute value used in smoothing. */
+    AlignedArray<float>          m_p1p2p3;
 public:
          TriangleMesh();
         ~TriangleMesh();
@@ -92,28 +94,36 @@ public:
     /** Returns the points of the 'indx' triangle.
      *  \param indx Index of the triangle to get.
      *  \param p1,p2,p3 On return the three points of the triangle. */
-    void getTriangle(unsigned int indx, btVector3 *p1, btVector3 *p2,
-                     btVector3 *p3) const
+    void getTriangle(unsigned int indx, btVector3 **p1, btVector3 **p2,
+                     btVector3 **p3) const
     {
         const IndexedMeshArray &m = m_mesh.getIndexedMeshArray();
         btVector3 *p = &(((btVector3*)(m[0].m_vertexBase))[3*indx]);
-        *p1 = p[0];
-        *p2 = p[1];
-        *p3 = p[2];
+        *p1 = &(p[0]);
+        *p2 = &(p[1]);
+        *p3 = &(p[2]);
     }   // getTriangle
     // ------------------------------------------------------------------------
     /** Returns the normals of the triangle with the given index.
      *  \param indx Index of the triangle to get the three normals of.
      *  \result n1,n2,n3 The three normals. */
-    void getNormals(unsigned int indx, btVector3 *n1, btVector3 *n2,
-                    btVector3 *n3) const
+    void getNormals(unsigned int indx, const btVector3 **n1, 
+                    const btVector3 **n2, const btVector3 **n3) const
     {
         assert(indx < m_triangleIndex2Material.size());
         unsigned int n = indx*3;
-        *n1 = m_normals[n  ];
-        *n2 = m_normals[n+1];
-        *n3 = m_normals[n+2];
+        *n1 = &(m_normals[n  ]);
+        *n2 = &(m_normals[n+1]);
+        *n3 = &(m_normals[n+2]);
     }   // getNormals
+    // ------------------------------------------------------------------------
+    /** Returns basically the area of the triangle, which is needed when
+     *  smoothing the normals. */
+    float getP1P2P3(unsigned int indx) const
+    {
+        assert(indx < m_p1p2p3.size());
+        return m_p1p2p3[indx];
+    }
 };
 #endif
 /* EOF */

From 0627bd85f3c488e99b51f396473b0f8e80271eb2 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 16:35:05 +1000
Subject: [PATCH 103/331] Added some (commented out) debug features for gpu
 particles.

---
 src/graphics/gpuparticles.cpp | 18 ++++++++++++++++++
 src/graphics/gpuparticles.hpp |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 43d832a75..d9dc260ac 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -406,6 +406,24 @@ void ParticleSystemProxy::simulate()
     glBindVertexArray(0);
 
     glDisable(GL_RASTERIZER_DISCARD);
+#ifdef DEBUG_PARTICLES
+    // This code maps the data from the particles (initial data, current data
+    // and output of transform feedback shader) into memory. Useful for debugging.
+    if (std::string(getName()) == std::string("particles(C:/Users/jhenrich/supertuxkart/stk-assets/textures/skid-particle1.png)"))
+    {
+        glBindVertexArray(current_simulation_vao);
+        glBindBuffer(GL_ARRAY_BUFFER, initial_values_buffer);
+        ParticleData *p_initial = (ParticleData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, m_count*sizeof(ParticleData), GL_MAP_READ_BIT);
+        glUnmapBuffer(GL_ARRAY_BUFFER);
+        glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[0]);
+        ParticleData *p_prev = (ParticleData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, m_count*sizeof(ParticleData), GL_MAP_READ_BIT);
+        glUnmapBuffer(GL_ARRAY_BUFFER);
+        glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[1]);
+        ParticleData *p_new = (ParticleData*)glMapBufferRange(GL_ARRAY_BUFFER, 0, m_count*sizeof(ParticleData), GL_MAP_READ_BIT);
+        glUnmapBuffer(GL_ARRAY_BUFFER);
+    }
+#endif
+
     std::swap(tfb_buffers[0], tfb_buffers[1]);
     std::swap(current_rendering_vao, non_current_rendering_vao);
     std::swap(current_simulation_vao, non_current_simulation_vao);
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index 8225beb36..6127d304d 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -56,7 +56,6 @@ protected:
     virtual void simulate();
     virtual void draw();
 
-public:
     struct ParticleData
     {
         float PositionX;

From ecdf32c01ec3d2f64e0572c2a12a7d2a87771c95 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 16:37:54 +1000
Subject: [PATCH 104/331] Fixed size of shader parameter (though de-facto
 doesn't matter much).

---
 src/graphics/gpuparticles.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index d9dc260ac..3e9c39b7b 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -362,7 +362,7 @@ void ParticleSystemProxy::CommonSimulationVAO(GLuint position_vbo, GLuint initia
     glEnableVertexAttribArray(1);
     glVertexAttribPointer(1, 1, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(3 * sizeof(float)));
     glEnableVertexAttribArray(2);
-    glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(4 * sizeof(float)));
+    glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(4 * sizeof(float)));
     glEnableVertexAttribArray(3);
     glVertexAttribPointer(3, 1, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(7 * sizeof(float)));
 
@@ -372,7 +372,7 @@ void ParticleSystemProxy::CommonSimulationVAO(GLuint position_vbo, GLuint initia
     glEnableVertexAttribArray(5);
     glVertexAttribPointer(5, 1, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(3 * sizeof(float)));
     glEnableVertexAttribArray(6);
-    glVertexAttribPointer(6, 4, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(4 * sizeof(float)));
+    glVertexAttribPointer(6, 3, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(4 * sizeof(float)));
     glEnableVertexAttribArray(7);
     glVertexAttribPointer(7, 1, GL_FLOAT, GL_FALSE, sizeof(ParticleSystemProxy::ParticleData), (GLvoid*)(7 * sizeof(float)));
 }

From fb9d422f9bf017fdcac475edaa0bcd2d9e52be26 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 16:39:28 +1000
Subject: [PATCH 105/331] Made interpolated normals white to make them easier
 to distinguish.

---
 src/physics/btKart.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index c21737e0c..093500931 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -972,7 +972,6 @@ void btKart::updateFriction(btScalar timeStep)
 // ----------------------------------------------------------------------------
 void btKart::debugDraw(btIDebugDraw* debugDrawer)
 {
-
     for (int v=0;v<getNumWheels();v++)
     {
         btVector3 wheelColor(0,1,1);
@@ -998,8 +997,9 @@ void btKart::debugDraw(btIDebugDraw* debugDrawer)
                               wheelColor);
         // Draw the (interpolated) normal of the ground at the wheel position
         debugDrawer->drawLine(getWheelInfo(v).m_raycastInfo.m_contactPointWS,
-                              getWheelInfo(v).m_raycastInfo.m_contactPointWS+getWheelInfo(v).m_raycastInfo.m_contactNormalWS,
-            btVector3(0.5f, 0.5f, 0.5f));
+                              getWheelInfo(v).m_raycastInfo.m_contactPointWS+
+                                 getWheelInfo(v).m_raycastInfo.m_contactNormalWS,
+                              btVector3(1.0f, 1.0f, 1.0f));
 
     }   // for i < getNumWheels
     btVector3 yellow(1.0f, 1.0f, 0.0f);

From 8f090525fb6aca6682f960fe5bbc0e8646ac5dab Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 14 Apr 2015 16:40:50 +1000
Subject: [PATCH 106/331] Added more skidding particle debug code.

---
 src/karts/skidding.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/karts/skidding.cpp b/src/karts/skidding.cpp
index 9c7de0521..261087abc 100644
--- a/src/karts/skidding.cpp
+++ b/src/karts/skidding.cpp
@@ -217,6 +217,12 @@ void Skidding::update(float dt, bool is_on_ground,
         reset();
         return;
     }
+#ifdef SKIDDING_PARTICLE_DEBUG
+    // This code will cause skidmarks to be displayed all the time, even
+    // when the kart is not moving.
+    m_kart->getKartGFX()->setCreationRateRelative(KartGFX::KGFX_SKIDL, 0.5f);
+    m_kart->getKartGFX()->setCreationRateRelative(KartGFX::KGFX_SKIDR, 0.5f);
+#endif
 
     // No skidding backwards or while stopped
     if(m_kart->getSpeed() < m_min_skid_speed &&

From e8b8bbdd3b9120e3d6f0b2287904baf7458f4ee5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 15 Apr 2015 07:44:50 +1000
Subject: [PATCH 107/331] Added display of normals at the vertices of the
 triangles the kart is driving on to the debug display, which is useful to
 find why interpolated normals are wrong.

---
 .../Vehicle/btVehicleRaycaster.h              |  2 +
 .../src/BulletDynamics/Vehicle/btWheelInfo.h  |  1 +
 src/physics/btKart.cpp                        | 43 ++++++++++++++-----
 src/physics/btKartRaycast.cpp                 |  2 +
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/lib/bullet/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/lib/bullet/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
index 3cc909c65..5542471a6 100644
--- a/lib/bullet/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+++ b/lib/bullet/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
@@ -25,6 +25,8 @@ virtual ~btVehicleRaycaster()
 		btVector3	m_hitPointInWorld;
 		btVector3	m_hitNormalInWorld;
 		btScalar	m_distFraction;
+        /** If a triangle mesh, the index of the triangle, otherwise -1. */
+        int         m_triangle_index;
 	};
 
 	virtual void* castRay(const btVector3& from,const btVector3& to, btVehicleRaycasterResult& result) = 0;
diff --git a/lib/bullet/src/BulletDynamics/Vehicle/btWheelInfo.h b/lib/bullet/src/BulletDynamics/Vehicle/btWheelInfo.h
index daf4157ad..f1f7d246e 100644
--- a/lib/bullet/src/BulletDynamics/Vehicle/btWheelInfo.h
+++ b/lib/bullet/src/BulletDynamics/Vehicle/btWheelInfo.h
@@ -48,6 +48,7 @@ struct btWheelInfo
 		btVector3	m_wheelAxleWS; // axle in worldspace
 		bool		m_isInContact;
 		void*		m_groundObject; //could be general void* ptr
+        int         m_triangle_index; // if a triangle mesh was hit, the index of the triangle.
 	};
 
 	RaycastInfo	m_raycastInfo;
diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index 093500931..785a2a8aa 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -23,6 +23,9 @@
 #include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
 
 #include "karts/kart.hpp"
+#include "modes/world.hpp"
+#include "physics/triangle_mesh.hpp"
+#include "tracks/track.hpp"
 
 #define ROLLING_INFLUENCE_FIX
 
@@ -260,6 +263,7 @@ btScalar btKart::rayCast(unsigned int index)
         wheel.m_raycastInfo.m_contactNormalWS.normalize();
         wheel.m_raycastInfo.m_isInContact = true;
         ///@todo for driving on dynamic/movable objects!;
+        wheel.m_raycastInfo.m_triangle_index = rayResults.m_triangle_index;;
         wheel.m_raycastInfo.m_groundObject = &getFixedBody();
 
         wheel.m_raycastInfo.m_suspensionLength = depth - wheel.m_wheelsRadius;
@@ -975,7 +979,8 @@ void btKart::debugDraw(btIDebugDraw* debugDrawer)
     for (int v=0;v<getNumWheels();v++)
     {
         btVector3 wheelColor(0,1,1);
-        if (getWheelInfo(v).m_raycastInfo.m_isInContact)
+        const btWheelInfo &w = getWheelInfo(v);
+        if (w.m_raycastInfo.m_isInContact)
         {
             wheelColor.setValue(0,0,1);
         } else
@@ -983,23 +988,40 @@ void btKart::debugDraw(btIDebugDraw* debugDrawer)
             wheelColor.setValue(1,0,1);
         }
 
-        btVector3 wheelPosWS = getWheelInfo(v).m_worldTransform.getOrigin();
+        btVector3 wheelPosWS = w.m_worldTransform.getOrigin();
 
         btVector3 axle = btVector3(
-            getWheelInfo(v).m_worldTransform.getBasis()[0][getRightAxis()],
-            getWheelInfo(v).m_worldTransform.getBasis()[1][getRightAxis()],
-            getWheelInfo(v).m_worldTransform.getBasis()[2][getRightAxis()]);
+                            w.m_worldTransform.getBasis()[0][getRightAxis()],
+                            w.m_worldTransform.getBasis()[1][getRightAxis()],
+                            w.m_worldTransform.getBasis()[2][getRightAxis()]);
 
         //debug wheels (cylinders)
         debugDrawer->drawLine(wheelPosWS,wheelPosWS+axle,wheelColor);
         debugDrawer->drawLine(wheelPosWS,
-                              getWheelInfo(v).m_raycastInfo.m_contactPointWS,
+                              w.m_raycastInfo.m_contactPointWS,
                               wheelColor);
         // Draw the (interpolated) normal of the ground at the wheel position
-        debugDrawer->drawLine(getWheelInfo(v).m_raycastInfo.m_contactPointWS,
-                              getWheelInfo(v).m_raycastInfo.m_contactPointWS+
-                                 getWheelInfo(v).m_raycastInfo.m_contactNormalWS,
-                              btVector3(1.0f, 1.0f, 1.0f));
+        btVector3 white(1.0f, 1.0f, 1.0f);
+        debugDrawer->drawLine(w.m_raycastInfo.m_contactPointWS,
+                              w.m_raycastInfo.m_contactPointWS+
+                                 w.m_raycastInfo.m_contactNormalWS,
+                              white);
+        int n = w.m_raycastInfo.m_triangle_index;
+        if (n > -1)
+        {
+            const TriangleMesh &tm = World::getWorld()->getTrack()->getTriangleMesh();
+            btVector3 *p1, *p2, *p3;
+            tm.getTriangle(n, &p1, &p2, &p3);
+            const btVector3 *n1, *n2, *n3;
+            tm.getNormals(n, &n1, &n2, &n3);
+            // Draw the normals at the vertices
+            debugDrawer->drawLine(*p1, *p1 + *n1, white);
+            debugDrawer->drawLine(*p2, *p2 + *n2, white);
+            debugDrawer->drawLine(*p3, *p3 + *n3, white);
+            // Also draw the triangle in white, it can make it easier
+            // to identify which triangle a wheel is on
+            debugDrawer->drawTriangle(*p1, *p2, *p3, white, 1.0f);
+        }
 
     }   // for i < getNumWheels
     btVector3 yellow(1.0f, 1.0f, 0.0f);
@@ -1070,6 +1092,7 @@ btScalar btKart::rayCast(btWheelInfo& wheel, const btVector3& ray)
         wheel.m_raycastInfo.m_contactPointWS   = rayResults.m_hitPointInWorld;
         wheel.m_raycastInfo.m_contactNormalWS  = rayResults.m_hitNormalInWorld;
         wheel.m_raycastInfo.m_isInContact      = true;
+        wheel.m_raycastInfo.m_triangle_index   = rayResults.m_triangle_index;
     }
 
     return depth;
diff --git a/src/physics/btKartRaycast.cpp b/src/physics/btKartRaycast.cpp
index c9b13b647..71ec999a8 100644
--- a/src/physics/btKartRaycast.cpp
+++ b/src/physics/btKartRaycast.cpp
@@ -70,6 +70,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
             result.m_hitNormalInWorld = rayCallback.m_hitNormalWorld;
             result.m_hitNormalInWorld.normalize();
             result.m_distFraction = rayCallback.m_closestHitFraction;
+            result.m_triangle_index = -1;
             const TriangleMesh &tm =
                 World::getWorld()->getTrack()->getTriangleMesh();
             if(m_smooth_normals &&
@@ -79,6 +80,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
 #ifdef DEBUG_NORMALS
                 btVector3 n=result.m_hitNormalInWorld;
 #endif
+                result.m_triangle_index = rayCallback.getTriangleIndex();
                 result.m_hitNormalInWorld =
                     tm.getInterpolatedNormal(rayCallback.getTriangleIndex(),
                                              result.m_hitPointInWorld);

From 50acbea31511dd9e7ca315de1c6e77fbbb04bb08 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 07:53:44 +1000
Subject: [PATCH 108/331] Fix crash in case of invalid kart types (e.g.
 'default', which the exporter actually writes if 'default' is selected).

---
 src/config/stk_config.hpp     | 12 ++++++++++--
 src/karts/kart_properties.cpp | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/config/stk_config.hpp b/src/config/stk_config.hpp
index c1825822a..f4a5e9514 100644
--- a/src/config/stk_config.hpp
+++ b/src/config/stk_config.hpp
@@ -178,9 +178,17 @@ public:
     const KartProperties &
          getDefaultKartProperties() const {return *m_default_kart_properties; }
 
-    const KartProperties &
-         getKartProperties(std::string type) { return *m_kart_properties[type]; }
+    // ------------------------------------------------------------------------
+    /** Returns the kart properties for a certain type of kart.
+     *  \throw out_of_range if there is no data for 'type'.
+     *  \param type Type of kart (e.g. heavy, medium, ...).
+     */
+    const KartProperties& getKartProperties(std::string type)
+    {
+        return *m_kart_properties.at(type); 
+    }   // getKartProperties
 
+    // ------------------------------------------------------------------------
     const PlayerDifficulty * getPlayerDifficulty(PerPlayerDifficulty difficulty)
         { return m_player_difficulties[difficulty]; }
 }
diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp
index d47ae7ac7..2d2198faa 100644
--- a/src/karts/kart_properties.cpp
+++ b/src/karts/kart_properties.cpp
@@ -178,8 +178,19 @@ void KartProperties::load(const std::string &filename, const std::string &node)
 
     const XMLNode* root = new XMLNode(filename);
     std::string kart_type;
+
     if (root->get("type", &kart_type))
-        copyFrom(&stk_config->getKartProperties(kart_type));
+    {
+        // Handle the case that kart_type might be incorrect
+        try
+        {
+            copyFrom(&stk_config->getKartProperties(kart_type));
+        }
+        catch (std::out_of_range)
+        {
+            copyFrom(&stk_config->getDefaultKartProperties());
+        }   // try .. catch
+    }
     else
         copyFrom(&stk_config->getDefaultKartProperties());
 

From d4c33b294d6b3d47f8dc52d68169d380ec33e25e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 08:15:20 +1000
Subject: [PATCH 109/331] Fixed compiler warning.

---
 src/graphics/post_processing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index ca27d13e7..8e9b33c17 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -98,11 +98,11 @@ void PostProcessing::reset()
         const core::recti &vp = Camera::getCamera(i)->getViewport();
         // Map viewport to [-1,1] x [-1,1]. First define the coordinates
         // left, right, top, bottom:
-        float right = vp.LowerRightCorner.X < irr_driver->getActualScreenSize().Width
+        float right = vp.LowerRightCorner.X < (int)irr_driver->getActualScreenSize().Width
                      ? 0.0f : 1.0f;
         float left   = vp.UpperLeftCorner.X  > 0.0f ? 0.0f : -1.0f;
         float top    = vp.UpperLeftCorner.Y  > 0.0f ? 0.0f : 1.0f;
-        float bottom = vp.LowerRightCorner.Y < irr_driver->getActualScreenSize().Height
+        float bottom = vp.LowerRightCorner.Y < (int)irr_driver->getActualScreenSize().Height
                      ? 0.0f : -1.0f;
 
         // Use left etc to define 4 vertices on which the rendered screen

From 4b956ebfce159414550c0c8a6080407ab2460a53 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 15 Apr 2015 18:45:29 -0400
Subject: [PATCH 110/331] Update translations

---
 data/po/de.po         |    7 +-
 data/po/eu.po         |  343 ++---
 data/po/fi.po         |  202 +--
 data/po/gd.po         |    6 +-
 data/po/gui_strings.h | 1527 +++++++++++++++++++
 data/po/he.po         |  249 +--
 data/po/it.po         |   27 +-
 data/po/jbo.po        |   10 +-
 data/po/kw.po         |   44 +-
 data/po/lt.po         |  254 ++--
 data/po/lv.po         | 3372 +++++++++++++++++++++++++++++++++++++++++
 data/po/mn_MN.po      | 3369 ++++++++++++++++++++++++++++++++++++++++
 data/po/pl.po         |    6 +-
 data/po/ru.po         |  115 +-
 data/po/sl.po         |  502 +++---
 data/po/uk.po         |  279 ++--
 16 files changed, 9296 insertions(+), 1016 deletions(-)
 create mode 100644 data/po/gui_strings.h
 create mode 100644 data/po/lv.po
 create mode 100644 data/po/mn_MN.po

diff --git a/data/po/de.po b/data/po/de.po
index 409d67687..c9724a47e 100644
--- a/data/po/de.po
+++ b/data/po/de.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Flakebi, 2015
+# Joerg Henrichs <joerg@chiu-henrichs.id.au>, 2015
 # konstin <konsti.schuetze@t-online.de>, 2015
 # Wasilis Mandratzis-Walz, 2015
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-15 03:03+0000\n"
-"Last-Translator: Wasilis Mandratzis-Walz\n"
+"PO-Revision-Date: 2015-04-06 23:24+0000\n"
+"Last-Translator: Joerg Henrichs <joerg@chiu-henrichs.id.au>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/supertuxkart/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2484,7 +2485,7 @@ msgstr "Rechter Trigger"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr "GESCHWINDIGKEIT"
+msgstr "Tempo"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
diff --git a/data/po/eu.po b/data/po/eu.po
index da662a999..d71fd6b77 100644
--- a/data/po/eu.po
+++ b/data/po/eu.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2015
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
+# Manex Agirrezabal <manex.agirrezabal@gmail.com>, 2015
+# Mikel Olasagasti Uranga <mikel@olasagasti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-14 14:40+0000\n"
+"Last-Translator: Manex Agirrezabal <manex.agirrezabal@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/supertuxkart/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +40,8 @@ msgstr " Baina zuok ziztrinok ez zarete inoiz gai izango ni garaitzeko - Karten
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lagun %d dago linean orain."
+msgstr[1] "%d lagun daude linean orain."
 
 #. I18N: 'handicapped' indicates that per-player handicaps are
 #. activated for this kart (i.e. it will drive slower)
@@ -208,7 +211,7 @@ msgstr "= puntuazio onenak ="
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "AI karts"
-msgstr ""
+msgstr "AA kart"
 
 #: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
@@ -378,7 +381,7 @@ msgstr "Erakutsi beti saio hasierako pantaila"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr ""
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -393,7 +396,7 @@ msgstr ""
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr ""
+msgstr "Errore bat gertatu da zure txapelketa gordetzen saiatzean."
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Anchor - slows down greatly the kart in the first position."
@@ -442,18 +445,18 @@ msgstr "Anisotropoa x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Izen hori duen txapelketa bat existitzen da dagoeneko."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Anti-aliasing"
-msgstr ""
+msgstr "Anti-aliasing-a"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr ""
+msgstr "Anti-aliasing-a: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 msgid "Apply"
@@ -493,7 +496,7 @@ msgstr "Itsasargiaren inguruan"
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
 msgid "Assign nothing"
-msgstr ""
+msgstr "Ez esleitu ezer"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -576,7 +579,7 @@ msgstr "Itzuli menura"
 
 #. I18N: ./data/achievements.xml
 msgid "Banana Lover"
-msgstr ""
+msgstr "Banana zalea"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -692,7 +695,7 @@ msgstr "Utzi"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Ezeztatu eskaera"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -752,11 +755,11 @@ msgstr "Itxi"
 
 #. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Kakaoaren tenplua"
 
 #. I18N: ./data/achievements.xml
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Bildu gutxienez 5 banana lasterketa batean."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
@@ -787,12 +790,12 @@ msgstr "Nitroak batzean dagokion teklan sakatuz zure abiadura handitu dezakezu e
 
 #: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Bete erronka guztiak ate handia irekitzeko!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "\"%s\" lorpena erdietsita."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
@@ -839,7 +842,7 @@ msgstr "Jarraitu"
 #. I18N: In the grand prix info screen
 #: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Jarraitu gordetako txapelketa"
 
 #: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
@@ -906,7 +909,7 @@ msgstr "Uneko pasahitz baliogabea."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Unean saioa hasi gabe"
 
 #. I18N: custom video settings
 #: src/states_screens/options_screen_video.cpp:411
@@ -921,22 +924,22 @@ msgstr "Ezarpen pertsonalizatuak..."
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "DPad behera"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "DPad ezkerra"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "DPad eskuina"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "DPad gora"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
@@ -1017,7 +1020,7 @@ msgstr "Behera"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Gidatu alderantzizko aldera"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:455
@@ -1035,7 +1038,7 @@ msgstr "Editatu"
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Editatu txapelketa"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
@@ -1127,7 +1130,7 @@ msgstr "Besteok:\nSakatu orain 'aukeratu' jokora batzeko!"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Existing Online Account"
-msgstr ""
+msgstr "Existitzen den lineako kontua"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
@@ -1167,27 +1170,27 @@ msgstr ""
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Lorpenak eskuratzen"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Lagunak eskuratzen"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Azken botoa eskuratzen"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Zerbitzariak eskuratzen"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Pasahitza berrezarri ahal izateko idatzi erregistratzean erabili zenituen erabiltzaile-izen eta pasahitza"
 
 #: src/modes/linear_world.cpp:276
 msgid "Final lap!"
@@ -1239,8 +1242,8 @@ msgstr "Magma gaztelua"
 #, c-format
 msgid "Found %d wiimote"
 msgid_plural "Found %d wiimotes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Wiimote %d aurkitu da"
+msgstr[1] "%d wiimote aurkitu dira"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1248,19 +1251,19 @@ msgstr "Laguna kenduta!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Lagun eskaera onartua!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Lagun eskaera bertan behera utzita!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Lagun eskaera ukatuta!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Lagun eskaera bidalia!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
@@ -1297,7 +1300,7 @@ msgstr "Jolas moduak"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Joko mota (Gol kopurua / Denbora muga)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1330,13 +1333,13 @@ msgstr "Utzi lasterketa"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Global illumination"
-msgstr ""
+msgstr "Argiztapen orokorra"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Argiztapen orokorra: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1360,11 +1363,11 @@ msgstr "Aurrera!"
 
 #. I18N: ./data/achievements.xml
 msgid "Gold driver"
-msgstr ""
+msgstr "Urrezko gidaria"
 
 #. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Gran Paradiso irla"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
@@ -1375,12 +1378,12 @@ msgstr "Txapelketa"
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Txapelketa editorea"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Txapelketa editorea"
 
 #: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
@@ -1418,12 +1421,12 @@ msgstr "Gonbidatua"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "%d gonbidatua"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Guest Log in"
-msgstr ""
+msgstr "Gonbidatu saio hasiera"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
@@ -1448,7 +1451,7 @@ msgstr "Puntuazio onenak"
 
 #. I18N: ./data/achievements.xml
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Jo 10 kart bolatokiko bolarekin."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
@@ -1458,7 +1461,7 @@ msgstr "Jo beste jokalariak tiro eginez bizitza guztiak galdu arte. (Hainbat jok
 
 #. I18N: ./data/achievements.xml
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Jo kart bera 5 aldiz lasterketa batean."
 
 #. I18N: animations setting (only karts with human players are animated)
 #: src/states_screens/dialogs/custom_video_settings.cpp:64
@@ -1507,7 +1510,7 @@ msgstr "Tartekoa"
 #: src/states_screens/register_screen.cpp:401
 #: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Interneteko sarbidea desgaituta dago, mesedez gaitu aukeretan"
 
 #: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
@@ -1515,16 +1518,16 @@ msgstr "Berdinketa"
 
 #. I18N: ./data/achievements.xml
 msgid "It's secret"
-msgstr ""
+msgstr "Sekretua da"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Join"
-msgstr ""
+msgstr "Sartu"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Zerbitzariarekin bat egiten"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -1567,7 +1570,7 @@ msgstr "%i. bira"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Bira"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1648,7 +1651,7 @@ msgstr ""
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "Izen lokala"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1672,26 +1675,26 @@ msgstr "Giltzatuta!"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Log In"
-msgstr ""
+msgstr "Hasi saioa"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Log Out"
-msgstr ""
+msgstr "Amaitu saioa"
 
 #: src/states_screens/online_screen.cpp:139
 #, c-format
 msgid "Logged in as: %s."
-msgstr ""
+msgstr "Honela saioa hasita: %s."
 
 #: src/states_screens/online_screen.cpp:155
 msgid "Logging in"
-msgstr ""
+msgstr "Saioa hasten"
 
 #: src/states_screens/user_screen.cpp:494
 #, c-format
 msgid "Logging in '%s'"
-msgstr ""
+msgstr "'%s'(e)n saioa hasten"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
@@ -1703,19 +1706,19 @@ msgstr ""
 
 #: src/states_screens/online_screen.cpp:160
 msgid "Logging out"
-msgstr ""
+msgstr "Saioa amaitzen"
 
 #: src/states_screens/user_screen.cpp:493
 #, c-format
 msgid "Logging out '%s'"
-msgstr ""
+msgstr "'%s' saioa amaitzen"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
 #: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Hasi saioa"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1725,31 +1728,31 @@ msgstr "Begiratu atzera"
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
 msgid "Look for more friends:"
-msgstr ""
+msgstr "Bilatu lagun gehiago:"
 
 #. I18N: ./data/achievements.xml
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Egin 5 irristaketa bira bakarrean."
 
 #. I18N: ./data/achievements.xml
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Egin 5 bira edo gehiagoko lasterketa bat."
 
 #. I18N: ./data/achievements.xml
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratoilaria"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Max. number of players"
-msgstr ""
+msgstr "Gehienezko jokalari kopurua"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Gehienezko denbora (min.)"
 
 #. I18N: if some kart animations are enabled
 #: src/states_screens/options_screen_video.cpp:436
@@ -1763,11 +1766,11 @@ msgstr "Menu teklak"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
 msgid "Minigolf"
-msgstr ""
+msgstr "Minigolfa"
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
-msgstr ""
+msgstr "Eltxo ehiztaria"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1797,12 +1800,12 @@ msgstr "Saguaren botoia %d"
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Move down"
-msgstr ""
+msgstr "Eraman behera"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Move up"
-msgstr ""
+msgstr "Eraman gora"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
@@ -1832,35 +1835,35 @@ msgstr "Musika"
 #: src/states_screens/online_profile_achievements.cpp:73
 #: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Izena"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Izenak 4 eta 30 karaktere bitarteko luzeera behar du!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Izena hutsik dago."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Izena luzeegia da."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Name of the server"
-msgstr ""
+msgstr "Zerbitzariaren izena"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "Nessie-ren urmaela"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "New"
-msgstr ""
+msgstr "Berria"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
@@ -1870,16 +1873,16 @@ msgstr "Txapelketa berria '%s' orain erabilgarri"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "New Online Account"
-msgstr ""
+msgstr "Lineako kontu berria"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "New Password"
-msgstr ""
+msgstr "Pasahitz berria"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Eskaera berria"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
@@ -1917,7 +1920,7 @@ msgstr "NItro erronka"
 #: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
 msgid "No"
-msgstr ""
+msgstr "Ez"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
 msgid "Nolok"
@@ -1969,12 +1972,12 @@ msgstr "Gol kopurua irabazteko"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Number of laps"
-msgstr ""
+msgstr "Bira kopurua"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
 msgid "Number of laps:"
-msgstr ""
+msgstr "Bira kopurua:"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
@@ -1998,12 +2001,12 @@ msgstr "Ohiko bideetatik kanpo"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Lineaz kanpo"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Offline Account"
-msgstr ""
+msgstr "Lineaz kanpoko kontua"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -2028,25 +2031,25 @@ msgstr "Oliver-en matematika klasea"
 #: src/states_screens/main_menu_screen.cpp:185
 #: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Linean"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Hainbat jokalari linean"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Online Username"
-msgstr ""
+msgstr "Lineako erabiltzaile-izena"
 
 #: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Lineako erabiltzaile-izenak 3 eta 30 karaktere artean izan behar ditu!"
 
 #: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Lineako erabiltzaile-izenak ezin du zenbaki batekin hasi!"
 
 #: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
@@ -2069,7 +2072,7 @@ msgstr "Aukerak"
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
 msgid "Overview"
-msgstr ""
+msgstr "Ikuspegi orokorra"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
@@ -2086,31 +2089,31 @@ msgstr "Jausgailua - Zure aurretik doazen kart guztiak moteltzen ditu."
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
 msgid "Password"
-msgstr ""
+msgstr "Pasahitza"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
 msgid "Password :"
-msgstr ""
+msgstr "Pasahitza :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Password Change"
-msgstr ""
+msgstr "Pasahitz aldaketa"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 #: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Pasahitzak 8 eta 30 karaktere artean izan behar ditu!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Pasahitza behar bezala aldatu da."
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
 #: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Pasahitzak ez datoz bat!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2149,7 +2152,7 @@ msgstr "Jolastu guztiak"
 
 #. I18N: ./data/achievements.xml
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Jokatu zirkuitu ofizial guztiak gutxienez behin."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
@@ -2173,7 +2176,7 @@ msgstr ""
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Sartu txapelketa berriaren izena"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
@@ -2200,7 +2203,7 @@ msgstr "Bentosa - Bota aurrekoari honi atzeraka eginaz azkartzeko, edo atzera be
 
 #. I18N: ./data/achievements.xml
 msgid "Powerup Love"
-msgstr ""
+msgstr "Oparizalea"
 
 #: src/tracks/track_object_presentation.cpp:930
 #, c-format
@@ -2254,16 +2257,16 @@ msgstr "Arazoak '%s' gehigarria kentzean."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Prozesatzen"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Profile"
-msgstr ""
+msgstr "Profila"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Aurrerapena"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
 msgid "Puffy"
@@ -2278,7 +2281,7 @@ msgstr "Golak sartzeko bultza baloia aurkatu kaiolara (hainbat jokalariko moduan
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Quick Play"
-msgstr ""
+msgstr "Joko azkarra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2287,7 +2290,7 @@ msgstr "Irten"
 
 #: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Irten zerbitzaritik."
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: ./data/gui/select_challenge.stkgui
@@ -2297,7 +2300,7 @@ msgstr "Lasterketa konfigurazioa"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Ausazkoa"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2305,7 +2308,7 @@ msgstr "Ausazko borroka-zelaia"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Ausazko txapelketa"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
@@ -2334,7 +2337,7 @@ msgstr "Prest!"
 
 #. I18N: ./data/achievements.xml
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Benetan... sekretua."
 
 #: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
@@ -2343,7 +2346,7 @@ msgstr "Talde gorriak irabazi du"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Register"
-msgstr ""
+msgstr "Erregistratu"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
@@ -2355,14 +2358,14 @@ msgstr "Lasterketa normala: Kolpe guztiak onartzen dira, beraz hartu armak eta e
 #: src/states_screens/gp_info_screen.cpp:153
 #: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Birkargatu"
 
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Gogoratu pasahitza"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -2429,11 +2432,11 @@ msgstr "Birak alderantzizkoan"
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
 msgid "Reverse:"
-msgstr ""
+msgstr "Alderantziz:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Alderantziz"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2482,7 +2485,7 @@ msgstr ""
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "ABIADURA"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
@@ -2490,31 +2493,31 @@ msgstr ""
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "Sara lasterkaria"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "Sara aztia"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Save"
-msgstr ""
+msgstr "Gorde"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Gorde txapelketa"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Bilatu"
 
 #: src/states_screens/online_user_search.cpp:208
 #: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Bilatzen"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2523,7 +2526,7 @@ msgstr "Hautatu"
 
 #. I18N: ./data/gui/racesetup.stkgui
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Hautatu zailtasuna"
 
 #. I18N: ./data/gui/racesetup.stkgui
 msgid "Select a game mode"
@@ -2531,7 +2534,7 @@ msgstr "Hautatu jolasteko era"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Hautatu zirkuitua"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
@@ -2541,26 +2544,26 @@ msgstr "Hautatu karta"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Bidali HW estatistika anonimoak"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 msgid "Server Creation"
-msgstr ""
+msgstr "Zerbitzaria sortu"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Server Info"
-msgstr ""
+msgstr "Zerbitzariaren informazioa"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
 msgid "Server Selection"
-msgstr ""
+msgstr "Zerbitzari aukeraketa"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
 msgid "Server name :"
-msgstr ""
+msgstr "Zerbitzariaren izena :"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
@@ -2603,21 +2606,21 @@ msgstr "Aldiri distiratsuak"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Sign In"
-msgstr ""
+msgstr "Hasi saioa"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Sign In As Guest"
-msgstr ""
+msgstr "Hasi saioa gonbidatu bezala"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Noiztik:"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
 msgid "Singleplayer"
-msgstr ""
+msgstr "Jokalari bakarra"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2686,7 +2689,7 @@ msgstr "Arrunta"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
@@ -2701,7 +2704,7 @@ msgstr "Hasi lasterketa"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Egoera"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2727,7 +2730,7 @@ msgstr ""
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 msgid "Submit"
-msgstr ""
+msgstr "Bidali"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
 msgid "Subsea"
@@ -2805,7 +2808,7 @@ msgstr ""
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "Tenplua"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -2815,7 +2818,7 @@ msgstr ""
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Texture compression"
-msgstr ""
+msgstr "Testuren konpresioa"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -2843,7 +2846,7 @@ msgstr "Puntuazio onenen fitxategia oso zaharra da.\nPuntuazio on zahar horiek e
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Gehienezko jokalari kopuruak 2 eta 12 artean egon behar du."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -2874,7 +2877,7 @@ msgstr "Ilargira eta itzuli"
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Gaur"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -2884,12 +2887,12 @@ msgstr "lehen %iak"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Zirkuitua"
 
 #: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "%i%i zirkuitua"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -2901,7 +2904,7 @@ msgstr "Zirkuituaren egilea: %s"
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "Track group"
-msgstr ""
+msgstr "Zirkuitu taldea"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -2941,7 +2944,7 @@ msgstr "Mota:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Mota: Txapelketa"
 
 #: src/online/xml_request.cpp:83
 msgid ""
@@ -2956,7 +2959,7 @@ msgstr "Desinstalatu"
 
 #. I18N: ./data/achievements.xml
 msgid "Unstoppable"
-msgstr ""
+msgstr "Geldiezina"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -2979,17 +2982,17 @@ msgstr "Eguneratze data"
 
 #. I18N: ./data/achievements.xml
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Erabili 10 opari edo gehiago lasterketa batean."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Erabili bereizmen handiko testurak "
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Erabili ezker/eskuin zure taldea aukeratzeko eta sakatu tiro"
 
 #: src/tracks/track_object_presentation.cpp:949
 #, c-format
@@ -2999,7 +3002,7 @@ msgstr "Erabili bildutako nitroak <%s> sakatuz!"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
 msgid "User Info"
-msgstr ""
+msgstr "Erabiltzailearen informazioa"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
@@ -3013,11 +3016,11 @@ msgstr "Erabiltzaile-interfazea"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Erabiltzaileak definitua"
 
 #. I18N: ./data/gui/online/user_search.stkgui
 msgid "User search"
-msgstr ""
+msgstr "Erabiltzaileen bilaketa"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
@@ -3028,11 +3031,11 @@ msgstr ""
 #: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
 msgid "Username"
-msgstr ""
+msgstr "Erabiltzaile-izena"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Erabiltzaile-izen edo e-posta helbide baliogabea."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 msgid "VS"
@@ -3042,7 +3045,7 @@ msgstr "VS"
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
 #: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Informazioa balioztatzen"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3059,7 +3062,7 @@ msgstr "Sinkronizazio bertikala (berrabiarazi behar da)"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Ikusi"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -3069,15 +3072,15 @@ msgstr "Bolumena"
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
 msgid "Vote"
-msgstr ""
+msgstr "Bozkatu"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Baliozko botoa! Leihoa itxi dezakezu orain."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "PISUA"
 
 #: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
@@ -3131,7 +3134,7 @@ msgstr "Sarrerako gailuak konfiguratuta daudenean jolasteko prest zaude. Hautatu
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Txuria"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
 msgid "Wilber"
@@ -3139,11 +3142,11 @@ msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Irabazi 5 lasterketa bakun jarraian."
 
 #. I18N: ./data/achievements.xml
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Irabazi jokalari bakarreko modu guztietan, gutxienez 3 aurkariren kontra."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
 msgid "XR591"
@@ -3236,7 +3239,7 @@ msgstr[1] ""
 
 #: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Lagun eskaera berri bat daukazu!"
 
 #: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
@@ -3258,11 +3261,11 @@ msgstr ""
 
 #: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Pasahitza sartu behar duzu."
 
 #: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
-msgstr "%0 txapelketara   sarrera daukazu"
+msgstr "%0 txapelketara  sarrera lortu duzu"
 
 #: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
@@ -3306,7 +3309,7 @@ msgstr "Zure konfigurazio fitxategia zaharregia da, ezabatu egingo da eta berria
 #: src/main.cpp:1367
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
-msgstr ""
+msgstr "Zure kontrolatzailearen bertsioa zaharregia da. Mesedez instalatu bideo kontrolatzaile berrienak."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3315,7 +3318,7 @@ msgstr "Zure sarrera konfigurazio fitxategia ez da bateragarria STK bertsio hone
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Zure profila"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
 msgid "Zen Garden"
@@ -3329,12 +3332,12 @@ msgstr "[bat ere ez]"
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
 msgid "actions"
-msgstr ""
+msgstr "ekintzak"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "guztiak"
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
 #. "John Doe")
@@ -3348,11 +3351,11 @@ msgstr "Nabarmendua"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
-msgstr ""
+msgstr "altua"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
-msgstr ""
+msgstr "baxua"
 
 #. I18N: arena group name
 #. I18N: track group name
diff --git a/data/po/fi.po b/data/po/fi.po
index 58d8db02e..3af98e7ef 100644
--- a/data/po/fi.po
+++ b/data/po/fi.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:15+0000\n"
+"PO-Revision-Date: 2015-04-03 11:14+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/supertuxkart/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr[1] "%d kaveria on nyt linjoilla."
 #: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (tasoitettu)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -118,7 +118,7 @@ msgstr "(verkkopeli ei ole vielä käytössä)"
 
 #: src/states_screens/options_screen_input2.cpp:372
 msgid "* A blue item means a conflict with another configuration"
-msgstr "Sininen merkintä tarkoittaa ristiriitaa toisten asetusten kanssa"
+msgstr "* Sininen merkintä tarkoittaa ristiriitaa toisen asetuksen kanssa"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
@@ -127,7 +127,7 @@ msgstr "* Punainen merkintä tarkoittaa ristiriitaa nykyisten asetusten kanssa"
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
 msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr "Nykyisiä näppäinasetuksia voi tarkastella/muokata Valinnat-valikossa"
+msgstr "* Nykyisiä näppäinasetuksia voi tarkastella/muokata Valinnat-valikossa"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
@@ -136,7 +136,7 @@ msgid ""
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr "Suurinta osaa näistä pelimuodoista voi pelata myös grand prix -tyyliin, eli yhden kisan sijasta pelataan monta peräkkäin. Mitä paremmin sijoitut, sitä enemmän saat pisteitä. Eniten pisteitä saanut voittaa."
+msgstr "* Suurinta osaa näistä pelimuodoista voi pelata myös grand prix -tyyliin, eli yhden kisan sijasta pelataan monta peräkkäin. Mitä paremmin sijoitut, sitä enemmän saat pisteitä. Eniten pisteitä saanut voittaa."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -147,7 +147,7 @@ msgstr "* Käynnistä STK uudelleen, jotta muutokset tulevat voimaan"
 msgid ""
 "* Which config to use will be inferred from which 'Select' key is pressed to"
 " join the game."
-msgstr ""
+msgstr "* Käytettävä asetus päätellään sen mukaan, minkä ohjaimen \"Valitse\"-näppäintä painetaan peliin liitymisen yhteydessä."
 
 #. I18N: ./data/gui/online/profile_achievements.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
@@ -208,7 +208,7 @@ msgstr "= Ennätykset ="
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "AI karts"
-msgstr ""
+msgstr "Tietokonevastustajia"
 
 #: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
@@ -337,7 +337,7 @@ msgstr "Adiumy"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
+msgstr "Hienot grafiikat (valaistus yms.)"
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
@@ -378,18 +378,18 @@ msgstr "Näytä aina kirjautumisnäkymä"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr ""
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Ambient Occlusion"
-msgstr ""
+msgstr "Ambientin okkluusio"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:464
 #, c-format
 msgid "Ambient occlusion : %s"
-msgstr ""
+msgstr "Ambientin okkluusio: %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
@@ -493,7 +493,7 @@ msgstr "Majakan ympäri"
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
 msgid "Assign nothing"
-msgstr ""
+msgstr "Älä aseta mitään"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -530,7 +530,7 @@ msgstr "Akseli %d"
 #: src/input/binding.cpp:272
 #, c-format
 msgid "Axis %d %s"
-msgstr "Akseli %d%s"
+msgstr "Akseli %d %s"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:279
@@ -613,13 +613,13 @@ msgstr "Kummituskartano"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Bloom"
-msgstr ""
+msgstr "Kukoistus"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:473
 #, c-format
 msgid "Bloom : %s"
-msgstr ""
+msgstr "Kukoistus: %s"
 
 #: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
@@ -633,7 +633,7 @@ msgstr "Karjapihan kierros"
 msgid ""
 "Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
 " backwards."
-msgstr "Keilapallo - kimpoaa seinistä. Jos olet katsomassa taakse, se heitetään taaksepäin."
+msgstr "Keilapallo - kimpoaa seinistä. Jos katsot taakse, pallo heitetään taaksepäin."
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:239
@@ -654,7 +654,7 @@ msgstr "Mutta olen reilu otus, joten teen sinulle tarjouksen."
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
 "Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr "Kakku - heitetään lähimpää kilpailijaa kohti, toimii parhaiten lyhyillä etäisyyksillä ja pitkillä suorilla."
+msgstr "Kakku - heitetään lähintä kilpailijaa kohti, toimii parhaiten lyhyillä etäisyyksillä ja pitkillä suorilla."
 
 #: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
@@ -688,7 +688,7 @@ msgstr "Yhteyttä stkaddons-palvelimeen ei saada..."
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
 #: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
-msgstr "Peruuta"
+msgstr "Peru"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
@@ -697,7 +697,7 @@ msgstr "Peru pyyntö"
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
 msgid "Cancel/Back"
-msgstr "Peruuta/takaisin"
+msgstr "Peru/takaisin"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
 msgid "Cave X"
@@ -756,7 +756,7 @@ msgstr "Kaakaotemppeli"
 
 #. I18N: ./data/achievements.xml
 msgid "Collect at least 5 bananas in one race."
-msgstr "Kerää vähintään 5 banaania yhdessä kilpailussa."
+msgstr "Kerää vähintään viisi banaania yhdessä kilpailussa."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
@@ -865,11 +865,11 @@ msgstr "Kopioi"
 #: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr "Käyttäjän '%s' luominen epäonnistui."
+msgstr "Käyttäjän \"%s\" luominen epäonnistui."
 
 #: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
-msgstr "Yhtään Wiimotea ei löydetty :/"
+msgstr "Yhtäkään Wiimotea ei löytynyt :/"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
@@ -921,22 +921,22 @@ msgstr "Omat asetukset..."
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "Suuntanäppäin alas"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "Suuntanäppäin vasemmalle"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "Suuntanäppäin oikealle"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "Suuntanäppäin ylös"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
@@ -1017,7 +1017,7 @@ msgstr "Alas"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Aja vastasuuntaan"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:455
@@ -1070,11 +1070,11 @@ msgstr "Sähköposti"
 
 #: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr "Sähköpostin tulee olla sisältää neljästä 50:een merkkiä!"
+msgstr "Sähköpostiosoitteen tulee olla pituudeltaan 4-50 merkkiä!"
 
 #: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr "Sähköposti on virheellinen!"
+msgstr "Sähköpostiosoite on virheellinen!"
 
 #: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
@@ -1093,7 +1093,7 @@ msgstr "Ota laite käyttöön"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Enable per-player handicaps"
-msgstr ""
+msgstr "Käytä pelaajakohtaisia tasoituksia"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -1157,12 +1157,12 @@ msgstr "Löydä kaikki radoille piilotetut munat"
 #: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d  - Poly-määrä: %d kappaletta, %d varjoa - Valon etäisyys: %d"
 
 #: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
@@ -1256,7 +1256,7 @@ msgstr "Kaveripyyntö peruttu!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Kaveripyyntö hylätty!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
@@ -1271,7 +1271,7 @@ msgstr "Kaverit"
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
 msgid "Fullscreen"
-msgstr "Kokoruututila"
+msgstr "Koko näytön tila"
 
 #. I18N: Shown when a goal is scored
 #: src/states_screens/race_gui_base.cpp:70
@@ -1297,7 +1297,7 @@ msgstr "Pelimuodot"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Pelin tyyppi (maaliraja / aikaraja)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1330,24 +1330,24 @@ msgstr "Luovuta kilpailu"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Global illumination"
-msgstr ""
+msgstr "Yleinen valaisu"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Yleinen valaisu: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Hohto (ääriviivat)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Hohto (ääriviivat): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
 msgid "Gnu"
@@ -1436,7 +1436,7 @@ msgstr "Hacienda"
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
 msgid "Help"
-msgstr "Apua"
+msgstr "Ohje"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
 msgid "Hexley"
@@ -1448,7 +1448,7 @@ msgstr "Ennätykset"
 
 #. I18N: ./data/achievements.xml
 msgid "Hit 10 karts with a bowling-ball."
-msgstr "Osu 10 autoon keilapallolla."
+msgstr "Osu kymmeneen autoon keilapallolla."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
@@ -1458,7 +1458,7 @@ msgstr "Käytä aseistustasi muihin pelaajiin kunnes heiltä loppuu elämät. (V
 
 #. I18N: ./data/achievements.xml
 msgid "Hit the same kart at least 5 times in one race."
-msgstr "Osu samaan autoon vähintään 5 kertaa yhden kisan aikana."
+msgstr "Osu samaan autoon vähintään viisi kertaa yhden kisan aikana."
 
 #. I18N: animations setting (only karts with human players are animated)
 #: src/states_screens/dialogs/custom_video_settings.cpp:64
@@ -1490,7 +1490,7 @@ msgstr "Jätetään %s huomiotta. Pelataksesi sinun olisi pitänyt liittyä aika
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr ""
+msgstr "Kuvapohjainen valaistus"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -1587,49 +1587,49 @@ msgstr "Vasen"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "L1-painike"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Vasen peukalonäppäin"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Vasen peukalo alas"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Vasen peukalo vasemmalle"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Vasen peukalo oikealle"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Vasen peukalo ylös"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "L2-painike"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Valokeila (jumalsäteet)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Valokeila (jumalsäteet): %s"
 
 #: src/guiengine/engine.cpp:1330
 msgid "Loading"
@@ -1733,7 +1733,7 @@ msgstr "Suorita viisi sivuluisua yhden kierroksen aikana."
 
 #. I18N: ./data/achievements.xml
 msgid "Make a race with 5 laps or more."
-msgstr "Suorita kilpailu, jossa on vähintään 5 kierrosta."
+msgstr "Suorita kilpailu, jossa on vähintään viisi kierrosta."
 
 #. I18N: ./data/achievements.xml
 msgid "Marathoner"
@@ -1772,13 +1772,13 @@ msgstr "Itikan metsästäjä!"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Motion blur"
-msgstr ""
+msgstr "Liikepehmennys"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Liikepehmennys: %s"
 
 #. I18N: to appear in input configuration screen, for mouse (might not be used
 #. at all)
@@ -1836,7 +1836,7 @@ msgstr "Nimi"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr "Nimen tulee sisältää vähintään 4 merkkiä, enintään 30 merkkiä!"
+msgstr "Nimen tulee olla pituudeltaan 4-30 merkkiä!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
@@ -1855,7 +1855,7 @@ msgstr "Palvelimen nimi"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "Nessien lammikko"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
@@ -1998,12 +1998,12 @@ msgstr "Sivussa valtavirrasta"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Ei linjoilla"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Offline Account"
-msgstr ""
+msgstr "Yhteydetön tili"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -2028,7 +2028,7 @@ msgstr "Oliverin matikantunti"
 #: src/states_screens/main_menu_screen.cpp:185
 #: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Verkkopeli"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
@@ -2038,15 +2038,15 @@ msgstr "Moninpeli verkossa"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Online Username"
-msgstr "Käyttäjätunnus verkkopeleissä"
+msgstr "Verkkopelitunnus"
 
 #: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr "Verkkokäyttäjätunnuksen tulee olla vähintään 3 merkkiä pitkä, enintään 30 merkkiä pitkä!"
+msgstr "Verkkopelitunnuksen tulee olla pituudeltaan 3-30 merkkiä!"
 
 #: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr "Verkkokäyttäjätunnus ei saa alkaa numerolla!"
+msgstr "Verkkopelitunnus ei saa alkaa numerolla!"
 
 #: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
@@ -2073,7 +2073,7 @@ msgstr "Yhteenveto"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "TEHO"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Parachute - slows down all karts in a better position."
@@ -2101,7 +2101,7 @@ msgstr "Salasanan vaihto"
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 #: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr "Salasanan tulee sisältää vähintään 8 merkkiä, enintään 30 merkkiä!"
+msgstr "Salasanan tulee olla pituudeltaan 8-30 merkkiä!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
@@ -2168,7 +2168,7 @@ msgstr "Pelaajat"
 msgid ""
 "Players can select handicapped (more difficult) profiles on the kart "
 "selection screen"
-msgstr ""
+msgstr "Pelaajat voivat valita tasoitettuja profiileja (tavallista vaikeampia), kun autoa valitaan."
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
@@ -2212,7 +2212,7 @@ msgstr "Paina <%s> katsoaksesi taaksesi, ammu käyttäen <%s> ja ammu taakse pai
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
 msgid "Press ESC to cancel"
-msgstr "Paina ESCiä peruuttaaksesi"
+msgstr "Paina ESCiä peruaksesi"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 msgid "Press a key"
@@ -2283,7 +2283,7 @@ msgstr "Pikapeli"
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 msgid "Quit"
-msgstr "Poistu"
+msgstr "Poistu   "
 
 #: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
@@ -2443,42 +2443,42 @@ msgstr "Oikea"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "R1-painike"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Oikea peukalonäppäin"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Oikea peukalo alas"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Oikea peukalo vasemmalle"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Oikea peukalo oikealle"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Oikea peukalo ylös"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "R2-painike"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
@@ -2490,11 +2490,11 @@ msgstr "STK Enterprise"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "Sara kilpakuskina"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "Sara velhona"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
@@ -2612,7 +2612,7 @@ msgstr "Kirjaudu vieraana"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Lähtien"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
@@ -2664,7 +2664,7 @@ msgid ""
 "Sorry, an error occurred while contacting the add-ons website. Make sure you"
 " are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr "Lisäosasivustoon ei saatu yhteyttä. Tarkista, että yhteys Internetiin on kunnossa ja että palomuuri ei estä SuperTuxKartia ottamasta yhteyttä verkkoon."
+msgstr "Lisäosasivustoon ei saatu yhteyttä. Tarkista, että yhteys internetiin toimii ja ettei palomuuri estä SuperTuxKartia ottamasta yhteyttä verkkoon."
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
@@ -2716,7 +2716,7 @@ msgstr "Ohjaa oikealle"
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
 msgid "Story Mode"
-msgstr "Tarinamoodi"
+msgstr "Tarinatila"
 
 #. I18N: ./data/achievements.xml
 msgid "Strike!"
@@ -2727,7 +2727,7 @@ msgstr "Kaato!"
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 msgid "Submit"
-msgstr ""
+msgstr "Vaihda salasana"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
 msgid "Subsea"
@@ -2776,7 +2776,7 @@ msgid ""
 "(To change this setting at a later time, go to options, select tab 'User "
 "Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
 "statistics\")."
-msgstr ""
+msgstr "SuperTuxKart voi ottaa yhteyden internetiin lisäosien lataamiseksi ja päivitysten tarkistamiseksi. Laitteistostasi voidaan kerätä anonyymeja tietoja STK:n kehittämiseksi. Lue yksityisyyskäytäntö osoitteessa http://privacy.supertuxkart.net. Sallitko yhteyden muodostamisen internetiin? (Nämä asetukset on mahdollista muuttaa kohdasta Valinnat -> Käyttöliittymä ja poistamalla käytöstä \"Yhdistä internetiin\" sekä \"Lähetä anonyymeja tietoja laitteistosta\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
@@ -2801,11 +2801,11 @@ msgstr "Järjestelmän kieli"
 msgid ""
 "Take your opponents for mosquitos! With the swatter, squash at least 5 of "
 "them in a race."
-msgstr ""
+msgstr "Kohtele vastustajia itikoina! Lätkäise kärpäslätkällä vähintään viittä vastustajaa kilpailun aikana."
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "Temppeli"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -2843,7 +2843,7 @@ msgstr "Ennätystiedosto oli liian vanha.\nEnnätykset on nyt nollattu."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Pelaajien enimmäismäärä on oltava 2-12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -2975,7 +2975,7 @@ msgstr "Päivitetty"
 
 #: src/states_screens/addons_screen.cpp:111
 msgid "Updated date"
-msgstr "Päivityksen aika"
+msgstr "Päivitetty"
 
 #. I18N: ./data/achievements.xml
 msgid "Use 10 or more powerups in a race."
@@ -2989,7 +2989,7 @@ msgstr "Käytä tarkkoja tekstuureita"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Käytä vasenta tai oikeaa näppäintä valitaksesi joukkueesi ja paina sitten ampusnäppäintä"
 
 #: src/tracks/track_object_presentation.cpp:949
 #, c-format
@@ -3013,7 +3013,7 @@ msgstr "Käyttöliittymä"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Käyttäjän määrittämä"
 
 #. I18N: ./data/gui/online/user_search.stkgui
 msgid "User search"
@@ -3042,7 +3042,7 @@ msgstr "vastaan"
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
 #: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Varmistetaan tietoja"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3077,7 +3077,7 @@ msgstr "Äänestys onnistui! Voit nyt sulkea ikkunan."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "PAINO"
 
 #: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
@@ -3126,7 +3126,7 @@ msgid ""
 " the game. Each player can use their input device to select their kart. The "
 "game continues when everyone selected their kart. Note that the mouse may "
 "not be used for this operation."
-msgstr "Kun syöttölaitteiden asetukset on tehty, peli voi alkaa. Valitse Moninpeli-kuvake päävalikosta. Autoja valitessa pelaajat voivat liittyä peliin painamalla omaa ampumisnäppäintään. Jokainen pelaaja voi käyttää omia näppäimiään autonsa valitsemiseen. Peli jatkuu, kun kaikki ovat valinneet autonsa. Huomaa, että hiirtä ei voi käyttää valitsemiseen."
+msgstr "Kun syöttölaitteiden asetukset on tehty, peli voi alkaa. Valitse Moninpeli päävalikosta. Autoja valitessa pelaajat voivat liittyä peliin painamalla omaa ampumisnäppäintään. Jokainen pelaaja voi käyttää omia näppäimiään autonsa valitsemiseen. Peli jatkuu, kun kaikki ovat valinneet autonsa. Huomaa, että hiirtä ei voi käyttää valitsemiseen."
 
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
@@ -3139,11 +3139,11 @@ msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
 msgid "Win 5 single races in a row."
-msgstr "Voita 5 yksittäistä kilpailua putkeen."
+msgstr "Voita viisi yksittäistä kilpailua putkeen."
 
 #. I18N: ./data/achievements.xml
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Voita kaikissa yksinpelitiloissa vähintään kolmea vastustajaa vastaan."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
 msgid "XR591"
@@ -3169,21 +3169,21 @@ msgstr "Pelaajahahmosi on"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Voit muokata aiempaa arvosteluasi napsauttamalla alapuolella olevia tähtiä."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
 "You can not download addons without internet access. If you want to download"
 " addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Lisäosia ei voi ladata ilman internetyhteyttä. Jos haluat ladata lisäosia, mene Valinnat -> Käyttöliittymä ja valitse \"Yhdistä internetiin\""
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
 "You can not play online without internet access. If you want to play online,"
 " go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Verkossa ei voi pelata ilman internetyhteyttä. Jos haluat ladata lisäosia, mene Valinnat -> Käyttöliittymä ja valitse \"Yhdistä internetiin\""
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
@@ -3191,7 +3191,7 @@ msgid ""
 "You can play without creating an online account by selecting an offline "
 "account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Voit pelata luomatta verkkotiliä valitsemalla \"Yhteydetön tili\". Yhteydettömällä tilillä et voi yhdistää kavereidesi kanssa, äänestää lisäosia jne. Lue yksityisyyssuoja osoitteessa http://privacy.supertuxkart.net"
 
 #: src/states_screens/grand_prix_win.cpp:124
 #: src/states_screens/race_result_gui.cpp:175
@@ -3210,18 +3210,18 @@ msgstr "Sait grand prixin päätökseen!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Suoritit vaikean haasteen! Tässä tasossa ansaittuja pisteitä: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Suoritit helpon haasteen! Tässä tasossa ansaittuja pisteitä: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Suoritit keskitason haasteen! Tässä tasossa ansaittuja pisteitä: %i/%i"
 
 #: src/karts/kart.cpp:856
 msgid "You finished the race!"
@@ -3246,7 +3246,7 @@ msgstr "Sinut poistettiin kisasta!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Et ole vielä äänestänyt tätä lisäosaa. Arvostele lisäosa napsauttamalla alla olevia tähtiä"
 
 #: src/karts/kart.cpp:1913
 msgid ""
diff --git a/data/po/gd.po b/data/po/gd.po
index 5c2e4cf0a..d10f8c5fc 100644
--- a/data/po/gd.po
+++ b/data/po/gd.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-15 12:27+0000\n"
+"PO-Revision-Date: 2015-04-08 11:29+0000\n"
 "Last-Translator: GunChleoc\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/projects/p/supertuxkart/language/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -897,7 +897,7 @@ msgstr "A’ cruthachadh cunntas"
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
 msgid "Credits"
-msgstr "Cliù"
+msgstr "urram"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
@@ -2687,7 +2687,7 @@ msgstr "Èifeachdan fuaime"
 #. I18N: track group
 #: src/states_screens/grand_prix_editor_screen.cpp:334
 msgid "Standard"
-msgstr "Bun-tomhasach"
+msgstr "Coitcheann"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
diff --git a/data/po/gui_strings.h b/data/po/gui_strings.h
new file mode 100644
index 000000000..6fed3abcb
--- /dev/null
+++ b/data/po/gui_strings.h
@@ -0,0 +1,1527 @@
+//I18N: ./data/achievements.xml
+_("Christoffel Columbus")
+
+//I18N: ./data/achievements.xml
+_("Play every official track at least once.")
+
+//I18N: ./data/achievements.xml
+_("Strike!")
+
+//I18N: ./data/achievements.xml
+_("Hit 10 karts with a bowling-ball.")
+
+//I18N: ./data/achievements.xml
+_("Arch Enemy")
+
+//I18N: ./data/achievements.xml
+_("Hit the same kart at least 5 times in one race.")
+
+//I18N: ./data/achievements.xml
+_("Marathoner")
+
+//I18N: ./data/achievements.xml
+_("Make a race with 5 laps or more.")
+
+//I18N: ./data/achievements.xml
+_("Skid-row")
+
+//I18N: ./data/achievements.xml
+_("Make 5 skidding in a single lap.")
+
+//I18N: ./data/achievements.xml
+_("Gold driver")
+
+//I18N: ./data/achievements.xml
+_("Win in all single player modes, against at least 3 opponents.")
+
+//I18N: ./data/achievements.xml
+_("Powerup Love")
+
+//I18N: ./data/achievements.xml
+_("Use 10 or more powerups in a race.")
+
+//I18N: ./data/achievements.xml
+_("Unstoppable")
+
+//I18N: ./data/achievements.xml
+_("Win 5 single races in a row.")
+
+//I18N: ./data/achievements.xml
+_("Banana Lover")
+
+//I18N: ./data/achievements.xml
+_("Collect at least 5 bananas in one race.")
+
+//I18N: ./data/achievements.xml
+_("It's secret")
+
+//I18N: ./data/achievements.xml
+_("Really ... a secret.")
+
+//I18N: ./data/achievements.xml
+_("Mosquito Hunter")
+
+//I18N: ./data/achievements.xml
+_("Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.")
+
+//I18N: ./data/grandprix/1_penguinplayground.grandprix
+_("Penguin Playground")
+
+//I18N: ./data/grandprix/2_offthebeatentrack.grandprix
+_("Off the beaten track")
+
+//I18N: ./data/grandprix/3_tothemoonandback.grandprix
+_("To the moon and back")
+
+//I18N: ./data/grandprix/4_atworldsend.grandprix
+_("At World's End")
+
+//I18N: ./data/gui/addons_loading.stkgui
+//I18N: Add-on screen action
+_("Install");
+
+//I18N: ./data/gui/addons_loading.stkgui
+//I18N: Add-on screen action
+_("Uninstall");
+
+//I18N: ./data/gui/addons_loading.stkgui
+//I18N: Add-on screen action
+_("Back");
+
+//I18N: ./data/gui/addons_screen.stkgui
+_("SuperTuxKart Addons")
+
+//I18N: ./data/gui/addons_screen.stkgui
+//I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
+_("Updated");
+
+//I18N: ./data/gui/addons_screen.stkgui
+//I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
+_("Rating >=");
+
+//I18N: ./data/gui/addons_screen.stkgui
+//I18N: In the addons screen
+_("Karts");
+
+//I18N: ./data/gui/addons_screen.stkgui
+//I18N: In the addons screen
+_("Tracks");
+
+//I18N: ./data/gui/addons_screen.stkgui
+//I18N: In the addons screen
+_("Arenas");
+
+//I18N: ./data/gui/arenas.stkgui
+//I18N: Section in arena tracks selection screen
+_("Arenas");
+
+//I18N: ./data/gui/arenas.stkgui
+//I18N: track group
+_("Standard");
+
+//I18N: ./data/gui/arenas.stkgui
+//I18N: track group
+_("Add-Ons");
+
+//I18N: ./data/gui/arenas.stkgui
+//I18N: track group
+_("All");
+
+//I18N: ./data/gui/challenges.stkgui
+//I18N: Title for challenges screen
+_("Challenges : Trophy Room");
+
+//I18N: ./data/gui/confirm_dialog.stkgui
+//I18N: In a 'are you sure?' dialog
+_("Yes");
+
+//I18N: ./data/gui/confirm_dialog.stkgui
+//I18N: In a 'are you sure?' dialog
+_("Cancel");
+
+//I18N: ./data/gui/confirm_resolution_dialog.stkgui
+//I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+_("Keep this resolution");
+
+//I18N: ./data/gui/confirm_resolution_dialog.stkgui
+//I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+_("Cancel");
+
+//I18N: ./data/gui/credits.stkgui
+//I18N: Title in credits screen
+_("Credits");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+_("Graphics Settings")
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Advanced pipeline (lights, etc.)");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Shadows");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Image-based lighting");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Bloom");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Light shaft (God rays)");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Ambient Occlusion");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Global illumination");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Glow (outlines)");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Anti-aliasing");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Motion blur");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Depth of field");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Weather Effects");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Animated Scenery");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Texture compression");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Use high definition textures");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Animated Characters");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("Texture filtering");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+//I18N: Video settings
+_("* Restart STK to apply new settings");
+
+//I18N: ./data/gui/custom_video_settings.stkgui
+_("Apply")
+
+//I18N: ./data/gui/easter_egg.stkgui
+//I18N: Section in easter egg tracks selection screen
+_("All Tracks");
+
+//I18N: ./data/gui/easter_egg.stkgui
+//I18N: track group
+_("Standard");
+
+//I18N: ./data/gui/easter_egg.stkgui
+//I18N: track group
+_("Add-Ons");
+
+//I18N: ./data/gui/easter_egg.stkgui
+//I18N: track group
+_("All");
+
+//I18N: ./data/gui/edit_track.stkgui
+//I18N: In the edit track screen
+_("Number of laps:");
+
+//I18N: ./data/gui/edit_track.stkgui
+//I18N: In the edit track screen
+_("Reverse:");
+
+//I18N: ./data/gui/edit_track.stkgui
+_("OK")
+
+//I18N: ./data/gui/edit_track.stkgui
+_("Cancel")
+
+//I18N: ./data/gui/enter_gp_name_dialog.stkgui
+//I18N: In the 'add new grand prix' dialog
+_("Please enter the name of the grand prix");
+
+//I18N: ./data/gui/enter_gp_name_dialog.stkgui
+//I18N: In the 'add new grand prix' dialog
+_("OK");
+
+//I18N: ./data/gui/enter_gp_name_dialog.stkgui
+//I18N: In the 'add new grand prix' dialog
+_("Cancel");
+
+//I18N: ./data/gui/enter_player_name_dialog.stkgui
+//I18N: In the 'add new player' dialog
+_("Enter the new player's name");
+
+//I18N: ./data/gui/enter_player_name_dialog.stkgui
+//I18N: In the 'add new player' dialog
+_("OK");
+
+//I18N: ./data/gui/enter_player_name_dialog.stkgui
+//I18N: In the 'add new player' dialog
+_("Cancel");
+
+//I18N: ./data/gui/feature_unlocked.stkgui
+_("Continue")
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Title in edit grand prix screen
+_("Edit Grand Prix");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Move up");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Move down");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Add");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Edit");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Remove");
+
+//I18N: ./data/gui/gpedit.stkgui
+//I18N: Menu item
+_("Save");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Title in grand prix editor screen
+_("Grand Prix editor");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Menu item
+_("New");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Menu item
+_("Copy");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Menu item
+_("Edit");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Menu item
+_("Remove");
+
+//I18N: ./data/gui/gpeditor.stkgui
+//I18N: Menu item
+_("Rename");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("AI karts");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Reverse");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Tracks");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Track group");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Start Race");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Continue saved GP");
+
+//I18N: ./data/gui/grand_prix_lose.stkgui
+_("Continue")
+
+//I18N: ./data/gui/grand_prix_lose.stkgui
+_("Save Grand Prix")
+
+//I18N: ./data/gui/grand_prix_win.stkgui
+_("Continue")
+
+//I18N: ./data/gui/grand_prix_win.stkgui
+_("Save Grand Prix")
+
+//I18N: ./data/gui/help1.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help1.stkgui
+_("Click here to play the tutorial")
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Collect blue boxes : they will give you weapons or other powerups");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Avoid bananas!");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Collecting nitro allows you to get speed boosts whenever you wish by pressing the appropriate key. You can see your current level of nitro in the bar at the right of the game screen.");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("If you see a button with a lock like this one, you need to complete a challenge to unlock it.");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help menu
+_("The 'skidding' key allows you to skid in sharp turns and get a boost.");
+
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help screen
+_("* Current key bindings can be seen/changed in menu Options");
+
+//I18N: ./data/gui/help2.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: In the help menu
+_("To help you win, there are some powerups you can collect :");
+
+//I18N: ./data/gui/help2.stkgui
+_("BubbleGum - protect yourself with a shield, or use while looking back to leave a sticky pink puddle behind you.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Cake - thrown at the closest rival, best on short ranges and long straights.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Parachute - slows down all karts in a better position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Anchor - slows down greatly the kart in the first position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swapper - gift boxes are transformed into bananas and vice versa for a short time.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Basket Ball - bounces after the leader, and might squash and slow down karts down on the way.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swatter - will squash karts close by, slowing them down.")
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart features several game modes")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Regular Race: All blows allowed, so catch weapons and make clever use of them!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Time Trial: Contains no powerups, so only your driving skills matter!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Follow the leader: Run for second place, as the last kart will be disqualified every time the counter hits zero. Beware : going in front of the leader will get you eliminated too!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("3 Strikes Battle: Only in multiplayer games. Hit others with weapons until they lose all their lives.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Soccer: Only in multiplayer games. Use your kart to push the ball into the goal.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Egg hunt: Explore tracks to find all hidden eggs.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("* Most of these game modes can also be played in a Grand Prix fashion: instead of playing a single race, you play many in a row. The better you rank, the more points you get. In the end, the player with the most points wins the cup.");
+
+//I18N: ./data/gui/help4.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help4.stkgui
+_("SuperTuxKart can be played in multiplayer mode on the same computer")
+
+//I18N: ./data/gui/help4.stkgui
+_("(network play is not yet available)")
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: In the help menu
+_("First, you will need several input devices (having multiple gamepads or joysticks is the best way to play with several people). Go in the input configuration screen and setup the gamepads. It is also possible to play on keyboard(s), however each player will need a different set of keys, and keep in mind that most keyboards are not appropriate for multiplayer gameplay because they do not support large number of keypresses.");
+
+//I18N: ./data/gui/help4.stkgui
+//I18N: In the help menu
+_("When input devices are configured, you are ready to play. Select the 'multiplayer race' icon in the main menu. When it is time to choose a kart, each player can press on the 'fire' key of their gamepad or keyboard to join the game. Each player can use their input device to select their kart. The game continues when everyone selected their kart. Note that the mouse may not be used for this operation.");
+
+//I18N: ./data/gui/karts.stkgui
+//I18N: In the kart selection (player setup) screen
+_("Choose a Kart");
+
+//I18N: ./data/gui/karts_online.stkgui
+//I18N: In the kart selection (player setup) screen
+_("Choose a Kart");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: Main menu button
+_("Story Mode");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: Main menu button
+_("Singleplayer");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: Main menu button
+_("Multiplayer");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: Main menu button
+_("Online");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: Main menu button
+_("Addons");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Options");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Help");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Tutorial");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Achievements");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Grand Prix Editor");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("About");
+
+//I18N: ./data/gui/main.stkgui
+//I18N: In the main screen
+_("Quit");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("Password Change");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("Current Password");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("New Password");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("Confirm");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("Submit");
+
+//I18N: ./data/gui/online/change_password.stkgui
+//I18N: In the change password dialog
+_("Close");
+
+//I18N: ./data/gui/online/create_server.stkgui
+//I18N: In the server creation screen
+_("Server Creation");
+
+//I18N: ./data/gui/online/create_server.stkgui
+//I18N: In the server creation screen
+_("Name of the server");
+
+//I18N: ./data/gui/online/create_server.stkgui
+//I18N: In the server creation screen
+_("Max. number of players");
+
+//I18N: ./data/gui/online/create_server.stkgui
+//I18N: In the server creation screen
+_("Create");
+
+//I18N: ./data/gui/online/create_server.stkgui
+//I18N: In the server creation screen
+_("Cancel");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+_("Login")
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: Tab in login menu
+_("Sign In");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: Tab in login menu
+_("Sign In As Guest");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: Tab in login menu
+_("Register");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: In the login dialog
+_("Guest Log in");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: In the login dialog
+_("Logging in as a guest allows you to participate in online races, but it does not allow you to vote for addons, or collect any achievements while being online.");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: In the login dialog
+_("Log In");
+
+//I18N: ./data/gui/online/guest_login.stkgui
+//I18N: In the login dialog
+_("Close");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("Lobby");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Server name :");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("actions");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Exit");
+
+//I18N: ./data/gui/online/lobby_settings.stkgui
+//I18N: In the lobby settings screen
+_("Lobby Settings");
+
+//I18N: ./data/gui/online/lobby_settings.stkgui
+//I18N: In the lobby settings screen
+_("Name of the server");
+
+//I18N: ./data/gui/online/lobby_settings.stkgui
+//I18N: In the lobby settings screen
+_("Max. number of players");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Online Multiplayer");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Quick Play");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Find Server");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Create Server");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Profile");
+
+//I18N: ./data/gui/online/main.stkgui
+//I18N: In the online multiplayer screen
+_("Log Out");
+
+//I18N: ./data/gui/online/notification_dialog.stkgui
+//I18N: User info dialog
+_("View");
+
+//I18N: ./data/gui/online/notification_dialog.stkgui
+//I18N: User info dialog
+_("Close");
+
+//I18N: ./data/gui/online/profile_achievements.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_achievements_tab.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_achievements_tab.stkgui
+//I18N: Section in the profile screen
+_("Achievements");
+
+//I18N: ./data/gui/online/profile_friends.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_friends.stkgui
+//I18N: Section in the profile screen
+_("Friends");
+
+//I18N: ./data/gui/online/profile_friends.stkgui
+//I18N: In the profile screen
+_("Look for more friends:");
+
+//I18N: ./data/gui/online/profile_friends.stkgui
+_("Search")
+
+//I18N: ./data/gui/online/profile_overview.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_overview.stkgui
+//I18N: Section in the profile screen
+_("Overview");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: Section in the profile screen
+_("Account Settings");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: In the online account settings screen
+_("Password :");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("Change")
+
+//I18N: ./data/gui/online/recovery_info.stkgui
+//I18N: In the recovery dialog
+_("Account Recovery");
+
+//I18N: ./data/gui/online/recovery_info.stkgui
+//I18N: In the recovery dialog
+_("You will receive an email with further instructions on how to reset your password. Please be patient and be sure to check your spam folder.");
+
+//I18N: ./data/gui/online/recovery_info.stkgui
+//I18N: In the recovery dialog
+_("Close");
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+//I18N: In the recovery dialog
+_("Account Recovery");
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+_("Fill in the username and email address you supplied at registration to be able to reset your password.")
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+//I18N: In the recovery dialog
+_("Username");
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+//I18N: In the recovery dialog
+_("Email");
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+//I18N: In the recovery dialog
+_("Submit");
+
+//I18N: ./data/gui/online/recovery_input.stkgui
+//I18N: In the recovery dialog
+_("Cancel");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Create User");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: Section in the register screen
+_("New Online Account");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: Section in the register screen
+_("Existing Online Account");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: Section in the register screen
+_("Offline Account");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Local Name");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Online Username");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Password");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Confirm");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Email");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("You can play without creating an online account by selecting an offline account. Though then you can not connect to friends, vote for addons etc. Please read our privacy statement at http://privacy.supertuxkart.net");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("OK");
+
+//I18N: ./data/gui/online/register.stkgui
+//I18N: In the registration dialog
+_("Cancel");
+
+//I18N: ./data/gui/online/registration_terms.stkgui
+//I18N: In the registration dialog
+_("Terms and Agreement");
+
+//I18N: ./data/gui/online/registration_terms.stkgui
+//I18N: In the registration dialog
+_("I agree to the above terms and am 13 years or older. ");
+
+//I18N: ./data/gui/online/registration_terms.stkgui
+//I18N: In the registration dialog
+_("Accept");
+
+//I18N: ./data/gui/online/registration_terms.stkgui
+//I18N: In the registration dialog
+_("Cancel");
+
+//I18N: ./data/gui/online/server_info_dialog.stkgui
+//I18N: In the server info dialog
+_("Server Info");
+
+//I18N: ./data/gui/online/server_info_dialog.stkgui
+//I18N: In the server info dialog
+_("Name");
+
+//I18N: ./data/gui/online/server_info_dialog.stkgui
+//I18N: In the server info dialog
+_("Join");
+
+//I18N: ./data/gui/online/server_info_dialog.stkgui
+//I18N: In the server info dialog
+_("Cancel");
+
+//I18N: ./data/gui/online/server_selection.stkgui
+_("Server Selection")
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog' dialog
+_("User Info");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Name");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Remove");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Add Friend");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Accept");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Decline");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("View");
+
+//I18N: ./data/gui/online/user_info_dialog.stkgui
+//I18N: User info dialog
+_("Close");
+
+//I18N: ./data/gui/online/user_search.stkgui
+_("User search")
+
+//I18N: ./data/gui/online/user_search.stkgui
+_("Search")
+
+//I18N: ./data/gui/online/vote_dialog.stkgui
+//I18N: In the vote dialog
+_("Vote");
+
+//I18N: ./data/gui/online/vote_dialog.stkgui
+//I18N: Vote dialog
+_("Close");
+
+//I18N: ./data/gui/options_audio.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: Section in the settings menu
+_("Audio");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Music");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Enabled");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Volume");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Sound Effects");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Enabled");
+
+//I18N: ./data/gui/options_audio.stkgui
+//I18N: In the audio options screen
+_("Volume");
+
+//I18N: ./data/gui/options_device.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_device.stkgui
+//I18N: Section in the settings menu
+_("Controls");
+
+//I18N: ./data/gui/options_device.stkgui
+//I18N: In the input configuration screen
+_("Delete Configuration");
+
+//I18N: ./data/gui/options_device.stkgui
+//I18N: In the input configuration screen
+_("Back to device list");
+
+//I18N: ./data/gui/options_input.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_input.stkgui
+//I18N: Section in the settings menu
+_("Controls");
+
+//I18N: ./data/gui/options_input.stkgui
+//I18N: In the input configuration screen
+_("Press enter or double-click on a device to configure it");
+
+//I18N: ./data/gui/options_input.stkgui
+//I18N: In the input configuration screen
+_("Add a device");
+
+//I18N: ./data/gui/options_input.stkgui
+_("* Which config to use will be inferred from which 'Select' key is pressed to join the game.")
+
+//I18N: ./data/gui/options_players.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_players.stkgui
+//I18N: Section in the settings menu
+_("Players");
+
+//I18N: ./data/gui/options_players.stkgui
+_("You are playing as")
+
+//I18N: ./data/gui/options_players.stkgui
+//I18N: In the player configuration screen
+_("Press enter or double-click on a player to edit him/her");
+
+//I18N: ./data/gui/options_players.stkgui
+//I18N: In the player configuration screen
+_("Add Player");
+
+//I18N: ./data/gui/options_ui.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: Section in the settings menu
+_("User Interface");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Skin");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Display FPS");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Always show login screen");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Send anonymous HW statistics");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Enable per-player handicaps");
+
+//I18N: ./data/gui/options_ui.stkgui
+//I18N: In the ui settings
+_("Connect to the Internet");
+
+//I18N: ./data/gui/options_video.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: Section in the settings menu
+_("Graphics");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Graphical Effects Level");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Custom settings...");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Vertical Sync (requires restart)");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Resolution");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Fullscreen");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Remember window location");
+
+//I18N: ./data/gui/options_video.stkgui
+//I18N: In the video settings
+_("Apply new resolution");
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+_("Paused")
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+//I18N: In the in-game dialog
+_("Back to Game");
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+//I18N: In the in-game dialog
+_("Select kart");
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+//I18N: In the in-game dialog
+_("Options");
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+//I18N: In the in-game dialog
+_("Help");
+
+//I18N: ./data/gui/overworld_dialog.stkgui
+//I18N: In the in-game dialog
+_("Back to menu");
+
+//I18N: ./data/gui/press_a_key_dialog.stkgui
+_("Press a key")
+
+//I18N: ./data/gui/press_a_key_dialog.stkgui
+//I18N: When configuring input
+_("Assign to ESC key");
+
+//I18N: ./data/gui/press_a_key_dialog.stkgui
+//I18N: When configuring input
+_("Assign nothing");
+
+//I18N: ./data/gui/press_a_key_dialog.stkgui
+//I18N: When configuring input
+_("Press ESC to cancel");
+
+//I18N: ./data/gui/racesetup.stkgui
+_("Race Setup")
+
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a difficulty")
+
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("Novice");
+
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("Intermediate");
+
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("Expert");
+
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("SuperTux");
+
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a game mode")
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+_("Paused")
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Back to Race");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Setup New Race");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Restart Race");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Give Up Race");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Options");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Help");
+
+//I18N: ./data/gui/race_paused_dialog.stkgui
+//I18N: Race paused button
+_("Exit Race");
+
+//I18N: ./data/gui/select_challenge.stkgui
+_("Race Setup")
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Type of race, in a challenge
+_("Type :");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Novice");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Intermediate");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Expert");
+
+//I18N: ./data/gui/soccer_setup.stkgui
+_("Race Setup")
+
+//I18N: ./data/gui/soccer_setup.stkgui
+//I18N: In soccer setup screen
+_("Number of goals to win");
+
+//I18N: ./data/gui/soccer_setup.stkgui
+//I18N: In soccer setup screen
+_("Maximum time (min.)");
+
+//I18N: ./data/gui/soccer_setup.stkgui
+//I18N: In soccer setup screen
+_("Game type (Goals limit / Time limit)");
+
+//I18N: ./data/gui/soccer_setup.stkgui
+//I18N: In soccer setup screen
+_("Use left/right to choose your team and press fire");
+
+//I18N: ./data/gui/soccer_setup.stkgui
+_("VS")
+
+//I18N: ./data/gui/soccer_setup.stkgui
+//I18N: In soccer setup screen
+_("Continue");
+
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("Grand Prix");
+
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("All Tracks");
+
+//I18N: ./data/gui/track_info.stkgui
+_("= Highscores =")
+
+//I18N: ./data/gui/track_info.stkgui
+_("(Empty)")
+
+//I18N: ./data/gui/track_info.stkgui
+_("(Empty)")
+
+//I18N: ./data/gui/track_info.stkgui
+_("(Empty)")
+
+//I18N: ./data/gui/track_info.stkgui
+//I18N: In the track info screen
+_("Number of laps");
+
+//I18N: ./data/gui/track_info.stkgui
+//I18N: In the track info screen
+_("Number of AI karts");
+
+//I18N: ./data/gui/track_info.stkgui
+//I18N: In the track info screen
+_("Drive in reverse");
+
+//I18N: ./data/gui/track_info.stkgui
+//I18N: In the track info screen
+_("Start Race");
+
+//I18N: ./data/gui/tutorial.stkgui
+//I18N: Title for tutorials screen
+_("Tutorial : Selection Room");
+
+//I18N: ./data/gui/tutorial.stkgui
+_("Play all")
+
+//I18N: ./data/gui/tutorial_message_dialog.stkgui
+//I18N: Button in tutorial
+_("Continue");
+
+//I18N: ./data/gui/user_screen.stkgui
+_("Login")
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Online");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Remember password");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Username");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Password");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("OK");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Add user");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Delete");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Rename");
+
+//I18N: ./data/gui/user_screen.stkgui
+//I18N: In the user screen
+_("Cancel");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+_("SuperTuxKart Options")
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: Section in the settings menu
+_("Players");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Online");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Remember password");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Username");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the registration dialog
+_("Password");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("OK");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Add user");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Delete");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Rename");
+
+//I18N: ./data/gui/user_screen_tab.stkgui
+//I18N: In the user screen
+_("Cancel");
+
+//I18N: ../stk-assets/tracks/battleisland/track.xml
+_("Battle Island")
+
+//I18N: ../stk-assets/tracks/cave/track.xml
+_("Cave X")
+
+//I18N: ../stk-assets/tracks/city/track.xml
+_("Shiny Suburbs")
+
+//I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+_("Cocoa Temple")
+
+//I18N: ../stk-assets/tracks/farm/track.xml
+_("Bovine Barnyard")
+
+//I18N: ../stk-assets/tracks/fortmagma/track.xml
+_("Fort Magma")
+
+//I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+_("Gran Paradiso Island")
+
+//I18N: ../stk-assets/tracks/greenvalley/track.xml
+_("Green Valley")
+
+//I18N: ../stk-assets/tracks/hacienda/track.xml
+_("Hacienda")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+
+//I18N: ../stk-assets/tracks/lighthouse/track.xml
+_("Around the lighthouse")
+
+//I18N: ../stk-assets/tracks/mansion/track.xml
+_("Blackhill Mansion")
+
+//I18N: ../stk-assets/tracks/mines/track.xml
+_("Old Mine")
+
+//I18N: ../stk-assets/tracks/minigolf/track.xml
+_("Minigolf")
+
+//I18N: ../stk-assets/tracks/olivermath/track.xml
+_("Oliver's Math Class")
+
+//I18N: ../stk-assets/tracks/sandtrack/track.xml
+_("Shifting Sands")
+
+//I18N: ../stk-assets/tracks/scotland/track.xml
+_("Nessie's pond")
+
+//I18N: ../stk-assets/tracks/snowmountain/track.xml
+_("Northern Resort")
+
+//I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+_("Snow Peak")
+
+//I18N: ../stk-assets/tracks/soccer_field/track.xml
+_("Soccer field")
+
+//I18N: ../stk-assets/tracks/stadium/track.xml
+_("The Stadium")
+
+//I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+_("STK Enterprise")
+
+//I18N: ../stk-assets/tracks/subsea/track.xml
+_("Subsea")
+
+//I18N: ../stk-assets/tracks/temple/track.xml
+_("Temple")
+
+//I18N: ../stk-assets/tracks/xr591/track.xml
+_("XR591")
+
+//I18N: ../stk-assets/tracks/zengarden/track.xml
+_("Zen Garden")
+
+//I18N: ../stk-assets/karts/adiumy/kart.xml
+_("Adiumy")
+
+//I18N: ../stk-assets/karts/amanda/kart.xml
+_("Amanda")
+
+//I18N: ../stk-assets/karts/beastie/kart.xml
+_("Beastie")
+
+//I18N: ../stk-assets/karts/elephpant/kart.xml
+_("Elephpant")
+
+//I18N: ../stk-assets/karts/emule/kart.xml
+_("Emule")
+
+//I18N: ../stk-assets/karts/gnu/kart.xml
+_("Gnu")
+
+//I18N: ../stk-assets/karts/hexley/kart.xml
+_("Hexley")
+
+//I18N: ../stk-assets/karts/konqi/kart.xml
+_("Konqi")
+
+//I18N: ../stk-assets/karts/nolok/kart.xml
+_("Nolok")
+
+//I18N: ../stk-assets/karts/pidgin/kart.xml
+_("Pidgin")
+
+//I18N: ../stk-assets/karts/puffy/kart.xml
+_("Puffy")
+
+//I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+_("Sara the Racer")
+
+//I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+_("Sara the Wizard")
+
+//I18N: ../stk-assets/karts/suzanne/kart.xml
+_("Suzanne")
+
+//I18N: ../stk-assets/karts/tux/kart.xml
+_("Tux")
+
+//I18N: ../stk-assets/karts/wilber/kart.xml
+_("Wilber")
+
+//I18N: ../stk-assets/karts/xue/kart.xml
+_("Xue")
+
diff --git a/data/po/he.po b/data/po/he.po
index 934d18db4..a234cb98e 100644
--- a/data/po/he.po
+++ b/data/po/he.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Capri <musicsuse@gmx.com>, 2015
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
+# GenghisKhan <genghiskhan@gmx.ca>, 2015
+# Ys, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-07 22:59+0000\n"
+"Last-Translator: Ys\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/supertuxkart/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +33,7 @@ msgstr "   Y"
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr " �בל הפ�נקיסטי� הפתטיי� שלך לעול� ל� יוכלו להביס �ותי - מלך המכוניות!"
+msgstr " �בל טיפשי� קטני� שכמותכ� ל� תצליחו להביס �ותי - מלך המכוניות!"
 
 #. I18N: Only used for count > 3
 #: src/online/online_player_profile.cpp:429
@@ -147,7 +150,7 @@ msgstr "* התחל מחדש �ת STK כדי להחיל הגדרות חדשות"
 msgid ""
 "* Which config to use will be inferred from which 'Select' key is pressed to"
 " join the game."
-msgstr ""
+msgstr "*  התצורה ש�שתמש בה תוסק מלחיצת מקש ה'בחירה' המוגדר על מנת להצטרף למשחק."
 
 #. I18N: ./data/gui/online/profile_achievements.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
@@ -337,7 +340,7 @@ msgstr "�דיומי"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Advanced pipeline (lights, etc.)"
-msgstr "צינור מתקד� (�ורות, וכו׳)"
+msgstr "מנוע מתקד� (�ורות, וכו.)"
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
@@ -378,7 +381,7 @@ msgstr "הצג תמיד מסך התחברות"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr ""
+msgstr "�מנדה"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -447,13 +450,13 @@ msgstr "גרנד פרי �חר בש� זה כבר קיי�."
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Anti-aliasing"
-msgstr "Anti-aliasing"
+msgstr "הפחתת מדרג עקומות (Anti-aliasing)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:461
 #, c-format
 msgid "Anti-aliasing : %s"
-msgstr "Anti-aliasing : %s"
+msgstr "הפחתת מדרג עקומות: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 msgid "Apply"
@@ -518,7 +521,7 @@ msgstr "שמע"
 #. I18N: In the help menu
 #: src/tracks/track_object_presentation.cpp:906
 msgid "Avoid bananas!"
-msgstr "הימנע מן בננות!"
+msgstr "הימנע מבננות!"
 
 #. I18N: to appear in input configuration screen, for gamepad axes
 #: src/input/binding.cpp:284
@@ -582,7 +585,7 @@ msgstr "חובב בננות"
 msgid ""
 "Basket Ball - bounces after the leader, and might squash and slow down karts"
 " down on the way."
-msgstr "כדורסל - מקפץ �חר המוביל, ועשוי למעוך ול�ט מכוניות בדרך."
+msgstr "כדורסל - מקפץ �חרי המוביל, ועשוי למעוך ולה�ט מכוניות בדרך."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
 msgid "Battle Island"
@@ -627,7 +630,7 @@ msgstr "קבוצה כחולה מנצחת"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
 msgid "Bovine Barnyard"
-msgstr "משק"
+msgstr "משק הפרות"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -644,7 +647,7 @@ msgstr "בלימה"
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr "גומי לעיסב - הגן על עצמך בעזרת מגן, �ו השתמש בזה כעת הסתכלות ל�חור כדי להותיר שלולית ורודה דביקה מ�חוריך."
+msgstr "גומי לעיסה - הגן על עצמך בעזרת מגן, �ו השתמש בזה כעת הסתכלות ל�חור כדי להותיר שלולית ורודה דביקה מ�חוריך."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -697,7 +700,7 @@ msgstr "בטל בקשה"
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
 msgid "Cancel/Back"
-msgstr "ביטול\\חזרה"
+msgstr "ביטול/חזרה"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
 msgid "Cave X"
@@ -729,7 +732,7 @@ msgstr "בחר מכונית"
 
 #. I18N: ./data/achievements.xml
 msgid "Christoffel Columbus"
-msgstr "כריסטופר קולומבוס"
+msgstr "כריסטופל קולומבוס"
 
 #. I18N: ./data/gui/help1.stkgui
 msgid "Click here to play the tutorial"
@@ -998,7 +1001,7 @@ msgstr "ה�� �תה בטוח כי ברצונך לנטוש �ת הגרנד פר
 #: src/states_screens/user_screen.cpp:583
 #, c-format
 msgid "Do you really want to delete player '%s' ?"
-msgstr "ה�� �תה בטוח כי ברצונך למחוק �ת השחקן '%s'?"
+msgstr "ה�� �תה בטוח כי ברצונך למחוק �ת שחקן '%s'?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
@@ -1045,7 +1048,7 @@ msgstr "ציד ביצי�"
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr "חיפוש ביצי�: סייר במסלולי� ומצ� ביצי� חבויות."
+msgstr "חיפוש ביצי�: סייר במסלולי� ומצ� �ת הביצי� המוסתרות."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1074,7 +1077,7 @@ msgstr "על �ורך דו�״ל להיות בין 4 עד 50 תווי�!"
 
 #: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr "דו�״ל �ינו תקף!"
+msgstr "דו�״ל ל� חוקי!"
 
 #: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
@@ -1093,7 +1096,7 @@ msgstr "הפעלת התקן"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Enable per-player handicaps"
-msgstr ""
+msgstr "הפעל הגבלות לכל שחקן"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -1127,7 +1130,7 @@ msgstr "כול�:\nלחצו כעת על 'בחר' כדי להצטרף למשחק!
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Existing Online Account"
-msgstr ""
+msgstr "חשבון מקוון קיי�"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
@@ -1157,37 +1160,37 @@ msgstr "סייר במסלולי� ומצ� �ת כל הביצי� הנסתרות
 #: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "פריימי� לשנייה:  %d/%d/%d - ספירת מצולעי�: %d מוצק, %d צללי� - הפצת �ור: %d"
 
 #: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "פריימי� לשנייה: %d/%d/%d - %d "
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "מבי� הישגי�"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "מבי� חברי�"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "מבי� הצבעה"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "מבי� שרתי�"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "מל� �ת ש� המשתמש וכתובת המייל שסיפקת בהרשמה כדי ל�פס �ת סיסמתך."
 
 #: src/modes/linear_world.cpp:276
 msgid "Final lap!"
@@ -1196,7 +1199,7 @@ msgstr "הקפה �חרונה!"
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Find Server"
-msgstr "מצ� שרת"
+msgstr "חפש שרת"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1239,8 +1242,8 @@ msgstr "מבצר המ�גמה"
 #, c-format
 msgid "Found %d wiimote"
 msgid_plural "Found %d wiimotes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "נמצ� %d wiimote"
+msgstr[1] "נמצ�ו %d wiimotes"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1330,24 +1333,24 @@ msgstr "נטוש מירוץ"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Global illumination"
-msgstr ""
+msgstr "ה�רה גלובלית"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "ה�רה גלובלית: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "זוהר (מתווה)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "זוהר (מתווה): % s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
 msgid "Gnu"
@@ -1423,7 +1426,7 @@ msgstr "�ורח %d"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Guest Log in"
-msgstr ""
+msgstr "התחבר כ�ורח"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
@@ -1490,7 +1493,7 @@ msgstr "מתעל� מן׳'%s', היה עליך להצטרף מוקד� יותר
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr ""
+msgstr "ה�רה מבוססת-תמונות"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -1544,7 +1547,7 @@ msgstr "היצמדו למכונית המובילה, �בל �ל תעקפו �ו
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "מקשי קיצור"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1587,53 +1590,53 @@ msgstr "שמ�לה"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "פגוש שמ�לי"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "כפתור �גודל שמ�לי"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "�גודל שמ�לי למטה"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "�גודל שמ�לי שמ�לה"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "�גודל שמ�לי ימינה"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "�גודל שמ�לי למעלה"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "הדק שמ�לי"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "פיר �ור"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "פיר �ור: %s"
 
 #: src/guiengine/engine.cpp:1330
 msgid "Loading"
-msgstr "כעת טוען"
+msgstr "טוען"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
@@ -1648,7 +1651,7 @@ msgstr "הגדרות לובי"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "ש� מקומי"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1663,7 +1666,7 @@ msgstr "נעול"
 #: src/states_screens/race_setup_screen.cpp:214
 #: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr "נעול: השלימו �תגר כדי לקבל גישה ליותר!"
+msgstr "נעול: השלימו �תגרי� פעילי� כדי לקבל גישה ליותר!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
@@ -1672,26 +1675,26 @@ msgstr "נעול!"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Log In"
-msgstr ""
+msgstr "התחבר"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Log Out"
-msgstr ""
+msgstr "התנתק"
 
 #: src/states_screens/online_screen.cpp:139
 #, c-format
 msgid "Logged in as: %s."
-msgstr ""
+msgstr "מחובר בתור: %s"
 
 #: src/states_screens/online_screen.cpp:155
 msgid "Logging in"
-msgstr ""
+msgstr "מתחבר"
 
 #: src/states_screens/user_screen.cpp:494
 #, c-format
 msgid "Logging in '%s'"
-msgstr ""
+msgstr "מתחבר כ: %s"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
@@ -1699,16 +1702,16 @@ msgid ""
 "Logging in as a guest allows you to participate in online races, but it does"
 " not allow you to vote for addons, or collect any achievements while being "
 "online."
-msgstr ""
+msgstr "התחברות כ�ורח מ�פשרת לך להשתתף במירוצי�, �בל ל� מ�פשרת  לך לבחור עבור תוספי�ת �ו ל�סוף הישגי� בהיותך מחובר."
 
 #: src/states_screens/online_screen.cpp:160
 msgid "Logging out"
-msgstr ""
+msgstr "מתנתק"
 
 #: src/states_screens/user_screen.cpp:493
 #, c-format
 msgid "Logging out '%s'"
-msgstr ""
+msgstr "מנתק '%s'"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: ./data/gui/user_screen.stkgui
@@ -1729,11 +1732,11 @@ msgstr "חפש עוד חברי�:"
 
 #. I18N: ./data/achievements.xml
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "בצע 5 החלקות בהקפה �חת"
 
 #. I18N: ./data/achievements.xml
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "צור מירוץ ע� 5 הקפות �ו יותר."
 
 #. I18N: ./data/achievements.xml
 msgid "Marathoner"
@@ -1767,7 +1770,7 @@ msgstr "מיני גולף"
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
-msgstr ""
+msgstr "צייד יתושי�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1836,7 +1839,7 @@ msgstr "ש�"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr "על �ורך ש� להיות בין 4 עד 50 תווי�!"
+msgstr "על �ורך ש� להיות בין 4 עד 30 תווי�!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
@@ -1855,7 +1858,7 @@ msgstr "ש� השרת"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "הבריכה של נסי"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
@@ -1870,7 +1873,7 @@ msgstr "גרנד פרי חדש '%s' זמין כעת"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "New Online Account"
-msgstr ""
+msgstr "חשבון מקוון חדש"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
@@ -2003,7 +2006,7 @@ msgstr "ל� מקוון"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Offline Account"
-msgstr ""
+msgstr "חשבון ל� מקוון"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -2042,11 +2045,11 @@ msgstr "ש� משתמש מקוון"
 
 #: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "ש� משתמש מקוון חייב להיות בין 3 ל 30 תווי�!"
 
 #: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "�סור שש� משתמש מקוון יתחיל ע� סיפרה!"
 
 #: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
@@ -2073,7 +2076,7 @@ msgstr "סיכו�"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "עוצמה"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Parachute - slows down all karts in a better position."
@@ -2110,17 +2113,17 @@ msgstr "סיסמה שונתה בהצלחה."
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
 #: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr "סיסמ�ות ל� תו�מות."
+msgstr "סיסמ�ות ל� תו�מות!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
 msgid "Pause Game"
-msgstr "הקפ�ת משחק"
+msgstr "השהה משחק"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 msgid "Paused"
-msgstr "מוקפ�"
+msgstr "מושהה"
 
 #: src/karts/controller/network_player_controller.cpp:281
 #: src/karts/controller/player_controller.cpp:338
@@ -2129,7 +2132,7 @@ msgstr "זמן עונשין!!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "תלוי ועומד"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
 msgid "Penguin Playground"
@@ -2137,7 +2140,7 @@ msgstr "חצר הפינגוויני�"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "מבצע הצבעה"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
 msgid "Pidgin"
@@ -2149,7 +2152,7 @@ msgstr "הצג הכל"
 
 #. I18N: ./data/achievements.xml
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "שחק בכול מסלול רשמי לפחות פע� �חת."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
@@ -2168,7 +2171,7 @@ msgstr "שחקני�"
 msgid ""
 "Players can select handicapped (more difficult) profiles on the kart "
 "selection screen"
-msgstr ""
+msgstr "שחקני� יכולי� לבחור פרופילי� מוגבלי� (יותר קשי�) במסך בחירת המכוניות"
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
@@ -2182,7 +2185,7 @@ msgstr "�נ� הגדירו מחדש �ת המקשי�."
 
 #: src/states_screens/dialogs/registration_dialog.cpp:42
 msgid "Please read the terms and conditions "
-msgstr ""
+msgstr "�נ� קר�ו �ת תנ�י השימש "
 
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
@@ -2200,7 +2203,7 @@ msgstr "טובלן – השליכו קדימה כדי למשוך יריב �חו
 
 #. I18N: ./data/achievements.xml
 msgid "Powerup Love"
-msgstr ""
+msgstr "חובב כוחות מדליקי�"
 
 #: src/tracks/track_object_presentation.cpp:930
 #, c-format
@@ -2273,7 +2276,7 @@ msgstr "פ�פי"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr "דחוף �ת הכדור לכלוב הנגדע כדי להקיע שער (במשחק מרובה משתתפי� בלבד)"
+msgstr "דחוף �ת הכדור לכלוב הנגדי כדי להקיע שער (במשחק מרובה משתתפי� בלבד)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
@@ -2287,7 +2290,7 @@ msgstr "יצי�ה"
 
 #: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr "צ� מן השרת"
+msgstr "צ� מתוך השרת."
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: ./data/gui/select_challenge.stkgui
@@ -2355,7 +2358,7 @@ msgstr "מירוץ רגיל: הכל מותר, �ז תפוס נשקי� ועשה
 #: src/states_screens/gp_info_screen.cpp:153
 #: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr "טען שוב"
+msgstr "טען מחדש"
 
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
@@ -2443,46 +2446,46 @@ msgstr "ימינה"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "פגוש ימני"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "כפתור �גודל ימני"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "�גודל ימני למטה"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "�גודל ימני שמ�לה"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "�גודל ימני ימינה"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "�גודל ימני למעלה"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "הדק ימני"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "מהירות"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
@@ -2490,11 +2493,11 @@ msgstr "STK �נטרפרייז"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "שרה הרוכבת"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "שרה הקוסמת"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
@@ -2541,7 +2544,7 @@ msgstr "בחר מכונית"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "שלח סטטיסטיקות חומרה �נונימיות"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
@@ -2585,7 +2588,7 @@ msgstr "צללי�"
 #: src/states_screens/options_screen_video.cpp:470
 #, c-format
 msgid "Shadows: %i"
-msgstr ""
+msgstr "צללי�: %i"
 
 #: src/states_screens/options_screen_video.cpp:468
 #, c-format
@@ -2626,7 +2629,7 @@ msgstr "גודל: %s"
 
 #. I18N: ./data/achievements.xml
 msgid "Skid-row"
-msgstr ""
+msgstr "שורת החלקות"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2664,11 +2667,11 @@ msgid ""
 "Sorry, an error occurred while contacting the add-ons website. Make sure you"
 " are connected to the Internet and that SuperTuxKart is not blocked by a "
 "firewall"
-msgstr "לצערנו, �ירעה שגי�ה בחיבור ל�תר התוספי�. �נ� וד� ש�תה מחובר ל�ינטרנט, וכי SuperTuxKart �ינו חסו� על ידי חומת �ש"
+msgstr "מצטערי�, �ירעה שגי�ה בחיבור ל�תר התוספי�. �נ� וד� ש�תה מחובר ל�ינטרנט, וכי SuperTuxKart �ינו חסו� על ידי חומת �ש"
 
 #: src/states_screens/dialogs/addons_loading.cpp:279
 msgid "Sorry, downloading the add-on failed"
-msgstr "לצערנו, הורדת התוסף נכשלה"
+msgstr "מצטערי�, הורדת התוסף נכשלה"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -2776,7 +2779,7 @@ msgid ""
 "(To change this setting at a later time, go to options, select tab 'User "
 "Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
 "statistics\")."
-msgstr ""
+msgstr "SuperTuxKart יכול להתחבר לשרת על מנת להוריד תוספי� ולהודיע לך על עדכוני�. �נו �וספי� ג� סטטיסתיקות חומרה �נונימיות  על נמת לעזור ע� הפיתוח של STK. �נ� קר�ו �ת מדיניות הפרטיות בכתובת http://privacy.supertuxkart.net. ה�� ברצונכ� להפעיל תכונה זו? (כדי לשנות הגדרה זו מ�וחר יותר, כנסו להגדרות, בחרו לשונית 'ממשק המשתמש' וערכו \"התחבר ל�ינטרנט\" ו\"שלח סטטיסטיקות חומרה �נונימיות\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
@@ -2790,7 +2793,7 @@ msgstr "מחליף – קופס�ות מתנה ובננות מתחלפות לז
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr "מחבט – מועך מכוניות סמוכות ומ�ט �ותן."
+msgstr "מחבט זבובי� – מועך מכוניות סמוכות ומ�ט �ותן."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
@@ -2801,11 +2804,11 @@ msgstr "שפת המערכת"
 msgid ""
 "Take your opponents for mosquitos! With the swatter, squash at least 5 of "
 "them in a race."
-msgstr ""
+msgstr "קח �ת יריביך כיתושי�! ע� המחבט, מעך לפחות 5 מה� במירוץ."
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "מקדש"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -2815,7 +2818,7 @@ msgstr "תנ�י� והסכמה"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Texture compression"
-msgstr ""
+msgstr "דחיסת מקר�"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -2843,7 +2846,7 @@ msgstr "קובץ השי�י� ישן מדי.\nכל השי�י� נמחקו."
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "המספר המירבי של שחקני� חייב להיות בין 2 עד 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -2901,7 +2904,7 @@ msgstr "מסלול מ�ת %s"
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "Track group"
-msgstr ""
+msgstr "קבוצת מסלולי�"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -2928,7 +2931,7 @@ msgstr "מדריך"
 #. I18N: ./data/gui/tutorial.stkgui
 #. I18N: Title for tutorials screen
 msgid "Tutorial : Selection Room"
-msgstr "מדריך: חדר מבחר"
+msgstr "מדריך: חדר בחירה"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
 msgid "Tux"
@@ -2937,17 +2940,17 @@ msgstr "ט�קס"
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
 msgid "Type :"
-msgstr "טיפוס :"
+msgstr "סוג:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr "טיפוס: גרנד פרי"
+msgstr "סוג: גרנד פרי"
 
 #: src/online/xml_request.cpp:83
 msgid ""
 "Unable to connect to the server. Check your internet connection or try again"
 " later."
-msgstr ""
+msgstr "ל� ניתן להתחבר לשרת. �נ� בדקו �ת חיבור ה�ינטרנט �ו נסו שוב  מ�וחר יותר."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -2979,17 +2982,17 @@ msgstr "ת�ריך עדכון"
 
 #. I18N: ./data/achievements.xml
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "השתמש ב10 �ו יותר כוחות מדליקי� במירוץ."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Use high definition textures"
-msgstr ""
+msgstr "השתמש במרקמי� ב�יכות גבוהה"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "התשמש במקשי החיצי� ימין �ו שמ�ל כדי לבחור צוות ולחץ �ש"
 
 #: src/tracks/track_object_presentation.cpp:949
 #, c-format
@@ -3032,7 +3035,7 @@ msgstr "ש� משתמש"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "ש� משתמשו/�ו כתובת מייל ל� חוקיי�."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 msgid "VS"
@@ -3073,11 +3076,11 @@ msgstr "הצבע"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "ההצבעה הצליחה! ניתן לסגור חלון זה."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "משקל"
 
 #: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
@@ -3139,11 +3142,11 @@ msgstr "ווילבר"
 
 #. I18N: ./data/achievements.xml
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "נצח 5 מירוצי� יחידי� ברצף."
 
 #. I18N: ./data/achievements.xml
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "נצח בכל סוגי המצבי� לשחקן יחיד, כנגד לפחות 3 יריבי�."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
 msgid "XR591"
@@ -3169,21 +3172,21 @@ msgstr "�תה משחק בתור"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "�תה יכול להת�י� דירוג קוד� שלך על ידי לחיצה על הכוכבי� למטה."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
 "You can not download addons without internet access. If you want to download"
 " addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "�תה ל� יכול להוריד תוספי� לל� גישה ל�ינטרנט. ��פ תרצה להוריד  תוספי�, כנס להגדרות, בחר לשונית 'ממשק המשתמש', וערוך \"התחבר ל�ינטרנט\"."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
 "You can not play online without internet access. If you want to play online,"
 " go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "�תה ל� יכול לשחק ברשת בלי גישה ל�ינטרנט. �� תרצה לשחק ברשת,  כנס להגדרות, בחר לשונית 'ממשק המשתמש', וערוך \"התחבר ל�ינטרנט\"."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
@@ -3191,7 +3194,7 @@ msgid ""
 "You can play without creating an online account by selecting an offline "
 "account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "�תה יכול לשחק בלי ליצור חשבון מקוון על ידי בחירת חשבון בלתי מקוון. למרות של� תוכל להתחבר לחבריך, להצביע עבור תוספי� �הובי�, וכו. �נ� קר� �ת מדיניות הפרטיות שלנו בכתובת http://privacy.supertuxkart.net"
 
 #: src/states_screens/grand_prix_win.cpp:124
 #: src/states_screens/race_result_gui.cpp:175
@@ -3231,8 +3234,8 @@ msgstr "סיימת �ת המירוץ!"
 #, c-format
 msgid "You have %d new friend request!"
 msgid_plural "You have %d new friend requests!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "יש לך %d בקשת חברות חדשה!"
+msgstr[1] "יש לך %d בקשות חברות חדשות!"
 
 #: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
@@ -3246,7 +3249,7 @@ msgstr "נפסלת!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "עוד ל� הצבעת עבור תוסף זה. בחר �ת הדירוג המת�י� לך על ידי לחיצה על הכוכבי� למטה"
 
 #: src/karts/kart.cpp:1913
 msgid ""
@@ -3273,13 +3276,13 @@ msgstr "פתחת �ת המסלול %0"
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "�ת� תקבלו הודעה ע� הור�ות להמשך על מנת ל�פס �ת הסיסמ� שלכ�. �נ� הת�זרו בסבלנות ובדקו �ת תיקיית הזבל שלכ�."
 
 #: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "�ת/ה תקבלו הודעה ע� הור�ות נוספות לגבי הפעלת החשבון. �נ� הת�זרו בסבלנות ווד�ו לבדוק �ת תיקיית הזבל שלכ�."
 
 #: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
@@ -3289,7 +3292,7 @@ msgstr "ניצחת במירוץ!"
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
 "your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
-msgstr ""
+msgstr "גרסת ה-OpenGL נר�ת כישנה מ�וד. �נ� בדקו שיש עדכון למנהל ההתקן. SuperTuxKart דורש OpenGl 3.1 �ו יותר."
 
 #: src/config/user_config.cpp:700
 msgid ""
@@ -3306,7 +3309,7 @@ msgstr "קובץ הגדרות שלך היה ישן מדי, כך שזה נמחק
 #: src/main.cpp:1367
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
-msgstr ""
+msgstr "גרסת מנהל התקן שלך ישנה מדי. �נ� התקן �ת מנהל התקן העדכני ביותר. "
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
diff --git a/data/po/it.po b/data/po/it.po
index a7d1fcffc..fbb98ae61 100644
--- a/data/po/it.po
+++ b/data/po/it.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Enrico <allin@infinito.it>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-09 17:01+0000\n"
+"Last-Translator: Enrico <allin@infinito.it>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/supertuxkart/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +61,7 @@ msgstr "%s MB"
 #: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s e %s sono ora in linea."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -78,7 +79,7 @@ msgstr "%s di %s"
 #: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s è ora in linea."
 
 #: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
@@ -88,17 +89,17 @@ msgstr "%s è pronto"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "profilo di %s"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "server di %s"
 
 #: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s e %s sono ora in linea."
 
 #: src/modes/world.cpp:1147
 #, c-format
@@ -121,7 +122,7 @@ msgstr "* Un elemento blu indica un conflitto con un'altra configurazione"
 
 #: src/states_screens/options_screen_input2.cpp:377
 msgid "* A red item means a conflict in the current configuration"
-msgstr ""
+msgstr "* Un elemento blu indica un conflitto con la configurazione attuale"
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help screen
@@ -140,7 +141,7 @@ msgstr "* La maggior parte di queste modalità può essere giocata in modalità
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "* Riavvia STK per applicare le nuove impostazioni"
 
 #. I18N: ./data/gui/options_input.stkgui
 msgid ""
@@ -154,7 +155,7 @@ msgstr ""
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
@@ -240,7 +241,7 @@ msgstr "Accelera con <%s> e sterza con <%s> e <%s>"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Accetta"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
@@ -253,7 +254,7 @@ msgstr ""
 #. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Impostazioni account"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -275,7 +276,7 @@ msgstr ""
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Add Friend"
-msgstr ""
+msgstr "Aggiungi amico"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
diff --git a/data/po/jbo.po b/data/po/jbo.po
index 8cb8c5a98..f61eb3207 100644
--- a/data/po/jbo.po
+++ b/data/po/jbo.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-15 18:15+0000\n"
+"PO-Revision-Date: 2015-03-27 10:37+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: Lojban (http://www.transifex.com/projects/p/supertuxkart/language/jbo/)\n"
 "MIME-Version: 1.0\n"
@@ -1861,7 +1861,7 @@ msgstr ""
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "New"
-msgstr ""
+msgstr "cnino"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
@@ -2298,7 +2298,7 @@ msgstr ""
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "cunso"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2487,7 +2487,7 @@ msgstr ""
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr ""
+msgstr "la entyrprais"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
@@ -2806,7 +2806,7 @@ msgstr ""
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "la malsi"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
diff --git a/data/po/kw.po b/data/po/kw.po
index 7a33b1859..0d14c4ebe 100644
--- a/data/po/kw.po
+++ b/data/po/kw.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-10 03:20+0000\n"
+"Last-Translator: Nicky Rowe <nickyrowe@gmail.com>\n"
 "Language-Team: Cornish (http://www.transifex.com/projects/p/supertuxkart/language/kw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -381,7 +381,7 @@ msgstr "Diskwedhes prest an skrin omgelmi"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr ""
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1096,7 +1096,7 @@ msgstr "Gallosegi an devis"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Enable per-player handicaps"
-msgstr ""
+msgstr "Gallosegi handikappys devnydhyer"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -1242,10 +1242,10 @@ msgstr "Dinas Magma"
 #, c-format
 msgid "Found %d wiimote"
 msgid_plural "Found %d wiimotes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d wiimote kevys"
+msgstr[1] "%d wiimote kevys"
+msgstr[2] "%d wiimote kevys"
+msgstr[3] "%d wiimote kevys"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
@@ -1495,7 +1495,7 @@ msgstr "Ow skonya aswon '%s', res o dhis junya moy a-varr rag gwari!"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr ""
+msgstr "Golowyans imach-selyes"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -1653,7 +1653,7 @@ msgstr "Settyansow an dhegemerva"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "Hanow teythyek"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1860,7 +1860,7 @@ msgstr "Hanow an servyer"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "Lynn Nessie"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
@@ -2173,7 +2173,7 @@ msgstr "Gwarioryon"
 msgid ""
 "Players can select handicapped (more difficult) profiles on the kart "
 "selection screen"
-msgstr ""
+msgstr "Gwarioryon a yll dewis profilys handikappys (moy kales) war an skrin dewis kert"
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
@@ -2187,7 +2187,7 @@ msgstr "Gwra dasrestra dha golmow."
 
 #: src/states_screens/dialogs/registration_dialog.cpp:42
 msgid "Please read the terms and conditions "
-msgstr ""
+msgstr "Gwrewgh redya an termynyow hag ambosow"
 
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
@@ -2495,11 +2495,11 @@ msgstr "STK Enterprise"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "Sara an Resegores"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "Sara an Bystriores"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
@@ -2781,7 +2781,7 @@ msgid ""
 "(To change this setting at a later time, go to options, select tab 'User "
 "Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
 "statistics\")."
-msgstr ""
+msgstr "SuperTuxKart a yll junya gans servyer rag iskarga keworransow ha dha warnya a nowedhansow. Ynwedh y kuntelyn statystygyon dihanow a'n kalesweyth rag gweres displegya STK. Gwrewgh redya agan polici privetter orth http://privacy.supertuxkart.net. Eus hwans dhis gallosegi an nas ma? (Rag chanjya an settyans ma orth termyn aral, ke dhe'n dewisyow, dewis an tab 'Ynterfas devnydhyer', ha chanj \"Junya gans an Kesrosweyth\" ha \"Danvon statystygyon kalesweyth dihanow\")."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
@@ -2810,7 +2810,7 @@ msgstr "Dyght dha erbynoryon kepar ha moskitos! Der an swattyell, skwatt 5 anedh
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "Templa"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -3236,10 +3236,10 @@ msgstr "Ty a gorfennas an resek!"
 #, c-format
 msgid "You have %d new friend request!"
 msgid_plural "You have %d new friend requests!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Yma %d wovyn koweth nowydh dhis!"
+msgstr[1] "Yma %d wovyn koweth nowydh dhis!"
+msgstr[2] "Yma %d govyn koweth nowydh dhis!"
+msgstr[3] "Yma %d govyn koweth nowydh dhis!"
 
 #: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
@@ -3296,7 +3296,7 @@ msgstr "Ty a waynyas an resek!"
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
 "your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
-msgstr ""
+msgstr "Yth hevel bos agas versyon a OpenGL re goth. Gwrewgh gweles mars eus nowedhans kavadow rag'as lewyel gwydhyo. Res yw OpenGL 3.1 po ughella dhe SuperTuxKart."
 
 #: src/config/user_config.cpp:700
 msgid ""
diff --git a/data/po/lt.po b/data/po/lt.po
index a58f73d1c..eb9b51768 100644
--- a/data/po/lt.po
+++ b/data/po/lt.po
@@ -5,13 +5,15 @@
 # Translators:
 # Algimantas Margevi�ius <margevicius.algimantas@gmail.com>, 2011
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
+# Jonas Kriau�iūnas <jonukas@gmail.com>, 2015
+# Mantas Kriau�iūnas <mantas@akl.lt>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-08 18:35+0000\n"
+"Last-Translator: Jonas Kriau�iūnas <jonukas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/projects/p/supertuxkart/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,9 +40,9 @@ msgstr ""
 #, c-format
 msgid "%d friend is now online."
 msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d draugas dabar prisijungęs."
+msgstr[1] "%d draugai dabar prisijungÄ™."
+msgstr[2] "%d draugų dabar prisijungę."
 
 #. I18N: 'handicapped' indicates that per-player handicaps are
 #. activated for this kart (i.e. it will drive slower)
@@ -63,7 +65,7 @@ msgstr "%s MB"
 #: src/online/online_player_profile.cpp:418
 #, c-format
 msgid "%s and %s are now online."
-msgstr ""
+msgstr "%s ir %s dabar prisijungÄ™."
 
 #. I18N: as in: The Old Island by Johannes Sjolund
 #: src/states_screens/addons_screen.cpp:306
@@ -81,7 +83,7 @@ msgstr "%s įveikė %s"
 #: src/online/online_player_profile.cpp:414
 #, c-format
 msgid "%s is now online."
-msgstr ""
+msgstr "%s jau prisijungÄ—."
 
 #: src/guiengine/widgets/player_kart_widget.cpp:420
 #, c-format
@@ -91,17 +93,17 @@ msgstr "%s yra pasiruošęs"
 #: src/states_screens/online_profile_base.cpp:108
 #, c-format
 msgid "%s's profile"
-msgstr ""
+msgstr "Naudotojo %s duomenys"
 
 #: src/states_screens/create_server_screen.cpp:60
 #, c-format
 msgid "%s's server"
-msgstr ""
+msgstr "serveris „%s“"
 
 #: src/online/online_player_profile.cpp:423
 #, c-format
 msgid "%s, %s and %s are now online."
-msgstr ""
+msgstr "%s, %s ir %s dabar prisijungÄ™."
 
 #: src/modes/world.cpp:1147
 #, c-format
@@ -138,12 +140,12 @@ msgid ""
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr "* Dauguma šių žaidimų gali būti žaidžiami „Grand Prix“ stiliumi: vietoj vienų lenktynių, žaidi daug lenktynių iš eilės. Kuo geresnė tavo vieta, tuo daugiau gauni taškų. Pabaigoj, žaidėjas turintis daugiausia taškų laimi taurę."
+msgstr "* Dauguma šių žaidimų gali būti žaidžiami �empionato (Grand Prix) stiliumi: vietoj vienos trasos lenktynių, žaidi daug lenktynių keliose trasose iš eilės. Kuo geresnė tavo vieta, tuo daugiau gauni taškų. Pabaigoj, žaidėjas turintis daugiausia taškų laimi taurę."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "* Restart STK to apply new settings"
-msgstr ""
+msgstr "Nauji nustatymai įsigalios kai paleisite Supertuxkart iš naujo"
 
 #. I18N: ./data/gui/options_input.stkgui
 msgid ""
@@ -161,23 +163,23 @@ msgstr ""
 
 #: src/states_screens/addons_screen.cpp:52
 msgid "1 month"
-msgstr ""
+msgstr "1 mÄ—nuo"
 
 #: src/states_screens/addons_screen.cpp:50
 msgid "1 week"
-msgstr ""
+msgstr "1 savaitÄ—"
 
 #: src/states_screens/addons_screen.cpp:56
 msgid "1 year"
-msgstr ""
+msgstr "1 metai"
 
 #: src/states_screens/addons_screen.cpp:51
 msgid "2 weeks"
-msgstr ""
+msgstr "2 savaitÄ—s"
 
 #: src/states_screens/addons_screen.cpp:57
 msgid "2 years"
-msgstr ""
+msgstr "2 metai"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:182
@@ -193,15 +195,15 @@ msgstr ""
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
-msgstr ""
+msgstr "3 mÄ—nesiai"
 
 #: src/states_screens/addons_screen.cpp:54
 msgid "6 months"
-msgstr ""
+msgstr "6 mÄ—nesiai"
 
 #: src/states_screens/addons_screen.cpp:55
 msgid "9 months"
-msgstr ""
+msgstr "9 mÄ—nesiai"
 
 #. I18N: ./data/gui/track_info.stkgui
 msgid "= Highscores ="
@@ -243,20 +245,20 @@ msgstr "Pagreitinsite paspaudÄ™ <%s>, o vairuosite su <%s> ir <%s>"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Accept"
-msgstr ""
+msgstr "Sutinku"
 
 #. I18N: ./data/gui/online/recovery_info.stkgui
 #. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 msgid "Account Recovery"
-msgstr ""
+msgstr "Paskyros Atkūrimas"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:101
 msgid "Account Settings"
-msgstr ""
+msgstr "Paskyros Nustatymai"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -264,21 +266,21 @@ msgstr ""
 #. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:100
 msgid "Achievements"
-msgstr ""
+msgstr "Pasiekimai"
 
 #: src/states_screens/options_screen_input2.cpp:71
 msgid "Action"
-msgstr ""
+msgstr "Veiksmas"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Add"
-msgstr ""
+msgstr "PridÄ—ti"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Add Friend"
-msgstr ""
+msgstr "PridÄ—ti draugÄ…"
 
 #. I18N: In the 'add new input device' dialog
 #: src/states_screens/dialogs/add_device_dialog.cpp:111
@@ -305,7 +307,7 @@ msgstr "Pridėti valdymo įrenginį"
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 msgid "Add user"
-msgstr ""
+msgstr "PridÄ—ti naudotojÄ…"
 
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
@@ -376,7 +378,7 @@ msgstr "Leidžiama viskas, taigi - rinkite ginklus bei kitus gerus dalykėlius i
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Always show login screen"
-msgstr ""
+msgstr "Visada rodyti prisijungimo langÄ…"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
@@ -444,7 +446,7 @@ msgstr ""
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr ""
+msgstr "Kitas �empionatas (grand prix) tokiu pa�iu pavadinimu jau yra."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -459,7 +461,7 @@ msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 msgid "Apply"
-msgstr ""
+msgstr "Pritaikyti"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -468,7 +470,7 @@ msgstr "Pritaikyt pasirinktą raišką"
 
 #. I18N: ./data/achievements.xml
 msgid "Arch Enemy"
-msgstr ""
+msgstr "Priešų šaudytojas"
 
 #. I18N: shown before deleting an input configuration
 #: src/states_screens/options_screen_input2.cpp:575
@@ -479,7 +481,7 @@ msgstr "Ar esate įsitikinę jog norite ištrinti konfigūraciją visam laikui?"
 #: src/states_screens/grand_prix_editor_screen.cpp:109
 #, c-format
 msgid "Are you sure you want to remove '%s'?"
-msgstr ""
+msgstr "Ar tikrai norite pašalinti '%s'?"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -578,7 +580,7 @@ msgstr "Grįžti į meniu"
 
 #. I18N: ./data/achievements.xml
 msgid "Banana Lover"
-msgstr ""
+msgstr "Bananų mylėtojas"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -606,7 +608,7 @@ msgstr ""
 #. I18N: Name of the black button on xbox controller
 #: src/input/gamepad_config.cpp:167
 msgid "Black"
-msgstr ""
+msgstr "Juodasis"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
 msgid "Blackhill Mansion"
@@ -625,7 +627,7 @@ msgstr ""
 
 #: src/states_screens/race_result_gui.cpp:969
 msgid "Blue Team Wins"
-msgstr ""
+msgstr "MÄ—lyna komanda laimÄ—jo"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
 msgid "Bovine Barnyard"
@@ -694,7 +696,7 @@ msgstr "Atsisakyti"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Atsisakyti prašymo"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -720,7 +722,7 @@ msgstr "Užduotys: trofėjų kambarys"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "Change"
-msgstr ""
+msgstr "Keisti"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
@@ -754,11 +756,11 @@ msgstr "Užverti"
 
 #. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Kakavos Å¡ventykla"
 
 #. I18N: ./data/achievements.xml
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Surinkti bent 5 bananus vienose varžybose."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
@@ -794,14 +796,14 @@ msgstr ""
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Jums suteiktas titulas „%s“."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Confirm"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching
 #. resoluton
@@ -813,7 +815,7 @@ msgstr "Patvirtinkite naują raišką (ankstesnė raiška atsistatys po %i sek.)
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Prisijungti prie interneto"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
@@ -841,11 +843,11 @@ msgstr "Tęsti"
 #. I18N: In the grand prix info screen
 #: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Tęsti įrašytą �empionatą"
 
 #: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Tęsti."
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
@@ -861,7 +863,7 @@ msgstr "Valdymas"
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "Copy"
-msgstr ""
+msgstr "Kopijuoti"
 
 #: src/states_screens/register_screen.cpp:217
 #: src/states_screens/register_screen.cpp:224
@@ -876,21 +878,21 @@ msgstr ""
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 msgid "Create"
-msgstr ""
+msgstr "Kurti"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Create Server"
-msgstr ""
+msgstr "Sukurti serverį"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Create User"
-msgstr ""
+msgstr "Sukurti naudotojÄ…"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Kuriamas serveris"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
@@ -900,11 +902,11 @@ msgstr "PadÄ—kos"
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Current Password"
-msgstr ""
+msgstr "Dabartinis slaptažodis"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Dabartinis slaptažodis netinkamas."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
@@ -943,18 +945,18 @@ msgstr ""
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Decline"
-msgstr ""
+msgstr "Nepriimti"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Įprastas"
 
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Pašalinti"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
@@ -1004,7 +1006,7 @@ msgstr "Ar tikrai norite ištrinti žaidėją „%s“?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Ar norite įrašyti pakeitimus?"
 
 #: src/karts/controller/network_player_controller.cpp:283
 #: src/karts/controller/player_controller.cpp:340
@@ -1019,7 +1021,7 @@ msgstr "Žemyn (rodyklė)"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Važiuoti priešinga kryptimi"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:455
@@ -1032,27 +1034,27 @@ msgstr ""
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Keisti"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
 msgid "Edit Grand Prix"
-msgstr ""
+msgstr "Keisti �empionatą (Grand Prix)"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
 msgid "Egg Hunt"
-msgstr ""
+msgstr "Rask paslėptus kiaušus"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
+msgstr "Paslėpti kiaušiniai: Tyrinėk trasas ir surask visus paslėptus kiaušinius."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
 msgid "Eggs: %d / %d"
-msgstr ""
+msgstr "Kiaušiniai: %d iš %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
 msgid "Elephpant"
@@ -1068,19 +1070,19 @@ msgstr ""
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Email"
-msgstr ""
+msgstr "El. paštas"
 
 #: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "El. pašto adresas turi būti nuo 4 iki 50 simbolių!"
 
 #: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Neteisingas el. pašto adresas!"
 
 #: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Pašto adresai nesutampa!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
 msgid "Emule"
@@ -1108,7 +1110,7 @@ msgstr "Įjungta"
 #. I18N: animations setting (all karts are animated)
 #: src/states_screens/dialogs/custom_video_settings.cpp:66
 msgid "Enabled for all"
-msgstr ""
+msgstr "Įjungta visiems"
 
 #. I18N: ./data/gui/enter_player_name_dialog.stkgui
 #. I18N: In the 'add new player' dialog
@@ -1134,7 +1136,7 @@ msgstr ""
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
 msgid "Exit"
-msgstr ""
+msgstr "IÅ¡eiti"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
@@ -1143,7 +1145,7 @@ msgstr "Baigti lenktynes"
 
 #: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Baigti žaidimą"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
@@ -1154,7 +1156,7 @@ msgstr "Ekspertas"
 
 #: src/states_screens/race_setup_screen.cpp:252
 msgid "Explore tracks to find all hidden eggs"
-msgstr ""
+msgstr "Tyrinėk trasas ir surask visus paslėptus kiaušinius"
 
 #: src/graphics/irr_driver.cpp:1795
 #, c-format
@@ -1169,7 +1171,7 @@ msgstr ""
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Atsiun�iami titulai"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
@@ -1198,7 +1200,7 @@ msgstr "Paskutinis ratas!"
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Find Server"
-msgstr ""
+msgstr "Rasti serverį"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1247,11 +1249,11 @@ msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Pašalintas draugas!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Draugo prašymas priimtas!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
@@ -1259,17 +1261,17 @@ msgstr ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Draugo prašymas atmestas!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Išsiųstas prašymas draugui!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Draugai"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -1279,7 +1281,7 @@ msgstr "Visame ekrane"
 #. I18N: Shown when a goal is scored
 #: src/states_screens/race_gui_base.cpp:70
 msgid "GOAL!"
-msgstr ""
+msgstr "Įvartis!"
 
 #. I18N: Key binding section
 #: src/states_screens/options_screen_input2.cpp:144
@@ -1363,7 +1365,7 @@ msgstr "Pirmyn!"
 
 #. I18N: ./data/achievements.xml
 msgid "Gold driver"
-msgstr ""
+msgstr "Auksinis vairuotojas"
 
 #. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
@@ -1378,12 +1380,12 @@ msgstr "ÄŒempionatai (Grand Prix)"
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 msgid "Grand Prix Editor"
-msgstr ""
+msgstr "Čempionatų kūrimas"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
 msgid "Grand Prix editor"
-msgstr ""
+msgstr "Čempionatų kūrimas"
 
 #: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
@@ -1410,7 +1412,7 @@ msgstr "Vaizdo nustatymai"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
 msgid "Green Valley"
-msgstr ""
+msgstr "Žaliasis slėnis"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1421,12 +1423,12 @@ msgstr "Sve�ias"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Sve�ias %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Guest Log in"
-msgstr ""
+msgstr "Prisijungti sve�iu"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
@@ -1514,20 +1516,20 @@ msgstr ""
 
 #: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
-msgstr ""
+msgstr "Lygiosios"
 
 #. I18N: ./data/achievements.xml
 msgid "It's secret"
-msgstr ""
+msgstr "Tai paslaptis"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Join"
-msgstr ""
+msgstr "Prisijungti"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Jungiamasi prie serverio"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -1570,13 +1572,13 @@ msgstr "Ratas %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Ratai"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
 #, c-format
 msgid "Laps : %i"
-msgstr ""
+msgstr "Ratai : %i"
 
 #: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
 msgid "Leader"
@@ -1651,7 +1653,7 @@ msgstr ""
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "Vietinis vardas"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1675,21 +1677,21 @@ msgstr "Užrakintas!"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Log In"
-msgstr ""
+msgstr "Prisijungti"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Log Out"
-msgstr ""
+msgstr "Atsijungti"
 
 #: src/states_screens/online_screen.cpp:139
 #, c-format
 msgid "Logged in as: %s."
-msgstr ""
+msgstr "Prisijungęs kaip: %s."
 
 #: src/states_screens/online_screen.cpp:155
 msgid "Logging in"
-msgstr ""
+msgstr "Jungiamasi"
 
 #: src/states_screens/user_screen.cpp:494
 #, c-format
@@ -1718,7 +1720,7 @@ msgstr ""
 #: src/states_screens/main_menu_screen.cpp:175
 #: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Prisijungti"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1770,7 +1772,7 @@ msgstr ""
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
-msgstr ""
+msgstr "Uodų gaudytojas"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1835,7 +1837,7 @@ msgstr "Muzika"
 #: src/states_screens/online_profile_achievements.cpp:73
 #: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Vardas"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
@@ -1854,7 +1856,7 @@ msgstr ""
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Name of the server"
-msgstr ""
+msgstr "Serverio vardas"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
@@ -1863,7 +1865,7 @@ msgstr ""
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "New"
-msgstr ""
+msgstr "Naujas"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
@@ -1878,7 +1880,7 @@ msgstr ""
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "New Password"
-msgstr ""
+msgstr "Naujas slaptažodis"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
@@ -1920,7 +1922,7 @@ msgstr "Užduotis „Nitro kuras“"
 #: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
 msgid "Nolok"
@@ -1957,7 +1959,7 @@ msgstr "Naujokas"
 #: src/states_screens/dialogs/select_challenge.cpp:68
 #, c-format
 msgid "Number of AI Karts : %i"
-msgstr ""
+msgstr "Kompiuterinių žaidėjų: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
@@ -1972,12 +1974,12 @@ msgstr ""
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Number of laps"
-msgstr ""
+msgstr "Trasos ratų kiekis"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
 msgid "Number of laps:"
-msgstr ""
+msgstr "Trasos ratų kiekis:"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
@@ -2089,31 +2091,31 @@ msgstr "Parašiutas - sulėtina visus kartus esan�ius geresnėje pozicijoj nei
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
 msgid "Password"
-msgstr ""
+msgstr "Slaptažodis"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
 msgid "Password :"
-msgstr ""
+msgstr "Slaptažodis :"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Password Change"
-msgstr ""
+msgstr "Slaptažodžio keitimas"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 #: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Slaptažodis turi būti nuo 8 iki 30 simbolių!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Slaptažodis sėkmingai pakeistas"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
 #: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Slaptažodžiai nesutampa!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2262,7 +2264,7 @@ msgstr ""
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Profile"
-msgstr ""
+msgstr "Profilis"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
@@ -2300,7 +2302,7 @@ msgstr "Lenktynių nustatymai"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Atsitiktinis"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2308,7 +2310,7 @@ msgstr "AtsitiktinÄ— arena"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr ""
+msgstr "Atsitiktinis �empionatas"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
@@ -2507,7 +2509,7 @@ msgstr ""
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
 msgid "Save Grand Prix"
-msgstr ""
+msgstr "Įrašyti �empionatą"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/user_search.stkgui
@@ -2554,7 +2556,7 @@ msgstr ""
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Server Info"
-msgstr ""
+msgstr "Serverio informacija"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
 msgid "Server Selection"
@@ -2563,7 +2565,7 @@ msgstr ""
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
 msgid "Server name :"
-msgstr ""
+msgstr "Serverio pavadinimas :"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
@@ -2583,7 +2585,7 @@ msgstr "Naujos lenktynÄ—s"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Shadows"
-msgstr ""
+msgstr "Šešėliai"
 
 #: src/states_screens/options_screen_video.cpp:470
 #, c-format
@@ -2620,7 +2622,7 @@ msgstr ""
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
 msgid "Singleplayer"
-msgstr ""
+msgstr "Žaisti vienam"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2704,7 +2706,7 @@ msgstr "PradÄ—ti lenktynes"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "BÅ«sena"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2719,7 +2721,7 @@ msgstr "Sukimas dešinėn"
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
 msgid "Story Mode"
-msgstr ""
+msgstr "Pradžia ir užduotys"
 
 #. I18N: ./data/achievements.xml
 msgid "Strike!"
@@ -2877,7 +2879,7 @@ msgstr ""
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Å iandien"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -2944,7 +2946,7 @@ msgstr ""
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr ""
+msgstr "Tipas: �empionatas (Grand Prix)"
 
 #: src/online/xml_request.cpp:83
 msgid ""
@@ -3002,7 +3004,7 @@ msgstr "Panaudokite surinktą „nitro“ kurą paspausdami <%s>!"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
 msgid "User Info"
-msgstr ""
+msgstr "Naudotojo informacija"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
@@ -3031,7 +3033,7 @@ msgstr ""
 #: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
 msgid "Username"
-msgstr ""
+msgstr "Naudotojo vardas"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
@@ -3319,7 +3321,7 @@ msgstr "Jūsų įvesties konfigūracijos failas nesuderinamas su šia STK versij
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Tavo duomenys"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
 msgid "Zen Garden"
diff --git a/data/po/lv.po b/data/po/lv.po
new file mode 100644
index 000000000..62d5b88e6
--- /dev/null
+++ b/data/po/lv.po
@@ -0,0 +1,3372 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-02-15 01:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/supertuxkart/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#. I18N: Do NOT literally translate this string!! Please enter Y as the
+#. translation if your language is a RTL (right-to-left) language,
+#. N (or nothing) otherwise
+#: src/utils/translation.cpp:262
+msgid "   Is this a RTL language?"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid ""
+" But you pathetic little twerps will never be able to beat me - King of the "
+"Karts!"
+msgstr ""
+
+#. I18N: Only used for count > 3
+#: src/online/online_player_profile.cpp:429
+#, c-format
+msgid "%d friend is now online."
+msgid_plural "%d friends are now online."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
+#, c-format
+msgid "%s (handicapped)"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:172
+#: src/states_screens/dialogs/addons_loading.cpp:176
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:165
+#, c-format
+msgid "%s MB"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:418
+#, c-format
+msgid "%s and %s are now online."
+msgstr ""
+
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/states_screens/addons_screen.cpp:306
+#, c-format
+msgctxt "addons"
+msgid "%s by %s"
+msgstr ""
+
+#: src/modes/linear_world.cpp:358
+#, c-format
+msgctxt "fastest_lap"
+msgid "%s by %s"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:414
+#, c-format
+msgid "%s is now online."
+msgstr ""
+
+#: src/guiengine/widgets/player_kart_widget.cpp:420
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:108
+#, c-format
+msgid "%s's profile"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:60
+#, c-format
+msgid "%s's server"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:423
+#, c-format
+msgid "%s, %s and %s are now online."
+msgstr ""
+
+#: src/modes/world.cpp:1147
+#, c-format
+msgid "'%s' has been eliminated."
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
+msgid "(Empty)"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "(network play is not yet available)"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:372
+msgid "* A blue item means a conflict with another configuration"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:377
+msgid "* A red item means a conflict in the current configuration"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help screen
+msgid "* Current key bindings can be seen/changed in menu Options"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"* Most of these game modes can also be played in a Grand Prix fashion: "
+"instead of playing a single race, you play many in a row. The better you "
+"rank, the more points you get. In the end, the player with the most points "
+"wins the cup."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "* Restart STK to apply new settings"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+msgid ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_achievements.stkgui
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "..."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:52
+msgid "1 month"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:50
+msgid "1 week"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:56
+msgid "1 year"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:51
+msgid "2 weeks"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:57
+msgid "2 years"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:182
+msgid "3 Strikes Battle"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
+"they lose all their lives."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:53
+msgid "3 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:54
+msgid "6 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:55
+msgid "9 months"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+msgid "= Highscores ="
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "AI karts"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:189
+msgid "Abort Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "About"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:236
+msgid "Accelerate"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:975
+#, c-format
+msgid ""
+"Accelerate and press the <%s> key while turning to skid. Skidding for a "
+"short while can help you turn faster to take sharp turns."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:897
+#, c-format
+msgid "Accelerate with <%s> and steer with <%s> and <%s>"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Accept"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Account Recovery"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:101
+msgid "Account Settings"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:100
+msgid "Achievements"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:71
+msgid "Action"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Add"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Add Friend"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:111
+msgid "Add Keyboard Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Add Player"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:90
+msgid "Add Wiimote"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Add a device"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Add user"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
+#: src/states_screens/grand_prix_editor_screen.cpp:336
+#: src/states_screens/kart_selection.cpp:286
+#: src/states_screens/tracks_screen.cpp:155
+msgid "Add-Ons"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:110
+msgid "Add-on name"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Addons"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
+msgid "Adiumy"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Advanced pipeline (lights, etc.)"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
+#: src/states_screens/addons_screen.cpp:49
+#: src/states_screens/arenas_screen.cpp:75
+#: src/states_screens/easter_egg_screen.cpp:137
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
+msgid "All"
+msgstr ""
+
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: Section in easter egg tracks selection screen
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+msgid "All Tracks"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:202
+msgid "All blows allowed, so catch weapons and make clever use of them!"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Always show login screen"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Ambient Occlusion"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:464
+#, c-format
+msgid "Ambient occlusion : %s"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:323
+msgid "An error occurred while trying to save your grand prix."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Anchor - slows down greatly the kart in the first position."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Characters"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:450
+#, c-format
+msgid "Animated Characters : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Scenery"
+msgstr ""
+
+#. I18N: in graphical options
+#. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
+#. UserConfigParams::m_pixel_shaders ? enabled : disabled);
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:444
+#, c-format
+msgid "Animated Scenery : %s"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
+msgid "Anisotropic x16"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
+msgid "Anisotropic x2"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
+msgid "Anisotropic x8"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
+msgid "Another grand prix with this name already exists."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Anti-aliasing"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:461
+#, c-format
+msgid "Anti-aliasing : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Apply"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Apply new resolution"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Arch Enemy"
+msgstr ""
+
+#. I18N: shown before deleting an input configuration
+#: src/states_screens/options_screen_input2.cpp:575
+msgid "Are you sure you want to permanently delete this configuration?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:123
+#: src/states_screens/grand_prix_editor_screen.cpp:109
+#, c-format
+msgid "Are you sure you want to remove '%s'?"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
+msgid "Arenas"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/lighthouse/track.xml
+msgid "Around the lighthouse"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign nothing"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign to ESC key"
+msgstr ""
+
+#. I18N: ./data/grandprix/4_atworldsend.grandprix
+msgid "At World's End"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
+msgid "Audio"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: src/tracks/track_object_presentation.cpp:906
+msgid "Avoid bananas!"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:284
+#, c-format
+msgid "Axis %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:272
+#, c-format
+msgid "Axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:279
+#, c-format
+msgid "Axis %d inverted"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
+#: src/states_screens/dialogs/addons_loading.cpp:284
+msgid "Back"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to Game"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Back to Race"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:205
+msgid "Back to challenge selection"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+msgid "Back to device list"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to menu"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:211
+msgid "Back to the menu"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Banana Lover"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/battleisland/track.xml
+msgid "Battle Island"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/beastie/kart.xml
+msgid "Beastie"
+msgstr ""
+
+#. I18N: when failing a GP
+#: src/states_screens/grand_prix_lose.cpp:161
+msgid "Better luck next time!"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
+msgid "Bilinear"
+msgstr ""
+
+#. I18N: Name of the black button on xbox controller
+#: src/input/gamepad_config.cpp:167
+msgid "Black"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mansion/track.xml
+msgid "Blackhill Mansion"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Bloom"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:473
+#, c-format
+msgid "Bloom : %s"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:969
+msgid "Blue Team Wins"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/farm/track.xml
+msgid "Bovine Barnyard"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:239
+msgid "Brake"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"BubbleGum - protect yourself with a shield, or use while looking back to "
+"leave a sticky pink puddle behind you."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "But I'm a fair creature, so I'll make you a deal."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Cake - thrown at the closest rival, best on short ranges and long straights."
+msgstr ""
+
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
+msgid "Can't access stkaddons server..."
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/addons_loading.cpp:227
+#: src/states_screens/dialogs/add_device_dialog.cpp:128
+#: src/states_screens/user_screen.cpp:112
+msgid "Cancel"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:56
+msgid "Cancel Request"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:277
+msgid "Cancel/Back"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cave/track.xml
+msgid "Cave X"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:493
+msgid "Challenge Completed"
+msgstr ""
+
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
+msgid "Challenge Failed"
+msgstr ""
+
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Title for challenges screen
+msgid "Challenges : Trophy Room"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "Change"
+msgstr ""
+
+#. I18N: ./data/gui/karts.stkgui
+#. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts_online.stkgui
+#. I18N: In the kart selection (player setup) screen
+msgid "Choose a Kart"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Christoffel Columbus"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+msgid "Click here to play the tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
+msgid "Close"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+msgid "Cocoa Temple"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Collect at least 5 bananas in one race."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid "Collect blue boxes : they will give you weapons or other powerups"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:916
+#, c-format
+msgid ""
+"Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:938
+msgid "Collect nitro bottles (we will use them after the curve)"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:648
+msgid "Collect nitro!"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"Collecting nitro allows you to get speed boosts whenever you wish by "
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:880
+msgid "Complete all challenges to unlock the big door!"
+msgstr ""
+
+#: src/achievements/achievement.cpp:202
+#, c-format
+msgid "Completed achievement \"%s\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Confirm"
+msgstr ""
+
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
+#, c-format
+msgid "Confirm resolution within %i seconds"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Connect to the Internet"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:387
+msgid ""
+"Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
+"instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:209
+msgid "Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+#. I18N: ./data/gui/tutorial_message_dialog.stkgui
+#. I18N: Button in tutorial
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
+msgid "Continue"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#: src/states_screens/gp_info_screen.cpp:146
+msgid "Continue saved GP"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:156
+msgid "Continue."
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:67
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
+msgid "Controls"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Copy"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
+#, c-format
+msgid "Could not create player '%s'."
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:418
+msgid "Could not detect any wiimote :/"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Create"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Create Server"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Create User"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:117
+msgid "Creating server"
+msgstr ""
+
+#. I18N: ./data/gui/credits.stkgui
+#. I18N: Title in credits screen
+msgid "Credits"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Current Password"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:134
+msgid "Current password invalid."
+msgstr ""
+
+#: src/config/player_manager.cpp:91
+msgid "Currently not signed in"
+msgstr ""
+
+#. I18N: custom video settings
+#: src/states_screens/options_screen_video.cpp:411
+msgid "Custom"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Custom settings..."
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
+msgid "DPad down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
+msgid "DPad left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
+msgid "DPad right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
+msgid "DPad up"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Decline"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:74
+msgid "Default"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Delete"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+#: src/states_screens/options_screen_input2.cpp:111
+msgid "Delete Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Depth of field"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:485
+#, c-format
+msgid "Depth of field : %s"
+msgstr ""
+
+#. I18N: button to disable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:96
+#: src/states_screens/options_screen_input2.cpp:587
+msgid "Disable Device"
+msgstr ""
+
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is disabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
+msgid "Disabled"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Display FPS"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:354
+msgid "Do you really want to abort the Grand Prix?"
+msgstr ""
+
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/user_screen.cpp:583
+#, c-format
+msgid "Do you really want to delete player '%s' ?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:140
+msgid "Do you want to save your changes?"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
+msgid "Don't accelerate before go"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:265
+msgid "Down"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Drive in reverse"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:455
+#, c-format
+msgid "Dynamic lights : %s"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Edit"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Title in edit grand prix screen
+msgid "Edit Grand Prix"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:184
+msgid "Egg Hunt"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Egg hunt: Explore tracks to find all hidden eggs."
+msgstr ""
+
+#: src/modes/easter_egg_hunt.cpp:202
+#, c-format
+msgid "Eggs: %d / %d"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/elephpant/kart.xml
+msgid "Elephpant"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
+msgid "Eliminated"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Email"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:292
+msgid "Email has to be between 4 and 50 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:298
+msgid "Email is invalid!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:276
+msgid "Emails don't match!"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/emule/kart.xml
+msgid "Emule"
+msgstr ""
+
+#. I18N: button to enable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:98
+#: src/states_screens/options_screen_input2.cpp:588
+msgid "Enable Device"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Enable per-player handicaps"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
+msgid "Enabled"
+msgstr ""
+
+#. I18N: animations setting (all karts are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
+msgid "Enabled for all"
+msgstr ""
+
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+msgid "Enter the new player's name"
+msgstr ""
+
+#: src/addons/news_manager.cpp:172
+#, c-format
+msgid "Error downloading news: '%s'."
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:923
+msgid ""
+"Everyone:\n"
+"Press 'Select' now to join the game!"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Exit"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Exit Race"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:111
+msgid "Exit game"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Expert"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:252
+msgid "Explore tracks to find all hidden eggs"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1795
+#, c-format
+msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1804
+#, c-format
+msgid "FPS: %d/%d/%d - %d KTris"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:128
+#: src/states_screens/online_profile_achievements.cpp:168
+msgid "Fetching achievements"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:88
+#: src/states_screens/online_profile_friends.cpp:174
+msgid "Fetching friends"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:171
+msgid "Fetching last vote"
+msgstr ""
+
+#: src/states_screens/server_selection.cpp:67
+#: src/states_screens/server_selection.cpp:210
+msgid "Fetching servers"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+msgid ""
+"Fill in the username and email address you supplied at registration to be "
+"able to reset your password."
+msgstr ""
+
+#: src/modes/linear_world.cpp:276
+msgid "Final lap!"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Find Server"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:242
+msgid "Fire"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"First, you will need several input devices (having multiple gamepads or "
+"joysticks is the best way to play with several people). Go in the input "
+"configuration screen and setup the gamepads. It is also possible to play on "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
+"because they do not support large number of keypresses."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:180
+msgid "Follow the Leader"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:650
+msgid "Follow the leader!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Follow the leader: Run for second place, as the last kart will be "
+"disqualified every time the counter hits zero. Beware : going in front of "
+"the leader will get you eliminated too!"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/fortmagma/track.xml
+msgid "Fort Magma"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:413
+#, c-format
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:313
+msgid "Friend removed!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:215
+msgid "Friend request accepted!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:364
+msgid "Friend request cancelled!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:267
+msgid "Friend request declined!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:158
+msgid "Friend request sent!"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:99
+msgid "Friends"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Fullscreen"
+msgstr ""
+
+#. I18N: Shown when a goal is scored
+#: src/states_screens/race_gui_base.cpp:70
+msgid "GOAL!"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:144
+msgid "Game Keys"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Game Modes"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Game type (Goals limit / Time limit)"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad buttons
+#: src/input/binding.cpp:292
+#, c-format
+msgid "Gamepad button %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad hats
+#: src/input/binding.cpp:260 src/input/binding.cpp:265
+#, c-format
+msgid "Gamepad hat %d"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "General"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Give Up Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Global illumination"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:489
+#, c-format
+msgid "Global illumination : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Glow (outlines)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:477
+#, c-format
+msgid "Glow (outlines) : %s"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/gnu/kart.xml
+msgid "Gnu"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:68
+msgid "Go!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Gold driver"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+msgid "Gran Paradiso Island"
+msgstr ""
+
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+#: src/states_screens/dialogs/select_challenge.cpp:145
+msgid "Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Grand Prix Editor"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Title in grand prix editor screen
+msgid "Grand Prix editor"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1214
+msgid "Grand Prix progress:"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Graphical Effects Level"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
+msgid "Graphics"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Graphics Settings"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/greenvalley/track.xml
+msgid "Green Valley"
+msgstr ""
+
+#. I18N: Name of first guest player (without number)
+#: src/config/player_manager.cpp:392
+msgid "Guest"
+msgstr ""
+
+#. I18N: Name of further guest players, with a 1, 2, ... attached
+#: src/config/player_manager.cpp:397
+#, c-format
+msgid "Guest %d"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Guest Log in"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/hacienda/track.xml
+msgid "Hacienda"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Help"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/hexley/kart.xml
+msgid "Hexley"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1252
+msgid "Highscores"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit 10 karts with a bowling-ball."
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:231
+msgid ""
+"Hit others with weapons until they lose all their lives. (Only in "
+"multiplayer games)"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit the same kart at least 5 times in one race."
+msgstr ""
+
+#. I18N: animations setting (only karts with human players are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
+msgid "Human players only"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "I agree to the above terms and am 13 years or older. "
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "If you can beat me at racing, I will free the old codger."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"If you see a button with a lock like this one, you need to complete a "
+"challenge to unlock it."
+msgstr ""
+
+#: src/input/input_manager.cpp:729
+#, c-format
+msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Install"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Intermediate"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
+msgid "Internet access is disabled, please enable it in the options"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:974
+msgid "It's a draw"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "It's secret"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Join"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:155
+msgid "Joining server"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+msgid "Karts"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+msgid "Keep this resolution"
+msgstr ""
+
+#. I18N: short definition for follow-the-leader game mode
+#: src/states_screens/race_setup_screen.cpp:222
+msgid "Keep up with the leader kart but don't overtake it!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:72
+msgid "Key binding"
+msgstr ""
+
+#: src/states_screens/options_screen_input.cpp:97
+#, c-format
+msgid "Keyboard %i"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/konqi/kart.xml
+msgid "Konqi"
+msgstr ""
+
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui_overworld.cpp:108
+msgid "Lap"
+msgstr ""
+
+#: src/modes/linear_world.cpp:303
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:67
+msgid "Laps"
+msgstr ""
+
+#. I18N: number of laps to race in a challenge
+#: src/challenges/challenge_data.cpp:249
+#, c-format
+msgid "Laps : %i"
+msgstr ""
+
+#: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
+msgid "Leader"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:268
+msgid "Left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:212
+msgid "Left bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:220
+msgid "Left thumb button"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:235
+msgid "Left thumb down"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:233
+msgid "Left thumb left"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:231
+msgid "Left thumb right"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:237
+msgid "Left thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
+msgid "Left trigger"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Light shaft (God rays)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:481
+#, c-format
+msgid "Light shaft (God rays) : %s"
+msgstr ""
+
+#: src/guiengine/engine.cpp:1330
+msgid "Loading"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "Lobby"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Lobby Settings"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Local Name"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:853
+msgid "Locked"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:237
+#: src/states_screens/arenas_screen.cpp:267
+#: src/states_screens/easter_egg_screen.cpp:225
+#: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
+msgid "Locked : solve active challenges to gain access to more!"
+msgstr ""
+
+#: src/states_screens/tracks_screen.cpp:201
+msgid "Locked!"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
+#: src/states_screens/main_menu_screen.cpp:175
+#: src/states_screens/main_menu_screen.cpp:186
+msgid "Login"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:251
+msgid "Look Back"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: In the profile screen
+msgid "Look for more friends:"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make 5 skidding in a single lap."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make a race with 5 laps or more."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Marathoner"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Max. number of players"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Maximum time (min.)"
+msgstr ""
+
+#. I18N: if some kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:436
+msgid "Me Only"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:158
+msgid "Menu Keys"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/minigolf/track.xml
+msgid "Minigolf"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Motion blur"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:458
+#, c-format
+msgid "Motion blur: %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:299
+#, c-format
+msgid "Mouse axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:295
+#, c-format
+msgid "Mouse button %d"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move down"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move up"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Multi­player"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Music"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#: src/states_screens/online_profile_achievements.cpp:73
+#: src/states_screens/server_selection.cpp:91
+msgid "Name"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:132
+msgid "Name has to be between 4 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
+msgid "Name is empty."
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
+msgid "Name is too long."
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Name of the server"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "New"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:502
+#, c-format
+msgid "New Grand Prix '%s' now available"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "New Password"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:145
+msgid "New Request"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:506
+#, c-format
+msgid "New difficulty '%s' now available"
+msgstr ""
+
+#: src/modes/linear_world.cpp:363
+msgid "New fastest lap"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:492
+#, c-format
+msgid "New game mode '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:516
+#, c-format
+msgid "New kart '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:486
+#, c-format
+msgid "New track '%s' now available"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:245
+msgid "Nitro"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:147
+msgid "Nitro challenge"
+msgstr ""
+
+#: src/states_screens/dialogs/message_dialog.cpp:128
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "No"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/nolok/kart.xml
+msgid "Nolok"
+msgstr ""
+
+#. I18N: if no kart animations are enabled
+#: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
+msgid "None"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:176
+msgid "Normal Race"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowmountain/track.xml
+msgid "Northern Resort"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:986
+msgid ""
+"Note that if you manage to skid for several seconds, you will receive a "
+"bonus speedup as a reward!"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Novice"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:68
+#, c-format
+msgid "Number of AI Karts : %i"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of AI karts"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Number of goals to win"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of laps"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Number of laps:"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
+msgid "OK"
+msgstr ""
+
+#. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
+msgid "Off the beaten track"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:150
+msgid "Offline"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mines/track.xml
+msgid "Old Mine"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/olivermath/track.xml
+msgid "Oliver's Math Class"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/main_menu_screen.cpp:170
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
+msgid "Online"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Online Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Online Username"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:280
+msgid "Online username has to be between 3 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:284
+msgid "Online username must not start with a number!"
+msgstr ""
+
+#: src/input/input_manager.cpp:759
+msgid "Only the Game Master may act at this point!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:960
+#, c-format
+msgid "Oops! When you're in trouble, press <%s> to be rescued"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Options"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: Section in the profile screen
+msgid "Overview"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:93
+msgid "POWER"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Parachute - slows down all karts in a better position."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the registration dialog
+msgid "Password"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: In the online account settings screen
+msgid "Password :"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Password Change"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
+msgid "Password has to be between 8 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:210
+msgid "Password successfully changed."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
+msgid "Passwords don't match!"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:257
+msgid "Pause Game"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+msgid "Paused"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
+msgid "Penalty time!!"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:146
+msgid "Pending"
+msgstr ""
+
+#. I18N: ./data/grandprix/1_penguinplayground.grandprix
+msgid "Penguin Playground"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:247
+msgid "Performing vote"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/pidgin/kart.xml
+msgid "Pidgin"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+msgid "Play all"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Play every official track at least once."
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
+msgid "Players"
+msgstr ""
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+msgid "Please enter the name of the grand prix"
+msgstr ""
+
+#. I18N: shown when config file is too old
+#: src/input/device_manager.cpp:500
+msgid "Please re-configure your key bindings."
+msgstr ""
+
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:437
+msgid "Please wait while addons are updated"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:557
+msgid "Please wait while the add-ons are loading"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Plunger - throw straight to pull an opponent back, or throw while looking "
+"back to make one lose sight."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Powerup Love"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:930
+#, c-format
+msgid ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Press ESC to cancel"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+msgid "Press a key"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Press enter or double-click on a device to configure it"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Press enter or double-click on a player to edit him/her"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:462
+msgid "Press fire to play the tutorial"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:532
+msgid "Press fire to start the challenge"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:390
+msgid ""
+"Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
+"mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:357
+#, c-format
+msgid "Problems installing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:394
+#, c-format
+msgid "Problems removing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:474
+msgid "Processing"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Profile"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:79
+msgid "Progress"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/puffy/kart.xml
+msgid "Puffy"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:240
+msgid ""
+"Push the ball to the opposite cage to score goals. (Only in multiplayer "
+"games)"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Quick Play"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Quit"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:159
+msgid "Quit the server."
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "Race Setup"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:77
+msgid "Random"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:277
+msgid "Random Arena"
+msgstr ""
+
+#: src/race/grand_prix_data.hpp:171
+msgid "Random Grand Prix"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:839
+#: src/states_screens/kart_selection.cpp:1467
+msgid "Random Kart"
+msgstr ""
+
+#: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
+msgid "Random Track"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:109
+msgid "Rank"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
+msgid "Rating >="
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:64
+msgid "Ready!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Really ... a secret."
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:965
+msgid "Red Team Wins"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Register"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Regular Race: All blows allowed, so catch weapons and make clever use of "
+"them!"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
+msgid "Reload"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Remember password"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Remember window location"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Remove"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Rename"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:64
+#, c-format
+msgid "Required Nitro Points : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:53
+#, c-format
+msgid "Required Rank : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:58
+#, c-format
+msgid "Required Time : %i"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:254
+msgid "Rescue"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Resolution"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:199
+msgid "Restart"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Restart Race"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Reverse"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Reverse:"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:68
+msgid "Reversed"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:271
+msgid "Right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:214
+msgid "Right bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:222
+msgid "Right thumb button"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
+msgid "Right thumb down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
+msgid "Right thumb left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
+msgid "Right thumb right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
+msgid "Right thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
+msgid "Right trigger"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:89
+msgid "SPEED"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+msgid "STK Enterprise"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Save"
+msgstr ""
+
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+msgid "Save Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "Search"
+msgstr ""
+
+#: src/states_screens/online_user_search.cpp:208
+#: src/states_screens/online_user_search.cpp:288
+msgid "Searching"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:274
+msgid "Select"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a difficulty"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a game mode"
+msgstr ""
+
+#: src/states_screens/edit_track_screen.cpp:238
+msgid "Select a track"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Select kart"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Send anonymous HW statistics"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Server Creation"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Server Info"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_selection.stkgui
+msgid "Server Selection"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Server name :"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:58
+msgid "Server successfully created. You can now join it."
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:66
+msgid "Set!"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+#: src/states_screens/race_result_gui.cpp:209
+msgid "Setup New Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Shadows"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
+#, c-format
+msgid "Shadows: %s"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/sandtrack/track.xml
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/city/track.xml
+msgid "Shiny Suburbs"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In As Guest"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:70
+msgid "Since"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Singleplayer"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:177
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Skid-row"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:248
+msgid "Skidding"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Skin"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+msgid "Snow Peak"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:186
+msgid "Soccer"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/soccer_field/track.xml
+msgid "Soccer field"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Soccer: Only in multiplayer games. Use your kart to push the ball into the "
+"goal."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
+msgid ""
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
+"firewall"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:279
+msgid "Sorry, downloading the add-on failed"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Sound Effects"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#: src/states_screens/grand_prix_editor_screen.cpp:334
+msgid "Standard"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:218
+msgid "Start"
+msgstr ""
+
+#: src/states_screens/dialogs/gp_info_dialog.cpp:209
+msgid "Start Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Start Race"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:71
+msgid "Status"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:230
+msgid "Steer Left"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:233
+msgid "Steer Right"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Story Mode"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Strike!"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Submit"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/subsea/track.xml
+msgid "Subsea"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+msgid "SuperTux"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+msgid "SuperTuxKart Addons"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart Help"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
+msgid "SuperTuxKart Options"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+msgid "SuperTuxKart features several game modes"
+msgstr ""
+
+#: src/main.cpp:1201
+msgid ""
+"SuperTuxKart may connect to a server to download add-ons and notify you of "
+"updates. We also collect anonymous hardware statistics to help with the "
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr ""
+
+#. I18N: ../stk-assets/karts/suzanne/kart.xml
+msgid "Suzanne"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Swatter - will squash karts close by, slowing them down."
+msgstr ""
+
+#. I18N: in the language choice, to select the same language as the OS
+#: src/states_screens/options_screen_ui.cpp:186
+msgid "System Language"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "Terms and Agreement"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture compression"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture filtering"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help menu
+msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stadium/track.xml
+msgid "The Stadium"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:545
+msgid "The add-ons module is currently disabled in the Options screen"
+msgstr ""
+
+#: src/race/highscore_manager.cpp:101
+msgid ""
+"The highscore file was too old,\n"
+"all highscores have been erased."
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:136
+msgid "The maxinum number of players has to be between 2 and 12."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:178
+msgid "Time Trial"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#: src/states_screens/dialogs/add_device_dialog.cpp:64
+msgid ""
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
+"\n"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu
+msgid "To help you win, there are some powerups you can collect :"
+msgstr ""
+
+#. I18N: ./data/grandprix/3_tothemoonandback.grandprix
+msgid "To the moon and back"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:154
+#: src/states_screens/dialogs/user_info_dialog.cpp:211
+msgid "Today"
+msgstr ""
+
+#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/race_gui_base.cpp:103
+#, c-format
+msgid "Top %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:66
+msgid "Track"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1130
+#, c-format
+msgid "Track %i/%i"
+msgstr ""
+
+#. I18N: when showing who is the author of track '%s'
+#. I18N: (place %s where the name of the author should appear)
+#: src/states_screens/track_info_screen.cpp:107
+#, c-format
+msgid "Track by %s"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Track group"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Tracks"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
+msgid "Trilinear"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:369
+#: src/states_screens/dialogs/addons_loading.cpp:406
+msgid "Try again"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#: src/states_screens/race_gui_overworld.cpp:455
+msgid "Tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: Title for tutorials screen
+msgid "Tutorial : Selection Room"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/tux/kart.xml
+msgid "Tux"
+msgstr ""
+
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Type of race, in a challenge
+msgid "Type :"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:502
+msgid "Type: Grand Prix"
+msgstr ""
+
+#: src/online/xml_request.cpp:83
+msgid ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Uninstall"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Unstoppable"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:262
+msgid "Up"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:96
+msgid "Update"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
+msgid "Updated"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:111
+msgid "Updated date"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Use 10 or more powerups in a race."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Use high definition textures"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Use left/right to choose your team and press fire"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:949
+#, c-format
+msgid "Use the nitro you collected by pressing <%s>!"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog' dialog
+msgid "User Info"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
+msgid "User Interface"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:335
+msgid "User defined"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "User search"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
+#: src/states_screens/online_user_search.cpp:74
+msgid "Username"
+msgstr ""
+
+#: src/states_screens/dialogs/recovery_dialog.cpp:121
+msgid "Username and/or email address invalid."
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "VS"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:235
+#: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
+msgid "Validating info"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:108
+#, c-format
+msgid "Version: %d"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Vertical Sync (requires restart)"
+msgstr ""
+
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "View"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Volume"
+msgstr ""
+
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: In the vote dialog
+msgid "Vote"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:230
+msgid "Vote successful! You can now close the window."
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:85
+msgid "WEIGHT"
+msgstr ""
+
+#: src/modes/linear_world.cpp:882
+msgid "WRONG WAY!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:479
+msgid ""
+"Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
+"keys that contain a character that is different in upper-case will stop "
+"working."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Weapons"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Weather Effects"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:447
+#, c-format
+msgid "Weather Effects : %s"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "What's wrong, little hippies? Your great gnu leader is missing?"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"When input devices are configured, you are ready to play. Select the "
+"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
+"game continues when everyone selected their kart. Note that the mouse may "
+"not be used for this operation."
+msgstr ""
+
+#. I18N: Name of the white button on xbox controller
+#: src/input/gamepad_config.cpp:171
+msgid "White"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/wilber/kart.xml
+msgid "Wilber"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win 5 single races in a row."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win in all single player modes, against at least 3 opponents."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/xr591/track.xml
+msgid "XR591"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/xue/kart.xml
+msgid "Xue"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "Yes"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:996
+msgid "You are now ready to race. Good luck!"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+msgid "You are playing as"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:190
+msgid "You can adapt your previous rating by clicking the stars beneath."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:513
+msgid ""
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"the Internet\"."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:488
+msgid ""
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
+"Internet\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid ""
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
+"Please read our privacy statement at http://privacy.supertuxkart.net"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
+msgid "You completed a challenge!"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:176
+msgid "You completed challenges!"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:279
+msgid "You completed the Grand Prix!"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:208
+#, c-format
+msgid ""
+"You completed the difficult challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:200
+#, c-format
+msgid "You completed the easy challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:204
+#, c-format
+msgid ""
+"You completed the intermediate challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/karts/kart.cpp:856
+msgid "You finished the race!"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:466
+#, c-format
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/online/online_player_profile.cpp:472
+msgid "You have a new friend request!"
+msgstr ""
+
+#: src/modes/world.cpp:1144
+msgid "You have been eliminated!"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:195
+msgid ""
+"You have not yet voted for this addon. Select your desired rating by "
+"clicking the stars beneath"
+msgstr ""
+
+#: src/karts/kart.cpp:1913
+msgid ""
+"You need more points\n"
+"to enter this challenge!\n"
+"Check the minimap for\n"
+"available challenges."
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:472
+msgid "You need to enter a password."
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:568
+msgid "You unlocked grand prix %0"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:530
+msgid "You unlocked track %0"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+msgid ""
+"You will receive an email with further instructions on how to reset your "
+"password. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:361
+msgid ""
+"You will receive an email with further instructions regarding account "
+"activation. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
+msgid "You won the race!"
+msgstr ""
+
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
+#: src/config/user_config.cpp:700
+msgid ""
+"Your config file was malformed, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/config/user_config.cpp:711
+msgid ""
+"Your config file was too old, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
+#: src/input/device_manager.cpp:501
+msgid "Your input config file is not compatible with this version of STK."
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:105
+#: src/states_screens/online_profile_base.cpp:115
+msgid "Your profile"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/zengarden/track.xml
+msgid "Zen Garden"
+msgstr ""
+
+#. I18N: Unbound key binding
+#: src/input/binding.cpp:90
+msgid "[none]"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "actions"
+msgstr ""
+
+#. I18N: track group name
+#: src/states_screens/tracks_screen.cpp:151
+msgid "all"
+msgstr ""
+
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
+#: src/states_screens/race_gui_base.cpp:540
+msgid "by"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:139
+msgid "featured"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
+msgid "low"
+msgstr ""
+
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:81
+#: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
+msgid "standard"
+msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr ""
diff --git a/data/po/mn_MN.po b/data/po/mn_MN.po
new file mode 100644
index 000000000..0d2b1b04a
--- /dev/null
+++ b/data/po/mn_MN.po
@@ -0,0 +1,3369 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: SuperTuxKart\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"PO-Revision-Date: 2015-02-15 01:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian (Mongolia) (http://www.transifex.com/projects/p/supertuxkart/language/mn_MN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn_MN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. I18N: Do NOT literally translate this string!! Please enter Y as the
+#. translation if your language is a RTL (right-to-left) language,
+#. N (or nothing) otherwise
+#: src/utils/translation.cpp:262
+msgid "   Is this a RTL language?"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid ""
+" But you pathetic little twerps will never be able to beat me - King of the "
+"Karts!"
+msgstr ""
+
+#. I18N: Only used for count > 3
+#: src/online/online_player_profile.cpp:429
+#, c-format
+msgid "%d friend is now online."
+msgid_plural "%d friends are now online."
+msgstr[0] ""
+msgstr[1] ""
+
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:360
+#, c-format
+msgid "%s (handicapped)"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:172
+#: src/states_screens/dialogs/addons_loading.cpp:176
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:165
+#, c-format
+msgid "%s MB"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:418
+#, c-format
+msgid "%s and %s are now online."
+msgstr ""
+
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/states_screens/addons_screen.cpp:306
+#, c-format
+msgctxt "addons"
+msgid "%s by %s"
+msgstr ""
+
+#: src/modes/linear_world.cpp:358
+#, c-format
+msgctxt "fastest_lap"
+msgid "%s by %s"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:414
+#, c-format
+msgid "%s is now online."
+msgstr ""
+
+#: src/guiengine/widgets/player_kart_widget.cpp:420
+#, c-format
+msgid "%s is ready"
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:108
+#, c-format
+msgid "%s's profile"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:60
+#, c-format
+msgid "%s's server"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:423
+#, c-format
+msgid "%s, %s and %s are now online."
+msgstr ""
+
+#: src/modes/world.cpp:1147
+#, c-format
+msgid "'%s' has been eliminated."
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:252
+msgid "(Empty)"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "(network play is not yet available)"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:372
+msgid "* A blue item means a conflict with another configuration"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:377
+msgid "* A red item means a conflict in the current configuration"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help screen
+msgid "* Current key bindings can be seen/changed in menu Options"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"* Most of these game modes can also be played in a Grand Prix fashion: "
+"instead of playing a single race, you play many in a row. The better you "
+"rank, the more points you get. In the end, the player with the most points "
+"wins the cup."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "* Restart STK to apply new settings"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+msgid ""
+"* Which config to use will be inferred from which 'Select' key is pressed to"
+" join the game."
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_achievements.stkgui
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "..."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:52
+msgid "1 month"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:50
+msgid "1 week"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:56
+msgid "1 year"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:51
+msgid "2 weeks"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:57
+msgid "2 years"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:182
+msgid "3 Strikes Battle"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
+"they lose all their lives."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:53
+msgid "3 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:54
+msgid "6 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:55
+msgid "9 months"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+msgid "= Highscores ="
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "AI karts"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:189
+msgid "Abort Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "About"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:236
+msgid "Accelerate"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:975
+#, c-format
+msgid ""
+"Accelerate and press the <%s> key while turning to skid. Skidding for a "
+"short while can help you turn faster to take sharp turns."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:897
+#, c-format
+msgid "Accelerate with <%s> and steer with <%s> and <%s>"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Accept"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Account Recovery"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:101
+msgid "Account Settings"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:100
+msgid "Achievements"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:71
+msgid "Action"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Add"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Add Friend"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:111
+msgid "Add Keyboard Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Add Player"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:90
+msgid "Add Wiimote"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Add a device"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Add user"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:83
+#: src/states_screens/easter_egg_screen.cpp:145
+#: src/states_screens/grand_prix_editor_screen.cpp:336
+#: src/states_screens/kart_selection.cpp:286
+#: src/states_screens/tracks_screen.cpp:155
+msgid "Add-Ons"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:110
+msgid "Add-on name"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Addons"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
+msgid "Adiumy"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Advanced pipeline (lights, etc.)"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#. I18N: Time filters for add-ons
+#. I18N: name of the tab that will show arenas from all groups
+#. I18N: name of the tab that will show tracks from all groups
+#. I18N: if all kart animations are enabled
+#. I18N: name of the tab that will show tracks from all groups
+#: src/states_screens/addons_screen.cpp:49
+#: src/states_screens/arenas_screen.cpp:75
+#: src/states_screens/easter_egg_screen.cpp:137
+#: src/states_screens/edit_track_screen.cpp:147
+#: src/states_screens/gp_info_screen.cpp:76
+#: src/states_screens/grand_prix_editor_screen.cpp:333
+#: src/states_screens/kart_selection.cpp:278
+#: src/states_screens/options_screen_video.cpp:434
+#: src/states_screens/tracks_screen.cpp:145
+msgid "All"
+msgstr ""
+
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: Section in easter egg tracks selection screen
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+msgid "All Tracks"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:202
+msgid "All blows allowed, so catch weapons and make clever use of them!"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Always show login screen"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Ambient Occlusion"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:464
+#, c-format
+msgid "Ambient occlusion : %s"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:323
+msgid "An error occurred while trying to save your grand prix."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Anchor - slows down greatly the kart in the first position."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Characters"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:450
+#, c-format
+msgid "Animated Characters : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Scenery"
+msgstr ""
+
+#. I18N: in graphical options
+#. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
+#. UserConfigParams::m_pixel_shaders ? enabled : disabled);
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:444
+#, c-format
+msgid "Animated Scenery : %s"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
+msgid "Anisotropic x16"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
+msgid "Anisotropic x2"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
+msgid "Anisotropic x8"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
+msgid "Another grand prix with this name already exists."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Anti-aliasing"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:461
+#, c-format
+msgid "Anti-aliasing : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Apply"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Apply new resolution"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Arch Enemy"
+msgstr ""
+
+#. I18N: shown before deleting an input configuration
+#: src/states_screens/options_screen_input2.cpp:575
+msgid "Are you sure you want to permanently delete this configuration?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:123
+#: src/states_screens/grand_prix_editor_screen.cpp:109
+#, c-format
+msgid "Are you sure you want to remove '%s'?"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
+msgid "Arenas"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/lighthouse/track.xml
+msgid "Around the lighthouse"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign nothing"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign to ESC key"
+msgstr ""
+
+#. I18N: ./data/grandprix/4_atworldsend.grandprix
+msgid "At World's End"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/options_screen_video.cpp:163
+#: src/states_screens/user_screen.cpp:647
+msgid "Audio"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: src/tracks/track_object_presentation.cpp:906
+msgid "Avoid bananas!"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:284
+#, c-format
+msgid "Axis %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:272
+#, c-format
+msgid "Axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:279
+#, c-format
+msgid "Axis %d inverted"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
+#: src/states_screens/dialogs/addons_loading.cpp:284
+msgid "Back"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to Game"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Back to Race"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:205
+msgid "Back to challenge selection"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+msgid "Back to device list"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to menu"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:211
+msgid "Back to the menu"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Banana Lover"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Basket Ball - bounces after the leader, and might squash and slow down karts"
+" down on the way."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/battleisland/track.xml
+msgid "Battle Island"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/beastie/kart.xml
+msgid "Beastie"
+msgstr ""
+
+#. I18N: when failing a GP
+#: src/states_screens/grand_prix_lose.cpp:161
+msgid "Better luck next time!"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
+msgid "Bilinear"
+msgstr ""
+
+#. I18N: Name of the black button on xbox controller
+#: src/input/gamepad_config.cpp:167
+msgid "Black"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mansion/track.xml
+msgid "Blackhill Mansion"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Bloom"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:473
+#, c-format
+msgid "Bloom : %s"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:969
+msgid "Blue Team Wins"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/farm/track.xml
+msgid "Bovine Barnyard"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown"
+" backwards."
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:239
+msgid "Brake"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"BubbleGum - protect yourself with a shield, or use while looking back to "
+"leave a sticky pink puddle behind you."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "But I'm a fair creature, so I'll make you a deal."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Cake - thrown at the closest rival, best on short ranges and long straights."
+msgstr ""
+
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
+msgid "Can't access stkaddons server..."
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/addons_loading.cpp:227
+#: src/states_screens/dialogs/add_device_dialog.cpp:128
+#: src/states_screens/user_screen.cpp:112
+msgid "Cancel"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:56
+msgid "Cancel Request"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:277
+msgid "Cancel/Back"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cave/track.xml
+msgid "Cave X"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:493
+msgid "Challenge Completed"
+msgstr ""
+
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
+msgid "Challenge Failed"
+msgstr ""
+
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Title for challenges screen
+msgid "Challenges : Trophy Room"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "Change"
+msgstr ""
+
+#. I18N: ./data/gui/karts.stkgui
+#. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts_online.stkgui
+#. I18N: In the kart selection (player setup) screen
+msgid "Choose a Kart"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Christoffel Columbus"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+msgid "Click here to play the tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
+msgid "Close"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+msgid "Cocoa Temple"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Collect at least 5 bananas in one race."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid "Collect blue boxes : they will give you weapons or other powerups"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:916
+#, c-format
+msgid ""
+"Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:938
+msgid "Collect nitro bottles (we will use them after the curve)"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:648
+msgid "Collect nitro!"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"Collecting nitro allows you to get speed boosts whenever you wish by "
+"pressing the appropriate key. You can see your current level of nitro in the"
+" bar at the right of the game screen."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:880
+msgid "Complete all challenges to unlock the big door!"
+msgstr ""
+
+#: src/achievements/achievement.cpp:202
+#, c-format
+msgid "Completed achievement \"%s\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Confirm"
+msgstr ""
+
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+#: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
+#, c-format
+msgid "Confirm resolution within %i seconds"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Connect to the Internet"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:387
+msgid ""
+"Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
+"instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:209
+msgid "Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+#. I18N: ./data/gui/tutorial_message_dialog.stkgui
+#. I18N: Button in tutorial
+#: src/states_screens/dialogs/gp_info_dialog.cpp:212
+#: src/states_screens/race_result_gui.cpp:186
+msgid "Continue"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#: src/states_screens/gp_info_screen.cpp:146
+msgid "Continue saved GP"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:156
+msgid "Continue."
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:67
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/options_screen_video.cpp:166
+#: src/states_screens/user_screen.cpp:649
+msgid "Controls"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Copy"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
+#, c-format
+msgid "Could not create player '%s'."
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:418
+msgid "Could not detect any wiimote :/"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Create"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Create Server"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Create User"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:117
+msgid "Creating server"
+msgstr ""
+
+#. I18N: ./data/gui/credits.stkgui
+#. I18N: Title in credits screen
+msgid "Credits"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Current Password"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:134
+msgid "Current password invalid."
+msgstr ""
+
+#: src/config/player_manager.cpp:91
+msgid "Currently not signed in"
+msgstr ""
+
+#. I18N: custom video settings
+#: src/states_screens/options_screen_video.cpp:411
+msgid "Custom"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Custom settings..."
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
+msgid "DPad down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
+msgid "DPad left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
+msgid "DPad right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
+msgid "DPad up"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Decline"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:74
+msgid "Default"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Delete"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+#: src/states_screens/options_screen_input2.cpp:111
+msgid "Delete Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Depth of field"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:485
+#, c-format
+msgid "Depth of field : %s"
+msgstr ""
+
+#. I18N: button to disable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:96
+#: src/states_screens/options_screen_input2.cpp:587
+msgid "Disable Device"
+msgstr ""
+
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is disabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:432
+msgid "Disabled"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Display FPS"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:354
+msgid "Do you really want to abort the Grand Prix?"
+msgstr ""
+
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/user_screen.cpp:583
+#, c-format
+msgid "Do you really want to delete player '%s' ?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:140
+msgid "Do you want to save your changes?"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
+msgid "Don't accelerate before go"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:265
+msgid "Down"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Drive in reverse"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:455
+#, c-format
+msgid "Dynamic lights : %s"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Edit"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Title in edit grand prix screen
+msgid "Edit Grand Prix"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:184
+msgid "Egg Hunt"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Egg hunt: Explore tracks to find all hidden eggs."
+msgstr ""
+
+#: src/modes/easter_egg_hunt.cpp:202
+#, c-format
+msgid "Eggs: %d / %d"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/elephpant/kart.xml
+msgid "Elephpant"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
+msgid "Eliminated"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Email"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:292
+msgid "Email has to be between 4 and 50 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:298
+msgid "Email is invalid!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:276
+msgid "Emails don't match!"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/emule/kart.xml
+msgid "Emule"
+msgstr ""
+
+#. I18N: button to enable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:98
+#: src/states_screens/options_screen_input2.cpp:588
+msgid "Enable Device"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Enable per-player handicaps"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:429
+msgid "Enabled"
+msgstr ""
+
+#. I18N: animations setting (all karts are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
+msgid "Enabled for all"
+msgstr ""
+
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+msgid "Enter the new player's name"
+msgstr ""
+
+#: src/addons/news_manager.cpp:172
+#, c-format
+msgid "Error downloading news: '%s'."
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:923
+msgid ""
+"Everyone:\n"
+"Press 'Select' now to join the game!"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Exit"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Exit Race"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:111
+msgid "Exit game"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Expert"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:252
+msgid "Explore tracks to find all hidden eggs"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1795
+#, c-format
+msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
+msgstr ""
+
+#: src/graphics/irr_driver.cpp:1804
+#, c-format
+msgid "FPS: %d/%d/%d - %d KTris"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:128
+#: src/states_screens/online_profile_achievements.cpp:168
+msgid "Fetching achievements"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:88
+#: src/states_screens/online_profile_friends.cpp:174
+msgid "Fetching friends"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:171
+msgid "Fetching last vote"
+msgstr ""
+
+#: src/states_screens/server_selection.cpp:67
+#: src/states_screens/server_selection.cpp:210
+msgid "Fetching servers"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+msgid ""
+"Fill in the username and email address you supplied at registration to be "
+"able to reset your password."
+msgstr ""
+
+#: src/modes/linear_world.cpp:276
+msgid "Final lap!"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Find Server"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:242
+msgid "Fire"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"First, you will need several input devices (having multiple gamepads or "
+"joysticks is the best way to play with several people). Go in the input "
+"configuration screen and setup the gamepads. It is also possible to play on "
+"keyboard(s), however each player will need a different set of keys, and keep"
+" in mind that most keyboards are not appropriate for multiplayer gameplay "
+"because they do not support large number of keypresses."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:180
+msgid "Follow the Leader"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:650
+msgid "Follow the leader!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Follow the leader: Run for second place, as the last kart will be "
+"disqualified every time the counter hits zero. Beware : going in front of "
+"the leader will get you eliminated too!"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/fortmagma/track.xml
+msgid "Fort Magma"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:413
+#, c-format
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:313
+msgid "Friend removed!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:215
+msgid "Friend request accepted!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:364
+msgid "Friend request cancelled!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:267
+msgid "Friend request declined!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:158
+msgid "Friend request sent!"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:99
+msgid "Friends"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Fullscreen"
+msgstr ""
+
+#. I18N: Shown when a goal is scored
+#: src/states_screens/race_gui_base.cpp:70
+msgid "GOAL!"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:144
+msgid "Game Keys"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Game Modes"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Game type (Goals limit / Time limit)"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad buttons
+#: src/input/binding.cpp:292
+#, c-format
+msgid "Gamepad button %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for gamepad hats
+#: src/input/binding.cpp:260 src/input/binding.cpp:265
+#, c-format
+msgid "Gamepad hat %d"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "General"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Give Up Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Global illumination"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:489
+#, c-format
+msgid "Global illumination : %s"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Glow (outlines)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:477
+#, c-format
+msgid "Glow (outlines) : %s"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/gnu/kart.xml
+msgid "Gnu"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:68
+msgid "Go!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Gold driver"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+msgid "Gran Paradiso Island"
+msgstr ""
+
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+#: src/states_screens/dialogs/select_challenge.cpp:145
+msgid "Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Grand Prix Editor"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Title in grand prix editor screen
+msgid "Grand Prix editor"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1214
+msgid "Grand Prix progress:"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Graphical Effects Level"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_input2.cpp:85
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
+msgid "Graphics"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Graphics Settings"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/greenvalley/track.xml
+msgid "Green Valley"
+msgstr ""
+
+#. I18N: Name of first guest player (without number)
+#: src/config/player_manager.cpp:392
+msgid "Guest"
+msgstr ""
+
+#. I18N: Name of further guest players, with a 1, 2, ... attached
+#: src/config/player_manager.cpp:397
+#, c-format
+msgid "Guest %d"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Guest Log in"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/hacienda/track.xml
+msgid "Hacienda"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Help"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/hexley/kart.xml
+msgid "Hexley"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1252
+msgid "Highscores"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit 10 karts with a bowling-ball."
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:231
+msgid ""
+"Hit others with weapons until they lose all their lives. (Only in "
+"multiplayer games)"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit the same kart at least 5 times in one race."
+msgstr ""
+
+#. I18N: animations setting (only karts with human players are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
+msgid "Human players only"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "I agree to the above terms and am 13 years or older. "
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "If you can beat me at racing, I will free the old codger."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"If you see a button with a lock like this one, you need to complete a "
+"challenge to unlock it."
+msgstr ""
+
+#: src/input/input_manager.cpp:729
+#, c-format
+msgid "Ignoring '%s', you needed to join earlier to play!"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Install"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Intermediate"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
+msgid "Internet access is disabled, please enable it in the options"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:974
+msgid "It's a draw"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "It's secret"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Join"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:155
+msgid "Joining server"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+msgid "Karts"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_resolution_dialog.stkgui
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching
+#. resoluton
+msgid "Keep this resolution"
+msgstr ""
+
+#. I18N: short definition for follow-the-leader game mode
+#: src/states_screens/race_setup_screen.cpp:222
+msgid "Keep up with the leader kart but don't overtake it!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:72
+msgid "Key binding"
+msgstr ""
+
+#: src/states_screens/options_screen_input.cpp:97
+#, c-format
+msgid "Keyboard %i"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/konqi/kart.xml
+msgid "Konqi"
+msgstr ""
+
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui_overworld.cpp:108
+msgid "Lap"
+msgstr ""
+
+#: src/modes/linear_world.cpp:303
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:67
+msgid "Laps"
+msgstr ""
+
+#. I18N: number of laps to race in a challenge
+#: src/challenges/challenge_data.cpp:249
+#, c-format
+msgid "Laps : %i"
+msgstr ""
+
+#: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
+msgid "Leader"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:268
+msgid "Left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:212
+msgid "Left bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:220
+msgid "Left thumb button"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:235
+msgid "Left thumb down"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:233
+msgid "Left thumb left"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:231
+msgid "Left thumb right"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:237
+msgid "Left thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
+msgid "Left trigger"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Light shaft (God rays)"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:481
+#, c-format
+msgid "Light shaft (God rays) : %s"
+msgstr ""
+
+#: src/guiengine/engine.cpp:1330
+msgid "Loading"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "Lobby"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Lobby Settings"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Local Name"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:853
+msgid "Locked"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:237
+#: src/states_screens/arenas_screen.cpp:267
+#: src/states_screens/easter_egg_screen.cpp:225
+#: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1449
+#: src/states_screens/race_setup_screen.cpp:214
+#: src/states_screens/tracks_screen.cpp:283
+msgid "Locked : solve active challenges to gain access to more!"
+msgstr ""
+
+#: src/states_screens/tracks_screen.cpp:201
+msgid "Locked!"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid ""
+"Logging in as a guest allows you to participate in online races, but it does"
+" not allow you to vote for addons, or collect any achievements while being "
+"online."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
+#: src/states_screens/main_menu_screen.cpp:175
+#: src/states_screens/main_menu_screen.cpp:186
+msgid "Login"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:251
+msgid "Look Back"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: In the profile screen
+msgid "Look for more friends:"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make 5 skidding in a single lap."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make a race with 5 laps or more."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Marathoner"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Max. number of players"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Maximum time (min.)"
+msgstr ""
+
+#. I18N: if some kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:436
+msgid "Me Only"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:158
+msgid "Menu Keys"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/minigolf/track.xml
+msgid "Minigolf"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Motion blur"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:458
+#, c-format
+msgid "Motion blur: %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:299
+#, c-format
+msgid "Mouse axis %d %s"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used
+#. at all)
+#: src/input/binding.cpp:295
+#, c-format
+msgid "Mouse button %d"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move down"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move up"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Multi­player"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Music"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#: src/states_screens/online_profile_achievements.cpp:73
+#: src/states_screens/server_selection.cpp:91
+msgid "Name"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:132
+msgid "Name has to be between 4 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
+msgid "Name is empty."
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
+msgid "Name is too long."
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Name of the server"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "New"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:502
+#, c-format
+msgid "New Grand Prix '%s' now available"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "New Password"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:145
+msgid "New Request"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:506
+#, c-format
+msgid "New difficulty '%s' now available"
+msgstr ""
+
+#: src/modes/linear_world.cpp:363
+msgid "New fastest lap"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:492
+#, c-format
+msgid "New game mode '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:516
+#, c-format
+msgid "New kart '%s' now available"
+msgstr ""
+
+#: src/challenges/challenge_data.cpp:486
+#, c-format
+msgid "New track '%s' now available"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:245
+msgid "Nitro"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:147
+msgid "Nitro challenge"
+msgstr ""
+
+#: src/states_screens/dialogs/message_dialog.cpp:128
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "No"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/nolok/kart.xml
+msgid "Nolok"
+msgstr ""
+
+#. I18N: if no kart animations are enabled
+#: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:438
+msgid "None"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:176
+msgid "Normal Race"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowmountain/track.xml
+msgid "Northern Resort"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:986
+msgid ""
+"Note that if you manage to skid for several seconds, you will receive a "
+"bonus speedup as a reward!"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Novice"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:68
+#, c-format
+msgid "Number of AI Karts : %i"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of AI karts"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Number of goals to win"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of laps"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Number of laps:"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/dialogs/message_dialog.cpp:122
+#: src/states_screens/dialogs/message_dialog.cpp:135
+msgid "OK"
+msgstr ""
+
+#. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
+msgid "Off the beaten track"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:150
+msgid "Offline"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mines/track.xml
+msgid "Old Mine"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/olivermath/track.xml
+msgid "Oliver's Math Class"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/main_menu_screen.cpp:170
+#: src/states_screens/main_menu_screen.cpp:185
+#: src/states_screens/online_profile_friends.cpp:149
+msgid "Online"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Online Multiplayer"
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Online Username"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:280
+msgid "Online username has to be between 3 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:284
+msgid "Online username must not start with a number!"
+msgstr ""
+
+#: src/input/input_manager.cpp:759
+msgid "Only the Game Master may act at this point!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:960
+#, c-format
+msgid "Oops! When you're in trouble, press <%s> to be rescued"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Options"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: Section in the profile screen
+msgid "Overview"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:93
+msgid "POWER"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Parachute - slows down all karts in a better position."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the registration dialog
+msgid "Password"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: In the online account settings screen
+msgid "Password :"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Password Change"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
+msgid "Password has to be between 8 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:210
+msgid "Password successfully changed."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
+msgid "Passwords don't match!"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:257
+msgid "Pause Game"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+msgid "Paused"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
+msgid "Penalty time!!"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:146
+msgid "Pending"
+msgstr ""
+
+#. I18N: ./data/grandprix/1_penguinplayground.grandprix
+msgid "Penguin Playground"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:247
+msgid "Performing vote"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/pidgin/kart.xml
+msgid "Pidgin"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+msgid "Play all"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Play every official track at least once."
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/options_screen_video.cpp:165
+#: src/states_screens/server_selection.cpp:92
+msgid "Players"
+msgstr ""
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+msgid "Please enter the name of the grand prix"
+msgstr ""
+
+#. I18N: shown when config file is too old
+#: src/input/device_manager.cpp:500
+msgid "Please re-configure your key bindings."
+msgstr ""
+
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+msgid "Please read the terms and conditions "
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:437
+msgid "Please wait while addons are updated"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:557
+msgid "Please wait while the add-ons are loading"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Plunger - throw straight to pull an opponent back, or throw while looking "
+"back to make one lose sight."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Powerup Love"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:930
+#, c-format
+msgid ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
+" to fire behind!"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Press ESC to cancel"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+msgid "Press a key"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Press enter or double-click on a device to configure it"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Press enter or double-click on a player to edit him/her"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:462
+msgid "Press fire to play the tutorial"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:532
+msgid "Press fire to start the challenge"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:390
+msgid ""
+"Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
+"mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:357
+#, c-format
+msgid "Problems installing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:394
+#, c-format
+msgid "Problems removing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:474
+msgid "Processing"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Profile"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:79
+msgid "Progress"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/puffy/kart.xml
+msgid "Puffy"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:240
+msgid ""
+"Push the ball to the opposite cage to score goals. (Only in multiplayer "
+"games)"
+msgstr ""
+
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Quick Play"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Quit"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:159
+msgid "Quit the server."
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "Race Setup"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:77
+msgid "Random"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:277
+msgid "Random Arena"
+msgstr ""
+
+#: src/race/grand_prix_data.hpp:171
+msgid "Random Grand Prix"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:839
+#: src/states_screens/kart_selection.cpp:1467
+msgid "Random Kart"
+msgstr ""
+
+#: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:297
+msgid "Random Track"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:109
+msgid "Rank"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only items with good rating
+msgid "Rating >="
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:64
+msgid "Ready!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Really ... a secret."
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:965
+msgid "Red Team Wins"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Register"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Regular Race: All blows allowed, so catch weapons and make clever use of "
+"them!"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
+msgid "Reload"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Remember password"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Remember window location"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Remove"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Rename"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:64
+#, c-format
+msgid "Required Nitro Points : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:53
+#, c-format
+msgid "Required Rank : %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:58
+#, c-format
+msgid "Required Time : %i"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:254
+msgid "Rescue"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Resolution"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:199
+msgid "Restart"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Restart Race"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Reverse"
+msgstr ""
+
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Reverse:"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:68
+msgid "Reversed"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:271
+msgid "Right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:214
+msgid "Right bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:222
+msgid "Right thumb button"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
+msgid "Right thumb down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
+msgid "Right thumb left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
+msgid "Right thumb right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
+msgid "Right thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
+msgid "Right trigger"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:89
+msgid "SPEED"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+msgid "STK Enterprise"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Save"
+msgstr ""
+
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+msgid "Save Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "Search"
+msgstr ""
+
+#: src/states_screens/online_user_search.cpp:208
+#: src/states_screens/online_user_search.cpp:288
+msgid "Searching"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:274
+msgid "Select"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a difficulty"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a game mode"
+msgstr ""
+
+#: src/states_screens/edit_track_screen.cpp:238
+msgid "Select a track"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Select kart"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Send anonymous HW statistics"
+msgstr ""
+
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Server Creation"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Server Info"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_selection.stkgui
+msgid "Server Selection"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Server name :"
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:58
+msgid "Server successfully created. You can now join it."
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:66
+msgid "Set!"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+#: src/states_screens/race_result_gui.cpp:209
+msgid "Setup New Race"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Shadows"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:468
+#, c-format
+msgid "Shadows: %s"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/sandtrack/track.xml
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/city/track.xml
+msgid "Shiny Suburbs"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In"
+msgstr ""
+
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Sign In As Guest"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:70
+msgid "Since"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Singleplayer"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:177
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Skid-row"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:248
+msgid "Skidding"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Skin"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+msgid "Snow Peak"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:186
+msgid "Soccer"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/soccer_field/track.xml
+msgid "Soccer field"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Soccer: Only in multiplayer games. Use your kart to push the ball into the "
+"goal."
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
+msgid ""
+"Sorry, an error occurred while contacting the add-ons website. Make sure you"
+" are connected to the Internet and that SuperTuxKart is not blocked by a "
+"firewall"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:279
+msgid "Sorry, downloading the add-on failed"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Sound Effects"
+msgstr ""
+
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#: src/states_screens/grand_prix_editor_screen.cpp:334
+msgid "Standard"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:218
+msgid "Start"
+msgstr ""
+
+#: src/states_screens/dialogs/gp_info_dialog.cpp:209
+msgid "Start Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Start Race"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:71
+msgid "Status"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:230
+msgid "Steer Left"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:233
+msgid "Steer Right"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Story Mode"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Strike!"
+msgstr ""
+
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Submit"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/subsea/track.xml
+msgid "Subsea"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+msgid "SuperTux"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+msgid "SuperTuxKart Addons"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart Help"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
+msgid "SuperTuxKart Options"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+msgid "SuperTuxKart features several game modes"
+msgstr ""
+
+#: src/main.cpp:1201
+msgid ""
+"SuperTuxKart may connect to a server to download add-ons and notify you of "
+"updates. We also collect anonymous hardware statistics to help with the "
+"development of STK. Please read our privacy policy at "
+"http://privacy.supertuxkart.net. Would you like this feature to be enabled? "
+"(To change this setting at a later time, go to options, select tab 'User "
+"Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
+"statistics\")."
+msgstr ""
+
+#. I18N: ../stk-assets/karts/suzanne/kart.xml
+msgid "Suzanne"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Swapper - gift boxes are transformed into bananas and vice versa for a short"
+" time."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Swatter - will squash karts close by, slowing them down."
+msgstr ""
+
+#. I18N: in the language choice, to select the same language as the OS
+#: src/states_screens/options_screen_ui.cpp:186
+msgid "System Language"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "Terms and Agreement"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture compression"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture filtering"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help menu
+msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stadium/track.xml
+msgid "The Stadium"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:545
+msgid "The add-ons module is currently disabled in the Options screen"
+msgstr ""
+
+#: src/race/highscore_manager.cpp:101
+msgid ""
+"The highscore file was too old,\n"
+"all highscores have been erased."
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:136
+msgid "The maxinum number of players has to be between 2 and 12."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:178
+msgid "Time Trial"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#: src/states_screens/dialogs/add_device_dialog.cpp:64
+msgid ""
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it connected and it will appear in the list.\n"
+"\n"
+"To add a keyboard config, you can use the button below, HOWEVER please note that most keyboards only support a limited amount of simultaneous keypresses and are thus inappropriate for multiplayer gameplay. (You can, however, connect multiple keyboards to the computer. Remember that everyone still needs different keybindings in this case.)"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu
+msgid "To help you win, there are some powerups you can collect :"
+msgstr ""
+
+#. I18N: ./data/grandprix/3_tothemoonandback.grandprix
+msgid "To the moon and back"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:154
+#: src/states_screens/dialogs/user_info_dialog.cpp:211
+msgid "Today"
+msgstr ""
+
+#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/race_gui_base.cpp:103
+#, c-format
+msgid "Top %i"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:66
+msgid "Track"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1130
+#, c-format
+msgid "Track %i/%i"
+msgstr ""
+
+#. I18N: when showing who is the author of track '%s'
+#. I18N: (place %s where the name of the author should appear)
+#: src/states_screens/track_info_screen.cpp:107
+#, c-format
+msgid "Track by %s"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Track group"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Tracks"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
+msgid "Trilinear"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:369
+#: src/states_screens/dialogs/addons_loading.cpp:406
+msgid "Try again"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#: src/states_screens/race_gui_overworld.cpp:455
+msgid "Tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: Title for tutorials screen
+msgid "Tutorial : Selection Room"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/tux/kart.xml
+msgid "Tux"
+msgstr ""
+
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Type of race, in a challenge
+msgid "Type :"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:502
+msgid "Type: Grand Prix"
+msgstr ""
+
+#: src/online/xml_request.cpp:83
+msgid ""
+"Unable to connect to the server. Check your internet connection or try again"
+" later."
+msgstr ""
+
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Uninstall"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Unstoppable"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:262
+msgid "Up"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:96
+msgid "Update"
+msgstr ""
+
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will
+#. show only recently updated items
+msgid "Updated"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:111
+msgid "Updated date"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Use 10 or more powerups in a race."
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Use high definition textures"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Use left/right to choose your team and press fire"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:949
+#, c-format
+msgid "Use the nitro you collected by pressing <%s>!"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog' dialog
+msgid "User Info"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:164
+#: src/states_screens/user_screen.cpp:648
+msgid "User Interface"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:335
+msgid "User defined"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "User search"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+#: src/states_screens/online_profile_friends.cpp:67
+#: src/states_screens/online_user_search.cpp:74
+msgid "Username"
+msgstr ""
+
+#: src/states_screens/dialogs/recovery_dialog.cpp:121
+msgid "Username and/or email address invalid."
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "VS"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:235
+#: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
+msgid "Validating info"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:108
+#, c-format
+msgid "Version: %d"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Vertical Sync (requires restart)"
+msgstr ""
+
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "View"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Volume"
+msgstr ""
+
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: In the vote dialog
+msgid "Vote"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:230
+msgid "Vote successful! You can now close the window."
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:85
+msgid "WEIGHT"
+msgstr ""
+
+#: src/modes/linear_world.cpp:882
+msgid "WRONG WAY!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:479
+msgid ""
+"Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
+"keys that contain a character that is different in upper-case will stop "
+"working."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+msgid "Weapons"
+msgstr ""
+
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Weather Effects"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:447
+#, c-format
+msgid "Weather Effects : %s"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "What's wrong, little hippies? Your great gnu leader is missing?"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"When input devices are configured, you are ready to play. Select the "
+"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
+"each player can press on the 'fire' key of their gamepad or keyboard to join"
+" the game. Each player can use their input device to select their kart. The "
+"game continues when everyone selected their kart. Note that the mouse may "
+"not be used for this operation."
+msgstr ""
+
+#. I18N: Name of the white button on xbox controller
+#: src/input/gamepad_config.cpp:171
+msgid "White"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/wilber/kart.xml
+msgid "Wilber"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win 5 single races in a row."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win in all single player modes, against at least 3 opponents."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/xr591/track.xml
+msgid "XR591"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/xue/kart.xml
+msgid "Xue"
+msgstr ""
+
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "Yes"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:996
+msgid "You are now ready to race. Good luck!"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+msgid "You are playing as"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:190
+msgid "You can adapt your previous rating by clicking the stars beneath."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:513
+msgid ""
+"You can not download addons without internet access. If you want to download"
+" addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"the Internet\"."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:488
+msgid ""
+"You can not play online without internet access. If you want to play online,"
+" go to options, select  tab 'User Interface', and edit \"Connect to the "
+"Internet\"."
+msgstr ""
+
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid ""
+"You can play without creating an online account by selecting an offline "
+"account. Though then you can not connect to friends, vote for addons etc. "
+"Please read our privacy statement at http://privacy.supertuxkart.net"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
+msgid "You completed a challenge!"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:176
+msgid "You completed challenges!"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:279
+msgid "You completed the Grand Prix!"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:208
+#, c-format
+msgid ""
+"You completed the difficult challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:200
+#, c-format
+msgid "You completed the easy challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:204
+#, c-format
+msgid ""
+"You completed the intermediate challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/karts/kart.cpp:856
+msgid "You finished the race!"
+msgstr ""
+
+#: src/online/online_player_profile.cpp:466
+#, c-format
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/online/online_player_profile.cpp:472
+msgid "You have a new friend request!"
+msgstr ""
+
+#: src/modes/world.cpp:1144
+msgid "You have been eliminated!"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:195
+msgid ""
+"You have not yet voted for this addon. Select your desired rating by "
+"clicking the stars beneath"
+msgstr ""
+
+#: src/karts/kart.cpp:1913
+msgid ""
+"You need more points\n"
+"to enter this challenge!\n"
+"Check the minimap for\n"
+"available challenges."
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:472
+msgid "You need to enter a password."
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:568
+msgid "You unlocked grand prix %0"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:530
+msgid "You unlocked track %0"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
+msgid ""
+"You will receive an email with further instructions on how to reset your "
+"password. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:361
+msgid ""
+"You will receive an email with further instructions regarding account "
+"activation. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
+msgid "You won the race!"
+msgstr ""
+
+#: src/main.cpp:1375
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
+#: src/config/user_config.cpp:700
+msgid ""
+"Your config file was malformed, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/config/user_config.cpp:711
+msgid ""
+"Your config file was too old, so it was deleted and a new one will be "
+"created."
+msgstr ""
+
+#: src/main.cpp:1367
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
+#: src/input/device_manager.cpp:501
+msgid "Your input config file is not compatible with this version of STK."
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:105
+#: src/states_screens/online_profile_base.cpp:115
+msgid "Your profile"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/zengarden/track.xml
+msgid "Zen Garden"
+msgstr ""
+
+#. I18N: Unbound key binding
+#: src/input/binding.cpp:90
+msgid "[none]"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "actions"
+msgstr ""
+
+#. I18N: track group name
+#: src/states_screens/tracks_screen.cpp:151
+msgid "all"
+msgstr ""
+
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
+#. "John Doe")
+#: src/states_screens/race_gui_base.cpp:540
+msgid "by"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:139
+msgid "featured"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
+msgid "low"
+msgstr ""
+
+#. I18N: arena group name
+#. I18N: track group name
+#. I18N: kart group name
+#. I18N: track group name
+#: src/states_screens/arenas_screen.cpp:81
+#: src/states_screens/easter_egg_screen.cpp:143
+#: src/states_screens/kart_selection.cpp:284
+#: src/states_screens/tracks_screen.cpp:153
+msgid "standard"
+msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr ""
diff --git a/data/po/pl.po b/data/po/pl.po
index 8914af06c..e3dc87af5 100644
--- a/data/po/pl.po
+++ b/data/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-16 08:40+0000\n"
+"PO-Revision-Date: 2015-03-23 14:21+0000\n"
 "Last-Translator: Dawid Gan <deveee@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/supertuxkart/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -1493,7 +1493,7 @@ msgstr "Ignorowanie '%s', powinieneś/powinnaś dołączyć wcześniej go gry!"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr "Oświetlenie w oparciu o obrazy"
+msgstr "Oświetlenie IBL"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -2987,7 +2987,7 @@ msgstr "Użyj co najmniej 10 bonusów w wyścigu"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Use high definition textures"
-msgstr "Tekstury wysokiej rozdzielczości"
+msgstr "Tekstury HD"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
diff --git a/data/po/ru.po b/data/po/ru.po
index ad938af93..df7d3ce78 100644
--- a/data/po/ru.po
+++ b/data/po/ru.po
@@ -5,13 +5,14 @@
 # Translators:
 # Andrei Stepanov, 2015
 # Dmitry Dubrov <dimprogpro@hotmail.ru>, 2015
+# Oleg <laol-tomsk@mail.ru>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-16 09:10+0000\n"
-"Last-Translator: Dmitry Dubrov <dimprogpro@hotmail.ru>\n"
+"PO-Revision-Date: 2015-04-13 09:19+0000\n"
+"Last-Translator: Oleg <laol-tomsk@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/supertuxkart/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -138,7 +139,7 @@ msgid ""
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr "* В бо�льшую ча�ть �тих видов игры можно �ыграть в Гран-при: вме�то одной тра��ы, вы можете проезжать не�колько �разу. Чем лучше ваш ранг, тем больше очков вы получаете. В результате игрок � бо�льшим количе�твом очков выигрывает кубок."
+msgstr "* В большую ча�ть �тих видов игры можно �ыграть в Гран-при: вме�то одной тра��ы, вы можете проезжать не�колько �разу. Чем лучше ваш ранг, тем больше очков вы получаете. В результате игрок � бо�льшим количе�твом очков выигрывает кубок."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -149,7 +150,7 @@ msgstr "* Перезапу�тите STK дл� применени� измен
 msgid ""
 "* Which config to use will be inferred from which 'Select' key is pressed to"
 " join the game."
-msgstr "* Выбор конфигурации будет зави�еть от того,  � какого у�трой�тва нажата кнопка 'Выбрать' при �оединении к игре."
+msgstr "* Выбор конфигурации будет зави�еть от того,  � какого у�трой�тва нажата кнопка \"Выбрать\" при �оединении к игре."
 
 #. I18N: ./data/gui/online/profile_achievements.stkgui
 #. I18N: ./data/gui/online/profile_achievements_tab.stkgui
@@ -189,7 +190,7 @@ msgstr "Битва Трех Ударов"
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr "Битва трех ударов: только в многопользователь�ких играх. �такуйте других � помощью оружи� до тех пор, пока они не потер�ют в�е �вои жизни."
+msgstr "Битва Трех Ударов: только в мультиплеере. �такуйте других � помощью оружи� до тех пор, пока они не потер�ют в�е �вои жизни."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -210,7 +211,7 @@ msgstr "= Результаты ="
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "AI karts"
-msgstr "Боты"
+msgstr "Виртуальные карты"
 
 #: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
@@ -334,7 +335,7 @@ msgstr "Дополнени�"
 
 #. I18N: ../stk-assets/karts/adiumy/kart.xml
 msgid "Adiumy"
-msgstr "�диуми"
+msgstr "Adiumy"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -380,7 +381,7 @@ msgstr "В�егда показывать �кран входа"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr "�манда"
+msgstr "Amanda"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -490,7 +491,7 @@ msgstr "�рены"
 
 #. I18N: ../stk-assets/tracks/lighthouse/track.xml
 msgid "Around the lighthouse"
-msgstr "Вокруг Ма�ка"
+msgstr "Around the Lighthouse"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -592,7 +593,7 @@ msgstr "Battle Island"
 
 #. I18N: ../stk-assets/karts/beastie/kart.xml
 msgid "Beastie"
-msgstr "Биши"
+msgstr "Beastie"
 
 #. I18N: when failing a GP
 #: src/states_screens/grand_prix_lose.cpp:161
@@ -610,7 +611,7 @@ msgstr "Чёрный"
 
 #. I18N: ../stk-assets/tracks/mansion/track.xml
 msgid "Blackhill Mansion"
-msgstr "Тёмный о�обн�к на холме"
+msgstr "Blackhill Mansion"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -629,7 +630,7 @@ msgstr "Син�� команда победила"
 
 #. I18N: ../stk-assets/tracks/farm/track.xml
 msgid "Bovine Barnyard"
-msgstr "Скотный Двор"
+msgstr "Bovine Barnyard"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -703,7 +704,7 @@ msgstr "Отмена/�азад"
 
 #. I18N: ../stk-assets/tracks/cave/track.xml
 msgid "Cave X"
-msgstr "Пещера X"
+msgstr "Cave X"
 
 #: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
@@ -754,7 +755,7 @@ msgstr "Закрыть"
 
 #. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr "Храм Какао"
+msgstr "Cocoa Temple"
 
 #. I18N: ./data/achievements.xml
 msgid "Collect at least 5 bananas in one race."
@@ -1009,7 +1010,7 @@ msgstr "Хотите �охранить изменени�?"
 #: src/karts/controller/network_player_controller.cpp:283
 #: src/karts/controller/player_controller.cpp:340
 msgid "Don't accelerate before go"
-msgstr "�е жмите газ до �лова 'Марш'"
+msgstr "�е жмите газ до �лова \"Вперёд\"!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:265
@@ -1056,12 +1057,12 @@ msgstr "Яйца: %d / %d"
 
 #. I18N: ../stk-assets/karts/elephpant/kart.xml
 msgid "Elephpant"
-msgstr "Слон"
+msgstr "Elephpant"
 
 #: src/states_screens/race_result_gui.cpp:474
 #: src/states_screens/race_result_gui.cpp:833
 msgid "Eliminated"
-msgstr "Покинул гонку"
+msgstr "Выбыл из гонки"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
@@ -1084,7 +1085,7 @@ msgstr "Электронные почты не �овпадают!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
 msgid "Emule"
-msgstr "Эмуль"
+msgstr "Emule"
 
 #. I18N: button to enable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:98
@@ -1235,7 +1236,7 @@ msgstr "Следуйте за лидером: будьте на втором м
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
 msgid "Fort Magma"
-msgstr "Форт Магма"
+msgstr "Fort Magma"
 
 #: src/input/wiimote_manager.cpp:413
 #, c-format
@@ -1279,7 +1280,7 @@ msgstr "Полно�кранный режим"
 #. I18N: Shown when a goal is scored
 #: src/states_screens/race_gui_base.cpp:70
 msgid "GOAL!"
-msgstr "Гол!"
+msgstr "ГОЛ!"
 
 #. I18N: Key binding section
 #: src/states_screens/options_screen_input2.cpp:144
@@ -1354,7 +1355,7 @@ msgstr "Контурное �вечение: %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
 msgid "Gnu"
-msgstr "Гну"
+msgstr "GNU"
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:68
@@ -1367,7 +1368,7 @@ msgstr "Золотой водила"
 
 #. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr "О�тров Гран-Парадизо"
+msgstr "Gran Paradiso Island"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
@@ -1410,7 +1411,7 @@ msgstr "�а�тройки графики"
 
 #. I18N: ../stk-assets/tracks/greenvalley/track.xml
 msgid "Green Valley"
-msgstr "Зелёна� Долина"
+msgstr "Green Valley"
 
 #. I18N: Name of first guest player (without number)
 #: src/config/player_manager.cpp:392
@@ -1430,7 +1431,7 @@ msgstr "Го�ть: вход"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
-msgstr "Га�иенда"
+msgstr "Hacienda"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -1443,7 +1444,7 @@ msgstr "Помощь"
 
 #. I18N: ../stk-assets/karts/hexley/kart.xml
 msgid "Hexley"
-msgstr "Хек�ли"
+msgstr "Hexley"
 
 #: src/states_screens/race_result_gui.cpp:1252
 msgid "Highscores"
@@ -1518,7 +1519,7 @@ msgstr "Это ничь�"
 
 #. I18N: ./data/achievements.xml
 msgid "It's secret"
-msgstr "Секретный"
+msgstr "Это �екрет"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
@@ -1556,7 +1557,7 @@ msgstr "Клавиатура %i"
 
 #. I18N: ../stk-assets/karts/konqi/kart.xml
 msgid "Konqi"
-msgstr "Конки"
+msgstr "Konqi"
 
 #. I18N: Shown at the end of a race
 #: src/states_screens/race_gui_overworld.cpp:108
@@ -1766,7 +1767,7 @@ msgstr "Клавиши меню"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
 msgid "Minigolf"
-msgstr "Минигольф"
+msgstr "Minigolf"
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
@@ -1858,7 +1859,7 @@ msgstr "Им� �ервера"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr "Лохне��ов�кий пруд"
+msgstr "Nessie's pond"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
@@ -1924,7 +1925,7 @@ msgstr "�ет"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
 msgid "Nolok"
-msgstr "�олок"
+msgstr "Nolok"
 
 #. I18N: if no kart animations are enabled
 #: src/states_screens/gp_info_screen.cpp:75
@@ -1939,13 +1940,13 @@ msgstr "Обычна� гонка"
 
 #. I18N: ../stk-assets/tracks/snowmountain/track.xml
 msgid "Northern Resort"
-msgstr "Северный курорт"
+msgstr "Northern Resort"
 
 #: src/tracks/track_object_presentation.cpp:986
 msgid ""
 "Note that if you manage to skid for several seconds, you will receive a "
 "bonus speedup as a reward!"
-msgstr "Учтите, е�ли вам уда�т�� �кользить в течение не�кольких �екунд, вы получите дополнительное у�корение в каче�тве награды."
+msgstr "Учтите, что е�ли вам уда�т�� �кользить в течение не�кольких �екунд, вы получите дополнительное у�корение в каче�тве награды."
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
@@ -1957,12 +1958,12 @@ msgstr "�овичок"
 #: src/states_screens/dialogs/select_challenge.cpp:68
 #, c-format
 msgid "Number of AI Karts : %i"
-msgstr "Количе�тво ботов: %i"
+msgstr "Количе�тво виртуальных картов: %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Number of AI karts"
-msgstr "Количе�тво ботов"
+msgstr "Количе�тво виртуальных картов"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
@@ -1993,7 +1994,7 @@ msgstr "Количе�тво кругов:"
 #: src/states_screens/dialogs/message_dialog.cpp:122
 #: src/states_screens/dialogs/message_dialog.cpp:135
 msgid "OK"
-msgstr "Д�"
+msgstr "ОК"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
 msgid "Off the beaten track"
@@ -2015,11 +2016,11 @@ msgstr "�х да, видите ли, он у мен� �ейча� в замк
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
 msgid "Old Mine"
-msgstr "Стара� шахта"
+msgstr "Old Mine"
 
 #. I18N: ../stk-assets/tracks/olivermath/track.xml
 msgid "Oliver's Math Class"
-msgstr "Математиче�кий кла�� Оливера"
+msgstr "Oliver's Math Class"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
@@ -2118,7 +2119,7 @@ msgstr "Пароли не �овпадают!"
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
 msgid "Pause Game"
-msgstr "Пауза в игре"
+msgstr "По�тавить на паузу"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: ./data/gui/race_paused_dialog.stkgui
@@ -2144,7 +2145,7 @@ msgstr "Выполнение голо�овани�"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
 msgid "Pidgin"
-msgstr "Пиджин"
+msgstr "Pidgin"
 
 #. I18N: ./data/gui/tutorial.stkgui
 msgid "Play all"
@@ -2270,7 +2271,7 @@ msgstr "Прогре��"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
 msgid "Puffy"
-msgstr "Паффи"
+msgstr "Puffy"
 
 #: src/states_screens/race_setup_screen.cpp:240
 msgid ""
@@ -2489,15 +2490,15 @@ msgstr "СКОРОСТЬ"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr "Завод STK"
+msgstr "STK Enterprise"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr "Гонщица Сара"
+msgstr "Sara the Racer"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr "Ма�терица Сара"
+msgstr "Sara the Wizard"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
@@ -2597,11 +2598,11 @@ msgstr "Тени: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
 msgid "Shifting Sands"
-msgstr "Дюны"
+msgstr "Shifting Sands"
 
 #. I18N: ../stk-assets/tracks/city/track.xml
 msgid "Shiny Suburbs"
-msgstr "Солнечный Пригород"
+msgstr "Shiny Suburbs"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
@@ -2643,7 +2644,7 @@ msgstr "Тема"
 
 #. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
 msgid "Snow Peak"
-msgstr "Снежна� вершина"
+msgstr "Snow Peak"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:186
@@ -2652,7 +2653,7 @@ msgstr "Футбол"
 
 #. I18N: ../stk-assets/tracks/soccer_field/track.xml
 msgid "Soccer field"
-msgstr "Футбольное поле"
+msgstr "Soccer field"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
@@ -2734,12 +2735,12 @@ msgstr "Подтвердить"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
 msgid "Subsea"
-msgstr "Подводна�"
+msgstr "Subsea"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
 msgid "SuperTux"
-msgstr "Супер Тук�"
+msgstr "СуперTux"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 msgid "SuperTuxKart Addons"
@@ -2783,7 +2784,7 @@ msgstr "SuperTuxKart может подключать�� к �ерверу дл
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
-msgstr "Сюзан"
+msgstr "Suzanne"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -2808,7 +2809,7 @@ msgstr "Пред�тавь, что твои оппоненты - комары! 
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr "Храм"
+msgstr "Temple"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -2832,7 +2833,7 @@ msgstr "Клавиша зано�а позвол�ет зано�ить карт
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
 msgid "The Stadium"
-msgstr "Стадион"
+msgstr "The Stadium"
 
 #: src/states_screens/main_menu_screen.cpp:545
 msgid "The add-ons module is currently disabled in the Options screen"
@@ -2935,7 +2936,7 @@ msgstr "Обучение: Комната выбора"
 
 #. I18N: ../stk-assets/karts/tux/kart.xml
 msgid "Tux"
-msgstr "Тук�"
+msgstr "Tux"
 
 #. I18N: ./data/gui/select_challenge.stkgui
 #. I18N: Type of race, in a challenge
@@ -3076,7 +3077,7 @@ msgstr "Голо�овать"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr "Голо�ование завершено! Теперь вы может закрыть окно."
+msgstr "Голо� за�читан! Теперь Вы можете закрыть окно."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
@@ -3138,7 +3139,7 @@ msgstr "Белый"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
 msgid "Wilber"
-msgstr "Вилбер"
+msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
 msgid "Win 5 single races in a row."
@@ -3154,7 +3155,7 @@ msgstr "XR591"
 
 #. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr "Сю�"
+msgstr "Xue"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
@@ -3323,7 +3324,7 @@ msgstr "Ваш профиль"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
 msgid "Zen Garden"
-msgstr "Дз�н �ад"
+msgstr "Zen Garden"
 
 #. I18N: Unbound key binding
 #: src/input/binding.cpp:90
diff --git a/data/po/sl.po b/data/po/sl.po
index f458d98db..ce61eba90 100644
--- a/data/po/sl.po
+++ b/data/po/sl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-19 20:51+0000\n"
+"PO-Revision-Date: 2015-03-29 17:02+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/supertuxkart/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -651,7 +651,7 @@ msgstr "Žve�ilni gumi  - zaš�itite se s š�itom ali ga uporabite medtem ko
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "Toda, ker sem pošten, se bom dogovoril s tabo."
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -694,7 +694,7 @@ msgstr "Prekli�i"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:56
 msgid "Cancel Request"
-msgstr ""
+msgstr "Prekli�i zahtevo"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:277
@@ -720,7 +720,7 @@ msgstr "Izzivi : Soba s trofejami"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "Change"
-msgstr ""
+msgstr "Spremeni"
 
 #. I18N: ./data/gui/karts.stkgui
 #. I18N: In the kart selection (player setup) screen
@@ -731,7 +731,7 @@ msgstr "Izbor vozila"
 
 #. I18N: ./data/achievements.xml
 msgid "Christoffel Columbus"
-msgstr ""
+msgstr "Krištofel Kolumb"
 
 #. I18N: ./data/gui/help1.stkgui
 msgid "Click here to play the tutorial"
@@ -754,16 +754,16 @@ msgstr "Zapri"
 
 #. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
 msgid "Cocoa Temple"
-msgstr ""
+msgstr "Tempelj kakava"
 
 #. I18N: ./data/achievements.xml
 msgid "Collect at least 5 bananas in one race."
-msgstr ""
+msgstr "Zberite vsaj 5 banan v eni dirki."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
 msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr "Zbirajte modre škatle: dale vam bodo orožja in druge dodatke"
+msgstr "Zbirajte modre škatle: dale vam bodo orožja in druge bonuse"
 
 #: src/tracks/track_object_presentation.cpp:916
 #, c-format
@@ -789,19 +789,19 @@ msgstr "Pobiranje nitra vam omogo�a pospeške, kadarkoli pritisnete primerno ti
 
 #: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr ""
+msgstr "Dokon�ajte vse izzive in odklenite velika vrata!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
 msgid "Completed achievement \"%s\"."
-msgstr ""
+msgstr "Dokon�ani ste izziv \"%s\"."
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Confirm"
-msgstr ""
+msgstr "Potrdi"
 
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching
 #. resoluton
@@ -813,7 +813,7 @@ msgstr "Potrdite lo�ljivost v naslednjih %i sekundah"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Connect to the Internet"
-msgstr ""
+msgstr "Poveži se na Internet"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
@@ -823,7 +823,7 @@ msgstr "Povežite svoj wiimote z upravljalnikom Bluetooth in nato kliknite V red
 
 #: src/states_screens/race_setup_screen.cpp:209
 msgid "Contains no powerups, so only your driving skills matter!"
-msgstr "Ne vsebuje dodatkov, zato štejejo samo vaše vozniške sposobnosti!"
+msgstr "Ne vsebuje bonusov, zato štejejo samo vaše vozniške sposobnosti!"
 
 #. I18N: ./data/gui/feature_unlocked.stkgui
 #. I18N: ./data/gui/grand_prix_lose.stkgui
@@ -841,11 +841,11 @@ msgstr "Nadaljuj"
 #. I18N: In the grand prix info screen
 #: src/states_screens/gp_info_screen.cpp:146
 msgid "Continue saved GP"
-msgstr ""
+msgstr "Nadaljuj s shranjenim prvenstvom"
 
 #: src/states_screens/race_result_gui.cpp:156
 msgid "Continue."
-msgstr ""
+msgstr "Nadaljuj."
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: Section in the settings menu
@@ -861,13 +861,13 @@ msgstr "Tipke"
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "Copy"
-msgstr ""
+msgstr "Kopiraj"
 
 #: src/states_screens/register_screen.cpp:217
 #: src/states_screens/register_screen.cpp:224
 #, c-format
 msgid "Could not create player '%s'."
-msgstr ""
+msgstr "Ni mogo�e ustvariti igralca '%s'."
 
 #: src/input/wiimote_manager.cpp:418
 msgid "Could not detect any wiimote :/"
@@ -876,21 +876,21 @@ msgstr "Ni mogo�e zaznati wiimote :/"
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 msgid "Create"
-msgstr ""
+msgstr "Ustvari"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Create Server"
-msgstr ""
+msgstr "Ustvari strežnik"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Create User"
-msgstr ""
+msgstr "Ustvari uporabnika"
 
 #: src/states_screens/create_server_screen.cpp:117
 msgid "Creating server"
-msgstr ""
+msgstr "Ustvarjanje strežnika"
 
 #. I18N: ./data/gui/credits.stkgui
 #. I18N: Title in credits screen
@@ -900,15 +900,15 @@ msgstr "Zasluge"
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Current Password"
-msgstr ""
+msgstr "Trenutno geslo"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:134
 msgid "Current password invalid."
-msgstr ""
+msgstr "Trenutno geslo je neveljavno."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "Trenutno niste prijavljeni"
 
 #. I18N: custom video settings
 #: src/states_screens/options_screen_video.cpp:411
@@ -923,38 +923,38 @@ msgstr "Nastavitve po meri"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
 msgid "DPad down"
-msgstr ""
+msgstr "DPad navzdol"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
 msgid "DPad left"
-msgstr ""
+msgstr "DPad levo"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
 msgid "DPad right"
-msgstr ""
+msgstr "DPag desno"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
 msgid "DPad up"
-msgstr ""
+msgstr "DPad navzgor"
 
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "Decline"
-msgstr ""
+msgstr "Zavrni"
 
 #: src/states_screens/gp_info_screen.cpp:74
 msgid "Default"
-msgstr ""
+msgstr "Privzeto"
 
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 msgid "Delete"
-msgstr ""
+msgstr "Izbriši"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
@@ -965,13 +965,13 @@ msgstr "Izbriši nastavitev"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Depth of field"
-msgstr ""
+msgstr "Globina polja"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:485
 #, c-format
 msgid "Depth of field : %s"
-msgstr ""
+msgstr "Globina polja: %s"
 
 #. I18N: button to disable a gamepad configuration
 #: src/states_screens/options_screen_input2.cpp:96
@@ -1004,7 +1004,7 @@ msgstr "Ali ste prepri�ani, da želite izbrisati igralca '%s' ?"
 
 #: src/states_screens/edit_gp_screen.cpp:140
 msgid "Do you want to save your changes?"
-msgstr ""
+msgstr "Ali želite shraniti svoje spremembe?"
 
 #: src/karts/controller/network_player_controller.cpp:283
 #: src/karts/controller/player_controller.cpp:340
@@ -1019,20 +1019,20 @@ msgstr "Dol"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Drive in reverse"
-msgstr ""
+msgstr "Vozite vzvratno"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:455
 #, c-format
 msgid "Dynamic lights : %s"
-msgstr ""
+msgstr "Dinami�ne lu�i: %s"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
@@ -1068,19 +1068,19 @@ msgstr "Izlo�en"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Email"
-msgstr ""
+msgstr "E-pošta"
 
 #: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Naslov e-pošte mora biti dolg med 4 in 50 znaki!"
 
 #: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
-msgstr ""
+msgstr "Naslov e-pošte je neveljaven!"
 
 #: src/states_screens/register_screen.cpp:276
 msgid "Emails don't match!"
-msgstr ""
+msgstr "Naslova e-pošte se neujemata!"
 
 #. I18N: ../stk-assets/karts/emule/kart.xml
 msgid "Emule"
@@ -1095,7 +1095,7 @@ msgstr "Omogo�i napravo"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Enable per-player handicaps"
-msgstr ""
+msgstr "Omogo�i hendikep za igralca"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -1118,7 +1118,7 @@ msgstr "Vnesite ime novega igralca"
 #: src/addons/news_manager.cpp:172
 #, c-format
 msgid "Error downloading news: '%s'."
-msgstr ""
+msgstr "Napaka med prejemanjem novic: '%s'."
 
 #: src/states_screens/kart_selection.cpp:923
 msgid ""
@@ -1129,12 +1129,12 @@ msgstr "Vsi:\nPritisnite 'Izberi' zdaj za pridružitev igri!"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Existing Online Account"
-msgstr ""
+msgstr "Obstoje�i spletni ra�un"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
 msgid "Exit"
-msgstr ""
+msgstr "Kon�aj"
 
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
@@ -1143,7 +1143,7 @@ msgstr "Kon�aj dirko"
 
 #: src/states_screens/user_screen.cpp:111
 msgid "Exit game"
-msgstr ""
+msgstr "Kon�aj igro"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: Difficulty
@@ -1159,37 +1159,37 @@ msgstr "Raziš�ite proge in najdite vsa skrita jajca"
 #: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d  - Å teviloPolinmov: %d Prekrivnih, %d Senc - OdaljenostSvetlobe : %d"
 
 #: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
 msgid "Fetching achievements"
-msgstr ""
+msgstr "Pridobivanje dosežkov"
 
 #: src/states_screens/online_profile_friends.cpp:88
 #: src/states_screens/online_profile_friends.cpp:174
 msgid "Fetching friends"
-msgstr ""
+msgstr "Pridobivanje prijateljev"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Pridobivanje zadnjega glasu"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
 msgid "Fetching servers"
-msgstr ""
+msgstr "Pridobivanje strežnikov"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Vnesite uporabniško ime in naslov e-pošte ki ste ju vnesli ob registraciji. To vam bo omogo�ilo ponastavitev gesla."
 
 #: src/modes/linear_world.cpp:276
 msgid "Final lap!"
@@ -1198,7 +1198,7 @@ msgstr "Zadnji krog!"
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Find Server"
-msgstr ""
+msgstr "Najdi strežnik"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:242
@@ -1241,36 +1241,36 @@ msgstr "Utrdba magme"
 #, c-format
 msgid "Found %d wiimote"
 msgid_plural "Found %d wiimotes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Najbena je bila %d naprava wiimote"
+msgstr[1] "Najbeni sta bili %d napravi wiimote"
+msgstr[2] "Najbene so bile %d naprave wiimote"
+msgstr[3] "Najbenih je bilo %d naprav wiimote"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Prijatelj je bil odstranjen!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
-msgstr ""
+msgstr "Zahteva po prijateljstvu je bila sprejeta!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:364
 msgid "Friend request cancelled!"
-msgstr ""
+msgstr "Zahteva po prijateljstvu je bila preklicana!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:267
 msgid "Friend request declined!"
-msgstr ""
+msgstr "Zahteva po prijateljstvu je bila zavrnjena!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:158
 msgid "Friend request sent!"
-msgstr ""
+msgstr "Zahteva po prijateljstvu je bila poslana!"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: Section in the profile screen
 #: src/states_screens/online_profile_base.cpp:99
 msgid "Friends"
-msgstr ""
+msgstr "Prijatelji"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -1301,7 +1301,7 @@ msgstr "Na�ini igre"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Vrsta igre (omejitev ciljev/�asovna omejitev)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1334,24 +1334,24 @@ msgstr "Predaj dirko"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Global illumination"
-msgstr ""
+msgstr "Splošna osvetlitev"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:489
 #, c-format
 msgid "Global illumination : %s"
-msgstr ""
+msgstr "Splošna osvetlitev: %s"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Glow (outlines)"
-msgstr ""
+msgstr "Žar (obrisi)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:477
 #, c-format
 msgid "Glow (outlines) : %s"
-msgstr ""
+msgstr "Žar (obrisi): %s"
 
 #. I18N: ../stk-assets/karts/gnu/kart.xml
 msgid "Gnu"
@@ -1364,11 +1364,11 @@ msgstr "Zdaj !"
 
 #. I18N: ./data/achievements.xml
 msgid "Gold driver"
-msgstr ""
+msgstr "Zlati voznik"
 
 #. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "Otok Gran Paradiso"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
@@ -1422,12 +1422,12 @@ msgstr "Gost"
 #: src/config/player_manager.cpp:397
 #, c-format
 msgid "Guest %d"
-msgstr ""
+msgstr "Gost %d"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Guest Log in"
-msgstr ""
+msgstr "Prijava gosta"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
@@ -1452,7 +1452,7 @@ msgstr "Seznam najboljših"
 
 #. I18N: ./data/achievements.xml
 msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
+msgstr "Zadenite 10 vozil s kroglo za kegljanje."
 
 #: src/states_screens/race_setup_screen.cpp:231
 msgid ""
@@ -1462,7 +1462,7 @@ msgstr "Streljajte na ostale z orožji, dokler ne izgubijo vseh svojih življenj
 
 #. I18N: ./data/achievements.xml
 msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
+msgstr "Zadenite isti avto vsaj 5-krat v eni dirki."
 
 #. I18N: animations setting (only karts with human players are animated)
 #: src/states_screens/dialogs/custom_video_settings.cpp:64
@@ -1472,7 +1472,7 @@ msgstr "Le �loveški igralci"
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Strinjam se z zgornjimi pogoji in sem star/a 13 let ali ve�."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -1494,7 +1494,7 @@ msgstr "Prezrtje '%s', za igranje bi se morali pridružiti prej!"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr ""
+msgstr "Na sliki osnovana osvetlitev"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -1511,7 +1511,7 @@ msgstr "Voznik"
 #: src/states_screens/register_screen.cpp:401
 #: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Dostop do interneta je onemogo�en, omogo�ite ga v možnostih."
 
 #: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
@@ -1519,16 +1519,16 @@ msgstr "Izena�eno"
 
 #. I18N: ./data/achievements.xml
 msgid "It's secret"
-msgstr ""
+msgstr "To je skrivnost"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Join"
-msgstr ""
+msgstr "Pridruži se"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:155
 msgid "Joining server"
-msgstr ""
+msgstr "Pridruževanje strežniku"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -1548,7 +1548,7 @@ msgstr "Sledite vode�emu vozilu, vendar ga NE prehitite!"
 
 #: src/states_screens/options_screen_input2.cpp:72
 msgid "Key binding"
-msgstr ""
+msgstr "Tipkovne bližnjice"
 
 #: src/states_screens/options_screen_input.cpp:97
 #, c-format
@@ -1571,7 +1571,7 @@ msgstr "Krog %i"
 
 #: src/states_screens/edit_gp_screen.cpp:67
 msgid "Laps"
-msgstr ""
+msgstr "Krogov"
 
 #. I18N: number of laps to race in a challenge
 #: src/challenges/challenge_data.cpp:249
@@ -1591,49 +1591,49 @@ msgstr "Levo"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:212
 msgid "Left bumper"
-msgstr ""
+msgstr "Levi odbija�"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:220
 msgid "Left thumb button"
-msgstr ""
+msgstr "Levi prst gumb"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:235
 msgid "Left thumb down"
-msgstr ""
+msgstr "Levi prst navzdol"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:233
 msgid "Left thumb left"
-msgstr ""
+msgstr "Levi prst levo"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:231
 msgid "Left thumb right"
-msgstr ""
+msgstr "Levi prst desno"
 
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:237
 msgid "Left thumb up"
-msgstr ""
+msgstr "Levi prst navzgor"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
 msgid "Left trigger"
-msgstr ""
+msgstr "Levi sprožilec"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Light shaft (God rays)"
-msgstr ""
+msgstr "Soj svetlobe (božji žarki)"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:481
 #, c-format
 msgid "Light shaft (God rays) : %s"
-msgstr ""
+msgstr "Soj svetlobe (božji žarki): %s"
 
 #: src/guiengine/engine.cpp:1330
 msgid "Loading"
@@ -1642,17 +1642,17 @@ msgstr "Nalaganje"
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
 msgid "Lobby"
-msgstr ""
+msgstr "Klepetalnica"
 
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Lobby Settings"
-msgstr ""
+msgstr "Nastavitve klepetalnice"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "Krajevno ime"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1676,26 +1676,26 @@ msgstr "Zaklenjeno!"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Log In"
-msgstr ""
+msgstr "Prijava"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Log Out"
-msgstr ""
+msgstr "Odjava"
 
 #: src/states_screens/online_screen.cpp:139
 #, c-format
 msgid "Logged in as: %s."
-msgstr ""
+msgstr "Prijavljeni kot: %s."
 
 #: src/states_screens/online_screen.cpp:155
 msgid "Logging in"
-msgstr ""
+msgstr "Prijavljanje"
 
 #: src/states_screens/user_screen.cpp:494
 #, c-format
 msgid "Logging in '%s'"
-msgstr ""
+msgstr "Prijavljanje v '%s'"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
@@ -1703,23 +1703,23 @@ msgid ""
 "Logging in as a guest allows you to participate in online races, but it does"
 " not allow you to vote for addons, or collect any achievements while being "
 "online."
-msgstr ""
+msgstr "Prijava kot gost vam omogo�a sodelovanje v spletnih dirkah, vendar pa ne morete glasovati za dodatke ali zbirati dosežkov med spletnim dirkanjem."
 
 #: src/states_screens/online_screen.cpp:160
 msgid "Logging out"
-msgstr ""
+msgstr "Odjavljanje"
 
 #: src/states_screens/user_screen.cpp:493
 #, c-format
 msgid "Logging out '%s'"
-msgstr ""
+msgstr "Odjavljanje '%s'"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: ./data/gui/user_screen.stkgui
 #: src/states_screens/main_menu_screen.cpp:175
 #: src/states_screens/main_menu_screen.cpp:186
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:251
@@ -1729,31 +1729,31 @@ msgstr "Pogled nazaj"
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
 msgid "Look for more friends:"
-msgstr ""
+msgstr "Iskanje ve� prijateljev:"
 
 #. I18N: ./data/achievements.xml
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Izvedite 5 drsenj v enem krogu."
 
 #. I18N: ./data/achievements.xml
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Predirkajte dirko s 5 krogi in ve�."
 
 #. I18N: ./data/achievements.xml
 msgid "Marathoner"
-msgstr ""
+msgstr "Maratonec"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Max. number of players"
-msgstr ""
+msgstr "Najve�je število igralcev"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Najve�ji �as (najmanj)"
 
 #. I18N: if some kart animations are enabled
 #: src/states_screens/options_screen_video.cpp:436
@@ -1767,22 +1767,22 @@ msgstr "Menijske tipke"
 
 #. I18N: ../stk-assets/tracks/minigolf/track.xml
 msgid "Minigolf"
-msgstr ""
+msgstr "Minogolf"
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
-msgstr ""
+msgstr "Lovilec komarjev"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Motion blur"
-msgstr ""
+msgstr "Meglen obris"
 
 #. I18N: in graphical options
 #: src/states_screens/options_screen_video.cpp:458
 #, c-format
 msgid "Motion blur: %s"
-msgstr ""
+msgstr "Meglen obris: %s"
 
 #. I18N: to appear in input configuration screen, for mouse (might not be used
 #. at all)
@@ -1801,12 +1801,12 @@ msgstr "Miškin gumb %d"
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Move down"
-msgstr ""
+msgstr "Premakni navzdol"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Move up"
-msgstr ""
+msgstr "Premakni navzgor"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
@@ -1836,35 +1836,35 @@ msgstr "Glasba"
 #: src/states_screens/online_profile_achievements.cpp:73
 #: src/states_screens/server_selection.cpp:91
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Ime mora biti dolgo med 4 in 30 znakov!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
-msgstr ""
+msgstr "Ime je prazno."
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
 msgid "Name is too long."
-msgstr ""
+msgstr "Ime je predolgo."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 #. I18N: ./data/gui/online/lobby_settings.stkgui
 #. I18N: In the lobby settings screen
 msgid "Name of the server"
-msgstr ""
+msgstr "Ime strežnika"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "Nessijev ribnik"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: src/challenges/challenge_data.cpp:502
 #, c-format
@@ -1874,16 +1874,16 @@ msgstr "Na voljo je nov turnir '%s'"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "New Online Account"
-msgstr ""
+msgstr "Nov spletni ra�un"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "New Password"
-msgstr ""
+msgstr "Novo geslo"
 
 #: src/states_screens/online_profile_friends.cpp:145
 msgid "New Request"
-msgstr ""
+msgstr "Nova zahteva"
 
 #: src/challenges/challenge_data.cpp:506
 #, c-format
@@ -1921,7 +1921,7 @@ msgstr "Izziv z nitrom"
 #: src/states_screens/dialogs/message_dialog.cpp:128
 #: src/states_screens/edit_gp_screen.cpp:253
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. I18N: ../stk-assets/karts/nolok/kart.xml
 msgid "Nolok"
@@ -1973,12 +1973,12 @@ msgstr "Å tevilo golov za zmago"
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
 msgid "Number of laps"
-msgstr ""
+msgstr "Å tevilo krogov"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
 msgid "Number of laps:"
-msgstr ""
+msgstr "Å tevilo krogov:"
 
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
@@ -2002,12 +2002,12 @@ msgstr "Bogu za hrbtom"
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
-msgstr ""
+msgstr "Nepovezano"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Offline Account"
-msgstr ""
+msgstr "Nepovezani ra�un"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
@@ -2032,25 +2032,25 @@ msgstr "Oliverjeva matemati�na u�ilnica"
 #: src/states_screens/main_menu_screen.cpp:185
 #: src/states_screens/online_profile_friends.cpp:149
 msgid "Online"
-msgstr ""
+msgstr "Povezano"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Povezan ve�igralski na�in"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Online Username"
-msgstr ""
+msgstr "Spletno uporabniško ime"
 
 #: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Spletno uporabniško ime mora biti dolgo med 3 in 30 znakov!"
 
 #: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Spletno uporabniško ime se ne sme za�eti s številko!"
 
 #: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
@@ -2073,11 +2073,11 @@ msgstr "Možnosti"
 #. I18N: ./data/gui/online/profile_overview.stkgui
 #. I18N: Section in the profile screen
 msgid "Overview"
-msgstr ""
+msgstr "Pregled"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "MOČ"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Parachute - slows down all karts in a better position."
@@ -2090,31 +2090,31 @@ msgstr "Padalo - upo�asni vsa vozila pred vami"
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the registration dialog
 msgid "Password"
-msgstr ""
+msgstr "Geslo"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 #. I18N: In the online account settings screen
 msgid "Password :"
-msgstr ""
+msgstr "Geslo:"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 msgid "Password Change"
-msgstr ""
+msgstr "Sprememba gesla"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 #: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Geslo mora biti dolgo med 8 in 30 znakov!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Geslo je bilo uspešno spremenjeno."
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:147
 #: src/states_screens/register_screen.cpp:272
 msgid "Passwords don't match!"
-msgstr ""
+msgstr "Gesli se ne ujemati!"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:257
@@ -2133,7 +2133,7 @@ msgstr "Kazenski �as!!"
 
 #: src/states_screens/online_profile_friends.cpp:146
 msgid "Pending"
-msgstr ""
+msgstr "Na �akanju"
 
 #. I18N: ./data/grandprix/1_penguinplayground.grandprix
 msgid "Penguin Playground"
@@ -2141,7 +2141,7 @@ msgstr "Pingvinovo igriš�e"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Glasovanje"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
 msgid "Pidgin"
@@ -2153,7 +2153,7 @@ msgstr "Predvajaj vse"
 
 #. I18N: ./data/achievements.xml
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Igrajte vsako uradno progo vsaj enkrat."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
@@ -2172,7 +2172,7 @@ msgstr "Igralci"
 msgid ""
 "Players can select handicapped (more difficult) profiles on the kart "
 "selection screen"
-msgstr ""
+msgstr "Igralci lahko na zaslonu izbora dirkalnikov izberejo hendikepirane (težje) profile."
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
@@ -2186,7 +2186,7 @@ msgstr "Znova nastavite zmožnosti tipk."
 
 #: src/states_screens/dialogs/registration_dialog.cpp:42
 msgid "Please read the terms and conditions "
-msgstr ""
+msgstr "Prosimo preberite pogoje uporabe"
 
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
@@ -2204,14 +2204,14 @@ msgstr "Odmaševalnik - vrzite ga naravnost, da potegnete nasprotnika nazaj ali
 
 #. I18N: ./data/achievements.xml
 msgid "Powerup Love"
-msgstr ""
+msgstr "Ljubezen do bonusov"
 
 #: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
 "Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
 " to fire behind!"
-msgstr ""
+msgstr "Pritisnite <%s> za pogled nazaj. Izstrelite orožje z <%s> medtem ko držite <%s> za strel nazaj!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -2258,16 +2258,16 @@ msgstr "Težave med odstranjevanjem dodatka '%s'."
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:474
 msgid "Processing"
-msgstr ""
+msgstr "Obdelovanje"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: src/states_screens/online_profile_achievements.cpp:79
 msgid "Progress"
-msgstr ""
+msgstr "Napredek"
 
 #. I18N: ../stk-assets/karts/puffy/kart.xml
 msgid "Puffy"
@@ -2282,7 +2282,7 @@ msgstr "Potisnite žogo v nasprotno kletko in zadenite gol. (le v ve�igralskih
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Quick Play"
-msgstr ""
+msgstr "Hitra igra"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2291,7 +2291,7 @@ msgstr "Kon�aj"
 
 #: src/states_screens/race_result_gui.cpp:159
 msgid "Quit the server."
-msgstr ""
+msgstr "Kon�aj povezavo s strežnikom"
 
 #. I18N: ./data/gui/racesetup.stkgui
 #. I18N: ./data/gui/select_challenge.stkgui
@@ -2301,7 +2301,7 @@ msgstr "Nastavitev dirke"
 
 #: src/states_screens/gp_info_screen.cpp:77
 msgid "Random"
-msgstr ""
+msgstr "Naklju�no"
 
 #: src/states_screens/arenas_screen.cpp:277
 msgid "Random Arena"
@@ -2338,7 +2338,7 @@ msgstr "Pripravljeni!"
 
 #. I18N: ./data/achievements.xml
 msgid "Really ... a secret."
-msgstr ""
+msgstr "Resni�no ... skrivnost."
 
 #: src/states_screens/race_result_gui.cpp:965
 msgid "Red Team Wins"
@@ -2347,7 +2347,7 @@ msgstr "Rde�a ekipa zmaga"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Register"
-msgstr ""
+msgstr "Registriraj"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
@@ -2359,14 +2359,14 @@ msgstr "Obi�ajna igra: vse je dovoljeno, zato dobite orožja in jih pametno upo
 #: src/states_screens/gp_info_screen.cpp:153
 #: src/states_screens/gp_info_screen.cpp:178
 msgid "Reload"
-msgstr ""
+msgstr "Ponovno naloži"
 
 #. I18N: ./data/gui/user_screen.stkgui
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
 msgid "Remember password"
-msgstr ""
+msgstr "Zapomni si geslo"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -2433,11 +2433,11 @@ msgstr "Obrnjeno"
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: In the edit track screen
 msgid "Reverse:"
-msgstr ""
+msgstr "Obrnjeno:"
 
 #: src/states_screens/edit_gp_screen.cpp:68
 msgid "Reversed"
-msgstr ""
+msgstr "Obrnjeno"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:271
@@ -2447,46 +2447,46 @@ msgstr "Desno"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:214
 msgid "Right bumper"
-msgstr ""
+msgstr "Desni odbija�"
 
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:222
 msgid "Right thumb button"
-msgstr ""
+msgstr "Desni prst gumb"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
 msgid "Right thumb down"
-msgstr ""
+msgstr "Desni prst navzdol"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
 msgid "Right thumb left"
-msgstr ""
+msgstr "Desni prst levo"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
 msgid "Right thumb right"
-msgstr ""
+msgstr "Desni prst desno"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
 msgid "Right thumb up"
-msgstr ""
+msgstr "Desni prst navzgor"
 
 #. I18N: name of buttons on gamepads
 #. I18N: name of stick on gamepads
 #: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
 msgid "Right trigger"
-msgstr ""
+msgstr "Desni sprožilec"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:89
 msgid "SPEED"
-msgstr ""
+msgstr "HITROST"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
@@ -2494,16 +2494,16 @@ msgstr "Podjetje STK"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "Sara, dirka�ica"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "Sara, �arodejka"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
 msgid "Save"
-msgstr ""
+msgstr "Shrani"
 
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
@@ -2513,12 +2513,12 @@ msgstr "Shrani turnir"
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/user_search.stkgui
 msgid "Search"
-msgstr ""
+msgstr "Iš�i"
 
 #: src/states_screens/online_user_search.cpp:208
 #: src/states_screens/online_user_search.cpp:288
 msgid "Searching"
-msgstr ""
+msgstr "Iskanje"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:274
@@ -2527,7 +2527,7 @@ msgstr "Izbira"
 
 #. I18N: ./data/gui/racesetup.stkgui
 msgid "Select a difficulty"
-msgstr ""
+msgstr "Izberite težavnost"
 
 #. I18N: ./data/gui/racesetup.stkgui
 msgid "Select a game mode"
@@ -2535,7 +2535,7 @@ msgstr "Izberite na�in igre"
 
 #: src/states_screens/edit_track_screen.cpp:238
 msgid "Select a track"
-msgstr ""
+msgstr "Izberite progo"
 
 #. I18N: ./data/gui/overworld_dialog.stkgui
 #. I18N: In the in-game dialog
@@ -2545,30 +2545,30 @@ msgstr "Izbor vozila"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "Pošlji anonimno statistiko o strojni opremi"
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
 msgid "Server Creation"
-msgstr ""
+msgstr "Ustvarjanje strežnika"
 
 #. I18N: ./data/gui/online/server_info_dialog.stkgui
 #. I18N: In the server info dialog
 msgid "Server Info"
-msgstr ""
+msgstr "Podatki o strežniku"
 
 #. I18N: ./data/gui/online/server_selection.stkgui
 msgid "Server Selection"
-msgstr ""
+msgstr "Izbor strežnika"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
 msgid "Server name :"
-msgstr ""
+msgstr "Ime strežnika:"
 
 #: src/states_screens/dialogs/server_info_dialog.cpp:58
 msgid "Server successfully created. You can now join it."
-msgstr ""
+msgstr "Strežnik je bil uspešno ustvarjen. Sedaj se mu lahko pridružite."
 
 #. I18N: as in "ready, set, go", shown at the beginning of the race
 #: src/states_screens/race_gui_base.cpp:66
@@ -2584,17 +2584,17 @@ msgstr "Nastavi novo dirko"
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Shadows"
-msgstr ""
+msgstr "Sence"
 
 #: src/states_screens/options_screen_video.cpp:470
 #, c-format
 msgid "Shadows: %i"
-msgstr ""
+msgstr "Sence: %i"
 
 #: src/states_screens/options_screen_video.cpp:468
 #, c-format
 msgid "Shadows: %s"
-msgstr ""
+msgstr "Sence: %s"
 
 #. I18N: ../stk-assets/tracks/sandtrack/track.xml
 msgid "Shifting Sands"
@@ -2607,21 +2607,21 @@ msgstr "Bleš�e�e predmestje"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Sign In"
-msgstr ""
+msgstr "Prijava"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: Tab in login menu
 msgid "Sign In As Guest"
-msgstr ""
+msgstr "Prijava kot gost"
 
 #: src/states_screens/online_profile_friends.cpp:70
 msgid "Since"
-msgstr ""
+msgstr "Od"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: Main menu button
 msgid "Singleplayer"
-msgstr ""
+msgstr "En igralec"
 
 #: src/states_screens/dialogs/addons_loading.cpp:177
 #, c-format
@@ -2630,7 +2630,7 @@ msgstr "Velikost: %s"
 
 #. I18N: ./data/achievements.xml
 msgid "Skid-row"
-msgstr ""
+msgstr "Vrsta drsenja"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2690,7 +2690,7 @@ msgstr "Obi�ajna"
 #. I18N: name of buttons on gamepads
 #: src/input/gamepad_config.cpp:218
 msgid "Start"
-msgstr ""
+msgstr "Za�etek"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
@@ -2705,7 +2705,7 @@ msgstr "Za�ni dirko"
 
 #: src/states_screens/online_profile_friends.cpp:71
 msgid "Status"
-msgstr ""
+msgstr "Stanje"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:230
@@ -2724,14 +2724,14 @@ msgstr "Na�in zgodbe"
 
 #. I18N: ./data/achievements.xml
 msgid "Strike!"
-msgstr ""
+msgstr "Udarec!"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
 msgid "Submit"
-msgstr ""
+msgstr "Pošlji"
 
 #. I18N: ../stk-assets/tracks/subsea/track.xml
 msgid "Subsea"
@@ -2780,7 +2780,7 @@ msgid ""
 "(To change this setting at a later time, go to options, select tab 'User "
 "Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
 "statistics\")."
-msgstr ""
+msgstr "SuperTuxKart se lahko poveže na strežnik za prejem dodatkov in obvestilo o posodobitvah. Zbiramo tudi anonimno statistiko o strojni opremi za pomo� pri razvoju STK: preberite naša pravila o zasebnosti na http://privacy.supertuxkart.net. Ali želite omogo�iti to funkcijo? (Za spremembo te nastavitve pozneje, pojdite v možnosti, izberite zavihek 'Uporabniški vmesnik' in uredite 'Povezava na Internet' in 'Pošlji anonimno statistiko o strojni opremi')."
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
@@ -2805,21 +2805,21 @@ msgstr "Sistem jezik"
 msgid ""
 "Take your opponents for mosquitos! With the swatter, squash at least 5 of "
 "them in a race."
-msgstr ""
+msgstr "Z lovilcem komarjem sploš�ite vsaj 5 nasprotnikov v dirki."
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "Tempelj"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
 msgid "Terms and Agreement"
-msgstr ""
+msgstr "Pogoji uporabe"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Texture compression"
-msgstr ""
+msgstr "Stiskanje tekstur"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -2847,7 +2847,7 @@ msgstr "Datoteka z najboljšimi izidi je bila prestara,\nzato so bili vsi rezult
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Najve�je število igralcev mora biti med 2 in 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -2857,7 +2857,7 @@ msgstr "Dirka na �as"
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
 msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr "Dirka na �as: Ne vsebuje nobenih pripomo�kov, štejejo samo vaše vozniške sposobnosti!"
+msgstr "Dirka na �as: Ne vsebuje nobenih bonusov, štejejo samo vaše vozniške sposobnosti!"
 
 #: src/states_screens/dialogs/add_device_dialog.cpp:64
 msgid ""
@@ -2869,7 +2869,7 @@ msgstr "Za dodajanje nove naprave igralni ploš�ek/Joystick, povežite napravo
 #. I18N: ./data/gui/help2.stkgui
 #. I18N: In the help menu
 msgid "To help you win, there are some powerups you can collect :"
-msgstr "Za lažjo zmago lahko poberete razli�ne dodatke:"
+msgstr "Za lažjo zmago lahko poberete razli�ne bonuse:"
 
 #. I18N: ./data/grandprix/3_tothemoonandback.grandprix
 msgid "To the moon and back"
@@ -2878,7 +2878,7 @@ msgstr "Na luno in nazaj"
 #: src/states_screens/dialogs/user_info_dialog.cpp:154
 #: src/states_screens/dialogs/user_info_dialog.cpp:211
 msgid "Today"
-msgstr ""
+msgstr "Danes"
 
 #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
 #: src/states_screens/race_gui_base.cpp:103
@@ -2888,12 +2888,12 @@ msgstr "Najboljših %i"
 
 #: src/states_screens/edit_gp_screen.cpp:66
 msgid "Track"
-msgstr ""
+msgstr "Proga"
 
 #: src/states_screens/race_result_gui.cpp:1130
 #, c-format
 msgid "Track %i/%i"
-msgstr ""
+msgstr "Proga %i/%i"
 
 #. I18N: when showing who is the author of track '%s'
 #. I18N: (place %s where the name of the author should appear)
@@ -2905,7 +2905,7 @@ msgstr "Progo je ustvaril %s"
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
 msgid "Track group"
-msgstr ""
+msgstr "Skupina prog"
 
 #. I18N: ./data/gui/addons_screen.stkgui
 #. I18N: In the addons screen
@@ -2916,7 +2916,7 @@ msgstr "Proge"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:77
 msgid "Trilinear"
-msgstr ""
+msgstr "Trilinearno"
 
 #: src/states_screens/dialogs/addons_loading.cpp:369
 #: src/states_screens/dialogs/addons_loading.cpp:406
@@ -2951,7 +2951,7 @@ msgstr "Vrsta: turnir"
 msgid ""
 "Unable to connect to the server. Check your internet connection or try again"
 " later."
-msgstr ""
+msgstr "Ni se mogo�e povezati s strežnikom. Preverite svojo internetno povezavo in poskusite ponovno."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -2960,7 +2960,7 @@ msgstr "Odstrani"
 
 #. I18N: ./data/achievements.xml
 msgid "Unstoppable"
-msgstr ""
+msgstr "Neustavljiv-a"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:262
@@ -2983,17 +2983,17 @@ msgstr "Posodobljeno dne"
 
 #. I18N: ./data/achievements.xml
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Uporabite 10 ali ve� bonusov v igri."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Uporabi teksture visoke lo�ljivosti"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Uporabite levo/desno za izbiro ekipe in pritisnite tipko \"streljaj\""
 
 #: src/tracks/track_object_presentation.cpp:949
 #, c-format
@@ -3003,7 +3003,7 @@ msgstr "Zbrani nitro uporabite s pritiskom na tipko <%s>!"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog' dialog
 msgid "User Info"
-msgstr ""
+msgstr "Uporabniški podatki"
 
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: Section in the settings menu
@@ -3017,11 +3017,11 @@ msgstr "Uporabniški vmesnik"
 
 #: src/states_screens/grand_prix_editor_screen.cpp:335
 msgid "User defined"
-msgstr ""
+msgstr "Uporabniško dolo�eno"
 
 #. I18N: ./data/gui/online/user_search.stkgui
 msgid "User search"
-msgstr ""
+msgstr "Iskanje uporabnika"
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
@@ -3032,11 +3032,11 @@ msgstr ""
 #: src/states_screens/online_profile_friends.cpp:67
 #: src/states_screens/online_user_search.cpp:74
 msgid "Username"
-msgstr ""
+msgstr "Uporabniško ime"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Uporabniško ime in/ali naslov e-pošte sta neveljavna."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 msgid "VS"
@@ -3046,7 +3046,7 @@ msgstr "proti"
 #: src/states_screens/dialogs/recovery_dialog.cpp:209
 #: src/states_screens/register_screen.cpp:353
 msgid "Validating info"
-msgstr ""
+msgstr "Preverjanje podatkov"
 
 #: src/states_screens/dialogs/addons_loading.cpp:108
 #, c-format
@@ -3063,7 +3063,7 @@ msgstr "Navpi�no usklajevanje (zahteva ponoven zagon)"
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
 msgid "View"
-msgstr ""
+msgstr "Pogled"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -3073,15 +3073,15 @@ msgstr "Glasnost"
 #. I18N: ./data/gui/online/vote_dialog.stkgui
 #. I18N: In the vote dialog
 msgid "Vote"
-msgstr ""
+msgstr "Glasuj"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Glasovanje je bilo uspešno! Sedaj lahko zaprete okno."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
-msgstr ""
+msgstr "TEŽA"
 
 #: src/modes/linear_world.cpp:882
 msgid "WRONG WAY!"
@@ -3135,7 +3135,7 @@ msgstr "Ko so vnosne naprave nastavljene, lahko za�nete igrati. V glavnem menij
 #. I18N: Name of the white button on xbox controller
 #: src/input/gamepad_config.cpp:171
 msgid "White"
-msgstr ""
+msgstr "Bela"
 
 #. I18N: ../stk-assets/karts/wilber/kart.xml
 msgid "Wilber"
@@ -3143,11 +3143,11 @@ msgstr "Wilber"
 
 #. I18N: ./data/achievements.xml
 msgid "Win 5 single races in a row."
-msgstr ""
+msgstr "Zmagajte 5 dirk zapored."
 
 #. I18N: ./data/achievements.xml
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Zmagajte v vseh na�inih enega igralca proti vsaj 3 nasprotnikom."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
 msgid "XR591"
@@ -3173,21 +3173,21 @@ msgstr "Igrate kot"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Svojo prejšnjo oceno lahko prilagodite s klikom zvezdic spodaj."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
 "You can not download addons without internet access. If you want to download"
 " addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Dodatkov ne morete prejeti brez internetne povezave. Če želite prejeti dodatke, pojdite v možnosti, izberite zavihek 'Uporabniški vmesnik' in spremenite nastavitev 'Povezava do Interneta'."
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
 "You can not play online without internet access. If you want to play online,"
 " go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Brez dostopa do interneta ne morete igrati na spletu. Če želite igrati na spletu, pojdit v možnosti, izberite zavihek 'Uporabniški vmesnik' in spremenite nastavitev 'Povezava do Interneta'."
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
@@ -3195,7 +3195,7 @@ msgid ""
 "You can play without creating an online account by selecting an offline "
 "account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Igrate lahko tudi brez spletnega ra�una in sicer tako, da izberete nespletni ra�un. Vendar pa to pomeni, da se ne morete povezati s prijatelji, glasovati za dodatke, ipd. Preberite našo izjavo o zasebnosti na http://privacy.supertuxkart.net."
 
 #: src/states_screens/grand_prix_win.cpp:124
 #: src/states_screens/race_result_gui.cpp:175
@@ -3214,18 +3214,18 @@ msgstr "Dokon�ali ste turnir!"
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Dokon�ali ste težaven izziv! Dobili ste %i/%i to�k."
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Dokon�ali ste enostaven izziv! Dobili ste %i/%i to�k."
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Dokon�ali ste obi�ajen izziv! Dobili ste %i/%i to�k."
 
 #: src/karts/kart.cpp:856
 msgid "You finished the race!"
@@ -3235,14 +3235,14 @@ msgstr "Kon�ali ste dirko!"
 #, c-format
 msgid "You have %d new friend request!"
 msgid_plural "You have %d new friend requests!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Imate %d novo zahtevo za prijeteljstvo!"
+msgstr[1] "Imate %d novi zahtevi za prijeteljstvo!"
+msgstr[2] "Imate %d nove zahteve za prijeteljstvo!"
+msgstr[3] "Imate %d novih zahtev za prijeteljstvo!"
 
 #: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
-msgstr ""
+msgstr "Imate novo zahtevo za prijeteljstvo!"
 
 #: src/modes/world.cpp:1144
 msgid "You have been eliminated!"
@@ -3252,7 +3252,7 @@ msgstr "Bili ste odstranjeni!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Za ta dodatek Å¡e niste glasovali. Izberite svojo oceno s klikom na zvezdice spodaj."
 
 #: src/karts/kart.cpp:1913
 msgid ""
@@ -3260,11 +3260,11 @@ msgid ""
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Za vstop v ta izziv\npotrebujete ve� to�k!\nPreverite mini zemljevid\nza razpoložljive izzive."
 
 #: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
-msgstr ""
+msgstr "Vnesti morate geslo."
 
 #: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
@@ -3279,13 +3279,13 @@ msgstr "Odklenili ste progo %0"
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Prejeli boste e-pošto z nadaljnimi navodili kako ponastaviti vaše geslo. Prosimo bodite potrpežljivi in preverite mapo z neželeno pošto."
 
 #: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Prejeli boste e-pošto z nadaljnimi navodili kako aktivirati svoj ra�un. Prosimo bodite potrpežljivi in preverite mapo z neželeno pošto."
 
 #: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
@@ -3295,7 +3295,7 @@ msgstr "Zmagali ste dirko!"
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
 "your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
-msgstr ""
+msgstr "Vaša razli�ica OpenGL je prestara. Prosimo preverite, �e je na voljo posodobitev za vaš video gonilnik. SuperTuxKart zahteva OpenGL 3.1 ali boljši."
 
 #: src/config/user_config.cpp:700
 msgid ""
@@ -3312,7 +3312,7 @@ msgstr "Vaša nastavitvena datoteka je bila prestara, zato je bila izbrisana. Us
 #: src/main.cpp:1367
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
-msgstr ""
+msgstr "Vapa razli�ica gonilnika je prestara. Prosimo namestite najnovejše video gonilnike."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3321,7 +3321,7 @@ msgstr "Vaša vhodna nastavitvena datoteka ni združljiva s to razli�ico STK-ja
 #: src/states_screens/online_profile_base.cpp:105
 #: src/states_screens/online_profile_base.cpp:115
 msgid "Your profile"
-msgstr ""
+msgstr "Vaš profil"
 
 #. I18N: ../stk-assets/tracks/zengarden/track.xml
 msgid "Zen Garden"
@@ -3335,12 +3335,12 @@ msgstr "[brez]"
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In networking lobby
 msgid "actions"
-msgstr ""
+msgstr "dejanja"
 
 #. I18N: track group name
 #: src/states_screens/tracks_screen.cpp:151
 msgid "all"
-msgstr ""
+msgstr "vse"
 
 #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by
 #. "John Doe")
@@ -3354,11 +3354,11 @@ msgstr "zmožnost"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
-msgstr ""
+msgstr "visoko"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
-msgstr ""
+msgstr "nizko"
 
 #. I18N: arena group name
 #. I18N: track group name
diff --git a/data/po/uk.po b/data/po/uk.po
index 447345c41..76bae6d1a 100644
--- a/data/po/uk.po
+++ b/data/po/uk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fedik <fedikw@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: SuperTuxKart\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-13 21:42-0400\n"
-"PO-Revision-Date: 2015-03-14 11:00+0000\n"
-"Last-Translator: Auria <auria.mg@gmail.com>\n"
+"PO-Revision-Date: 2015-04-09 20:39+0000\n"
+"Last-Translator: fedik <fedikw@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/supertuxkart/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "   N"
 msgid ""
 " But you pathetic little twerps will never be able to beat me - King of the "
 "Karts!"
-msgstr ""
+msgstr "�ле ви, жалюгідний пройди�віт, ніколи не буде в змозі побити мене - корол� картів!"
 
 #. I18N: Only used for count > 3
 #: src/online/online_player_profile.cpp:429
@@ -45,7 +46,7 @@ msgstr[2] "%d друзів у мережі."
 #: src/guiengine/widgets/player_kart_widget.cpp:360
 #, c-format
 msgid "%s (handicapped)"
-msgstr ""
+msgstr "%s (важко)"
 
 #: src/states_screens/dialogs/addons_loading.cpp:172
 #: src/states_screens/dialogs/addons_loading.cpp:176
@@ -136,7 +137,7 @@ msgid ""
 "instead of playing a single race, you play many in a row. The better you "
 "rank, the more points you get. In the end, the player with the most points "
 "wins the cup."
-msgstr "* У більшу ча�тину цих видів гри можна зіграти в Гран-Прі: замі�ть однієї тра�и, ти можеш проїжджати декілька одразу. Чим вищий твій рейтинг, тим більше очок ти отримуєш. У результаті гравець з більшою кількі�тю очок виграє� кубок."
+msgstr "* У більшу ча�тину цих видів гри можна зіграти у Великому Змаганні: замі�ть однієї тра�и, можете проїжджати декілька одразу. Чим вищий рейтинг, тим більше очок ви отримуєте. У результаті гравець з більшою кількі�тю очок виграє� кубок."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -187,7 +188,7 @@ msgstr "Битва трьох ударів"
 msgid ""
 "3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
 "they lose all their lives."
-msgstr ""
+msgstr "Битва трьох ударів: Лише в багатокори�тувацькій грі. �такуйте інших допоки вони втрат�ть в�і �вої житт�."
 
 #: src/states_screens/addons_screen.cpp:53
 msgid "3 months"
@@ -212,7 +213,7 @@ msgstr "ШІ �уперників"
 
 #: src/states_screens/race_result_gui.cpp:189
 msgid "Abort Grand Prix"
-msgstr "Покинути Гран-прі"
+msgstr "Покинути Велике Змаганн�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -229,7 +230,7 @@ msgstr "Газ"
 msgid ""
 "Accelerate and press the <%s> key while turning to skid. Skidding for a "
 "short while can help you turn faster to take sharp turns."
-msgstr ""
+msgstr "Розженіть�� та нати�ніть <%s> під ча� зано�у. Ковзанн� може допомогти вам пройти го�трий поворот швидше."
 
 #: src/tracks/track_object_presentation.cpp:897
 #, c-format
@@ -378,7 +379,7 @@ msgstr "Завжди показувати екран входу"
 
 #. I18N: ../stk-assets/karts/amanda/kart.xml
 msgid "Amanda"
-msgstr ""
+msgstr "�манда"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -393,7 +394,7 @@ msgstr "Вплив оточенн� : %s"
 
 #: src/states_screens/edit_gp_screen.cpp:323
 msgid "An error occurred while trying to save your grand prix."
-msgstr "Стала�� помилка під ча� збереженн� вашого гран-прі."
+msgstr "Стала�� помилка під ча� збереженн� Великого Змаганн�."
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Anchor - slows down greatly the kart in the first position."
@@ -442,7 +443,7 @@ msgstr "�нізотропна x8"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
 msgid "Another grand prix with this name already exists."
-msgstr "Інше гран-прі вже і�нує з такою ж назвою."
+msgstr "Інше Велике Змаганн� вже і�нує з такою ж назвою."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -493,7 +494,7 @@ msgstr "�авколо ма�ка"
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
 msgid "Assign nothing"
-msgstr ""
+msgstr "�ічого не призначено"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -558,7 +559,7 @@ msgstr "Повернути�� до гонки"
 
 #: src/states_screens/race_result_gui.cpp:205
 msgid "Back to challenge selection"
-msgstr "Повернути�ь до вибору виклику"
+msgstr "Повернути�ь до вибору змаганн�"
 
 #. I18N: ./data/gui/options_device.stkgui
 #. I18N: In the input configuration screen
@@ -582,7 +583,7 @@ msgstr "Любитель бананів"
 msgid ""
 "Basket Ball - bounces after the leader, and might squash and slow down karts"
 " down on the way."
-msgstr ""
+msgstr "Ба�кетбольний м’�ч - �трибає за лідером, та може чавити та �повільн�ти карти на �воєму шл�ху."
 
 #. I18N: ../stk-assets/tracks/battleisland/track.xml
 msgid "Battle Island"
@@ -644,12 +645,12 @@ msgstr "Гальма"
 msgid ""
 "BubbleGum - protect yourself with a shield, or use while looking back to "
 "leave a sticky pink puddle behind you."
-msgstr ""
+msgstr "Жувальна гумка - захи�тіть �ебе з допомогою щита, або, під ча� погл�ду назад, викори�товуйте щоб залишити рожевий липкий �лід на дорозі."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
 msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
+msgstr "�ле � че�не �творінн�, тому запропоную Вам угоду."
 
 #. I18N: ./data/gui/help2.stkgui
 msgid ""
@@ -658,7 +659,7 @@ msgstr "Кек� — кидаєть�� в найближчого �уперни
 
 #: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
 msgid "Can't access stkaddons server..."
-msgstr "�емає до�тупу до �ервера додатків stkaddons.net…"
+msgstr "�емає до�тупу до �ервера додатків …"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
@@ -705,16 +706,16 @@ msgstr "Секретна печера"
 
 #: src/states_screens/feature_unlocked.cpp:493
 msgid "Challenge Completed"
-msgstr "Виклик завершено"
+msgstr "Змаганн� завершено"
 
 #: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
 msgid "Challenge Failed"
-msgstr "Виклик провалено"
+msgstr "�евдача"
 
 #. I18N: ./data/gui/challenges.stkgui
 #. I18N: Title for challenges screen
 msgid "Challenges : Trophy Room"
-msgstr "Змаганн�: зала призів"
+msgstr "Змаганн�: Зала призів"
 
 #. I18N: ./data/gui/online/profile_settings.stkgui
 msgid "Change"
@@ -767,7 +768,7 @@ msgstr "Збирай блакитні коробки: вони дадуть то
 #, c-format
 msgid ""
 "Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
+msgstr "Збирайте подарунки, та �тріл�йте з допомогою <%s> щоб прибрати ці коробки з дороги!"
 
 #: src/tracks/track_object_presentation.cpp:938
 msgid "Collect nitro bottles (we will use them after the curve)"
@@ -787,7 +788,7 @@ msgstr "Збирай зар�ди „нітро“, що дають можлив
 
 #: src/tracks/track_object_presentation.cpp:880
 msgid "Complete all challenges to unlock the big door!"
-msgstr "Завершіть в�і виклики аби відкрити браму!"
+msgstr "Завершіть в�і змаганн� аби відкрити браму!"
 
 #: src/achievements/achievement.cpp:202
 #, c-format
@@ -811,7 +812,7 @@ msgstr "Підтвердь рішенн� прот�гом %i �екунд"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Connect to the Internet"
-msgstr "З'єднати�ь з інтернетом"
+msgstr "З'єднанн� з інтернетом"
 
 #: src/input/wiimote_manager.cpp:387
 msgid ""
@@ -906,7 +907,7 @@ msgstr "Поточний пароль невірний."
 
 #: src/config/player_manager.cpp:91
 msgid "Currently not signed in"
-msgstr ""
+msgstr "�е увійшли"
 
 #. I18N: custom video settings
 #: src/states_screens/options_screen_video.cpp:411
@@ -988,11 +989,11 @@ msgstr "Вимкнено"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Display FPS"
-msgstr "Відображати кад./�ек."
+msgstr "Показувати кадр./�ек. "
 
 #: src/states_screens/race_result_gui.cpp:354
 msgid "Do you really want to abort the Grand Prix?"
-msgstr "Ви �правді бажаєте завершити Гран-прі?"
+msgstr "Ви �правді бажаєте завершити Велике Змаганн�?"
 
 #. I18N: In the player info dialog (when deleting)
 #: src/states_screens/user_screen.cpp:583
@@ -1035,17 +1036,17 @@ msgstr "Змінити"
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Title in edit grand prix screen
 msgid "Edit Grand Prix"
-msgstr "Змінити гран-прі"
+msgstr "Змінити Велике Змаганн�"
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:184
 msgid "Egg Hunt"
-msgstr ""
+msgstr "Полюванн� за �йц�ми"
 
 #. I18N: ./data/gui/help3.stkgui
 #. I18N: In the help menu
 msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
+msgstr "Полюванн� за �йц�ми: До�лідіть трек та знайдіть в�і �ховані �йц�."
 
 #: src/modes/easter_egg_hunt.cpp:202
 #, c-format
@@ -1070,7 +1071,7 @@ msgstr "Ел. пошта"
 
 #: src/states_screens/register_screen.cpp:292
 msgid "Email has to be between 4 and 50 characters long!"
-msgstr ""
+msgstr "Електронна адре�а має мі�тити від 4 до 50 �имволів!"
 
 #: src/states_screens/register_screen.cpp:298
 msgid "Email is invalid!"
@@ -1093,7 +1094,7 @@ msgstr "Включити при�трій"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Enable per-player handicaps"
-msgstr ""
+msgstr "Увімкнути труднощі дл� гравців"
 
 #. I18N: ./data/gui/options_audio.stkgui
 #. I18N: In the audio options screen
@@ -1122,12 +1123,12 @@ msgstr "Помилка завантаженн� новин: '%s'."
 msgid ""
 "Everyone:\n"
 "Press 'Select' now to join the game!"
-msgstr ""
+msgstr "В�і:\n�ати�ніть 'Обрати' зараз, щоб приєднати�ь до гри!"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Existing Online Account"
-msgstr ""
+msgstr "І�нуючий Онлайн екаунт"
 
 #. I18N: ./data/gui/online/lobby.stkgui
 #. I18N: In the networking lobby
@@ -1157,12 +1158,12 @@ msgstr "До�ліджуйте треки аби знайти в�і прихо
 #: src/graphics/irr_driver.cpp:1795
 #, c-format
 msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
+msgstr "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 
 #: src/graphics/irr_driver.cpp:1804
 #, c-format
 msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
+msgstr "FPS: %d/%d/%d - %d KTris"
 
 #: src/states_screens/online_profile_achievements.cpp:128
 #: src/states_screens/online_profile_achievements.cpp:168
@@ -1176,7 +1177,7 @@ msgstr "Отриманн� друзів"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:171
 msgid "Fetching last vote"
-msgstr ""
+msgstr "Отриманн� о�таннього голо�у"
 
 #: src/states_screens/server_selection.cpp:67
 #: src/states_screens/server_selection.cpp:210
@@ -1187,7 +1188,7 @@ msgstr "Отриманн� �ерверів"
 msgid ""
 "Fill in the username and email address you supplied at registration to be "
 "able to reset your password."
-msgstr ""
+msgstr "Вкажіть ім’� кори�тувача та електронну адре�у, �кі ви вказували при реє�трації, щоб мати �могу відоновити пароль."
 
 #: src/modes/linear_world.cpp:276
 msgid "Final lap!"
@@ -1229,7 +1230,7 @@ msgid ""
 "Follow the leader: Run for second place, as the last kart will be "
 "disqualified every time the counter hits zero. Beware : going in front of "
 "the leader will get you eliminated too!"
-msgstr ""
+msgstr "Сілдуй за лідером: Їдьте на другому мі�ці, о�танній карт буде ди�кавліфікований кожного разу коли лічильник добігатиме нул�. Обрережно: переган�ючи лідера ви будете виключені з гонки також!"
 
 #. I18N: ../stk-assets/tracks/fortmagma/track.xml
 msgid "Fort Magma"
@@ -1245,7 +1246,7 @@ msgstr[2] ""
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:313
 msgid "Friend removed!"
-msgstr ""
+msgstr "Друга вилучено!"
 
 #: src/states_screens/dialogs/user_info_dialog.cpp:215
 msgid "Friend request accepted!"
@@ -1298,7 +1299,7 @@ msgstr "Режим гри"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Game type (Goals limit / Time limit)"
-msgstr ""
+msgstr "Тип гри (Ліміт цілей / Ліміт ча�у)"
 
 #. I18N: to appear in input configuration screen, for gamepad buttons
 #: src/input/binding.cpp:292
@@ -1326,7 +1327,7 @@ msgstr "Головна"
 #. I18N: ./data/gui/race_paused_dialog.stkgui
 #. I18N: Race paused button
 msgid "Give Up Race"
-msgstr ""
+msgstr "Здати��"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1365,27 +1366,27 @@ msgstr "Золоті руки"
 
 #. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
 msgid "Gran Paradiso Island"
-msgstr ""
+msgstr "О�трів Великий Парадізо"
 
 #. I18N: ./data/gui/tracks.stkgui
 #. I18N: In the track selection screen
 #: src/states_screens/dialogs/select_challenge.cpp:145
 msgid "Grand Prix"
-msgstr "Гран-прі"
+msgstr "Велике Змаганн�"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
 msgid "Grand Prix Editor"
-msgstr "Редактор гран-прі"
+msgstr "Редактор Великого Змаганн�"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Title in grand prix editor screen
 msgid "Grand Prix editor"
-msgstr "Редактор гран-прі"
+msgstr "Редактор Великого Змаганн�"
 
 #: src/states_screens/race_result_gui.cpp:1214
 msgid "Grand Prix progress:"
-msgstr "Прогре� Гран-прі:"
+msgstr "Про�уванн� у Великому Змаганні:"
 
 #. I18N: ./data/gui/options_video.stkgui
 #. I18N: In the video settings
@@ -1424,7 +1425,7 @@ msgstr "Гі�ть %d"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Guest Log in"
-msgstr ""
+msgstr "Увійти �к гі�ть"
 
 #. I18N: ../stk-assets/tracks/hacienda/track.xml
 msgid "Hacienda"
@@ -1469,19 +1470,19 @@ msgstr "Тільки люди"
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
 msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
+msgstr "Я погоджую�ь з вказаними вище умовами і мені більше ніж 13 років."
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
 msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
+msgstr "Якщо ти зможеш перемогти мене в гонці, тоді � звільню цього �тарого дивака."
 
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: In the help menu
 msgid ""
 "If you see a button with a lock like this one, you need to complete a "
 "challenge to unlock it."
-msgstr "Зображенн� замка означає, що тобі необхідно завершити випробуванн�, щоб розблокувати його."
+msgstr "Якщо ви бачите замок �к цей, то це означає, що вам необхідно завершити змаганн�, щоб розблокувати його."
 
 #: src/input/input_manager.cpp:729
 #, c-format
@@ -1491,7 +1492,7 @@ msgstr "„%s“ ігноруєть��, потрібно було увійти
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Image-based lighting"
-msgstr ""
+msgstr "О�вітленн� на о�нові зображенн�"
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -1508,11 +1509,11 @@ msgstr "Середній рівень"
 #: src/states_screens/register_screen.cpp:401
 #: src/states_screens/user_screen.cpp:328
 msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
+msgstr "Інтернет до�туп вимкнено, будь ла�ка увімкніть його в налаштуванн�х"
 
 #: src/states_screens/race_result_gui.cpp:974
 msgid "It's a draw"
-msgstr ""
+msgstr "Це нічи�"
 
 #. I18N: ./data/achievements.xml
 msgid "It's secret"
@@ -1649,7 +1650,7 @@ msgstr "�алаштуванн� лобі"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Local Name"
-msgstr ""
+msgstr "Локальне ім’�"
 
 #: src/states_screens/kart_selection.cpp:853
 msgid "Locked"
@@ -1664,7 +1665,7 @@ msgstr "Заблоковано"
 #: src/states_screens/race_setup_screen.cpp:214
 #: src/states_screens/tracks_screen.cpp:283
 msgid "Locked : solve active challenges to gain access to more!"
-msgstr "Заблоковано: �першу виконай до�тупні змаганн� і тоді отримаєш до�туп!"
+msgstr "Заблоковано: �першу виконайте до�тупні змаганн� і тоді отримаєте до�туп!"
 
 #: src/states_screens/tracks_screen.cpp:201
 msgid "Locked!"
@@ -1673,26 +1674,26 @@ msgstr "Заблоковано!"
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
 msgid "Log In"
-msgstr ""
+msgstr "Вхід"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Log Out"
-msgstr ""
+msgstr "Вихід"
 
 #: src/states_screens/online_screen.cpp:139
 #, c-format
 msgid "Logged in as: %s."
-msgstr ""
+msgstr "Увійшли �к: %s."
 
 #: src/states_screens/online_screen.cpp:155
 msgid "Logging in"
-msgstr ""
+msgstr "Вхожу"
 
 #: src/states_screens/user_screen.cpp:494
 #, c-format
 msgid "Logging in '%s'"
-msgstr ""
+msgstr "Вхожу '%s'"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: In the login dialog
@@ -1700,16 +1701,16 @@ msgid ""
 "Logging in as a guest allows you to participate in online races, but it does"
 " not allow you to vote for addons, or collect any achievements while being "
 "online."
-msgstr ""
+msgstr "Увійшовши �к гі�ть ви можете брати уча�ть в онлайн заїздах, проте не можете голо�увати за додатки, або збирати будь �кі до��гненн� онлайн."
 
 #: src/states_screens/online_screen.cpp:160
 msgid "Logging out"
-msgstr ""
+msgstr "Виходжу"
 
 #: src/states_screens/user_screen.cpp:493
 #, c-format
 msgid "Logging out '%s'"
-msgstr ""
+msgstr "Виходжу '%s'"
 
 #. I18N: ./data/gui/online/guest_login.stkgui
 #. I18N: ./data/gui/user_screen.stkgui
@@ -1726,15 +1727,15 @@ msgstr "Озирнути�ь назад"
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: In the profile screen
 msgid "Look for more friends:"
-msgstr ""
+msgstr "Знайти більше друзів:"
 
 #. I18N: ./data/achievements.xml
 msgid "Make 5 skidding in a single lap."
-msgstr ""
+msgstr "Зробити 5 зано�ів на одному колі."
 
 #. I18N: ./data/achievements.xml
 msgid "Make a race with 5 laps or more."
-msgstr ""
+msgstr "Прове�ти гонку з 5 колами або більше."
 
 #. I18N: ./data/achievements.xml
 msgid "Marathoner"
@@ -1750,7 +1751,7 @@ msgstr "Мак�. кількі�ть гравців"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Maximum time (min.)"
-msgstr ""
+msgstr "Мак�имальний ча� (хв.)"
 
 #. I18N: if some kart animations are enabled
 #: src/states_screens/options_screen_video.cpp:436
@@ -1768,7 +1769,7 @@ msgstr "Мініґольф"
 
 #. I18N: ./data/achievements.xml
 msgid "Mosquito Hunter"
-msgstr ""
+msgstr "Ми�ливець на комарів"
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
@@ -1837,7 +1838,7 @@ msgstr "Ім’�"
 
 #: src/states_screens/create_server_screen.cpp:132
 msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
+msgstr "Ім’� має мі�тити від 4 до 30 �имволів!"
 
 #: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
 msgid "Name is empty."
@@ -1856,7 +1857,7 @@ msgstr "�азва �ервера"
 
 #. I18N: ../stk-assets/tracks/scotland/track.xml
 msgid "Nessie's pond"
-msgstr ""
+msgstr "Лохне�ьке озеро"
 
 #. I18N: ./data/gui/gpeditor.stkgui
 #. I18N: Menu item
@@ -1866,12 +1867,12 @@ msgstr "�овий"
 #: src/challenges/challenge_data.cpp:502
 #, c-format
 msgid "New Grand Prix '%s' now available"
-msgstr "До�тупне нове Гран-прі „%s“"
+msgstr "До�тупне нове Велике Змаганн� „%s“"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "New Online Account"
-msgstr ""
+msgstr "�овий Онлайн екаунт"
 
 #. I18N: ./data/gui/online/change_password.stkgui
 #. I18N: In the change password dialog
@@ -1955,7 +1956,7 @@ msgstr "Початківець"
 #: src/states_screens/dialogs/select_challenge.cpp:68
 #, c-format
 msgid "Number of AI Karts : %i"
-msgstr ""
+msgstr "Кількі�ть Картів ШІ : %i"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
@@ -1965,7 +1966,7 @@ msgstr "Кількі�ть віртуальних картів"
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Number of goals to win"
-msgstr ""
+msgstr "Кількі�ть голів дл� перемоги"
 
 #. I18N: ./data/gui/track_info.stkgui
 #. I18N: In the track info screen
@@ -1995,7 +1996,7 @@ msgstr "Гаразд"
 
 #. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
 msgid "Off the beaten track"
-msgstr ""
+msgstr "По бездоріжжю "
 
 #: src/states_screens/online_profile_friends.cpp:150
 msgid "Offline"
@@ -2004,12 +2005,12 @@ msgstr "Поза мережею"
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: Section in the register screen
 msgid "Offline Account"
-msgstr ""
+msgstr "Офлайн екаунт"
 
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
 msgid "Oh yes, see, he's in my castle now and will be served for supper..."
-msgstr ""
+msgstr "О так, диви�ь, він тепер в моєму замку і будо поданий на �упер..."
 
 #. I18N: ../stk-assets/tracks/mines/track.xml
 msgid "Old Mine"
@@ -2034,20 +2035,20 @@ msgstr "У мережі"
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
 msgid "Online Multiplayer"
-msgstr ""
+msgstr "Колективна гра онлайн"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
 msgid "Online Username"
-msgstr ""
+msgstr "Ім’� кори�тувача онлайн "
 
 #: src/states_screens/register_screen.cpp:280
 msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
+msgstr "Ім’� онлайн гравц� має мі�тити від 4 до 30 �имволів!"
 
 #: src/states_screens/register_screen.cpp:284
 msgid "Online username must not start with a number!"
-msgstr ""
+msgstr "Ім’� онлайн гравц� не повинно починати�ь з цифри!"
 
 #: src/input/input_manager.cpp:759
 msgid "Only the Game Master may act at this point!"
@@ -2056,7 +2057,7 @@ msgstr "Це може робити лише го�подар гри!"
 #: src/tracks/track_object_presentation.cpp:960
 #, c-format
 msgid "Oops! When you're in trouble, press <%s> to be rescued"
-msgstr ""
+msgstr "Уп�! Якщо у ва� проблеми ти�ніть <%s> дл� пор�тунку"
 
 #. I18N: ./data/gui/main.stkgui
 #. I18N: In the main screen
@@ -2074,7 +2075,7 @@ msgstr "Огл�д"
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:93
 msgid "POWER"
-msgstr ""
+msgstr "ПОТУЖ�ІСТЬ"
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Parachute - slows down all karts in a better position."
@@ -2102,7 +2103,7 @@ msgstr "Зміна парол�"
 #: src/states_screens/dialogs/change_password_dialog.cpp:140
 #: src/states_screens/register_screen.cpp:288
 msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
+msgstr "Пароль має мі�тити від 8 до 30 �имволів!"
 
 #: src/states_screens/dialogs/change_password_dialog.cpp:210
 msgid "Password successfully changed."
@@ -2138,7 +2139,7 @@ msgstr "Ігровий Майданчик Пінгвіна"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:247
 msgid "Performing vote"
-msgstr ""
+msgstr "Виконую голо�уванн�"
 
 #. I18N: ../stk-assets/karts/pidgin/kart.xml
 msgid "Pidgin"
@@ -2150,7 +2151,7 @@ msgstr "Відтворити в�е"
 
 #. I18N: ./data/achievements.xml
 msgid "Play every official track at least once."
-msgstr ""
+msgstr "Зіграйте на в�ій офіційних треках, хоча б один раз."
 
 #. I18N: ./data/gui/options_players.stkgui
 #. I18N: Section in the settings menu
@@ -2169,12 +2170,12 @@ msgstr "Гравці"
 msgid ""
 "Players can select handicapped (more difficult) profiles on the kart "
 "selection screen"
-msgstr ""
+msgstr "Гравці можуть обрати профілі з троднощами (�кладніша гра) на екрані вибору карта"
 
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
 msgid "Please enter the name of the grand prix"
-msgstr ""
+msgstr "Будь ла�ка вкажіть назву Великого Змаганн�"
 
 #. I18N: shown when config file is too old
 #: src/input/device_manager.cpp:500
@@ -2183,7 +2184,7 @@ msgstr "Будь ла�ка, переналаштуй клавіатуру."
 
 #: src/states_screens/dialogs/registration_dialog.cpp:42
 msgid "Please read the terms and conditions "
-msgstr ""
+msgstr "Будь ла�ка прочитайте умови та терміни. "
 
 #: src/states_screens/addons_screen.cpp:437
 msgid "Please wait while addons are updated"
@@ -2201,14 +2202,14 @@ msgstr "Вантуз — кидаєть�� пр�мо вперед, щоб за
 
 #. I18N: ./data/achievements.xml
 msgid "Powerup Love"
-msgstr ""
+msgstr "Любитель бону�ів"
 
 #: src/tracks/track_object_presentation.cpp:930
 #, c-format
 msgid ""
 "Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s>"
 " to fire behind!"
-msgstr ""
+msgstr "�ати�ніть <%s> щоб озирнути��, та �тріл�йте в тих хто позаду кнопкою <%s> поки <%s> нати�нута!"
 
 #. I18N: ./data/gui/press_a_key_dialog.stkgui
 #. I18N: When configuring input
@@ -2274,7 +2275,7 @@ msgstr "Паффі"
 msgid ""
 "Push the ball to the opposite cage to score goals. (Only in multiplayer "
 "games)"
-msgstr ""
+msgstr "Забийте м’�  у ворота �упернику. (Лише у багатокори�тувацькій грі)"
 
 #. I18N: ./data/gui/online/main.stkgui
 #. I18N: In the online multiplayer screen
@@ -2306,7 +2307,7 @@ msgstr "Випадкова арена"
 
 #: src/race/grand_prix_data.hpp:171
 msgid "Random Grand Prix"
-msgstr "Випадкове гран-прі"
+msgstr "Випадкове Велике Змаганн�"
 
 #: src/states_screens/kart_selection.cpp:839
 #: src/states_screens/kart_selection.cpp:1467
@@ -2351,7 +2352,7 @@ msgstr "Зареє�трувати"
 msgid ""
 "Regular Race: All blows allowed, so catch weapons and make clever use of "
 "them!"
-msgstr ""
+msgstr "Звичайна гонка: У�і витівки дозволено, отож пібдирай зброю та викори�товуй її розумно!"
 
 #: src/states_screens/gp_info_screen.cpp:153
 #: src/states_screens/gp_info_screen.cpp:178
@@ -2487,15 +2488,15 @@ msgstr "ШВИДКІСТЬ"
 
 #. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
 msgid "STK Enterprise"
-msgstr ""
+msgstr "Ко�мічний корабель"
 
 #. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 msgid "Sara the Racer"
-msgstr ""
+msgstr "Гонщик Сара"
 
 #. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 msgid "Sara the Wizard"
-msgstr ""
+msgstr "Сара чарівниц�"
 
 #. I18N: ./data/gui/gpedit.stkgui
 #. I18N: Menu item
@@ -2505,7 +2506,7 @@ msgstr "Зберегти"
 #. I18N: ./data/gui/grand_prix_lose.stkgui
 #. I18N: ./data/gui/grand_prix_win.stkgui
 msgid "Save Grand Prix"
-msgstr "Зберегти гран-прі"
+msgstr "Зберегти Велике Змаганн�"
 
 #. I18N: ./data/gui/online/profile_friends.stkgui
 #. I18N: ./data/gui/online/user_search.stkgui
@@ -2542,7 +2543,7 @@ msgstr "Оберіть карт"
 #. I18N: ./data/gui/options_ui.stkgui
 #. I18N: In the ui settings
 msgid "Send anonymous HW statistics"
-msgstr ""
+msgstr "�ад�илати анонімну �тати�тику обладнанн�."
 
 #. I18N: ./data/gui/online/create_server.stkgui
 #. I18N: In the server creation screen
@@ -2586,7 +2587,7 @@ msgstr "Тіні"
 #: src/states_screens/options_screen_video.cpp:470
 #, c-format
 msgid "Shadows: %i"
-msgstr ""
+msgstr "Тіні: %i"
 
 #: src/states_screens/options_screen_video.cpp:468
 #, c-format
@@ -2627,7 +2628,7 @@ msgstr "Розмір: %s"
 
 #. I18N: ./data/achievements.xml
 msgid "Skid-row"
-msgstr ""
+msgstr "Швидкі Ковзани"
 
 #. I18N: Key binding name
 #: src/states_screens/options_screen_input2.cpp:248
@@ -2657,7 +2658,7 @@ msgstr "Футбольне поле"
 msgid ""
 "Soccer: Only in multiplayer games. Use your kart to push the ball into the "
 "goal."
-msgstr ""
+msgstr "Футбол: Лише в багатокори�тувацькій грі. Викори�товуйте �вій карт щоб забити м’�ч у ворота."
 
 #: src/states_screens/addons_screen.cpp:514
 #: src/states_screens/main_menu_screen.cpp:550
@@ -2691,7 +2692,7 @@ msgstr "Почати"
 
 #: src/states_screens/dialogs/gp_info_dialog.cpp:209
 msgid "Start Grand Prix"
-msgstr "Почати Гран-прі"
+msgstr "Почати Велике Змаганн�"
 
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
@@ -2777,7 +2778,7 @@ msgid ""
 "(To change this setting at a later time, go to options, select tab 'User "
 "Interface', and edit \"Connect to the Internet\" and \"Send anonymous HW "
 "statistics\")."
-msgstr ""
+msgstr "SuperTuxKart може під’єднувати�ь до інтернету щоб завантажити додатки та перевірити оновленн�. Ми також збираємо анонімну інформацію про обладнанн�, щоб покращити розробку гри. Будь ла�ка прочитайте нашу політику приватно�ті на http://privacy.supertuxkart.net. Чи бажаєте щоб ц� можливі�ть була увімкнена? (Щоб змінити ці налаштуванн� пізніше, перейдіть в налаштуванн�, оберіть \"Інтерфей� кори�тувача\" та відредагуйте \"З'єднанн� з інтернетом\" та \"�ад�илати анонімну �тати�тику обладнанн�\")"
 
 #. I18N: ../stk-assets/karts/suzanne/kart.xml
 msgid "Suzanne"
@@ -2791,7 +2792,7 @@ msgstr "Замінювач — коробки з бону�ами перетво
 
 #. I18N: ./data/gui/help2.stkgui
 msgid "Swatter - will squash karts close by, slowing them down."
-msgstr "Мухобійка — причавлює проїжджаючі мимо карти, тим �амим �повільнюючи їх."
+msgstr "Хлопавка дл� мух — прихлопне карти, що проїжджають поруч, тим �амим �повільнюючи їх."
 
 #. I18N: in the language choice, to select the same language as the OS
 #: src/states_screens/options_screen_ui.cpp:186
@@ -2802,11 +2803,11 @@ msgstr "Мова �и�теми"
 msgid ""
 "Take your opponents for mosquitos! With the swatter, squash at least 5 of "
 "them in a race."
-msgstr ""
+msgstr "У�віть, що ваші �уперники це комарі! Прихлопніть принаймні 5 з них в гонці, хлопавкою дл� мух."
 
 #. I18N: ../stk-assets/tracks/temple/track.xml
 msgid "Temple"
-msgstr ""
+msgstr "Храм"
 
 #. I18N: ./data/gui/online/registration_terms.stkgui
 #. I18N: In the registration dialog
@@ -2826,7 +2827,7 @@ msgstr "Фільтраці� тек�тур"
 #. I18N: ./data/gui/help1.stkgui
 #. I18N: in the help menu
 msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
+msgstr "Кнопка 'ковзанн�'  дозвол�є ковзати в го�трому повороті та отримати при�коренн�."
 
 #. I18N: ../stk-assets/tracks/stadium/track.xml
 msgid "The Stadium"
@@ -2844,7 +2845,7 @@ msgstr "Таблиц� результатів за�таріла,\nу�і рез
 
 #: src/states_screens/create_server_screen.cpp:136
 msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
+msgstr "Мак�имальна кількі�ть гравців має бути між 2 та 12."
 
 #. I18N: Game mode
 #: src/race/race_manager.hpp:178
@@ -2942,13 +2943,13 @@ msgstr "Тип:"
 
 #: src/states_screens/race_gui_overworld.cpp:502
 msgid "Type: Grand Prix"
-msgstr "Type: гран-прі"
+msgstr "Тип: Велике Змаганн�"
 
 #: src/online/xml_request.cpp:83
 msgid ""
 "Unable to connect to the server. Check your internet connection or try again"
 " later."
-msgstr ""
+msgstr "�е можу під’єднати�ь до �ервера. Перевірте інтернет з’єднанн� або �пробуйте пізніше."
 
 #. I18N: ./data/gui/addons_loading.stkgui
 #. I18N: Add-on screen action
@@ -2980,17 +2981,17 @@ msgstr "Дата оновленн�"
 
 #. I18N: ./data/achievements.xml
 msgid "Use 10 or more powerups in a race."
-msgstr ""
+msgstr "Викори�тайте 10 або більше бону�ів при�коренн� в гонці."
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
 #. I18N: Video settings
 msgid "Use high definition textures"
-msgstr ""
+msgstr "Тек�тури ви�окої чітко�ті"
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 #. I18N: In soccer setup screen
 msgid "Use left/right to choose your team and press fire"
-msgstr ""
+msgstr "Викори�товуйте вліво/вправо щоб обрати команду та нати�ніть вогонь."
 
 #: src/tracks/track_object_presentation.cpp:949
 #, c-format
@@ -3033,7 +3034,7 @@ msgstr "Кори�тувач"
 
 #: src/states_screens/dialogs/recovery_dialog.cpp:121
 msgid "Username and/or email address invalid."
-msgstr ""
+msgstr "Хибне ім’� або електронна адре�а."
 
 #. I18N: ./data/gui/soccer_setup.stkgui
 msgid "VS"
@@ -3074,7 +3075,7 @@ msgstr "Голо�"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:230
 msgid "Vote successful! You can now close the window."
-msgstr ""
+msgstr "Голо� зараховано! Тепер можна закрити це вікно."
 
 #: src/guiengine/widgets/kart_stats_widget.cpp:85
 msgid "WEIGHT"
@@ -3116,7 +3117,7 @@ msgstr "Погодні ефекти: %s"
 #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
 #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
 msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
+msgstr "Що�ь не так, маленкі хіппі? Ваш великий ґну лідер зник?"
 
 #. I18N: ./data/gui/help4.stkgui
 #. I18N: In the help menu
@@ -3144,7 +3145,7 @@ msgstr "Виграти 5 гонок за раз"
 
 #. I18N: ./data/achievements.xml
 msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
+msgstr "Виграйте в�і однокори�тувацькі режими, проти щонайменше 3 �уперників."
 
 #. I18N: ../stk-assets/tracks/xr591/track.xml
 msgid "XR591"
@@ -3152,7 +3153,7 @@ msgstr "Ек� �р 591"
 
 #. I18N: ../stk-assets/karts/xue/kart.xml
 msgid "Xue"
-msgstr ""
+msgstr "Сюе"
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
 #. I18N: In a 'are you sure?' dialog
@@ -3170,21 +3171,21 @@ msgstr "Ви граєте �к"
 
 #: src/states_screens/dialogs/vote_dialog.cpp:190
 msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
+msgstr "Ви можете змінити ваш попередньо наді�ланий рейтинг, дл� цього клікніть на ці зірочки нижче."
 
 #: src/states_screens/main_menu_screen.cpp:513
 msgid ""
 "You can not download addons without internet access. If you want to download"
 " addons, go to options, select  tab 'User Interface', and edit \"Connect to "
 "the Internet\"."
-msgstr ""
+msgstr "Ви не можете завантажувати додатки без інтернет підключенн�. Якщо бажаєте це робити, перейдіть до налаштувань, оберіть вкладку 'Інтерфей� кори�тувача' та налаштуйте 'Підключенн� до інтернет'"
 
 #: src/states_screens/main_menu_screen.cpp:488
 msgid ""
 "You can not play online without internet access. If you want to play online,"
 " go to options, select  tab 'User Interface', and edit \"Connect to the "
 "Internet\"."
-msgstr ""
+msgstr "Ви не можете грати онлайн без інтернет підключенн�. Якщо бажаєте це робити, перейдіть до налаштувань, оберіть вкладку 'Інтерфей� кори�тувача' та налаштуйте 'Підключенн� до інтернет'"
 
 #. I18N: ./data/gui/online/register.stkgui
 #. I18N: In the registration dialog
@@ -3192,7 +3193,7 @@ msgid ""
 "You can play without creating an online account by selecting an offline "
 "account. Though then you can not connect to friends, vote for addons etc. "
 "Please read our privacy statement at http://privacy.supertuxkart.net"
-msgstr ""
+msgstr "Ви можете грати без онл�йн екаунту вибравши Офлайн екаунт. Проте тоді ви не зможете під’єдн�ти�ь до друзів, голо�увати за додатки та ін. Будь ла�ка, перегл�ньте нашу політику конфіденційно�ті на http://privacy.supertuxkart.net"
 
 #: src/states_screens/grand_prix_win.cpp:124
 #: src/states_screens/race_result_gui.cpp:175
@@ -3205,24 +3206,24 @@ msgstr "Ви виконали завданн�!"
 
 #: src/states_screens/grand_prix_win.cpp:279
 msgid "You completed the Grand Prix!"
-msgstr "Ти завершив Гран-Прі!"
+msgstr "Ви завершили Велике Змаганн�!"
 
 #: src/states_screens/feature_unlocked.cpp:208
 #, c-format
 msgid ""
 "You completed the difficult challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ви виграли у �кладному змаганні! �а цьому рівні здобуто очок: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:200
 #, c-format
 msgid "You completed the easy challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ви виграли у про�тому змаганні! �а цьому рівні здобуто очок: %i/%i"
 
 #: src/states_screens/feature_unlocked.cpp:204
 #, c-format
 msgid ""
 "You completed the intermediate challenge! Points earned on this level: %i/%i"
-msgstr ""
+msgstr "Ви виграли у �ереднє змаганні! �а цьому рівні здобуто очок: %i/%i"
 
 #: src/karts/kart.cpp:856
 msgid "You finished the race!"
@@ -3232,9 +3233,9 @@ msgstr "Ти завершив гонку!"
 #, c-format
 msgid "You have %d new friend request!"
 msgid_plural "You have %d new friend requests!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ви маєте %d запит товаришувати!"
+msgstr[1] "Ви маєте %d запити товаришувати!"
+msgstr[2] "Ви маєте %d запитів товаришувати!"
 
 #: src/online/online_player_profile.cpp:472
 msgid "You have a new friend request!"
@@ -3248,7 +3249,7 @@ msgstr "Ти ди�кваліфікований!"
 msgid ""
 "You have not yet voted for this addon. Select your desired rating by "
 "clicking the stars beneath"
-msgstr ""
+msgstr "Ви ще не голо�ували за цей додаток. Оберіть рейтиг клікнувши на зірочки."
 
 #: src/karts/kart.cpp:1913
 msgid ""
@@ -3256,7 +3257,7 @@ msgid ""
 "to enter this challenge!\n"
 "Check the minimap for\n"
 "available challenges."
-msgstr ""
+msgstr "Вам потрібно більше очок\nщоб розпочати це змаганн�!\nЗнайдіть до�тупні змаганн�\nна міні карті."
 
 #: src/states_screens/user_screen.cpp:472
 msgid "You need to enter a password."
@@ -3264,7 +3265,7 @@ msgstr "Потрібно вказати пароль"
 
 #: src/states_screens/feature_unlocked.cpp:568
 msgid "You unlocked grand prix %0"
-msgstr "Ви відкрили гран-прі %0"
+msgstr "Ви розблокували Велике Змаганн� %0"
 
 #: src/states_screens/feature_unlocked.cpp:530
 msgid "You unlocked track %0"
@@ -3275,13 +3276,13 @@ msgstr "Ви відкрили трек %0"
 msgid ""
 "You will receive an email with further instructions on how to reset your "
 "password. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ви отримаєте електронного ли�та з подальшими ін�трукці�ми дл� відновленн� паролю. Будь ла�ка, будьте терпл�чими, ткож перевірте ваш каталог із Спамом."
 
 #: src/states_screens/register_screen.cpp:361
 msgid ""
 "You will receive an email with further instructions regarding account "
 "activation. Please be patient and be sure to check your spam folder."
-msgstr ""
+msgstr "Ви отримаєте електронного ли�та з подальшими ін�трукці�ми дл� активаціє екаунту. Будь ла�ка, будьте терпл�чими, ткож перевірте ваш каталог із Спамом."
 
 #: src/karts/kart.cpp:856 src/karts/kart.cpp:875
 msgid "You won the race!"
@@ -3291,7 +3292,7 @@ msgstr "Ти виграв гонку!"
 msgid ""
 "Your OpenGL version appears to be too old. Please verify if an update for "
 "your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
-msgstr ""
+msgstr "Схоже ваша вер�і� OpenGL за�таріла. Будь ла�ка перевірте оновленн� дл� відео драйверів. SuperTuxKart вимагає OpenGL 3.1 або вище."
 
 #: src/config/user_config.cpp:700
 msgid ""
@@ -3308,7 +3309,7 @@ msgstr "Твій файл з налаштуванн�ми за�тарів, то
 #: src/main.cpp:1367
 msgid ""
 "Your driver version is too old. Please install the latest video drivers."
-msgstr ""
+msgstr "Ваші відеодрайвер за�тарів. Будь ла�ка оновіть відедрайвер."
 
 #: src/input/device_manager.cpp:501
 msgid "Your input config file is not compatible with this version of STK."
@@ -3350,11 +3351,11 @@ msgstr "рекомендований"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:88
 msgid "high"
-msgstr ""
+msgstr "ви�окі"
 
 #: src/states_screens/dialogs/custom_video_settings.cpp:87
 msgid "low"
-msgstr ""
+msgstr "низькі"
 
 #. I18N: arena group name
 #. I18N: track group name

From 418ccf284e1e5f9f61ea08dec4ea4ceab523b4df Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 15:11:25 +1000
Subject: [PATCH 111/331] Remove unnecessary \n after "Launchpad Contributions"
 (which caused an empty line to be shown in stk); ignore "FIRST AUTHOR" as
 author.

---
 tools/update_po_authors.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/update_po_authors.py b/tools/update_po_authors.py
index e5b0b4688..c6482979d 100755
--- a/tools/update_po_authors.py
+++ b/tools/update_po_authors.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 # A simple script that adds all authors from transifex, which are
 # listed in comments at the beginning of the file, to the 
@@ -41,7 +41,7 @@ if __name__ == "__main__":
         line = i[:-1]   # remove \n
         if line=="# Translators:":
             found = 1
-        elif found and line[:2]=="# ":
+        elif found and line[:2]=="# " and line [:14]!="# FIRST AUTHOR":
             new_authors.append(line[2:])
         elif line[:5]=="msgid":
             found = 0
@@ -85,7 +85,7 @@ if __name__ == "__main__":
         del lines[contributions]
 
     # Append new author list
-    lines.append("msgstr \"Launchpad Contributions:\\n%s\"\n"%all_authors_string)
+    lines.append("msgstr \"Launchpad Contributions:%s\"\n"%all_authors_string)
 
     # Overwrite old file
     f = open(sys.argv[1], "w")

From 00782180f7e47f4fbe2e4e6626eb75ceda27aa6e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 15:28:49 +1000
Subject: [PATCH 112/331] Fixed crash when using translation debugging (only
 happens if DEBUG_TRANSLATIONS is defined).

---
 src/states_screens/credits.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/states_screens/credits.cpp b/src/states_screens/credits.cpp
index 2602ae566..24d819965 100644
--- a/src/states_screens/credits.cpp
+++ b/src/states_screens/credits.cpp
@@ -166,13 +166,14 @@ void CreditsScreen::loadedFromFile()
     }
 
     int lineCount = 0;
-
+#undef DEBUG_TRANSLATIONS    // Enable to only see the translator credits
+#ifdef DEBUG_TRANSLATIONS
+        int my_counter = 0;
+#endif
     // let's assume the file is encoded as UTF-16
     while (getWideLine( file, &line ))
     {
-#undef DEBUG_TRANSLATIONS    // Enable to only see the translator credits
 #ifdef DEBUG_TRANSLATIONS
-        static int my_counter = 0;
         if (my_counter > 0)
             break;
         my_counter++;

From 4ea1145af10ada9aed776712d1f691f31e292b99 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 15:29:38 +1000
Subject: [PATCH 113/331] Updated translations credits by running
 update_po_authors.py script.

---
 data/po/ar.po    | 2 +-
 data/po/bg.po    | 2 +-
 data/po/bn.po    | 2 +-
 data/po/br.po    | 2 +-
 data/po/bs.po    | 2 +-
 data/po/ca.po    | 2 +-
 data/po/cs.po    | 2 +-
 data/po/da.po    | 2 +-
 data/po/da_DK.po | 4 ++++
 data/po/de.po    | 2 +-
 data/po/el.po    | 2 +-
 data/po/en_AU.po | 2 +-
 data/po/en_GB.po | 2 +-
 data/po/eo.po    | 2 +-
 data/po/es.po    | 2 +-
 data/po/eu.po    | 2 +-
 data/po/fa.po    | 2 +-
 data/po/fi.po    | 4 ++++
 data/po/fr.po    | 2 +-
 data/po/fr_CA.po | 2 +-
 data/po/ga.po    | 2 +-
 data/po/gd.po    | 2 +-
 data/po/gl.po    | 2 +-
 data/po/he.po    | 2 +-
 data/po/hi.po    | 2 +-
 data/po/hr.po    | 2 +-
 data/po/hu.po    | 2 +-
 data/po/hy.po    | 2 +-
 data/po/id.po    | 2 +-
 data/po/is.po    | 2 +-
 data/po/it.po    | 2 +-
 data/po/ja.po    | 2 +-
 data/po/jbo.po   | 2 +-
 data/po/ko.po    | 2 +-
 data/po/kw.po    | 2 +-
 data/po/ky.po    | 2 +-
 data/po/lt.po    | 2 +-
 data/po/lv.po    | 4 ++++
 data/po/mn_MN.po | 4 ++++
 data/po/nb.po    | 2 +-
 data/po/nl.po    | 2 +-
 data/po/nn.po    | 2 +-
 data/po/os.po    | 2 +-
 data/po/pl.po    | 2 +-
 data/po/pt.po    | 2 +-
 data/po/pt_BR.po | 2 +-
 data/po/ro.po    | 2 +-
 data/po/ru.po    | 2 +-
 data/po/sco.po   | 2 +-
 data/po/sk.po    | 2 +-
 data/po/sl.po    | 2 +-
 data/po/sq.po    | 2 +-
 data/po/sr.po    | 2 +-
 data/po/sv.po    | 2 +-
 data/po/tr.po    | 2 +-
 data/po/tt.po    | 2 +-
 data/po/uk.po    | 2 +-
 data/po/uz.po    | 2 +-
 data/po/vi.po    | 2 +-
 data/po/zh_CN.po | 2 +-
 data/po/zh_TW.po | 2 +-
 61 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/data/po/ar.po b/data/po/ar.po
index db5518617..f82c95d3b 100644
--- a/data/po/ar.po
+++ b/data/po/ar.po
@@ -3379,4 +3379,4 @@ msgstr "قياسي"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Benjamin Kerensa https://launchpad.net/~bkerensa\n  Dawid Gan https://launchpad.net/~deveee\n  Hichem Razgallah https://launchpad.net/~hichemraz\n  Majid Al-Dharrab https://launchpad.net/~majid\n  SAKOUM Yassine https://launchpad.net/~karaytanto\n  STK-team https://launchpad.net/~stk\n  abdXelrhman https://launchpad.net/~popo49-abdo\n  ص�ا ال�ليج https://launchpad.net/~safaalfulaij\n  محمدالحرقان https://launchpad.net/~imksa"
+msgstr "Launchpad Contributions:\nabdXelrhman https://launchpad.net/~popo49-abdo\nBenjamin Kerensa https://launchpad.net/~bkerensa\nDawid Gan https://launchpad.net/~deveee\nHichem Razgallah https://launchpad.net/~hichemraz\nMajid Al-Dharrab https://launchpad.net/~majid\nSAKOUM Yassine https://launchpad.net/~karaytanto\nSTK-team https://launchpad.net/~stk\nص�ا ال�ليج https://launchpad.net/~safaalfulaij\nمحمدالحرقان https://launchpad.net/~imksa"
diff --git a/data/po/bg.po b/data/po/bg.po
index 84191e8bc..4976003f1 100644
--- a/data/po/bg.po
+++ b/data/po/bg.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Svetoslav Stefanov https://launchpad.net/~svetlisashkov"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nSvetoslav Stefanov https://launchpad.net/~svetlisashkov"
diff --git a/data/po/bn.po b/data/po/bn.po
index ac0ba3dde..7d1846d8c 100644
--- a/data/po/bn.po
+++ b/data/po/bn.po
@@ -3367,4 +3367,4 @@ msgstr "আদর�শ"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Mahay Alam Khan https://launchpad.net/~mahayalamkhan"
+msgstr "Launchpad Contributions:\nMahay Alam Khan https://launchpad.net/~mahayalamkhan\nMahay Alam Khan, 2012"
diff --git a/data/po/br.po b/data/po/br.po
index 9dd8c88b5..163fea76e 100644
--- a/data/po/br.po
+++ b/data/po/br.po
@@ -3368,4 +3368,4 @@ msgstr "skoueriek"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Alan https://launchpad.net/~alan-m.\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nAlan https://launchpad.net/~alan-m.\nAlan Monfort, 2015\nDawid Gan https://launchpad.net/~deveee\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/bs.po b/data/po/bs.po
index 8aa02fdd1..9f48f601f 100644
--- a/data/po/bs.po
+++ b/data/po/bs.po
@@ -3370,4 +3370,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Kenan Dervišević https://launchpad.net/~kenan3008"
+msgstr "Launchpad Contributions:\nKenan Dervišević https://launchpad.net/~kenan3008"
diff --git a/data/po/ca.po b/data/po/ca.po
index 432e39d92..6941312a9 100644
--- a/data/po/ca.po
+++ b/data/po/ca.po
@@ -3368,4 +3368,4 @@ msgstr "Estàndard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Aljullu https://launchpad.net/~aljullu\n  Dawid Gan https://launchpad.net/~deveee\n  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  VPablo https://launchpad.net/~villumar"
+msgstr "Launchpad Contributions:\nAljullu https://launchpad.net/~aljullu\nDawid Gan https://launchpad.net/~deveee\nMarc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\nMarc Coll Carrillo, 2012\nMarc Coll Carrillo, 2015\nSTK-team https://launchpad.net/~stk\nTae-Wong SEO https://launchpad.net/~seotaewong40\nVPablo https://launchpad.net/~villumar"
diff --git a/data/po/cs.po b/data/po/cs.po
index 0f8c3a637..def3e1ec6 100644
--- a/data/po/cs.po
+++ b/data/po/cs.po
@@ -3369,4 +3369,4 @@ msgstr "standardní"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Ari Green https://launchpad.net/~ariyoyah\n  David Kolibá� https://launchpad.net/~david-kolibac\n  Dawid Gan https://launchpad.net/~deveee\n  František Zatloukal https://launchpad.net/~zatloukal-frantisek\n  H0ff1 https://launchpad.net/~stefhoff\n  Jakub Talich https://launchpad.net/~jakub.talich-deactivatedaccount\n  Jan Srb https://launchpad.net/~j-srb\n  Jirka Folta https://launchpad.net/~pholta-cz\n  Lukáš Machyán https://launchpad.net/~phobulos\n  Michal Kundrát https://launchpad.net/~dreit\n  MightyPork https://launchpad.net/~mighty-pork\n  Ondřej Holý https://launchpad.net/~ondrej-holy\n  Petr Wudi https://launchpad.net/~petr-wudi\n  STK-team https://launchpad.net/~stk\n  Tadeáš Pařík https://launchpad.net/~pariktadeas\n  Tomáš Velecký https://launchpad.net/~elektron112\n  donny https://launchpad.net/~michal-donat\n  dtfjgk https://launchpad.net/~dtfjgk-deactivatedaccount"
+msgstr "Launchpad Contributions:\nAri Green https://launchpad.net/~ariyoyah\nDavid Kolibá� https://launchpad.net/~david-kolibac\nDawid Gan https://launchpad.net/~deveee\ndonny https://launchpad.net/~michal-donat\ndtfjgk https://launchpad.net/~dtfjgk-deactivatedaccount\nFrantišek Zatloukal https://launchpad.net/~zatloukal-frantisek\nH0ff1 https://launchpad.net/~stefhoff\nJakub Talich https://launchpad.net/~jakub.talich-deactivatedaccount\nJan Srb https://launchpad.net/~j-srb\nJirka Folta https://launchpad.net/~pholta-cz\nLukáš Machyán https://launchpad.net/~phobulos\nMichal Kundrát https://launchpad.net/~dreit\nMightyPork https://launchpad.net/~mighty-pork\nOndřej Holý https://launchpad.net/~ondrej-holy\nPetr Wudi https://launchpad.net/~petr-wudi\nSTK-team https://launchpad.net/~stk\nTadeáš Pařík https://launchpad.net/~pariktadeas\nTomáš Velecký https://launchpad.net/~elektron112"
diff --git a/data/po/da.po b/data/po/da.po
index dff7f3bbd..386b75339 100644
--- a/data/po/da.po
+++ b/data/po/da.po
@@ -3368,4 +3368,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  1001sd https://launchpad.net/~siadyhr\n  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n  Auria https://launchpad.net/~auria-mg\n  J https://launchpad.net/~rumbukken\n  Marcus Møller https://launchpad.net/~marcusmoller\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\n1001sd https://launchpad.net/~siadyhr\nAputsiaĸ Niels Janussen https://launchpad.net/~aj\nAuria https://launchpad.net/~auria-mg\nJ https://launchpad.net/~rumbukken\nJoe Hansen, 2009,2015\nMarcus Møller https://launchpad.net/~marcusmoller\nSTK-team https://launchpad.net/~stk\nSøren Dyhr, 2015"
diff --git a/data/po/da_DK.po b/data/po/da_DK.po
index b2f69c5f4..a7547003f 100644
--- a/data/po/da_DK.po
+++ b/data/po/da_DK.po
@@ -3367,3 +3367,7 @@ msgstr ""
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr "Launchpad Contributions:"
diff --git a/data/po/de.po b/data/po/de.po
index c9724a47e..637c2a2fa 100644
--- a/data/po/de.po
+++ b/data/po/de.po
@@ -3370,4 +3370,4 @@ msgstr "Standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Bendetto https://launchpad.net/~biengo\n  DHermit https://launchpad.net/~dhermit\n  DaBASCHT https://launchpad.net/~dabascht\n  David Roth https://launchpad.net/~davidroth9\n  Dawid Gan https://launchpad.net/~deveee\n  Dennis https://launchpad.net/~theradialactive\n  Evolution https://launchpad.net/~marcken-ritter\n  Felix https://launchpad.net/~felixk\n  Gerjet Kleine-Weischede https://launchpad.net/~gerjet-deactivatedaccount-deactivatedaccount\n  Gregor Santner https://launchpad.net/~gregi94\n  H0ff1 https://launchpad.net/~stefhoff\n  John Doe https://launchpad.net/~kulok1493-deactivatedaccount\n  Matthias Lange https://launchpad.net/~lange-matthias\n  Robert Kurz https://launchpad.net/~e-robert-kurz-hd\n  STK-team https://launchpad.net/~stk\n  Salesome https://launchpad.net/~xaver-bastiani-deactivatedaccount\n  Simeon https://launchpad.net/~simeon5\n  Tobias Bannert https://launchpad.net/~toba\n  Wolfs https://launchpad.net/~pizzaservice\n  Wuzzy https://launchpad.net/~wuzzy\n  cmdrhenner https://launchpad.net/~cmdrhenner\n  e https://launchpad.net/~e-blosz\n  enz https://launchpad.net/~markus-enzenberger\n  hiker https://launchpad.net/~hiker-luding\n  konstin https://launchpad.net/~konstin\n  pert7 https://launchpad.net/~pert7-deactivatedaccount"
+msgstr "Launchpad Contributions:\nAuria https://launchpad.net/~auria-mg\nBendetto https://launchpad.net/~biengo\ncmdrhenner https://launchpad.net/~cmdrhenner\nDaBASCHT https://launchpad.net/~dabascht\nDavid Roth https://launchpad.net/~davidroth9\nDawid Gan https://launchpad.net/~deveee\nDennis https://launchpad.net/~theradialactive\nDHermit https://launchpad.net/~dhermit\ne https://launchpad.net/~e-blosz\nenz https://launchpad.net/~markus-enzenberger\nEvolution https://launchpad.net/~marcken-ritter\nFelix https://launchpad.net/~felixk\nFlakebi, 2015\nGerjet Kleine-Weischede https://launchpad.net/~gerjet-deactivatedaccount-deactivatedaccount\nGregor Santner https://launchpad.net/~gregi94\nH0ff1 https://launchpad.net/~stefhoff\nhiker https://launchpad.net/~hiker-luding\nJoerg Henrichs, 2015\nJohn Doe https://launchpad.net/~kulok1493-deactivatedaccount\nkonstin https://launchpad.net/~konstin\nkonstin, 2015\nMatthias Lange https://launchpad.net/~lange-matthias\npert7 https://launchpad.net/~pert7-deactivatedaccount\nRobert Kurz https://launchpad.net/~e-robert-kurz-hd\nSalesome https://launchpad.net/~xaver-bastiani-deactivatedaccount\nSimeon https://launchpad.net/~simeon5\nSTK-team https://launchpad.net/~stk\nTobias Bannert https://launchpad.net/~toba\nWasilis Mandratzis-Walz, 2015\nWolfs https://launchpad.net/~pizzaservice\nWuzzy https://launchpad.net/~wuzzy"
diff --git a/data/po/el.po b/data/po/el.po
index c9b541576..a4cf310b3 100644
--- a/data/po/el.po
+++ b/data/po/el.po
@@ -3368,4 +3368,4 @@ msgstr "βασικό"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Konstantinos Thermos https://launchpad.net/~subdee\n  Nefeli Stylla https://launchpad.net/~nefeli-st\n  STK-team https://launchpad.net/~stk\n  Vangelis Skarmoutsos https://launchpad.net/~skarmoutsosv\n  Yannis Kaskamanidis https://launchpad.net/~ttnfy17\n  tzem https://launchpad.net/~athmakrigiannis"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nKonstantinos Thermos https://launchpad.net/~subdee\nNefeli Stylla https://launchpad.net/~nefeli-st\nSTK-team https://launchpad.net/~stk\ntzem https://launchpad.net/~athmakrigiannis\nVangelis Skarmoutsos https://launchpad.net/~skarmoutsosv\nWasilis Mandratzis-Walz, 2015\nYannis Kaskamanidis https://launchpad.net/~ttnfy17"
diff --git a/data/po/en_AU.po b/data/po/en_AU.po
index bd71d6193..14d6d6a09 100644
--- a/data/po/en_AU.po
+++ b/data/po/en_AU.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Jackson Doak https://launchpad.net/~noskcaj"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nJackson Doak https://launchpad.net/~noskcaj"
diff --git a/data/po/en_GB.po b/data/po/en_GB.po
index 247819fe3..25d45f7fc 100644
--- a/data/po/en_GB.po
+++ b/data/po/en_GB.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Andi Chandler https://launchpad.net/~bing\n  Michael Torpey https://launchpad.net/~mctorpey\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nAndi Chandler https://launchpad.net/~bing\nMichael Torpey https://launchpad.net/~mctorpey\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/eo.po b/data/po/eo.po
index bc9a19182..fd5852d29 100644
--- a/data/po/eo.po
+++ b/data/po/eo.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Rubén https://launchpad.net/~sleepwalkdroid\n  STK-team https://launchpad.net/~stk\n  Éfrit https://launchpad.net/~efrit"
+msgstr "Launchpad Contributions:\nRubén https://launchpad.net/~sleepwalkdroid\nSTK-team https://launchpad.net/~stk\nÉfrit https://launchpad.net/~efrit"
diff --git a/data/po/es.po b/data/po/es.po
index c986d8379..3974f2995 100644
--- a/data/po/es.po
+++ b/data/po/es.po
@@ -3367,4 +3367,4 @@ msgstr "Estándar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Adolfo Jayme https://launchpad.net/~fitojb\n  Alejandro Pérez https://launchpad.net/~alexperezalonso\n  Alvaro Ortiz https://launchpad.net/~kirtash1197\n  CaArRi https://launchpad.net/~caarri91\n  David Ballesteros Mayo https://launchpad.net/~dividio\n  Dawid Gan https://launchpad.net/~deveee\n  DiegoJ https://launchpad.net/~diegojromerolopez\n  Eduardo Battaglia https://launchpad.net/~eduardo-battaglia\n  Eugenio M. Vigo https://launchpad.net/~evigo\n  Felipe Hommen https://launchpad.net/~felihommen\n  Jonay https://launchpad.net/~jonay-santana\n  Jose https://launchpad.net/~jose-medina-moreno\n  José Luis Bandala Pérez https://launchpad.net/~luis449bp\n  Leo Juszkiewicz https://launchpad.net/~juszr\n  LinuxNerdo https://launchpad.net/~catastro1\n  Louis DC https://launchpad.net/~1109558-y\n  Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\n  Mariano Agüero https://launchpad.net/~nero1000000\n  Morgan w c. https://launchpad.net/~bunk-v\n  STK-team https://launchpad.net/~stk\n  Simón Roca https://launchpad.net/~simonaaf\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  VPablo https://launchpad.net/~villumar\n  elhoir https://launchpad.net/~jfarroyo82\n  juanman https://launchpad.net/~juanmalbye\n  raven2286 https://launchpad.net/~r-casola\n  simon https://launchpad.net/~sianhulo\n  zer berros https://launchpad.net/~cerverros\n  �ngel https://launchpad.net/~pikapikan"
+msgstr "Launchpad Contributions:\nAdolfo Jayme https://launchpad.net/~fitojb\nAlejandro Pérez https://launchpad.net/~alexperezalonso\nAlvaro Ortiz https://launchpad.net/~kirtash1197\nCaArRi https://launchpad.net/~caarri91\nDavid Ballesteros Mayo https://launchpad.net/~dividio\nDawid Gan https://launchpad.net/~deveee\nDiegoJ https://launchpad.net/~diegojromerolopez\nEduardo Battaglia https://launchpad.net/~eduardo-battaglia\nelhoir https://launchpad.net/~jfarroyo82\nEugenio M. Vigo https://launchpad.net/~evigo\nFelipe Hommen https://launchpad.net/~felihommen\nJonay https://launchpad.net/~jonay-santana\nJose https://launchpad.net/~jose-medina-moreno\nJosé Luis Bandala Pérez https://launchpad.net/~luis449bp\njuanman https://launchpad.net/~juanmalbye\nLeo Juszkiewicz https://launchpad.net/~juszr\nLinuxNerdo https://launchpad.net/~catastro1\nLouis DC https://launchpad.net/~1109558-y\nMarc Coll Carrillo https://launchpad.net/~marc-coll-carrillo\nMarc Coll Carrillo, 2015\nMariano Agüero https://launchpad.net/~nero1000000\nMorgan w c. https://launchpad.net/~bunk-v\nraven2286 https://launchpad.net/~r-casola\nsimon https://launchpad.net/~sianhulo\nSimón Roca https://launchpad.net/~simonaaf\nSTK-team https://launchpad.net/~stk\nTae-Wong SEO https://launchpad.net/~seotaewong40\nVPablo https://launchpad.net/~villumar\nzer berros https://launchpad.net/~cerverros\n�ngel https://launchpad.net/~pikapikan"
diff --git a/data/po/eu.po b/data/po/eu.po
index d71fd6b77..43f7635fa 100644
--- a/data/po/eu.po
+++ b/data/po/eu.po
@@ -3370,4 +3370,4 @@ msgstr "arrunta"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Amy Smile Kerkhof https://launchpad.net/~amy\n  Ander Elortondo https://launchpad.net/~ander-elor\n  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde\n  Jan Mees https://launchpad.net/~jmees001\n  Mikel Iturbe Urretxa https://launchpad.net/~mik-iturbe\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nAmy Smile Kerkhof https://launchpad.net/~amy\nAnder Elortondo https://launchpad.net/~ander-elor\nAsier Iturralde Sarasola https://launchpad.net/~asier-iturralde\nAsier Iturralde Sarasola, 2015\nJan Mees https://launchpad.net/~jmees001\nManex Agirrezabal, 2015\nMikel Iturbe Urretxa https://launchpad.net/~mik-iturbe\nMikel Olasagasti Uranga, 2015\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/fa.po b/data/po/fa.po
index c20094bed..365cbda53 100644
--- a/data/po/fa.po
+++ b/data/po/fa.po
@@ -3364,4 +3364,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Danial Behzadi https://launchpad.net/~dani.behzi\n  Dawid Gan https://launchpad.net/~deveee\n  nava https://launchpad.net/~nava.a"
+msgstr "Launchpad Contributions:\nDanial Behzadi https://launchpad.net/~dani.behzi\nDawid Gan https://launchpad.net/~deveee\nnava https://launchpad.net/~nava.a"
diff --git a/data/po/fi.po b/data/po/fi.po
index 3af98e7ef..a90f5d2a4 100644
--- a/data/po/fi.po
+++ b/data/po/fi.po
@@ -3368,3 +3368,7 @@ msgstr "vakio"
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr "Jiri Grönroos\n\nLaunchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Joonas Nurmi https://launchpad.net/~joonas-nurmi\n  Kristian Laakkonen https://launchpad.net/~kristian-laakkonen\n  STK-team https://launchpad.net/~stk"
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr "Launchpad Contributions:\nJiri Grönroos, 2015"
diff --git a/data/po/fr.po b/data/po/fr.po
index d191529d1..e7a22852f 100644
--- a/data/po/fr.po
+++ b/data/po/fr.po
@@ -3367,4 +3367,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Alexis Lavaud https://launchpad.net/~alexislavaud191\n  Audiger Jeremy https://launchpad.net/~tankypon\n  Auria https://launchpad.net/~auria-mg\n  Baptiste Fontaine https://launchpad.net/~bfontaine\n  Florent (LSc) https://launchpad.net/~lorkscorguar\n  Juju Croco https://launchpad.net/~juju-croco\n  Kalsan https://launchpad.net/~info-kalsan\n  Louis-Philippe Breton https://launchpad.net/~bf5man\n  MCMic https://launchpad.net/~come-bernigaud\n  Marwane K. https://launchpad.net/~marwane-ka\n  Max Perkins https://launchpad.net/~maxperkinstoki\n  Nicolas Delvaux https://launchpad.net/~malizor\n  Otourly https://launchpad.net/~otourly\n  STK-team https://launchpad.net/~stk\n  Syl https://launchpad.net/~syl-\n  Thomas P T https://launchpad.net/~thomaspt\n  londumas https://launchpad.net/~helion331990\n  math07 https://launchpad.net/~mathlaprise\n  noname120 https://launchpad.net/~devnoname120\n  tipiak https://launchpad.net/~tipiak\n  xapantu https://launchpad.net/~xapantu\n  xemard.nicolas https://launchpad.net/~xemard.nicolas\n  Éfrit https://launchpad.net/~efrit"
+msgstr "Launchpad Contributions:\nAlexis Lavaud https://launchpad.net/~alexislavaud191\nAudiger Jeremy https://launchpad.net/~tankypon\nAuria https://launchpad.net/~auria-mg\nAuria, 2015\nBaptiste Fontaine https://launchpad.net/~bfontaine\nFlorent (LSc) https://launchpad.net/~lorkscorguar\nJuju Croco https://launchpad.net/~juju-croco\nKalsan https://launchpad.net/~info-kalsan\nlondumas https://launchpad.net/~helion331990\nLouis-Philippe Breton https://launchpad.net/~bf5man\nMarwane K. https://launchpad.net/~marwane-ka\nmath07 https://launchpad.net/~mathlaprise\nMax Perkins https://launchpad.net/~maxperkinstoki\nMCMic https://launchpad.net/~come-bernigaud\nNicolas Delvaux https://launchpad.net/~malizor\nnoname120 https://launchpad.net/~devnoname120\nOtourly https://launchpad.net/~otourly\nSTK-team https://launchpad.net/~stk\nSyl https://launchpad.net/~syl-\nThomas P T https://launchpad.net/~thomaspt\ntipiak https://launchpad.net/~tipiak\nxapantu https://launchpad.net/~xapantu\nxemard.nicolas https://launchpad.net/~xemard.nicolas\nÉfrit https://launchpad.net/~efrit"
diff --git a/data/po/fr_CA.po b/data/po/fr_CA.po
index 965cede37..5a0724cf8 100644
--- a/data/po/fr_CA.po
+++ b/data/po/fr_CA.po
@@ -3366,4 +3366,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee"
+msgstr "Launchpad Contributions:\nAuria https://launchpad.net/~auria-mg\nDawid Gan https://launchpad.net/~deveee"
diff --git a/data/po/ga.po b/data/po/ga.po
index 88cacf903..2664481db 100644
--- a/data/po/ga.po
+++ b/data/po/ga.po
@@ -3375,4 +3375,4 @@ msgstr "caighdeánach"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Aaron Kearns https://launchpad.net/~ajkearns6\n  Daithí Mac an Aircinn https://launchpad.net/~dmaa60"
+msgstr "Launchpad Contributions:\nAaron Kearns https://launchpad.net/~ajkearns6\nDaithí Mac an Aircinn https://launchpad.net/~dmaa60"
diff --git a/data/po/gd.po b/data/po/gd.po
index d10f8c5fc..a891264e0 100644
--- a/data/po/gd.po
+++ b/data/po/gd.po
@@ -3375,4 +3375,4 @@ msgstr "coitcheann"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  GunChleoc https://launchpad.net/~gunchleoc\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nGunChleoc https://launchpad.net/~gunchleoc\nGunChleoc, 2012-2015\nGunChleoc, 2015\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/gl.po b/data/po/gl.po
index 12f86c9c9..7259a7d3e 100644
--- a/data/po/gl.po
+++ b/data/po/gl.po
@@ -3369,4 +3369,4 @@ msgstr "Estándar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Adrián Chaves Fernández https://launchpad.net/~gallaecio\n  Auria https://launchpad.net/~auria-mg\n  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n  Trutxo64 https://launchpad.net/~celestino-freire"
+msgstr "Launchpad Contributions:\nAdrián Chaves Fernández https://launchpad.net/~gallaecio\nAdrián Chaves Fernández, 2010\nAdrián Chaves Fernández, 2010\nAdrián Chaves Fernández, 2010-2011,2013\nAuria https://launchpad.net/~auria-mg\nMiguel Anxo Bouzada https://launchpad.net/~mbouzada\nTrutxo64 https://launchpad.net/~celestino-freire"
diff --git a/data/po/he.po b/data/po/he.po
index a234cb98e..9d0dfc699 100644
--- a/data/po/he.po
+++ b/data/po/he.po
@@ -3370,4 +3370,4 @@ msgstr "רגיל"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Asael https://launchpad.net/~asaelr\n  Auria https://launchpad.net/~auria-mg\n  Ddorda https://launchpad.net/~ddorda\n  GenghisKhan https://launchpad.net/~genghiskhan\n  Jorge Mariano https://launchpad.net/~jmariano\n  Leo Juszkiewicz https://launchpad.net/~juszr\n  Reuma Mordechai https://launchpad.net/~reumamordechai\n  STK-team https://launchpad.net/~stk\n  Shai Shapira https://launchpad.net/~shayshap\n  Shimi Chen https://launchpad.net/~shimi-chen\n  Yaron https://launchpad.net/~sh-yaron"
+msgstr "Launchpad Contributions:\nAsael https://launchpad.net/~asaelr\nAuria https://launchpad.net/~auria-mg\nCapri, 2015\nDdorda https://launchpad.net/~ddorda\nGenghisKhan https://launchpad.net/~genghiskhan\nGenghisKhan, 2015\nJorge Mariano https://launchpad.net/~jmariano\nLeo Juszkiewicz https://launchpad.net/~juszr\nReuma Mordechai https://launchpad.net/~reumamordechai\nShai Shapira https://launchpad.net/~shayshap\nShimi Chen https://launchpad.net/~shimi-chen\nSTK-team https://launchpad.net/~stk\nYaron https://launchpad.net/~sh-yaron\nYs, 2015"
diff --git a/data/po/hi.po b/data/po/hi.po
index 13560984a..d4e8d70be 100644
--- a/data/po/hi.po
+++ b/data/po/hi.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Akela https://launchpad.net/~sdakela\n  STK-team https://launchpad.net/~stk\n  sid https://launchpad.net/~sidchat1"
+msgstr "Launchpad Contributions:\nAkela https://launchpad.net/~sdakela\nsid https://launchpad.net/~sidchat1\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/hr.po b/data/po/hr.po
index f51c04018..7b8ae1c96 100644
--- a/data/po/hr.po
+++ b/data/po/hr.po
@@ -3370,4 +3370,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Davor Buday https://launchpad.net/~davor-buday-gmail\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  dboki89 https://launchpad.net/~dboki89\n  student4 https://launchpad.net/~iputnik-msn"
+msgstr "Launchpad Contributions:\nDavor Buday https://launchpad.net/~davor-buday-gmail\nDawid Gan https://launchpad.net/~deveee\ndboki89 https://launchpad.net/~dboki89\nIvan Putnik, 2010\nSTK-team https://launchpad.net/~stk\nstudent4 https://launchpad.net/~iputnik-msn"
diff --git a/data/po/hu.po b/data/po/hu.po
index 04d7e3d1f..3a0070ac1 100644
--- a/data/po/hu.po
+++ b/data/po/hu.po
@@ -3367,4 +3367,4 @@ msgstr "alapjáték"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Balint https://launchpad.net/~lbekefi\n  Gyönki Bendegúz https://launchpad.net/~gyonkibendeguz\n  Jacob https://launchpad.net/~jacob11\n  Jf. Tasz https://launchpad.net/~jftatsz\n  Molditz György https://launchpad.net/~molditz\n  Papp Bence https://launchpad.net/~sclegnrbs\n  STK-team https://launchpad.net/~stk\n  Úr Balázs https://launchpad.net/~urbalazs"
+msgstr "Launchpad Contributions:\nBalint https://launchpad.net/~lbekefi\nGyönki Bendegúz https://launchpad.net/~gyonkibendeguz\nJacob https://launchpad.net/~jacob11\nJf. Tasz https://launchpad.net/~jftatsz\nMolditz György https://launchpad.net/~molditz\nPapp Bence https://launchpad.net/~sclegnrbs\nSTK-team https://launchpad.net/~stk\nÚr Balázs https://launchpad.net/~urbalazs"
diff --git a/data/po/hy.po b/data/po/hy.po
index 7434d9f2c..b548f5565 100644
--- a/data/po/hy.po
+++ b/data/po/hy.po
@@ -3367,4 +3367,4 @@ msgstr "Õ½Õ¿Õ¡Õ¶Õ¤Õ¡Ö€Õ¿"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Aram Palyan https://launchpad.net/~ararat-info"
+msgstr "Launchpad Contributions:\nAram Palyan https://launchpad.net/~ararat-info"
diff --git a/data/po/id.po b/data/po/id.po
index c48bc6c2a..f2f60e986 100644
--- a/data/po/id.po
+++ b/data/po/id.po
@@ -3364,4 +3364,4 @@ msgstr "Standar"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n  Aziz Rahmad https://launchpad.net/~azayrahmad\n  Dawid Gan https://launchpad.net/~deveee\n  Ega Zulfikar https://launchpad.net/~ega-bulb\n  Icho Y. Chandra https://launchpad.net/~project-zero\n  Muhammad Radifar https://launchpad.net/~m-radifar05\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nArief Setiadi Wibowo https://launchpad.net/~q-thrynx\nAziz Rahmad https://launchpad.net/~azayrahmad\nDawid Gan https://launchpad.net/~deveee\nEga Zulfikar https://launchpad.net/~ega-bulb\nIcho Y. Chandra https://launchpad.net/~project-zero\nMuhammad Radifar https://launchpad.net/~m-radifar05\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/is.po b/data/po/is.po
index b627fa709..6408bb939 100644
--- a/data/po/is.po
+++ b/data/po/is.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Benedikt Scheving-Thorsteinsson https://launchpad.net/~nammi-namm\n  Olafur Skorrdal https://launchpad.net/~skorrdal\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nBenedikt Scheving-Thorsteinsson https://launchpad.net/~nammi-namm\nOlafur Skorrdal https://launchpad.net/~skorrdal\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/it.po b/data/po/it.po
index fbb98ae61..ff463b2a1 100644
--- a/data/po/it.po
+++ b/data/po/it.po
@@ -3367,4 +3367,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Alessandro Aragione https://launchpad.net/~layn\n  Andrea Panontin https://launchpad.net/~any-97\n  Andrea Pivetta https://launchpad.net/~vanpivix\n  Dawid Gan https://launchpad.net/~deveee\n  Diego Pierotto https://launchpad.net/~gringo\n  Gigu https://launchpad.net/~pvinci26\n  Guido Barbi https://launchpad.net/~gbar\n  Massimiliano Caniparoli https://launchpad.net/~massic80\n  Max Perkins https://launchpad.net/~maxperkinstoki\n  Oibaf https://launchpad.net/~oibaf\n  STK-team https://launchpad.net/~stk\n  grandefava https://launchpad.net/~grandefava\n  marco https://launchpad.net/~marco97pa\n  nicoelba https://launchpad.net/~nicoelba\n  t3ddy https://launchpad.net/~t3ddy1988"
+msgstr "Launchpad Contributions:\nAlessandro Aragione https://launchpad.net/~layn\nAndrea Panontin https://launchpad.net/~any-97\nAndrea Pivetta https://launchpad.net/~vanpivix\nDawid Gan https://launchpad.net/~deveee\nDiego Pierotto https://launchpad.net/~gringo\nEnrico, 2015\nGigu https://launchpad.net/~pvinci26\ngrandefava https://launchpad.net/~grandefava\nGuido Barbi https://launchpad.net/~gbar\nmarco https://launchpad.net/~marco97pa\nMassimiliano Caniparoli https://launchpad.net/~massic80\nMax Perkins https://launchpad.net/~maxperkinstoki\nnicoelba https://launchpad.net/~nicoelba\nOibaf https://launchpad.net/~oibaf\nSTK-team https://launchpad.net/~stk\nt3ddy https://launchpad.net/~t3ddy1988"
diff --git a/data/po/ja.po b/data/po/ja.po
index e2888a41d..fbb1729be 100644
--- a/data/po/ja.po
+++ b/data/po/ja.po
@@ -3363,4 +3363,4 @@ msgstr "スタンダード"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  Yuki Shira https://launchpad.net/~shirayuking\n  lindwurm https://launchpad.net/~lindwurm\n  tkbd https://launchpad.net/~arolf\n  xapantu https://launchpad.net/~xapantu"
+msgstr "Launchpad Contributions:\nAuria https://launchpad.net/~auria-mg\nDawid Gan https://launchpad.net/~deveee\nlindwurm https://launchpad.net/~lindwurm\nSTK-team https://launchpad.net/~stk\nTae-Wong SEO https://launchpad.net/~seotaewong40\ntkbd https://launchpad.net/~arolf\nxapantu https://launchpad.net/~xapantu\nYuki Shira https://launchpad.net/~shirayuking"
diff --git a/data/po/jbo.po b/data/po/jbo.po
index f61eb3207..ec192275e 100644
--- a/data/po/jbo.po
+++ b/data/po/jbo.po
@@ -3368,4 +3368,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Willem Sonke https://launchpad.net/~willem-sonke\n  Wuzzy https://launchpad.net/~wuzzy"
+msgstr "Launchpad Contributions:\nWillem Sonke https://launchpad.net/~willem-sonke\nWuzzy https://launchpad.net/~wuzzy\nWuzzy, 2015"
diff --git a/data/po/ko.po b/data/po/ko.po
index e89b3f59b..ed868c5c7 100644
--- a/data/po/ko.po
+++ b/data/po/ko.po
@@ -3364,4 +3364,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dynamicwork https://launchpad.net/~dynamicwork\n  JJ https://launchpad.net/~jjemin1\n  Tae-Wong SEO https://launchpad.net/~seotaewong40"
+msgstr "Launchpad Contributions:\nDynamicwork https://launchpad.net/~dynamicwork\nJJ https://launchpad.net/~jjemin1\nTae-Wong SEO https://launchpad.net/~seotaewong40"
diff --git a/data/po/kw.po b/data/po/kw.po
index 0d14c4ebe..27abbafa7 100644
--- a/data/po/kw.po
+++ b/data/po/kw.po
@@ -3374,4 +3374,4 @@ msgstr "savonek"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  STK-team https://launchpad.net/~stk\n  kernow https://launchpad.net/~kernow"
+msgstr "Launchpad Contributions:\nkernow https://launchpad.net/~kernow\nNicky Rowe, 2015\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/ky.po b/data/po/ky.po
index cfbb4f590..c9268a5c4 100644
--- a/data/po/ky.po
+++ b/data/po/ky.po
@@ -3364,4 +3364,4 @@ msgstr "�тандарттуу"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  chyngyz https://launchpad.net/~chyngyz"
+msgstr "Launchpad Contributions:\nchyngyz https://launchpad.net/~chyngyz\nDawid Gan https://launchpad.net/~deveee\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/lt.po b/data/po/lt.po
index eb9b51768..8f8607042 100644
--- a/data/po/lt.po
+++ b/data/po/lt.po
@@ -3373,4 +3373,4 @@ msgstr "standartinis"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Algimantas Margevi�ius https://launchpad.net/~gymka\n  Mantas Kriau�iūnas https://launchpad.net/~mantas\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nAlgimantas Margevi�ius https://launchpad.net/~gymka\nAlgimantas Margevi�ius, 2011\nJonas Kriau�iūnas, 2015\nMantas Kriau�iūnas https://launchpad.net/~mantas\nMantas Kriau�iūnas, 2015\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/lv.po b/data/po/lv.po
index 62d5b88e6..913ab519b 100644
--- a/data/po/lv.po
+++ b/data/po/lv.po
@@ -3370,3 +3370,7 @@ msgstr ""
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr "Launchpad Contributions:"
diff --git a/data/po/mn_MN.po b/data/po/mn_MN.po
index 0d2b1b04a..78622ed59 100644
--- a/data/po/mn_MN.po
+++ b/data/po/mn_MN.po
@@ -3367,3 +3367,7 @@ msgstr ""
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr ""
+
+#: src/states_screens/credits.cpp:209
+msgid "translator-credits"
+msgstr "Launchpad Contributions:"
diff --git a/data/po/nb.po b/data/po/nb.po
index 17fb3dbb4..d08cc33c6 100644
--- a/data/po/nb.po
+++ b/data/po/nb.po
@@ -3366,4 +3366,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Eigil Iversen https://launchpad.net/~eig-iv\n  Magne Djupvik https://launchpad.net/~magnedj\n  STK-team https://launchpad.net/~stk\n  Tore Bergebakken https://launchpad.net/~toreb\n  oyvindln https://launchpad.net/~oyvindln"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nEigil Iversen https://launchpad.net/~eig-iv\nMagne Djupvik https://launchpad.net/~magnedj\noyvindln https://launchpad.net/~oyvindln\nSTK-team https://launchpad.net/~stk\nTore Bergebakken https://launchpad.net/~toreb"
diff --git a/data/po/nl.po b/data/po/nl.po
index a8efb6297..178c4c4e0 100644
--- a/data/po/nl.po
+++ b/data/po/nl.po
@@ -3368,4 +3368,4 @@ msgstr "Standaard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Amy Smile Kerkhof https://launchpad.net/~amy\n  Asciimonster https://launchpad.net/~asciimonster-myrealbox\n  Dawid Gan https://launchpad.net/~deveee\n  Foppe Benedictus https://launchpad.net/~foppe-benedictus\n  Guus https://launchpad.net/~guus-verbeek\n  Heimen Stoffels https://launchpad.net/~vistaus\n  Kaj-Ivar https://launchpad.net/~kaj-ivar\n  Koen_VL https://launchpad.net/~koenvl\n  STK-team https://launchpad.net/~stk\n  Ward Muylaert https://launchpad.net/~ward-muylaert\n  Willem Sonke https://launchpad.net/~willem-sonke\n  Wim Champagne https://launchpad.net/~fng-deactivatedaccount-deactivatedaccount\n  plutgamer https://launchpad.net/~plutgamer\n  toams https://launchpad.net/~toams"
+msgstr "Launchpad Contributions:\nAmy Smile Kerkhof https://launchpad.net/~amy\nAsciimonster https://launchpad.net/~asciimonster-myrealbox\nDawid Gan https://launchpad.net/~deveee\nFoppe Benedictus https://launchpad.net/~foppe-benedictus\nFrans van Rijn, 2015\nGuus https://launchpad.net/~guus-verbeek\nHeimen Stoffels https://launchpad.net/~vistaus\nKaj-Ivar https://launchpad.net/~kaj-ivar\nKoen_VL https://launchpad.net/~koenvl\nplutgamer https://launchpad.net/~plutgamer\nSTK-team https://launchpad.net/~stk\ntoams https://launchpad.net/~toams\nWard Muylaert https://launchpad.net/~ward-muylaert\nWard Muylaert, 2015\nWillem Sonke https://launchpad.net/~willem-sonke\nWim Champagne https://launchpad.net/~fng-deactivatedaccount-deactivatedaccount"
diff --git a/data/po/nn.po b/data/po/nn.po
index 7cf1b26a3..0a1b75936 100644
--- a/data/po/nn.po
+++ b/data/po/nn.po
@@ -3367,4 +3367,4 @@ msgstr "Vanleg"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Alexander Mackinnon Jansen https://launchpad.net/~alexander-jansen\n  Karl Ove Hufthammer https://launchpad.net/~huftis"
+msgstr "Launchpad Contributions:\nAlexander Mackinnon Jansen https://launchpad.net/~alexander-jansen\nKarl Ove Hufthammer https://launchpad.net/~huftis\nKarl Ove Hufthammer, 2011"
diff --git a/data/po/os.po b/data/po/os.po
index f0e55437f..2e13cb91f 100644
--- a/data/po/os.po
+++ b/data/po/os.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Xwybylty Soslan https://launchpad.net/~soslan"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nXwybylty Soslan https://launchpad.net/~soslan"
diff --git a/data/po/pl.po b/data/po/pl.po
index e3dc87af5..14606fe52 100644
--- a/data/po/pl.po
+++ b/data/po/pl.po
@@ -3371,4 +3371,4 @@ msgstr "standardowe"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Bill https://launchpad.net/~cges30901\n  Dawid Gan https://launchpad.net/~deveee\n  Kuba Polankowski https://launchpad.net/~tux4-b\n  Kuba Polankowski https://launchpad.net/~tux4-wp\n  Patryk Wychowaniec https://launchpad.net/~p98\n  STK-team https://launchpad.net/~stk\n  Twojwujaszek https://launchpad.net/~twojwujaszek-gmail"
+msgstr "Launchpad Contributions:\nAuria https://launchpad.net/~auria-mg\nBill https://launchpad.net/~cges30901\nDawid Gan https://launchpad.net/~deveee\nDawid Gan, 2015\nKuba Polankowski https://launchpad.net/~tux4-b\nKuba Polankowski https://launchpad.net/~tux4-wp\nPatryk Wychowaniec https://launchpad.net/~p98\nPatryk Wychowaniec, 2015\nSTK-team https://launchpad.net/~stk\nTwojwujaszek https://launchpad.net/~twojwujaszek-gmail"
diff --git a/data/po/pt.po b/data/po/pt.po
index ea362eb65..0aef66973 100644
--- a/data/po/pt.po
+++ b/data/po/pt.po
@@ -3368,4 +3368,4 @@ msgstr "padrão"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Auria https://launchpad.net/~auria-mg\n  Dawid Gan https://launchpad.net/~deveee\n  Bruno Ramalhete  https://launchpad.net/~bram-512\n  Douglas Moura https://launchpad.net/~araujodemoura\n  Evandro P. Alves https://launchpad.net/~evandro-pa\n  Fátima de Menezes Dantas https://launchpad.net/~fatima-menezes19\n  João Frade / 100 NOME https://launchpad.net/~100nome-portugal\n  Ricardo Conde https://launchpad.net/~turotulco\n  STK-team https://launchpad.net/~stk\n  Sérgio Marques https://launchpad.net/~sergio+marques"
+msgstr "Launchpad Contributions:\nAuria https://launchpad.net/~auria-mg\nBruno Ramalhete  https://launchpad.net/~bram-512\nBruno Ramalhete, 2015\nDawid Gan https://launchpad.net/~deveee\nDouglas Moura https://launchpad.net/~araujodemoura\nEvandro P. Alves https://launchpad.net/~evandro-pa\nFátima de Menezes Dantas https://launchpad.net/~fatima-menezes19\nJoão Frade / 100 NOME https://launchpad.net/~100nome-portugal\nRicardo Conde https://launchpad.net/~turotulco\nSTK-team https://launchpad.net/~stk\nSérgio Marques https://launchpad.net/~sergio+marques"
diff --git a/data/po/pt_BR.po b/data/po/pt_BR.po
index bcb042e45..c6ac02ac5 100644
--- a/data/po/pt_BR.po
+++ b/data/po/pt_BR.po
@@ -3368,4 +3368,4 @@ msgstr "padrão"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Adevair Heleno https://launchpad.net/~adevairhpj\n  Average John https://launchpad.net/~averagejohn\n  Eberval Oliveira Castro https://launchpad.net/~eberval-gmail\n  Edvaldo de Souza Cruz https://launchpad.net/~edvaldoscruz\n  Felipe Menezes https://launchpad.net/~felipe-fmc1\n  Flávio Zavan https://launchpad.net/~flaviozavan\n  Guilherme Marçal https://launchpad.net/~ogabiefofo\n  Marcelo R. de Sa https://launchpad.net/~marcelo-jambu\n  Mateus Ferreira Silva https://launchpad.net/~mtsferreirasilva\n  Mihailov https://launchpad.net/~mihailov\n  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n  Paulo Roberto de Oliveira Castro https://launchpad.net/~p-oliveira-castro\n  Pedro Folha https://launchpad.net/~pedrovi\n  Rafael Neri https://launchpad.net/~rafepel\n  Rodrigo Borges https://launchpad.net/~rbm0407\n  Rubens Bueno https://launchpad.net/~rubensvsbueno-l\n  STK-team https://launchpad.net/~stk\n  Teylo Laundos Aguiar https://launchpad.net/~teylo.aguiar\n  Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n  farrer https://launchpad.net/~farrer"
+msgstr "Launchpad Contributions:\nAdevair Heleno https://launchpad.net/~adevairhpj\nAverage John https://launchpad.net/~averagejohn\nEberval Oliveira Castro https://launchpad.net/~eberval-gmail\nEdvaldo de Souza Cruz https://launchpad.net/~edvaldoscruz\nfarrer https://launchpad.net/~farrer\nFelipe Menezes https://launchpad.net/~felipe-fmc1\nflaviozavan, 2015\nFlávio Zavan https://launchpad.net/~flaviozavan\nGuilherme Marçal https://launchpad.net/~ogabiefofo\nLaete Meireles, 2015\nMarcelo R. de Sa https://launchpad.net/~marcelo-jambu\nMateus Ferreira Silva https://launchpad.net/~mtsferreirasilva\nMihailov https://launchpad.net/~mihailov\nNeliton Pereira Jr. https://launchpad.net/~nelitonpjr\nPaulo Roberto de Oliveira Castro https://launchpad.net/~p-oliveira-castro\nPedro Folha https://launchpad.net/~pedrovi\nRafael Neri https://launchpad.net/~rafepel\nRodrigo Borges https://launchpad.net/~rbm0407\nRubens Bueno https://launchpad.net/~rubensvsbueno-l\nSTK-team https://launchpad.net/~stk\nTeylo Laundos Aguiar https://launchpad.net/~teylo.aguiar\nVitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves"
diff --git a/data/po/ro.po b/data/po/ro.po
index 566dfcd92..1e2f10bc4 100644
--- a/data/po/ro.po
+++ b/data/po/ro.po
@@ -3369,4 +3369,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Alexandru Guduleasa https://launchpad.net/~gulyan89\n  Daniel Butum https://launchpad.net/~danielcode\n  DimStar https://launchpad.net/~dominique-launchpad-net\n  Dominique Leuenberger aka DimStar https://launchpad.net/~dimstar\n  Matus Michael https://launchpad.net/~m-matus\n  Nicolae Crefelean https://launchpad.net/~kneekoo\n  STK-team https://launchpad.net/~stk\n  Vitalie Ciubotaru https://launchpad.net/~vitalie-ciubotaru"
+msgstr "Launchpad Contributions:\nAlexandru Guduleasa https://launchpad.net/~gulyan89\nDaniel Butum https://launchpad.net/~danielcode\nDimStar https://launchpad.net/~dominique-launchpad-net\nDominique Leuenberger aka DimStar https://launchpad.net/~dimstar\nMatus Michael https://launchpad.net/~m-matus\nNicolae Crefelean https://launchpad.net/~kneekoo\nSTK-team https://launchpad.net/~stk\nVitalie Ciubotaru https://launchpad.net/~vitalie-ciubotaru"
diff --git a/data/po/ru.po b/data/po/ru.po
index df7d3ce78..44d86f1bf 100644
--- a/data/po/ru.po
+++ b/data/po/ru.po
@@ -3372,4 +3372,4 @@ msgstr "�тандартные"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  AleXoundOS https://launchpad.net/~alexoundos\n  Alexander 'FONTER' Zinin https://launchpad.net/~spore-09\n  Andrey Olykainen https://launchpad.net/~andrey.olykainen\n  Denis Deryabin https://launchpad.net/~denis2010der\n  Dmitriy Koshel https://launchpad.net/~gaim4a\n  Dmitry https://launchpad.net/~dmitry-ashkadov\n  Dmitry Dubrov https://launchpad.net/~dimprogpro\n  Helen Antonova https://launchpad.net/~vigonett\n  Igor Shtompel https://launchpad.net/~i.shtompel\n  Kirill Babeev https://launchpad.net/~kirill-babeev\n  KroArtem https://launchpad.net/~kroartem\n  Maxim Kalinin https://launchpad.net/~kalinin-maxim\n  STK-team https://launchpad.net/~stk\n  Tae-Wong SEO https://launchpad.net/~seotaewong40\n  adem https://launchpad.net/~adem4ik\n  pingvin https://launchpad.net/~penguin-tux\n  Дмитрий https://launchpad.net/~starwars32\n  Олег  https://launchpad.net/~laoltomsk\n  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
+msgstr "Launchpad Contributions:\nadem https://launchpad.net/~adem4ik\nAlexander 'FONTER' Zinin https://launchpad.net/~spore-09\nAleXoundOS https://launchpad.net/~alexoundos\nAndrei Stepanov, 2015\nAndrey Olykainen https://launchpad.net/~andrey.olykainen\nDenis Deryabin https://launchpad.net/~denis2010der\nDmitriy Koshel https://launchpad.net/~gaim4a\nDmitry Dubrov https://launchpad.net/~dimprogpro\nDmitry Dubrov, 2015\nDmitry https://launchpad.net/~dmitry-ashkadov\nHelen Antonova https://launchpad.net/~vigonett\nIgor Shtompel https://launchpad.net/~i.shtompel\nKirill Babeev https://launchpad.net/~kirill-babeev\nKroArtem https://launchpad.net/~kroartem\nMaxim Kalinin https://launchpad.net/~kalinin-maxim\nOleg, 2015\npingvin https://launchpad.net/~penguin-tux\nSTK-team https://launchpad.net/~stk\nTae-Wong SEO https://launchpad.net/~seotaewong40\nДмитрий https://launchpad.net/~starwars32\nОлег  https://launchpad.net/~laoltomsk\n☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
diff --git a/data/po/sco.po b/data/po/sco.po
index 285772914..d554494f9 100644
--- a/data/po/sco.po
+++ b/data/po/sco.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Marco Cafolla https://launchpad.net/~cobradabest"
+msgstr "Launchpad Contributions:\nMarco Cafolla https://launchpad.net/~cobradabest"
diff --git a/data/po/sk.po b/data/po/sk.po
index 47b326811..85606c2bd 100644
--- a/data/po/sk.po
+++ b/data/po/sk.po
@@ -3370,4 +3370,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Miroslav Remák https://launchpad.net/~miroslavr256\n  Prescott_SK https://launchpad.net/~prescott66\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nMiroslav Remák https://launchpad.net/~miroslavr256\nPrescott_SK https://launchpad.net/~prescott66\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/sl.po b/data/po/sl.po
index ce61eba90..5b47f81dd 100644
--- a/data/po/sl.po
+++ b/data/po/sl.po
@@ -3373,4 +3373,4 @@ msgstr "obi�ajna"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n  Auria https://launchpad.net/~auria-mg\n  Denis_Ubuntu https://launchpad.net/~sirdrinksalot\n  Domen Knez https://launchpad.net/~dmen\n  Matic Gradišer https://launchpad.net/~0micky\n  STK-team https://launchpad.net/~stk\n  Sasa Batistic https://launchpad.net/~sasa-batistic"
+msgstr "Launchpad Contributions:\nAndrej Znidarsic https://launchpad.net/~andrej.znidarsic\nAndrej Znidarsic, 2015\nAuria https://launchpad.net/~auria-mg\nDenis_Ubuntu https://launchpad.net/~sirdrinksalot\nDomen Knez https://launchpad.net/~dmen\nMatic Gradišer https://launchpad.net/~0micky\nSasa Batistic https://launchpad.net/~sasa-batistic\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/sq.po b/data/po/sq.po
index cf077c4bd..7a70aa73e 100644
--- a/data/po/sq.po
+++ b/data/po/sq.po
@@ -3367,4 +3367,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Arianit Kukaj https://launchpad.net/~arking\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nArianit Kukaj https://launchpad.net/~arking\nDawid Gan https://launchpad.net/~deveee\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/sr.po b/data/po/sr.po
index 0727bea98..7fb85a11d 100644
--- a/data/po/sr.po
+++ b/data/po/sr.po
@@ -3372,4 +3372,4 @@ msgstr "уобичајено"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  STK-team https://launchpad.net/~stk\n  dboki89 https://launchpad.net/~dboki89\n  Миро�лав �иколић https://launchpad.net/~lipek\n  Саша Петровић https://launchpad.net/~salepetronije"
+msgstr "Launchpad Contributions:\ndboki89 https://launchpad.net/~dboki89\nSTK-team https://launchpad.net/~stk\nМиро�лав �иколић https://launchpad.net/~lipek\nМиро�лав �иколић, 2011\nСаша Петровић https://launchpad.net/~salepetronije\nСаша Петровић, 2012-2014"
diff --git a/data/po/sv.po b/data/po/sv.po
index 583ba9576..2636ac337 100644
--- a/data/po/sv.po
+++ b/data/po/sv.po
@@ -3366,4 +3366,4 @@ msgstr "standard"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Anders Carlsson https://launchpad.net/~kk7ntl9af-gk9\n  Arve Eriksson https://launchpad.net/~031299870-telia\n  Daniel Nylander https://launchpad.net/~yeager\n  Dawid Gan https://launchpad.net/~deveee\n  MDxm https://launchpad.net/~mdxm3000\n  Mathias Tillman https://launchpad.net/~master-homer\n  Mikael Mildén https://launchpad.net/~mikael-milden\n  Phoenix https://launchpad.net/~thephoenix\n  Rikard Edgren https://launchpad.net/~rikard-edgren\n  Rikard Johansson https://launchpad.net/~rikard-jo\n  STK-team https://launchpad.net/~stk"
+msgstr "Launchpad Contributions:\nAnders Carlsson https://launchpad.net/~kk7ntl9af-gk9\nArve Eriksson https://launchpad.net/~031299870-telia\nDaniel Nylander https://launchpad.net/~yeager\nDawid Gan https://launchpad.net/~deveee\nMathias Tillman https://launchpad.net/~master-homer\nMDxm https://launchpad.net/~mdxm3000\nMikael Mildén https://launchpad.net/~mikael-milden\nPhoenix https://launchpad.net/~thephoenix\nRikard Edgren https://launchpad.net/~rikard-edgren\nRikard Johansson https://launchpad.net/~rikard-jo\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/tr.po b/data/po/tr.po
index c4b121103..669de8c1a 100644
--- a/data/po/tr.po
+++ b/data/po/tr.po
@@ -3368,4 +3368,4 @@ msgstr "standart"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Muhammet Kara https://launchpad.net/~muhammet-k\n  Osman Tosun https://launchpad.net/~rainman-neu\n  STK-team https://launchpad.net/~stk\n  Volkan Gezer https://launchpad.net/~volkangezer\n  emre can yılmaz https://launchpad.net/~ecylmz\n  linuxseven https://launchpad.net/~linuxseven\n  maidis https://launchpad.net/~ozbekanil\n  yakup https://launchpad.net/~mutouk\n  zeugma https://launchpad.net/~sunder67"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nemre can yılmaz https://launchpad.net/~ecylmz\nlinuxseven https://launchpad.net/~linuxseven\nmaidis https://launchpad.net/~ozbekanil\nMuhammet Kara https://launchpad.net/~muhammet-k\nOsman Tosun https://launchpad.net/~rainman-neu\nSTK-team https://launchpad.net/~stk\nVolkan Gezer https://launchpad.net/~volkangezer\nVolkan Gezer, 2015\nyakup https://launchpad.net/~mutouk\nzeugma https://launchpad.net/~sunder67"
diff --git a/data/po/tt.po b/data/po/tt.po
index ae1f92c31..1c4b6138b 100644
--- a/data/po/tt.po
+++ b/data/po/tt.po
@@ -3364,4 +3364,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee"
diff --git a/data/po/uk.po b/data/po/uk.po
index 76bae6d1a..4a7244b0b 100644
--- a/data/po/uk.po
+++ b/data/po/uk.po
@@ -3370,4 +3370,4 @@ msgstr "�тандарт"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Helen Antonova https://launchpad.net/~vigonett\n  JOker https://launchpad.net/~spenser26\n  Maks Lyashuk aka Ma)(imuM https://launchpad.net/~probel\n  Pasha Sydoryshyn https://launchpad.net/~pandorrarv\n  Pavlo Bilyak https://launchpad.net/~pavlo1997\n  STK-team https://launchpad.net/~stk\n  Volodymyr Bodenchuk https://launchpad.net/~bodenchuk\n  Сергій Дубик https://launchpad.net/~dubyk-library"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nfedik, 2015\nHelen Antonova https://launchpad.net/~vigonett\nJOker https://launchpad.net/~spenser26\nMaks Lyashuk aka Ma)(imuM https://launchpad.net/~probel\nPasha Sydoryshyn https://launchpad.net/~pandorrarv\nPavlo Bilyak https://launchpad.net/~pavlo1997\nSTK-team https://launchpad.net/~stk\nVolodymyr Bodenchuk https://launchpad.net/~bodenchuk\nСергій Дубик https://launchpad.net/~dubyk-library"
diff --git a/data/po/uz.po b/data/po/uz.po
index 32864d32e..f493188c3 100644
--- a/data/po/uz.po
+++ b/data/po/uz.po
@@ -3364,4 +3364,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Umidjon Almasov https://launchpad.net/~kdemon"
+msgstr "Launchpad Contributions:\nUmidjon Almasov https://launchpad.net/~kdemon"
diff --git a/data/po/vi.po b/data/po/vi.po
index fddf5f1bd..1b0336473 100644
--- a/data/po/vi.po
+++ b/data/po/vi.po
@@ -3364,4 +3364,4 @@ msgstr "chuẩn"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Huynh Yen Loc https://launchpad.net/~nightgaunt13\n  STK-team https://launchpad.net/~stk\n  Vo Xuan Tien https://launchpad.net/~tienvx2008gs\n  Võ Xuân Tiến https://launchpad.net/~vo-ngan-90\n  Zombifier https://launchpad.net/~duckhoi1234"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nHuynh Yen Loc https://launchpad.net/~nightgaunt13\nSTK-team https://launchpad.net/~stk\nVo Xuan Tien https://launchpad.net/~tienvx2008gs\nVõ Xuân Tiến https://launchpad.net/~vo-ngan-90\nZombifier https://launchpad.net/~duckhoi1234"
diff --git a/data/po/zh_CN.po b/data/po/zh_CN.po
index 9c159e8e7..043fb86a2 100644
--- a/data/po/zh_CN.po
+++ b/data/po/zh_CN.po
@@ -3363,4 +3363,4 @@ msgstr "标准"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  STK-team https://launchpad.net/~stk\n  Sizhuang Liu https://launchpad.net/~lsz\n  Xhacker Liu https://launchpad.net/~xhacker\n  acme_pjz https://launchpad.net/~acme-pjz\n  jin https://launchpad.net/~zhangj\n  lks https://launchpad.net/~lks\n  luojie-dune https://launchpad.net/~luojie-dune\n  sohey https://launchpad.net/~sohey33"
+msgstr "Launchpad Contributions:\nacme_pjz https://launchpad.net/~acme-pjz\nDawid Gan https://launchpad.net/~deveee\njin https://launchpad.net/~zhangj\nlks https://launchpad.net/~lks\nluojie-dune https://launchpad.net/~luojie-dune\nSizhuang Liu https://launchpad.net/~lsz\nsohey https://launchpad.net/~sohey33\nSTK-team https://launchpad.net/~stk\nXhacker Liu https://launchpad.net/~xhacker"
diff --git a/data/po/zh_TW.po b/data/po/zh_TW.po
index a067ec0af..d6433673f 100644
--- a/data/po/zh_TW.po
+++ b/data/po/zh_TW.po
@@ -3365,4 +3365,4 @@ msgstr "一般"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:\n  Bill https://launchpad.net/~cges30901\n  Carl X. Su https://launchpad.net/~bcbcarl\n  Jeff Huang https://launchpad.net/~s8321414\n  STK-team https://launchpad.net/~stk\n  WM https://launchpad.net/~wandererm\n  jyc https://launchpad.net/~alphabet14\n  minhsien https://launchpad.net/~minhsien0330\n  tryneeds https://launchpad.net/~tryneeds\n  Ｖ字�(Vdragon) https://launchpad.net/~vdragon"
+msgstr "Launchpad Contributions:\nBill https://launchpad.net/~cges30901\nCarl X. Su https://launchpad.net/~bcbcarl\ncges30901, 2015\nJeff Huang https://launchpad.net/~s8321414\nJeff Huang, 2015\njyc https://launchpad.net/~alphabet14\nminhsien https://launchpad.net/~minhsien0330\nSTK-team https://launchpad.net/~stk\ntryneeds https://launchpad.net/~tryneeds\nWM https://launchpad.net/~wandererm\nＶ字�(Vdragon) https://launchpad.net/~vdragon"

From fbac4d791c4fc5ce77be07dcd4c1538a164f5957 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 16 Apr 2015 16:59:12 +1000
Subject: [PATCH 114/331] Updated Asian fonts.

---
 data/fonts/StkChineseFont.xml | Bin 173972 -> 174080 bytes
 data/fonts/wqyMicroHei0.png   | Bin 62386 -> 62433 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/fonts/StkChineseFont.xml b/data/fonts/StkChineseFont.xml
index f8c86b7d9ed54d6237ab3c92b0d6034665a2cbc8..43deba98987d468b228a52d8cb1538a4aea45938 100755
GIT binary patch
delta 512
zcmY*WJxc>Y6x=;E+1%yhf=WOyOF~2~A|$!J%jF9a3@H?%Vre6SV4+1?K@<YoNyrn{
zO4MGAmDr`Su+elD0j=!y2Z)<5b75gw=Djy>X7=J$K6#THdjvZHPX*zWsMzG;OFRvE
zQkpbT5=Bu6#kzMKS;&H$i3r3L4c-a$TPS6#Cs2%kC&g&U;fAKHLD8kv%j1yGIrz?|
zME~)Ii}L49NyR!Z{NQk1PIGTjBCg(=1TtV%UiKS^jga?s^~lq{QEdsRI06t-Rv_CN
z5a}q+!$}<GwR;?dCnX5A0CDz~=&*4l`ujrX+!TI4)G^laCugAMrsAFAcNrY%HhsFY
zu)j+<&0>NrSn{kvdw#&hpyG-^b4G&~kLG70Eqf}AAFoTDRf}MHDQq7M<T1oLN$23!
zOL?@8hqwtX?-oD5wn0gVSBJqK`Y68=6H3pFkct>Qv@`JKqq8Yw*m5&aT%67)>cU)s
QEL2PCSxLo@B~>c(KW{~IUH||9

delta 499
zcmY+Au};EZ6oqdQp%j5Oh8U&!1z}(?v9y%JVB%ni6DB53E{;wnuEwYhgNrdF2h*^L
zPXLpyK7o)pVhjw<8dnGZwxV>rIrp6VoqIWu+Rsw&NW_cCaK0hpMid1LrDhs~Xc(<{
z5!*3_Mox@rv`$$nQ4O}8MwTnRn2KIb`c-t&JfEwm62oz0>d{GeKEH%C4yAgA4_=TT
zr&E~>Z#JlklV}DbZvEK*x0)Cx-E;LtldOQVN+!DVc{CC#9^(vmg{jLR&3S4In<y+W
zMdQpaxqr~0k~8dZ78kR{WsV(?jlUA#Ts5c`P<@)M#EufAF~~wEv754}GP{rN+Y+*o
zA}UE0awV+Hrj<FEiE(5V^0JEiBy+BJL(>ZUExh=_oEzL9=e>~A6vN6y7AokE`~vSO
j=A7MzM6691wAUi`WTx=H%rKawHEsFImW2mf4qZ4u_?&NX

diff --git a/data/fonts/wqyMicroHei0.png b/data/fonts/wqyMicroHei0.png
index 0006d273fa385e12a1191894d4fad16e54b04b14..eb9c018ae0015f735eb3df0541a85773ea559ed4 100755
GIT binary patch
delta 33670
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
IM6N<$f`@ob;s5{u

delta 33679
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


From 52f77f7d4379e28eb6838ba5f3e8e509f988cbe8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 08:19:49 +1000
Subject: [PATCH 115/331] Fixed duplicated translator-credits strings.

---
 data/po/da_DK.po | 4 ----
 data/po/fi.po    | 6 +-----
 data/po/lv.po    | 4 ----
 data/po/mn_MN.po | 4 ----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/data/po/da_DK.po b/data/po/da_DK.po
index a7547003f..a9f883665 100644
--- a/data/po/da_DK.po
+++ b/data/po/da_DK.po
@@ -3364,10 +3364,6 @@ msgstr ""
 msgid "standard"
 msgstr ""
 
-#: src/states_screens/credits.cpp:209
-msgid "translator-credits"
-msgstr ""
-
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr "Launchpad Contributions:"
diff --git a/data/po/fi.po b/data/po/fi.po
index a90f5d2a4..0f6f22518 100644
--- a/data/po/fi.po
+++ b/data/po/fi.po
@@ -3367,8 +3367,4 @@ msgstr "vakio"
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Jiri Grönroos\n\nLaunchpad Contributions:\n  Dawid Gan https://launchpad.net/~deveee\n  Joonas Nurmi https://launchpad.net/~joonas-nurmi\n  Kristian Laakkonen https://launchpad.net/~kristian-laakkonen\n  STK-team https://launchpad.net/~stk"
-
-#: src/states_screens/credits.cpp:209
-msgid "translator-credits"
-msgstr "Launchpad Contributions:\nJiri Grönroos, 2015"
+msgstr "Launchpad Contributions:\nDawid Gan https://launchpad.net/~deveee\nJiri Grönroos, 2015\nJoonas Nurmi https://launchpad.net/~joonas-nurmi\nKristian Laakkonen https://launchpad.net/~kristian-laakkonen\nSTK-team https://launchpad.net/~stk"
diff --git a/data/po/lv.po b/data/po/lv.po
index 913ab519b..ae4422c16 100644
--- a/data/po/lv.po
+++ b/data/po/lv.po
@@ -3367,10 +3367,6 @@ msgstr ""
 msgid "standard"
 msgstr ""
 
-#: src/states_screens/credits.cpp:209
-msgid "translator-credits"
-msgstr ""
-
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr "Launchpad Contributions:"
diff --git a/data/po/mn_MN.po b/data/po/mn_MN.po
index 78622ed59..615eb3538 100644
--- a/data/po/mn_MN.po
+++ b/data/po/mn_MN.po
@@ -3364,10 +3364,6 @@ msgstr ""
 msgid "standard"
 msgstr ""
 
-#: src/states_screens/credits.cpp:209
-msgid "translator-credits"
-msgstr ""
-
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
 msgstr "Launchpad Contributions:"

From 543bb8d303e42a4c871bedd7e5fbbbdbe28ddf9f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 08:29:40 +1000
Subject: [PATCH 116/331] Updated donations.

---
 data/CREDITS | Bin 13948 -> 14124 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index 3e64361604a2ca72d0d8b79b2fa39e5e7ff589a7..b45b6cba23059580ead115bcf5309c4623f1e38e 100644
GIT binary patch
delta 148
zcmey9vnFptf$HQrIz08k4EYQ>3~w2V859_T7(O$kGo&&UG3Wq!UJQv0xj-IBCJe~V
zV@LtZ<pSA74B22c!3>o^-DN<LOrX31gA>rSJfImM6)6l{47xzEaG+QzLkU<f$c|Ko
WWT0-4DR~S!lbzL+H|MGH2?78$njgae

delta 12
TcmZ3J_a|pVf$C-jH6B3#D1rpu


From 513df96c53f884d3256e3cbc0a4d0d19a6d8eb6e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 09:24:12 +1000
Subject: [PATCH 117/331] Fixed font tool (by requesting an old opengl
 context), increased size and added some constants to change the size easier.

---
 tools/font_tool/main.cpp | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/tools/font_tool/main.cpp b/tools/font_tool/main.cpp
index 7315f74d0..1631ca90b 100644
--- a/tools/font_tool/main.cpp
+++ b/tools/font_tool/main.cpp
@@ -34,6 +34,9 @@ bool GLContextDebugBit = true;
 bool GLContextDebugBit = false;
 #endif
 
+const int WIDTH  = 1024;
+const int HEIGHT = 768;
+
 const s32 texturesizes[] = {128, 256, 512, 1024, 2048, 4096, 0};
 
 const wchar_t *fileformats[]		 =  { L"bmp", L"ppm", 0 };  // bitmap font formats
@@ -339,6 +342,7 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 {
 	gui::IGUIEnvironment *env = device->getGUIEnvironment();
 
+    //env->getSkin()->setSize((gui::EGUI_DEFAULT_SIZE, 24);
 	// change transparency of skin
 	for (s32 i=0; i<gui::EGDC_COUNT ; ++i)
 	{
@@ -347,10 +351,10 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 		env->getSkin()->setColor((gui::EGUI_DEFAULT_COLOR)i, col);
 	}
 
-	IGUIWindow *win = env->addWindow( core::rect<s32>(10,10,200,500), false, L"Font Creator");
+	IGUIWindow *win = env->addWindow( core::rect<s32>(10,HEIGHT/30,WIDTH/4,HEIGHT-100), false, L"Font Creator");
 	win->getCloseButton()->setVisible(false);
 
-	s32 xs=10,xp=xs, yp=30, h=20;
+	s32 xs=10,xp=xs, yp=HEIGHT/20, h=HEIGHT/30;
 
 	env->addStaticText(L"Charset", core::rect<s32>(xp,yp,50,yp+h),false,false, win);
 
@@ -489,23 +493,35 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 
 	// font image
 	gui::IGUIImage *img = env->addImage(0, core::position2d<s32>(0,0), true,0, MYGUI_IMAGE);
-	img->setRelativePosition(core::rect<s32>(0,20,800,600));
+	img->setRelativePosition(core::rect<s32>(0,HEIGHT/30,WIDTH,HEIGHT));
 
 	// font scrollbar
-	IGUIScrollBar *scrl= env->addScrollBar(true,core::rect<s32>(0,0,800,20),0, MYGUI_CURRENTIMAGE);
+	IGUIScrollBar *scrl= env->addScrollBar(true,core::rect<s32>(0,0,WIDTH,HEIGHT/30),0, MYGUI_CURRENTIMAGE);
 	scrl->setMax(0);
 	scrl->setSmallStep(1);
 
 	yp += h*3;
 
 	env->getRootGUIElement()->bringToFront(win);
-	win->setRelativePosition( core::rect<s32>(10,10,200,yp));
+	win->setRelativePosition( core::rect<s32>(0,HEIGHT/30,200,yp));
 }
 
 int main(int argc,char **argv)
 {
-	IrrlichtDevice* device =createDevice(video::EDT_OPENGL, core::dimension2du(800, 600));
-	video::IVideoDriver* driver = device->getVideoDriver();
+    SIrrlichtCreationParameters p;
+    p.DriverType        = video::EDT_OPENGL;
+    p.WindowSize        = core::dimension2du(WIDTH, HEIGHT);
+    p.Bits              = 16;
+    p.Fullscreen        = false;
+    p.Stencilbuffer     = false;
+    p.Vsync             = false;
+    p.EventReceiver     = NULL;
+    p.FileSystem        = NULL;
+    p.ForceLegacyDevice = true;
+
+    IrrlichtDevice *device = createDeviceEx(p);
+
+    video::IVideoDriver* driver = device->getVideoDriver();
 	scene::ISceneManager* smgr = device->getSceneManager();
 	gui::IGUIEnvironment *env = device->getGUIEnvironment();
 

From 50ff2e6e358ece90c82fea97b9a0087d410de486 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 09:40:28 +1000
Subject: [PATCH 118/331] Fixed donations, udpated samuncle's credits.

---
 data/CREDITS | Bin 14124 -> 14180 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index b45b6cba23059580ead115bcf5309c4623f1e38e..cfbbc96510cf7814c2f946609be336edf09aae8c 100644
GIT binary patch
delta 272
zcmZ3J_atva2eYUnLlHv>g91Z2Lq3p|&0xjA#h^QRKC`d54p7veA%`IaNc%EmGUPF&
zg5^Fl+cN4*wq}u5k6;L5FlDf0Fa(JMRe@kIP+dOIGzEqLp!!6hi8_-TSq$rgf$Sn6
zhNui-$N;kQfU?Cvl_fwO3Jkdnl|V8LD4q+nEeFg4sR7xa3RG7BB$I(Mi9k7sEJ8;K
z(7aTj`4H2+z&7Ur^*IAoCNh*Vq=*59Aly`-@u@&#p93w;+x(j4yu#*ts(yk17x6Ww

delta 181
zcmaEow<d2x2eWtxLlHwFLo!1)LotH_gB1f8gD#L(m^_!+cd~&X8>7NxMiyIcs3=&*
zo<(|c9*dZ01Va#mDT5`0AxsZgwvolq(w`xRAqB|GWyoa6V@QR{djst$Vkkki2c!oG
jgTZo%o84K@D@<<D6A*M_$Omdo2Mecw4A?BJ7AOb+-Wwo4


From 55079289da322a58232cb23f815701372fdb8a51 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 09:48:45 +1000
Subject: [PATCH 119/331] List all GSoC students.

---
 data/CREDITS | Bin 14180 -> 14122 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index cfbbc96510cf7814c2f946609be336edf09aae8c..60b065e4d4c572f2cb681bc5aa77662bc6528742 100644
GIT binary patch
delta 162
zcmaEow<>SLJPzp~hJ1!3hD?S$1_cH`Ae{{4=Kx_UL&@an9IBIlaVRizG3ZX-%ONce
zq=BlO7!nzZ7)pRFXP{c3>dEst6@4Lc!9clWh76!NB|uVvAsA>*9uSuSMT&rOC14&z
dts_G=LorZQB10uuCCClwKt53I=G&Z|x&XP$BJuzL

delta 202
zcmXAjF$%&k7=>TA<O~6gxZ250a1dPFy+CZ#2HRB9Lg^8lvkR_Hf*0@}t{%h}<>x1P
zyzjl_?mzx<74aoT*(_#KjTg{Z!EzdSv{XIz*zr8W;27Uxx=hT5u0zK)sHj_%yjik=
z%AqD-QPo^e&iq(*MkQ6A8rGx^oRs)88YgmrWO}W{z*dJM&gDd<#Fm~xK}s`W>2>^N
Jc;4hC{{oF^D#QQ)


From 63406b40f1a2c9d315ba527a233536c633a0242f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 17 Apr 2015 16:13:57 +1000
Subject: [PATCH 120/331] Fixed line ending style.

---
 tools/font_tool/main.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/font_tool/main.cpp b/tools/font_tool/main.cpp
index 1631ca90b..01b75c7c9 100644
--- a/tools/font_tool/main.cpp
+++ b/tools/font_tool/main.cpp
@@ -508,18 +508,18 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 
 int main(int argc,char **argv)
 {
-    SIrrlichtCreationParameters p;
-    p.DriverType        = video::EDT_OPENGL;
-    p.WindowSize        = core::dimension2du(WIDTH, HEIGHT);
-    p.Bits              = 16;
-    p.Fullscreen        = false;
-    p.Stencilbuffer     = false;
-    p.Vsync             = false;
-    p.EventReceiver     = NULL;
-    p.FileSystem        = NULL;
-    p.ForceLegacyDevice = true;
-
-    IrrlichtDevice *device = createDeviceEx(p);
+    SIrrlichtCreationParameters p;
+    p.DriverType        = video::EDT_OPENGL;
+    p.WindowSize        = core::dimension2du(WIDTH, HEIGHT);
+    p.Bits              = 16;
+    p.Fullscreen        = false;
+    p.Stencilbuffer     = false;
+    p.Vsync             = false;
+    p.EventReceiver     = NULL;
+    p.FileSystem        = NULL;
+    p.ForceLegacyDevice = true;
+
+    IrrlichtDevice *device = createDeviceEx(p);
 
     video::IVideoDriver* driver = device->getVideoDriver();
 	scene::ISceneManager* smgr = device->getSceneManager();

From b6a10b7603791e1f0e002c8e9ad3aa148ea2fb65 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 20 Apr 2015 17:34:51 +1000
Subject: [PATCH 121/331] Use stk font to display menu - which is at least a
 readable size ;) Hacked the GUI to be a bit easier to scale, but it's still
 hacky. Changed default to be what is typically used in stk.

---
 tools/font_tool/main.cpp | 84 +++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/tools/font_tool/main.cpp b/tools/font_tool/main.cpp
index 01b75c7c9..a5229e59f 100644
--- a/tools/font_tool/main.cpp
+++ b/tools/font_tool/main.cpp
@@ -340,7 +340,13 @@ public:
 
 void createGUI(IrrlichtDevice* device, CFontTool* fc)
 {
+    // Scaling factor to allow a larger font to be used
+    float scale = 2.0f;
+    io::path previous_cwd = device->getFileSystem()->getWorkingDirectory();
+
 	gui::IGUIEnvironment *env = device->getGUIEnvironment();
+    gui::IGUIFont *font = env->getFont(io::path("../../../data/fonts/StkFont.xml"));
+    device->getGUIEnvironment()->getSkin()->setFont(font);
 
     //env->getSkin()->setSize((gui::EGUI_DEFAULT_SIZE, 24);
 	// change transparency of skin
@@ -351,29 +357,29 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 		env->getSkin()->setColor((gui::EGUI_DEFAULT_COLOR)i, col);
 	}
 
-	IGUIWindow *win = env->addWindow( core::rect<s32>(10,HEIGHT/30,WIDTH/4,HEIGHT-100), false, L"Font Creator");
+	IGUIWindow *win = env->addWindow( core::rect<s32>(10,HEIGHT/30,int(scale*WIDTH)/4,HEIGHT-100), false, L"Font Creator");
 	win->getCloseButton()->setVisible(false);
 
-	s32 xs=10,xp=xs, yp=HEIGHT/20, h=HEIGHT/30;
+	s32 xs=10,xp=xs, yp=HEIGHT/20, h=HEIGHT/20;
 
-	env->addStaticText(L"Charset", core::rect<s32>(xp,yp,50,yp+h),false,false, win);
+	env->addStaticText(L"Charset", core::rect<s32>(int(scale*xp),yp,int(scale*90),yp+h),false,false, win);
 
 	xp+=60;
 
 	// charset combo
-	gui::IGUIComboBox* cbo = env->addComboBox( core::rect<s32>(xp,yp,180,yp+h),win, MYGUI_CHARSET);
+	gui::IGUIComboBox* cbo = env->addComboBox( core::rect<s32>(int(scale*xp),yp,int(scale*180),yp+h),win, MYGUI_CHARSET);
 	for (u32 i=0; i < fc->CharSets.size(); ++i)
 		cbo->addItem(fc->CharSets[i].c_str());
 
 	yp += (s32)(h*1.5f);
 	xp = xs;
 
-	env->addStaticText(L"Font", core::rect<s32>(xp,yp,50,yp+h),false,false, win);
+	env->addStaticText(L"Font", core::rect<s32>(int(scale*xp),yp,int(scale*50),yp+h),false,false, win);
 
 	xp+=60;
 
 	// font name combo
-	cbo = env->addComboBox( core::rect<s32>(xp,yp,180,yp+h),win, MYGUI_FONTNAME);
+	cbo = env->addComboBox( core::rect<s32>(int(scale*xp),yp,int(scale*180),yp+h),win, MYGUI_FONTNAME);
 	for (u32 i=0; i < fc->FontNames.size(); ++i){
 		cbo->addItem(fc->FontNames[i].c_str());
 		if(fc->FontNames[i] == L"\u6587\u6CC9\u9A7F\u5FAE\u7C73\u9ED1") cbo->setSelected(i); //auto select wqy-microhei
@@ -382,7 +388,7 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 	yp += (s32)(h*1.5f);
 	xp = xs;
 
-	env->addStaticText(L"Size", core::rect<s32>(xp,yp,50,yp+h),false,false, win);
+	env->addStaticText(L"Size", core::rect<s32>(int(scale*xp),yp,int(scale*(50+xp)),yp+h),false,false, win);
 
 	xp += 60;
 
@@ -392,40 +398,40 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 	for (s32 i=0; fc->FontSizes[i] != 0; ++i)
 		cbo->addItem( ((core::stringw(fc->FontSizes[i])) + L"pt").c_str()); */
 
-	env->addEditBox(L"4",core::rect<s32>(xp,yp,xp+70,yp+h), true, win, MYGUI_SIZE);
-	xp += 80;
+	env->addEditBox(L"24",core::rect<s32>(int(scale*xp),yp,int(scale*(xp+70)),yp+h), true, win, MYGUI_SIZE);
+	xp += int(scale*80);
 	env->addStaticText(L"pt", core::rect<s32>(xp,yp,xp+50,yp+h),false,false,win);
 
 	xp = xs;
 	yp += (s32)(h*1.5f);
 
 	// bold checkbox
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_BOLD, L"Bold");
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+50)),yp+h),win, MYGUI_BOLD, L"Bold");
 
-	xp += 45;
+	xp += int(45*scale);
 
 	// italic checkbox
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_ITALIC, L"Italic");
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+50)),yp+h),win, MYGUI_ITALIC, L"Italic");
 
-	xp += 45;
+	xp += int(55*scale);
 
 	// AA checkbox
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_ANTIALIAS, L"AA");
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+50)),yp+h),win, MYGUI_ANTIALIAS, L"AA");
 
-	xp +=40;
+    xp += int(scale * 40);
 
 	// Alpha checkbox
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_ALPHA, L"Alpha");
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+50)),yp+h),win, MYGUI_ALPHA, L"Alpha");
 
 	xp = xs;
 	yp += (s32)(h*1.5f);
 
 	//new
 
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+150,yp+h),win, 201, L"Export used characters only")->setChecked(false);
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+200)),yp+h),win, 201, L"Only used characters")->setChecked(false);
 	yp += (s32)(h*1.5f);
 
-	env->addCheckBox(false, core::rect<s32>(xp,yp,xp+150,yp+h),win, 202, L"Exclude basic latin characters");
+	env->addCheckBox(false, core::rect<s32>(xp,yp,int(scale*(xp+200)),yp+h),win, 202, L"Exclude basic latin");
 	yp += (s32)(h*1.5f);
 
 	/*
@@ -435,61 +441,61 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 	yp += (s32)(h*1.5f);
 	*/
 
-	env->addStaticText(L"Max Width:", core::rect<s32>(xp,yp,50,yp+h),false,false, win);
+	env->addStaticText(L"Max Width:", core::rect<s32>(xp,yp,int(scale*100),yp+h),false,false, win);
 
-	xp += 60;
+	xp += int(scale*90);
 
 	// texture widths
-	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+70,yp+h),win, MYGUI_TEXWIDTH);
+	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+int(scale*80),yp+h),win, MYGUI_TEXWIDTH);
 	for (s32 i=0; texturesizes[i] != 0; ++i)
 		cbo->addItem( ((core::stringw(texturesizes[i])) + L" wide").c_str());
-
+    cbo->setSelected(2);   // 128, 256, 512 --> make 512 the default
 	xp=xs;
 	yp += (s32)(h*1.5f);
 
-	env->addStaticText(L"Max Height:", core::rect<s32>(xp,yp,60,yp+h),false,false, win);
+	env->addStaticText(L"Max Height:", core::rect<s32>(xp,yp,int(scale*100),yp+h),false,false, win);
 
-	xp += 60;
+	xp += int(scale*90);
 
 	// texture height
-	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+70,yp+h),win, MYGUI_TEXHEIGHT);
+	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+int(scale*80),yp+h),win, MYGUI_TEXHEIGHT);
 	for (s32 i=0; texturesizes[i] != 0; ++i)
 		cbo->addItem( ((core::stringw(texturesizes[i])) + L" tall").c_str());
-
+    cbo->setSelected(2);   // 512 as default
 	// file name
 	xp = xs;
 	yp += (s32)(h*1.5f);
-	env->addStaticText(L"Filename", core::rect<s32>(xp,yp,60,yp+h),false,false, win);
-	xp += 60;
-	env->addEditBox(L"myfont",core::rect<s32>(xp,yp,xp+70,yp+h), true, win, MYGUI_FILENAME);
+	env->addStaticText(L"Filename", core::rect<s32>(xp,yp,int(scale*100),yp+h),false,false, win);
+	xp += int(scale*90);
+	env->addEditBox(L"wqyMicroHei",core::rect<s32>(xp,yp,xp+int(scale*80),yp+h), true, win, MYGUI_FILENAME);
 
 	// file format
 	xp = xs;
 	yp += (s32)(h*1.5f);
-	env->addStaticText(L"File Format", core::rect<s32>(xp,yp,60,yp+h),false,false, win);
-	xp += 60;
+	env->addStaticText(L"File Format", core::rect<s32>(xp,yp,int(scale*100),yp+h),false,false, win);
+	xp += int(scale*90);
 
-	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+70,yp+h),win, MYGUI_FORMAT);
+	cbo = env->addComboBox( core::rect<s32>(xp,yp,xp+int(scale*80),yp+h),win, MYGUI_FORMAT);
 	for (s32 i=0; fileformats[i] != 0; ++i)
 		cbo->addItem( core::stringw(fileformats[i]).c_str());
 	for (s32 i=0; alphafileformats[i] != 0; ++i)
 		cbo->addItem( core::stringw(alphafileformats[i]).c_str());
-
+    cbo->setSelected(2);   // bmp, ppm, png, ... --> select pn
 	xp = xs;
 	yp += h*2;
 
 	// create button
-	env->addButton( core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_CREATE, L"Create");
+	env->addButton( core::rect<s32>(xp,yp,int(scale*(xp+50)),yp+h),win, MYGUI_CREATE, L"Create");
 
-	xp += 60;
+	xp += int(scale*60);
 
 	// save button
-	env->addButton( core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_SAVE, L"Save");
+	env->addButton( core::rect<s32>(xp,yp,xp+int(scale*50),yp+h),win, MYGUI_SAVE, L"Save");
 
-	xp += 60;
+	xp += int(scale*60);
 
 	// help button
-	env->addButton( core::rect<s32>(xp,yp,xp+50,yp+h),win, MYGUI_HELPBUTTON, L"Help");
+	env->addButton( core::rect<s32>(xp,yp,xp+int(scale*50),yp+h),win, MYGUI_HELPBUTTON, L"Help");
 
 	// font image
 	gui::IGUIImage *img = env->addImage(0, core::position2d<s32>(0,0), true,0, MYGUI_IMAGE);
@@ -503,7 +509,7 @@ void createGUI(IrrlichtDevice* device, CFontTool* fc)
 	yp += h*3;
 
 	env->getRootGUIElement()->bringToFront(win);
-	win->setRelativePosition( core::rect<s32>(0,HEIGHT/30,200,yp));
+	win->setRelativePosition( core::rect<s32>(0,HEIGHT/30,int(scale*200),yp));
 }
 
 int main(int argc,char **argv)

From 262fc0c373c292b5803942e5307eafe7645bad10 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 23 Apr 2015 16:44:26 +1000
Subject: [PATCH 122/331] Started refactoring of shaders to follow our coding
 style. One transform feedback buffer shader in particles is done.

---
 sources.cmake                 |   2 +-
 src/graphics/gpuparticles.cpp | 117 +++++++++++++++--
 src/graphics/gpuparticles.hpp |  36 +++++-
 src/graphics/shader.cpp       | 200 +++++++++++++++++++++++++++++
 src/graphics/shader.hpp       | 228 ++++++++++++++++++++++++++++++++++
 src/graphics/shaders.cpp      |  50 --------
 src/graphics/shaders.hpp      |  31 -----
 src/io/file_manager.hpp       |   9 ++
 8 files changed, 578 insertions(+), 95 deletions(-)
 create mode 100644 src/graphics/shader.cpp
 create mode 100644 src/graphics/shader.hpp

diff --git a/sources.cmake b/sources.cmake
index f484b15d5..dfc0e3774 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically. 
+# This will then trigger a new cmake run automatically.  
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 3e9c39b7b..8fd6783a1 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -17,6 +17,7 @@
 
 #include "graphics/irr_driver.hpp"
 #include "graphics/glwrap.hpp"
+#include "graphics/shaders_util.hpp"
 #include "gpuparticles.hpp"
 #include "io/file_manager.hpp"
 #include "config/user_config.hpp"
@@ -386,15 +387,15 @@ void ParticleSystemProxy::simulate()
     glEnable(GL_RASTERIZER_DISCARD);
     if (has_height_map)
     {
-        glUseProgram(ParticleShader::HeightmapSimulationShader::getInstance()->Program);
-        glActiveTexture(GL_TEXTURE0 + ParticleShader::HeightmapSimulationShader::getInstance()->TU_heightmap);
+        glUseProgram(HeightmapSimulationShader::getInstance()->Program);
+        glActiveTexture(GL_TEXTURE0 + HeightmapSimulationShader::getInstance()->TU_heightmap);
         glBindTexture(GL_TEXTURE_BUFFER, heightmaptexture);
-        ParticleShader::HeightmapSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor, track_x, track_x_len, track_z, track_z_len);
+        HeightmapSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor, track_x, track_x_len, track_z, track_z_len);
     }
     else
     {
-        glUseProgram(ParticleShader::SimpleSimulationShader::getInstance()->Program);
-        ParticleShader::SimpleSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor);
+        PointEmitterShader::getInstance()->use();
+        PointEmitterShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor);
     }
 
     glBindVertexArray(current_simulation_vao);
@@ -432,10 +433,10 @@ void ParticleSystemProxy::simulate()
 void ParticleSystemProxy::drawFlip()
 {
     glBlendFunc(GL_ONE, GL_ONE);
-    glUseProgram(ParticleShader::FlipParticleRender::getInstance()->Program);
+    glUseProgram(FlipParticleRender::getInstance()->Program);
 
-    ParticleShader::FlipParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
-    ParticleShader::FlipParticleRender::getInstance()->setUniforms();
+    FlipParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
+    FlipParticleRender::getInstance()->setUniforms();
 
     glBindVertexArray(current_rendering_vao);
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, m_count);
@@ -447,13 +448,13 @@ void ParticleSystemProxy::drawNotFlip()
         glBlendFunc(GL_ONE, GL_ONE);
     else
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    glUseProgram(ParticleShader::SimpleParticleRender::getInstance()->Program);
+    glUseProgram(SimpleParticleRender::getInstance()->Program);
 
-    ParticleShader::SimpleParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
+    SimpleParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
     video::SColorf ColorFrom = video::SColorf(getColorFrom()[0], getColorFrom()[1], getColorFrom()[2]);
     video::SColorf ColorTo = video::SColorf(getColorTo()[0], getColorTo()[1], getColorTo()[2]);
 
-    ParticleShader::SimpleParticleRender::getInstance()->setUniforms(ColorFrom, ColorTo);
+    SimpleParticleRender::getInstance()->setUniforms(ColorFrom, ColorTo);
 
     glBindVertexArray(current_rendering_vao);
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, m_count);
@@ -534,3 +535,97 @@ void ParticleSystemProxy::render() {
     simulate();
     draw();
 }
+
+
+// ============================================================================
+
+PointEmitterShader::PointEmitterShader()
+{
+    const char *varyings[] = {
+        "new_particle_position",
+        "new_lifetime",
+        "new_particle_velocity",
+        "new_size",
+    };
+    loadTFBProgram("pointemitter.vert", varyings, 4);
+    assignUniforms("sourcematrix", "dt", "level", "size_increase_factor");
+}
+
+
+struct TexUnit
+{
+    GLuint m_index;
+    const char* m_uniform;
+
+    TexUnit(GLuint index, const char* uniform)
+    {
+        m_index = index;
+        m_uniform = uniform;
+    }
+};
+static void
+AssignTextureUnit(GLuint Program, TexUnit texUnit)
+{
+    glUseProgram(Program);
+    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
+    glUniform1i(uniform, texUnit.m_index);
+    glUseProgram(0);
+}
+
+template<typename... T>
+static void AssignTextureUnit(GLuint Program, TexUnit texUnit, T... rest)
+{
+    glUseProgram(Program);
+    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
+    glUniform1i(uniform, texUnit.m_index);
+    AssignTextureUnit_Sub(Program, rest...);
+    glUseProgram(0);
+}
+
+static void AssignTextureUnit_Sub(GLuint Program) {}
+
+template<typename... T>
+static void AssignTextureUnit_Sub(GLuint Program, TexUnit texUnit, T... rest)
+{
+    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
+    glUniform1i(uniform, texUnit.m_index);
+    AssignTextureUnit_Sub(Program, rest...);
+}
+
+
+
+HeightmapSimulationShader::HeightmapSimulationShader()
+{
+    const char *varyings[] = {
+        "new_particle_position",
+        "new_lifetime",
+        "new_particle_velocity",
+        "new_size",
+    };
+    Program = LoadTFBProgram(file_manager->getAsset("shaders/particlesimheightmap.vert").c_str(), varyings, 4);
+    TU_heightmap = 2;
+    AssignTextureUnit(Program, TexUnit(TU_heightmap, "heightmap"));
+    AssignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
+}
+
+SimpleParticleRender::SimpleParticleRender()
+{
+    Program = LoadProgram(PARTICLES_RENDERING,
+        GL_VERTEX_SHADER, file_manager->getAsset("shaders/particle.vert").c_str(),
+        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
+        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
+    AssignUniforms("color_from", "color_to");
+
+    AssignSamplerNames(Program, 0, "tex", 1, "dtex");
+}
+
+FlipParticleRender::FlipParticleRender()
+{
+    Program = LoadProgram(PARTICLES_RENDERING,
+        GL_VERTEX_SHADER, file_manager->getAsset("shaders/flipparticle.vert").c_str(),
+        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
+        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
+    AssignUniforms();
+
+    AssignSamplerNames(Program, 0, "tex", 1, "dtex");
+}
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index 6127d304d..80f5dc42d 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -15,13 +15,45 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef GPUPARTICLES_H
-#define GPUPARTICLES_H
+#ifndef HEADER_GPU_PARTICLES_HPP
+#define HEADER_GPU_PARTICLES_HPP
 
+#include "graphics/shader.hpp"
 #include "../lib/irrlicht/source/Irrlicht/CParticleSystemSceneNode.h"
 #include <ISceneManager.h>
 #include <IParticleSystemSceneNode.h>
 
+
+class PointEmitterShader : public Shader 
+                           < PointEmitterShader, core::matrix4, int, int, float >
+{
+public:
+    PointEmitterShader();
+};
+
+
+
+    class HeightmapSimulationShader : public ShaderHelperSingleton<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
+    {
+    public:
+        GLuint TU_heightmap;
+
+        HeightmapSimulationShader();
+    };
+
+    class SimpleParticleRender : public ShaderHelperSingleton<SimpleParticleRender, video::SColorf, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
+    {
+    public:
+        SimpleParticleRender();
+    };
+
+    class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
+    {
+    public:
+        FlipParticleRender();
+    };
+
+
 namespace irr { namespace video{ class ITexture; } }
 
 class ParticleSystemProxy : public scene::CParticleSystemSceneNode
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
new file mode 100644
index 000000000..d0260b02f
--- /dev/null
+++ b/src/graphics/shader.cpp
@@ -0,0 +1,200 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//            (C) 2015      Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/shader.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/gl_headers.hpp"
+#include "io/file_manager.hpp"
+#include "utils/log.hpp"
+
+#include <fstream>
+#include <sstream>
+#include <stdio.h>
+
+std::string                ShaderBase::m_shader_header = "";
+std::vector<ShaderBase *>  ShaderBase::m_all_shaders;
+
+// ----------------------------------------------------------------------------
+/** Returns a string with the content of header.txt (which contains basic
+ *  shader defines).
+ */
+const std::string& ShaderBase::getHeader()
+{
+    // Only read file first time
+    if (m_shader_header.empty())
+    {
+        std::ifstream stream(file_manager->getShader("header.txt"), std::ios::in);
+        if (stream.is_open())
+        {
+            std::string line = "";
+            while (getline(stream, line))
+                m_shader_header += "\n" + line;
+            stream.close();
+        }
+    }   // if m_shader_header.empty()
+
+    return m_shader_header;
+}   // getHeader
+
+// ----------------------------------------------------------------------------
+/** Loads a single shader.
+ *  \param file Filename of the shader to load.
+ *  \param type Type of the shader.
+ */
+GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
+{
+    GLuint id = glCreateShader(type);
+    
+    std::ostringstream code;
+    code << "#version " << CVS->getGLSLVersion()<<"\n";
+    if (CVS->isAMDVertexShaderLayerUsable())
+        code << "#extension GL_AMD_vertex_shader_layer : enable\n";
+    if (CVS->isAZDOEnabled())
+    {
+        code << "#extension GL_ARB_bindless_texture : enable\n";
+        code << "#define Use_Bindless_Texture\n";
+    }
+    code << "//" + std::string(file) + "\n";
+    if (!CVS->isARBUniformBufferObjectUsable())
+        code << "#define UBO_DISABLED\n";
+    if (CVS->isAMDVertexShaderLayerUsable())
+        code << "#define VSLayer\n";
+    if (CVS->needsRGBBindlessWorkaround())
+        code << "#define SRGBBindlessFix\n";
+    code << getHeader();
+
+    std::ifstream stream(file, std::ios::in);
+    if (stream.is_open())
+    {
+        std::string Line = "";
+        while (getline(stream, Line))
+            code << "\n" + Line;
+        stream.close();
+    }
+    else
+        Log::error("shader", "Can not open '%s'.", file.c_str());
+
+    Log::info("shader", "Compiling shader : %s", file);
+    const std::string &source  = code.str();
+    char const *source_pointer = source.c_str();
+    int len                    = source.size();
+    glShaderSource(id, 1, &source_pointer, &len);
+    glCompileShader(id);
+
+    GLint result = GL_FALSE;
+    glGetShaderiv(id, GL_COMPILE_STATUS, &result);
+    if (result == GL_FALSE)
+    {
+        int info_length;
+        Log::error("GLWrap", "Error in shader %s", file);
+        glGetShaderiv(id, GL_INFO_LOG_LENGTH, &info_length);
+        if (info_length<0)
+            info_length = 1024;
+        char *error_message = new char[info_length];
+        error_message[0] = 0;
+        glGetShaderInfoLog(id, info_length, NULL, error_message);
+        Log::error("GLWrap", error_message);
+        delete[] error_message;
+    }
+
+    glGetError();
+
+    return id;
+}   // loadShader
+
+// ----------------------------------------------------------------------------
+/** Loads a transform feedback buffer shader with a given number of varying
+ *  parameters.
+*/
+int ShaderBase::loadTFBProgram(const std::string &shader_name, 
+                               const char **varyings,
+                               unsigned varying_count)
+{
+    std::string full_path = file_manager->getShader(shader_name);
+    m_program = glCreateProgram();
+    loadAndAttachShader(GL_VERTEX_SHADER, full_path);
+    if (CVS->getGLSLVersion() < 330)
+        setAttribute(PARTICLES_SIM);
+
+    glTransformFeedbackVaryings(m_program, varying_count, varyings,
+                               GL_INTERLEAVED_ATTRIBS);
+    glLinkProgram(m_program);
+
+    GLint result = GL_FALSE;
+    glGetProgramiv(m_program, GL_LINK_STATUS, &result);
+    if (result == GL_FALSE)
+    {
+        int info_log_length;
+        glGetProgramiv(m_program, GL_INFO_LOG_LENGTH, &info_log_length);
+        char *error_message = new char[info_log_length];
+        glGetProgramInfoLog(m_program, info_log_length, NULL, error_message);
+        Log::error("GLWrap", error_message);
+        delete[] error_message;
+    }
+
+    glGetError();
+
+    return m_program;
+}   // loadTFBProgram
+
+// ----------------------------------------------------------------------------
+ShaderBase::ShaderBase()
+{
+    m_all_shaders.push_back(this);
+}   // ShaderBase
+
+// ----------------------------------------------------------------------------
+
+void ShaderBase::setAttribute(AttributeType type)
+{
+    switch (type)
+    {
+    case OBJECT:
+        glBindAttribLocation(m_program, 0, "Position");
+        glBindAttribLocation(m_program, 1, "Normal");
+        glBindAttribLocation(m_program, 2, "Color");
+        glBindAttribLocation(m_program, 3, "Texcoord");
+        glBindAttribLocation(m_program, 4, "SecondTexcoord");
+        glBindAttribLocation(m_program, 5, "Tangent");
+        glBindAttribLocation(m_program, 6, "Bitangent");
+        glBindAttribLocation(m_program, 7, "Origin");
+        glBindAttribLocation(m_program, 8, "Orientation");
+        glBindAttribLocation(m_program, 9, "Scale");
+        break;
+    case PARTICLES_SIM:
+        glBindAttribLocation(m_program, 0, "particle_position");
+        glBindAttribLocation(m_program, 1, "lifetime");
+        glBindAttribLocation(m_program, 2, "particle_velocity");
+        glBindAttribLocation(m_program, 3, "size");
+        glBindAttribLocation(m_program, 4, "particle_position_initial");
+        glBindAttribLocation(m_program, 5, "lifetime_initial");
+        glBindAttribLocation(m_program, 6, "particle_velocity_initial");
+        glBindAttribLocation(m_program, 7, "size_initial");
+        break;
+    case PARTICLES_RENDERING:
+        glBindAttribLocation(m_program, 1, "lifetime");
+        glBindAttribLocation(m_program, 2, "size");
+        glBindAttribLocation(m_program, 4, "quadcorner");
+        glBindAttribLocation(m_program, 5, "rotationvec");
+        glBindAttribLocation(m_program, 6, "anglespeed");
+        break;
+    }
+}   // setAttribute
+
+// ============================================================================
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
new file mode 100644
index 000000000..fd38a9cb9
--- /dev/null
+++ b/src/graphics/shader.hpp
@@ -0,0 +1,228 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SHADER_HPP
+#define HEADER_SHADER_HPP
+
+#include "graphics/gl_headers.hpp"
+#include "utils/singleton.hpp"
+
+#include <matrix4.h>
+#include <SColor.h>
+#include <vector3d.h>
+
+#include <string>
+#include <vector>
+
+class ShaderBase
+{
+private:
+    // Static members
+    /** Stores the context of header.txt, to avoid reading
+    *  this file repeatedly. */
+    static std::string m_shader_header;
+
+    /** Maintains a list of all shaders. */
+    static std::vector<ShaderBase *> m_all_shaders;
+
+    enum AttributeType
+    {
+        OBJECT,
+        PARTICLES_SIM,
+        PARTICLES_RENDERING,
+    };
+
+protected:
+    /** OpenGL's program id. */
+    GLuint m_program;
+
+private:
+    // ------------------------------------------------------------------------
+    // Ends vararg template
+    template<typename ... Types>
+    void loadAndAttachShader(GLint ProgramID)
+    {
+        return;
+    }   // loadAndAttachShader
+    // ------------------------------------------------------------------------
+    template<typename ... Types>
+    void loadAndAttachShader(GLint shader_type, const std::string &name,
+                             Types ... args)
+    {
+        GLint shader_id = loadShader(name, shader_type);
+        glAttachShader(m_program, shader_id);
+        glDeleteShader(shader_id);
+        loadAndAttachShader(shader_type, args...);
+    }   // loadAndAttachShader
+
+    const std::string& getHeader();
+
+    GLuint loadShader(const std::string &file, unsigned type);
+    void setAttribute(AttributeType type);
+
+public:
+        ShaderBase();
+    int loadTFBProgram(const std::string &vertex_file_path,
+                       const char **varyings,
+                       unsigned varyingscount);
+
+    // ------------------------------------------------------------------------
+    /** Activates the shader calling glUseProgram. */
+    void use() { glUseProgram(m_program); }
+};   // ShaderBase
+
+// ============================================================================
+template<typename T, typename... Args>
+class Shader : public ShaderBase, public Singleton<T>
+{
+private:
+    std::vector<GLuint> m_uniforms;
+
+    /** Finds the specified uniform block and assigns a binding point to it. */
+    void bindPoint(const char *name, int index)
+    {
+        GLuint block_index = glGetUniformBlockIndex(m_program, name);
+        if (block_index != GL_INVALID_INDEX)
+            glUniformBlockBinding(m_program, block_index, index);
+    }   // bindPoint
+    // ------------------------------------------------------------------------
+    /** End of recursive implementation of assignUniforms. */
+    void assignUniformsImpl()
+    {
+        bindPoint("MatrixData",   0);
+        bindPoint("LightingData", 1);
+    }   // assignUniformsImpl
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation of assignniforms. It collects the unfirom
+     *  locations in m_uniform, then recursing.
+     *  \param name Name of the uniform.
+     */
+    template<typename... U>
+    void assignUniformsImpl(const char* name, U... rest)
+    {
+        m_uniforms.push_back(glGetUniformLocation(m_program, name));
+        assignUniformsImpl(rest...);
+    }   // assignUniformsImpl
+
+    // ------------------------------------------------------------------------
+    /** End of recursion for setUniforms implementation.
+     */
+    template<unsigned N = 0>
+    void setUniformsImpl() const
+    {
+    }   // setUniformImpl
+    // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a matrix uniform. */
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::core::matrix4 &mat, Args... arg) const
+    {
+        glUniformMatrix4fv(m_uniforms[N], 1, GL_FALSE, mat.pointer());
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::video::SColorf &col, Args... arg) const
+    {
+        glUniform3f(m_uniforms[N], col.r, col.g, col.b);
+        setUniformsImpl<N + 1>(arg...);
+    }  // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::video::SColor &col, Args... arg) const
+    {
+        glUniform4i(m_uniforms[N], col.getRed(), c ol.getGreen(),
+                                   col.getBlue(), col.getAlpha());
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::core::vector3df &v, Args... arg) const
+    {
+        glUniform3f(m_uniforms[N], v.X, v.Y, v.Z);
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::core::vector2df &v, Args... arg) const
+    {
+        glUniform2f(m_uniforms[N], v.X, v.Y);
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const irr::core::dimension2df &v, Args... arg) const
+    {
+        glUniform2f(m_uniforms[N], v.Width, v.Height);
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(float f, Args... arg) const
+    {
+        glUniform1f(m_uniforms[N], f);
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(int f, Args... arg) const
+    {
+        glUniform1i(m_uniforms[N], f);
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+    // ------------------------------------------------------------------------
+    template<unsigned N = 0, typename... Args>
+    void setUniformsImpl(const std::vector<float> &v, Args... arg) const
+    {
+        glUniform1fv(m_uniforms[N], (int)v.size(), v.data());
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
+public:
+    // ------------------------------------------------------------------------
+    /** This variadic template collects all names of uniforms in
+     *  a std::vector. */
+    template<typename... U>
+    void assignUniforms(U... rest)
+    {
+        static_assert(sizeof...(rest) == sizeof...(Args),
+                      "Count of Uniform's name mismatch");
+        assignUniformsImpl(rest...);
+    }   // assignUniforms
+
+    // ------------------------------------------------------------------------
+    void setUniforms(const Args & ... args) const
+    {
+        if (needsUBO())
+            bypassUBO(m_program);
+        setUniformsImpl(args...);
+    }
+
+
+};   // Shader
+
+// ============================================================================
+#endif
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 22da14162..6b976aff2 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1491,56 +1491,6 @@ namespace LightShader
 }
 
 
-namespace ParticleShader
-{
-    SimpleSimulationShader::SimpleSimulationShader()
-    {
-        const char *varyings[] = {
-            "new_particle_position",
-            "new_lifetime",
-            "new_particle_velocity",
-            "new_size",
-        };
-        Program = LoadTFBProgram(file_manager->getAsset("shaders/pointemitter.vert").c_str(), varyings, 4);
-        AssignUniforms("sourcematrix", "dt", "level", "size_increase_factor");
-    }
-
-    HeightmapSimulationShader::HeightmapSimulationShader()
-    {
-        const char *varyings[] = {
-            "new_particle_position",
-            "new_lifetime",
-            "new_particle_velocity",
-            "new_size",
-        };
-        Program = LoadTFBProgram(file_manager->getAsset("shaders/particlesimheightmap.vert").c_str(), varyings, 4);
-        TU_heightmap = 2;
-        AssignTextureUnit(Program, TexUnit(TU_heightmap, "heightmap"));
-        AssignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
-    }
-
-    SimpleParticleRender::SimpleParticleRender()
-    {
-        Program = LoadProgram(PARTICLES_RENDERING,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/particle.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
-        AssignUniforms("color_from", "color_to");
-
-        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
-    }
-
-    FlipParticleRender::FlipParticleRender()
-    {
-        Program = LoadProgram(PARTICLES_RENDERING,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/flipparticle.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
-        AssignUniforms();
-
-        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
-    }
-}
 
 static GLuint createVAO(GLuint Program)
 {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7fff167bd..45f6237dc 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -339,37 +339,6 @@ namespace LightShader
     };
 }
 
-namespace ParticleShader
-{
-
-class SimpleSimulationShader : public ShaderHelperSingleton<SimpleSimulationShader, core::matrix4, int, int, float>
-{
-public:
-    SimpleSimulationShader();
-};
-
-
-
-class HeightmapSimulationShader : public ShaderHelperSingleton<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
-{
-public:
-    GLuint TU_heightmap;
-
-    HeightmapSimulationShader();
-};
-
-class SimpleParticleRender : public ShaderHelperSingleton<SimpleParticleRender, video::SColorf, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
-{
-public:
-    SimpleParticleRender();
-};
-
-class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
-{
-public:
-    FlipParticleRender();
-};
-}
 
 template<typename T, typename... Args>
 static void DrawFullScreenEffect(Args...args)
diff --git a/src/io/file_manager.hpp b/src/io/file_manager.hpp
index 18d6e1949..1c0e7a6b6 100644
--- a/src/io/file_manager.hpp
+++ b/src/io/file_manager.hpp
@@ -158,7 +158,16 @@ public:
     {
         m_music_search_path.push_back(path);
     }   // pushMusicSearchPath
+    // ------------------------------------------------------------------------
+    /** Returns the full path to a shader (this function could be modified 
+     *  later to allow track-specific shaders).
+     *  \param name Name of the shader.
+     */
+    std::string getShader(const std::string &name) const
+    {
+        return getAsset(SHADER, name);
 
+    }   // getShader
 };   // FileManager
 
 extern FileManager* file_manager;

From a51225ec36bdc6a7defb48668792934717affbae Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 23 Apr 2015 17:11:19 +1000
Subject: [PATCH 123/331] Added bypassUBO method to new shader base class.

---
 src/graphics/irr_driver.hpp      |  6 ++---
 src/graphics/render_lighting.cpp |  6 ++---
 src/graphics/shader.cpp          | 44 ++++++++++++++++++++++++++++++++
 src/graphics/shader.hpp          |  7 +++--
 src/graphics/shaders.cpp         |  4 ---
 src/graphics/shaders_util.hpp    |  3 ++-
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index cc28d14ee..5af343f98 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -300,7 +300,7 @@ private:
     u32                  m_renderpass;
     class STKMeshSceneNode *m_sun_interposer;
     scene::ICameraSceneNode *m_suncam;
-    core::vector3df m_sundirection;
+    core::vector3df m_sun_direction;
     video::SColorf m_suncolor;
     std::pair<float, float> m_shadow_scales[4];
     scene::ICameraSceneNode *m_shadow_camnodes[4];
@@ -544,11 +544,11 @@ public:
     // ------------------------------------------------------------------------
     inline core::vector3df getWind()  {return m_wind->getWind();}
     // -----------------------------------------------------------------------
-    core::vector3df getSunDirection() const { return m_sundirection; };
+    const core::vector3df& getSunDirection() const { return m_sun_direction; };
     // -----------------------------------------------------------------------
     void setSunDirection(const core::vector3df &SunPos)
     {
-        m_sundirection = SunPos;
+        m_sun_direction = SunPos;
     }
     // -----------------------------------------------------------------------
     video::SColorf getSunColor() const { return m_suncolor; }
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 031b6d04e..97b4f28bc 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -129,9 +129,9 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
 void IrrDriver::uploadLightingData()
 {
     float Lighting[36];
-    Lighting[0] = m_sundirection.X;
-    Lighting[1] = m_sundirection.Y;
-    Lighting[2] = m_sundirection.Z;
+    Lighting[0] = m_sun_direction.X;
+    Lighting[1] = m_sun_direction.Y;
+    Lighting[2] = m_sun_direction.Z;
     Lighting[4] = m_suncolor.getRed();
     Lighting[5] = m_suncolor.getGreen();
     Lighting[6] = m_suncolor.getBlue();
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index d0260b02f..cc38f71f5 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -20,6 +20,7 @@
 
 #include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
+#include "graphics/irr_driver.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 
@@ -154,6 +155,49 @@ int ShaderBase::loadTFBProgram(const std::string &shader_name,
 }   // loadTFBProgram
 
 // ----------------------------------------------------------------------------
+void ShaderBase::bypassUBO() const
+{
+    GLint VM = glGetUniformLocation(m_program, "ViewMatrix");
+    glUniformMatrix4fv(VM, 1, GL_FALSE, irr_driver->getViewMatrix().pointer());
+
+    GLint PM = glGetUniformLocation(m_program, "ProjectionMatrix");
+    glUniformMatrix4fv(PM, 1, GL_FALSE, irr_driver->getProjMatrix().pointer());
+
+    GLint IVM = glGetUniformLocation(m_program, "InverseViewMatrix");
+    glUniformMatrix4fv(IVM, 1, GL_FALSE, irr_driver->getInvViewMatrix().pointer());
+
+    GLint IPM = glGetUniformLocation(m_program, "InverseProjectionMatrix");
+    glUniformMatrix4fv(IPM, 1, GL_FALSE, irr_driver->getInvProjMatrix().pointer());
+
+    GLint Screen = glGetUniformLocation(m_program, "screen");
+    glUniform2f(Screen, irr_driver->getCurrentScreenSize().X, 
+                        irr_driver->getCurrentScreenSize().Y);
+
+    GLint bLmn = glGetUniformLocation(m_program, "blueLmn[0]");
+    glUniform1fv(bLmn, 9, irr_driver->blueSHCoeff);
+
+    GLint gLmn = glGetUniformLocation(m_program, "greenLmn[0]");
+    glUniform1fv(gLmn, 9, irr_driver->greenSHCoeff);
+
+    GLint rLmn = glGetUniformLocation(m_program, "redLmn[0]");
+    glUniform1fv(rLmn, 9, irr_driver->redSHCoeff);
+
+    GLint sun_dir = glGetUniformLocation(m_program, "sun_direction");
+    const core::vector3df &sd = irr_driver->getSunDirection();
+    glUniform3f(sun_dir, sd.X, sd.Y, sd.Z);
+
+    GLint sun_col = glGetUniformLocation(m_program, "sun_col");
+    const video::SColorf& sc = irr_driver->getSunColor();
+    glUniform3f(sun_col, sc.getRed(), sc.getGreen(), sc.getBlue());
+
+    GLint sun_angle = glGetUniformLocation(m_program, "sun_angle");
+    glUniform1f(sun_angle, 0.54f);
+}   // bypassUBO
+
+// ----------------------------------------------------------------------------
+/** Constructor, which adds the shader to all instantiated shaders (for the
+ *  reload-all-shaders debug option).
+ */
 ShaderBase::ShaderBase()
 {
     m_all_shaders.push_back(this);
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index fd38a9cb9..3b35318c1 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -18,6 +18,7 @@
 #ifndef HEADER_SHADER_HPP
 #define HEADER_SHADER_HPP
 
+#include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
 #include "utils/singleton.hpp"
 
@@ -50,6 +51,8 @@ protected:
     /** OpenGL's program id. */
     GLuint m_program;
 
+    void bypassUBO() const;
+
 private:
     // ------------------------------------------------------------------------
     // Ends vararg template
@@ -216,8 +219,8 @@ public:
     // ------------------------------------------------------------------------
     void setUniforms(const Args & ... args) const
     {
-        if (needsUBO())
-            bypassUBO(m_program);
+        if (!CVS->isARBUniformBufferObjectUsable())
+            bypassUBO();
         setUniformsImpl(args...);
     }
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 6b976aff2..2eaec8ee9 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -648,10 +648,6 @@ namespace UtilShader
 }
 using namespace UtilShader;
 
-bool needsUBO()
-{
-    return !CVS->isARBUniformBufferObjectUsable();
-}
 
 void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 {
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 533ac1626..ab9862865 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -18,6 +18,7 @@
 #ifndef SHADERS_UTIL_HPP
 #define SHADERS_UTIL_HPP
 
+#include "graphics/central_settings.hpp"
 #include "utils/singleton.hpp"
 #include <vector>
 #include <matrix4.h>
@@ -222,7 +223,7 @@ public:
 
     void setUniforms(const Args & ... args) const
     {
-        if (needsUBO())
+        if (!CVS->isARBUniformBufferObjectUsable())
             bypassUBO(Program);
         UniformHelper::setUniformsHelper(uniforms, args...);
     }

From adceb3581231e3d08a987703695335100cc0bcc6 Mon Sep 17 00:00:00 2001
From: konstin <konstin@konstin.no-ip.biz>
Date: Thu, 23 Apr 2015 17:40:20 +0200
Subject: [PATCH 124/331] add --log to --help message

---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 98b88bcad..5d9854cf1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -547,6 +547,8 @@ void cmdLineHelp()
     "                          stdout.log.\n"
     "       --console          Write messages in the console and files\n"
     "  -h,  --help             Show this help.\n"
+    "       --log=N            Set the verbosity to a value between\n"
+    "                          0 (Debug) and 5 (Only Fatal messages)\n"
     "\n"
     "You can visit SuperTuxKart's homepage at "
     "http://supertuxkart.sourceforge.net\n\n",

From 76270ce0ecf1940633e852e6075340592ff84ba3 Mon Sep 17 00:00:00 2001
From: Nado <nado@troglodyte.be>
Date: Thu, 23 Apr 2015 19:55:12 +0200
Subject: [PATCH 125/331] Fix compilation with -DUSE_FRIBIDI=0

---
 src/utils/translation.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index da9139bbb..fb26df8d1 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -96,6 +96,7 @@ wchar_t* utf8_to_wide(const char* input)
 
 // ----------------------------------------------------------------------------
 /** Frees the memory allocated for the result of toFribidiChar(). */
+#ifdef ENABLE_BIDI
 void freeFribidiChar(FriBidiChar *str)
 {
 #ifdef TEST_BIDI
@@ -105,13 +106,16 @@ void freeFribidiChar(FriBidiChar *str)
         delete[] str;
 #endif
 }
+#endif
 
 /** Frees the memory allocated for the result of fromFribidiChar(). */
+#ifdef ENABLE_BIDI
 void freeFribidiChar(wchar_t *str)
 {
     if (sizeof(wchar_t) != sizeof(FriBidiChar))
         delete[] str;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 /** Converts a wstring to a FriBidi-string.
@@ -121,6 +125,7 @@ void freeFribidiChar(wchar_t *str)
     On linux, the string doesn't need to be converted because wchar_t is
     already UTF-32. On windows the string is converted from UTF-16 by this
     function. */
+#ifdef ENABLE_BIDI
 FriBidiChar* toFribidiChar(const wchar_t* str)
 {
     std::size_t length = wcslen(str);
@@ -168,6 +173,7 @@ wchar_t* fromFribidiChar(const FriBidiChar* str)
     }
     return result;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 Translations::Translations() //: m_dictionary_manager("UTF-16")

From 1a395efbfd6d5dd12fb473c2a0d08207c1762caa Mon Sep 17 00:00:00 2001
From: Nado <nado@troglodyte.be>
Date: Thu, 23 Apr 2015 20:08:19 +0200
Subject: [PATCH 126/331] Fix #2102. Moving output modifier and early exit
 options (--help, --version, --log, etc) earlier in the execution so nothing
 useless is printed.

---
 src/main.cpp | 55 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 98b88bcad..df6263ac6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -555,14 +555,10 @@ void cmdLineHelp()
 }   // cmdLineHelp
 
 //=============================================================================
-/** For base options that don't need much to be inited (and, in some cases,
- *  that need to be read before initing stuff) - it only assumes that
- *  user config is loaded (necessary to check for blacklisted screen
- *  resolutions), but nothing else (esp. not kart_properties_manager and
- *  track_manager, since their search path might be extended by command
- *  line options).
+/** For base options that modify the output (loglevel/color) or exit right
+ * after being processed (version/help).
  */
-int handleCmdLinePreliminary()
+int handleCmdLineOutputModifier()
 {
     if (CommandLine::has("--help") || CommandLine::has("-help") ||
         CommandLine::has("-h"))
@@ -585,7 +581,36 @@ int handleCmdLinePreliminary()
         exit(0);
     }
 
-    if(CommandLine::has("--gamepad-visualisation") ||   // only BE
+    int n;
+    if(CommandLine::has("--log", &n))
+        Log::setLogLevel(n);
+
+    if(CommandLine::has("--log=nocolor"))
+    {
+        Log::disableColor();
+        Log::verbose("main", "Colours disabled.");
+    }
+
+    if(CommandLine::has("--console"))
+        UserConfigParams::m_log_errors_to_console=true;
+    if(CommandLine::has("--no-console"))
+        UserConfigParams::m_log_errors_to_console=false;
+
+
+    return 0;
+}
+
+//=============================================================================
+/** For base options that don't need much to be inited (and, in some cases,
+ *  that need to be read before initing stuff) - it only assumes that
+ *  user config is loaded (necessary to check for blacklisted screen
+ *  resolutions), but nothing else (esp. not kart_properties_manager and
+ *  track_manager, since their search path might be extended by command
+ *  line options).
+ */
+int handleCmdLinePreliminary()
+{
+   if(CommandLine::has("--gamepad-visualisation") ||   // only BE
        CommandLine::has("--gamepad-visualization")    ) // both AE and BE
         UserConfigParams::m_gamepad_visualisation=true;
     if(CommandLine::has("--debug=memory"))
@@ -600,17 +625,8 @@ int handleCmdLinePreliminary()
         UserConfigParams::m_verbosity |= UserConfigParams::LOG_MISC;
     if(CommandLine::has("--debug=all") )
         UserConfigParams::m_verbosity |= UserConfigParams::LOG_ALL;
-    if(CommandLine::has("--console"))
-        UserConfigParams::m_log_errors_to_console=true;
-    if(CommandLine::has("--no-console"))
-        UserConfigParams::m_log_errors_to_console=false;
     if(CommandLine::has("--online"))
         MainMenuScreen::m_enable_online=true;
-    if(CommandLine::has("--log=nocolor"))
-    {
-        Log::disableColor();
-        Log::verbose("main", "Colours disabled.");
-    }
 
     std::string s;
     if(CommandLine::has("--stk-config", &s))
@@ -700,8 +716,6 @@ int handleCmdLinePreliminary()
         UserConfigParams::m_xmas_mode = n;
     if (CommandLine::has("--easter", &n))
         UserConfigParams::m_easter_ear_mode = n;
-    if(CommandLine::has("--log", &n))
-        Log::setLogLevel(n);
 
     return 0;
 }   // handleCmdLinePreliminary
@@ -1238,6 +1252,9 @@ int main(int argc, char *argv[] )
     try
     {
         std::string s;
+
+        handleCmdLineOutputModifier();
+
         if(CommandLine::has("--root", &s))
         {
             FileManager::addRootDirs(s);

From 1a96ed6249e09e2ca67f909cc74d4f95c74f2b92 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 24 Apr 2015 08:26:17 +1000
Subject: [PATCH 127/331] Made SimpleParticleRender based on the new shader
 base class.

---
 src/graphics/gpuparticles.cpp | 30 +++++++++++--------
 src/graphics/gpuparticles.hpp | 17 +++++++----
 src/graphics/shader.cpp       |  9 +++---
 src/graphics/shader.hpp       | 56 ++++++++++++++++++++++++++++++-----
 4 files changed, 81 insertions(+), 31 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 8fd6783a1..d71ebf9ff 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -448,7 +448,7 @@ void ParticleSystemProxy::drawNotFlip()
         glBlendFunc(GL_ONE, GL_ONE);
     else
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    glUseProgram(SimpleParticleRender::getInstance()->Program);
+    SimpleParticleRender::getInstance()->use();
 
     SimpleParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
     video::SColorf ColorFrom = video::SColorf(getColorFrom()[0], getColorFrom()[1], getColorFrom()[2]);
@@ -549,7 +549,22 @@ PointEmitterShader::PointEmitterShader()
     };
     loadTFBProgram("pointemitter.vert", varyings, 4);
     assignUniforms("sourcematrix", "dt", "level", "size_increase_factor");
-}
+}   // PointEmitterShader
+
+// ============================================================================
+SimpleParticleRender::SimpleParticleRender()
+{
+    loadProgram(PARTICLES_RENDERING,
+                GL_VERTEX_SHADER,   "particle.vert",
+                GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                GL_FRAGMENT_SHADER, "particle.frag");
+
+    assignUniforms("color_from", "color_to");
+
+    AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+}   // SimpleParticleRender
+
+// ============================================================================
 
 
 struct TexUnit
@@ -608,17 +623,6 @@ HeightmapSimulationShader::HeightmapSimulationShader()
     AssignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
 }
 
-SimpleParticleRender::SimpleParticleRender()
-{
-    Program = LoadProgram(PARTICLES_RENDERING,
-        GL_VERTEX_SHADER, file_manager->getAsset("shaders/particle.vert").c_str(),
-        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
-    AssignUniforms("color_from", "color_to");
-
-    AssignSamplerNames(Program, 0, "tex", 1, "dtex");
-}
-
 FlipParticleRender::FlipParticleRender()
 {
     Program = LoadProgram(PARTICLES_RENDERING,
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index 80f5dc42d..458202040 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -29,9 +29,19 @@ class PointEmitterShader : public Shader
 {
 public:
     PointEmitterShader();
-};
+};   // PointEmitterShader
 
+// ============================================================================
+class SimpleParticleRender : public Shader<SimpleParticleRender, video::SColorf,
+                                           video::SColorf>,
+                             public TextureRead<Trilinear_Anisotropic_Filtered,
+                                                Nearest_Filtered>
+{
+public:
+    SimpleParticleRender();
+};   // SimpleParticleRender
 
+// ============================================================================
 
     class HeightmapSimulationShader : public ShaderHelperSingleton<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
     {
@@ -41,11 +51,6 @@ public:
         HeightmapSimulationShader();
     };
 
-    class SimpleParticleRender : public ShaderHelperSingleton<SimpleParticleRender, video::SColorf, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
-    {
-    public:
-        SimpleParticleRender();
-    };
 
     class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
     {
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index cc38f71f5..123fb15db 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -71,7 +71,7 @@ GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
         code << "#extension GL_ARB_bindless_texture : enable\n";
         code << "#define Use_Bindless_Texture\n";
     }
-    code << "//" + std::string(file) + "\n";
+    code << "//" << file << "\n";
     if (!CVS->isARBUniformBufferObjectUsable())
         code << "#define UBO_DISABLED\n";
     if (CVS->isAMDVertexShaderLayerUsable())
@@ -80,12 +80,12 @@ GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
         code << "#define SRGBBindlessFix\n";
     code << getHeader();
 
-    std::ifstream stream(file, std::ios::in);
+    std::ifstream stream(file_manager->getShader(file), std::ios::in);
     if (stream.is_open())
     {
         std::string Line = "";
         while (getline(stream, Line))
-            code << "\n" + Line;
+            code << "\n" << Line;
         stream.close();
     }
     else
@@ -127,9 +127,8 @@ int ShaderBase::loadTFBProgram(const std::string &shader_name,
                                const char **varyings,
                                unsigned varying_count)
 {
-    std::string full_path = file_manager->getShader(shader_name);
     m_program = glCreateProgram();
-    loadAndAttachShader(GL_VERTEX_SHADER, full_path);
+    loadAndAttachShader(GL_VERTEX_SHADER, shader_name);
     if (CVS->getGLSLVersion() < 330)
         setAttribute(PARTICLES_SIM);
 
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 3b35318c1..466b242e5 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -40,24 +40,24 @@ private:
     /** Maintains a list of all shaders. */
     static std::vector<ShaderBase *> m_all_shaders;
 
+protected:
     enum AttributeType
     {
         OBJECT,
         PARTICLES_SIM,
         PARTICLES_RENDERING,
-    };
+    };   // AttributeType
 
-protected:
     /** OpenGL's program id. */
     GLuint m_program;
 
     void bypassUBO() const;
 
-private:
+protected:
     // ------------------------------------------------------------------------
     // Ends vararg template
     template<typename ... Types>
-    void loadAndAttachShader(GLint ProgramID)
+    void loadAndAttachShader()
     {
         return;
     }   // loadAndAttachShader
@@ -69,12 +69,21 @@ private:
         GLint shader_id = loadShader(name, shader_type);
         glAttachShader(m_program, shader_id);
         glDeleteShader(shader_id);
-        loadAndAttachShader(shader_type, args...);
+        loadAndAttachShader(args...);
     }   // loadAndAttachShader
+    // ------------------------------------------------------------------------
+    template<typename ... Types>
+    void loadAndAttachShader(GLint shader_type, const char *name,
+                             Types ... args)
+    {
+        loadAndAttachShader(shader_type, std::string(name), args...);
+    }   // loadAndAttachShader
+    // ------------------------------------------------------------------------
 
     const std::string& getHeader();
 
     GLuint loadShader(const std::string &file, unsigned type);
+protected:
     void setAttribute(AttributeType type);
 
 public:
@@ -139,6 +148,7 @@ private:
     }   // setUniformImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a matrix SColorF values. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::video::SColorf &col, Args... arg) const
     {
@@ -147,6 +157,7 @@ private:
     }  // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a SColor uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::video::SColor &col, Args... arg) const
     {
@@ -156,6 +167,7 @@ private:
     }   // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a vector3df uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::core::vector3df &v, Args... arg) const
     {
@@ -163,8 +175,8 @@ private:
         setUniformsImpl<N + 1>(arg...);
     }   // setUniformsImpl
 
-
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a vector2df uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::core::vector2df &v, Args... arg) const
     {
@@ -173,6 +185,7 @@ private:
     }   // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a dimension2df uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::core::dimension2df &v, Args... arg) const
     {
@@ -181,6 +194,7 @@ private:
     }   // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a float uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(float f, Args... arg) const
     {
@@ -189,6 +203,7 @@ private:
     }   // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for an int uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(int f, Args... arg) const
     {
@@ -197,6 +212,7 @@ private:
     }   // setUniformsImpl
 
     // ------------------------------------------------------------------------
+    /** Implementation for setUniforms for a vector<float> uniform. */
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const std::vector<float> &v, Args... arg) const
     {
@@ -204,7 +220,32 @@ private:
         setUniformsImpl<N + 1>(arg...);
     }   // setUniformsImpl
 
+
 public:
+
+    template<typename ... Types>
+    void loadProgram(AttributeType type, Types ... args)
+    {
+        m_program = glCreateProgram();
+        loadAndAttachShader(args...);
+        if (getGLSLVersion() < 330)
+            setAttribute(type);
+        glLinkProgram(m_program);
+
+        GLint Result = GL_FALSE;
+        glGetProgramiv(m_program, GL_LINK_STATUS, &Result);
+        if (Result == GL_FALSE) {
+            int info_length;
+            Log::error("GLWrapp", "Error when linking these shaders :");
+            printFileList(args...);
+            glGetProgramiv(m_program, GL_INFO_LOG_LENGTH, &info_length);
+            char *error_message = new char[info_length];
+            glGetProgramInfoLog(m_program, info_length, NULL, error_message);
+            Log::error("GLWrapp", error_message);
+            delete[] error_message;
+        }
+    }   // loadProgram
+
     // ------------------------------------------------------------------------
     /** This variadic template collects all names of uniforms in
      *  a std::vector. */
@@ -217,12 +258,13 @@ public:
     }   // assignUniforms
 
     // ------------------------------------------------------------------------
+    /** Sets the uniforms for this shader. */
     void setUniforms(const Args & ... args) const
     {
         if (!CVS->isARBUniformBufferObjectUsable())
             bypassUBO();
         setUniformsImpl(args...);
-    }
+    }   // setUniforms
 
 
 };   // Shader

From bbaf061ae996e089f2364f74b213c67608b302d2 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 24 Apr 2015 08:38:04 +1000
Subject: [PATCH 128/331] Added printFileList to Shader, renamed old global
 function.

---
 src/graphics/shader.hpp       | 20 ++++++++++++++++++++
 src/graphics/shaders_util.hpp |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 466b242e5..4ba57160a 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -220,6 +220,26 @@ private:
         setUniformsImpl<N + 1>(arg...);
     }   // setUniformsImpl
 
+    // ------------------------------------------------------------------------
+    /** End recursion for variadic template. */
+    template<typename ...Types>
+    void printFileList()
+    {
+        return;
+    }   // printFileList
+
+    // ------------------------------------------------------------------------
+    /** Variadic template to print a list of file names.
+     *  \param shader_type Ignored (used since the variadic calling function
+     *         has this parameter).
+     *  \param filepath Name of the file to print.
+     */
+    template<typename ...Types>
+    void printFileList(GLint shader_type, const char *filepath, Types ... args)
+    {
+        Log::error("shader", filepath);
+        printFileList(args...);
+    }   // printFileList
 
 public:
 
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index ab9862865..1a5638b9c 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -49,16 +49,16 @@ void loadAndAttach(GLint ProgramID, GLint ShaderType, const char *filepath, Type
 }
 
 template<typename ...Types>
-void printFileList()
+void oldPrintFileList()
 {
     return;
 }
 
 template<typename ...Types>
-void printFileList(GLint ShaderType, const char *filepath, Types ... args)
+void oldPrintFileList(GLint ShaderType, const char *filepath, Types ... args)
 {
     Log::error("GLWrapp", filepath);
-    printFileList(args...);
+    oldPrintFileList(args...);
 }
 
 enum AttributeType
@@ -84,7 +84,7 @@ GLint LoadProgram(AttributeType Tp, Types ... args)
     glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
     if (Result == GL_FALSE) {
         Log::error("GLWrapp", "Error when linking these shaders :");
-        printFileList(args...);
+        oldPrintFileList(args...);
         glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
         char *ErrorMessage = new char[InfoLogLength];
         glGetProgramInfoLog(ProgramID, InfoLogLength, NULL, ErrorMessage);

From 1cc3a0f0b83b88fc11d0c1383cacd2882cac1d39 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 23 Apr 2015 19:20:42 -0400
Subject: [PATCH 129/331] Tweak times of scotland challenge

---
 data/challenges/scotland.challenge | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/challenges/scotland.challenge b/data/challenges/scotland.challenge
index aece8b5a1..a5ad68208 100644
--- a/data/challenges/scotland.challenge
+++ b/data/challenges/scotland.challenge
@@ -10,10 +10,10 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements time="175"/>
+        <requirements time="185"/>
     </medium>
     <easy>
         <karts number="4"/>
-        <requirements time="225"/>
+        <requirements time="270"/>
     </easy>
 </challenge>

From 5d098488e609fb9c0257cc042554789f8ec03156 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 24 Apr 2015 10:31:37 +1000
Subject: [PATCH 130/331] Use new Shader baseclass for all shaders.

---
 src/graphics/2dutils.cpp          |   12 +-
 src/graphics/IBL.cpp              |    2 +-
 src/graphics/glwrap.cpp           |    2 +-
 src/graphics/gpuparticles.cpp     |   22 +-
 src/graphics/gpuparticles.hpp     |    4 +-
 src/graphics/post_processing.cpp  |   28 +-
 src/graphics/render.cpp           |    8 +-
 src/graphics/render_geometry.cpp  |   38 +-
 src/graphics/render_lighting.cpp  |    8 +-
 src/graphics/render_skybox.cpp    |    2 +-
 src/graphics/shader.cpp           |    2 +-
 src/graphics/shader.hpp           |    2 +-
 src/graphics/shaders.cpp          | 1143 ++++++++++++++---------------
 src/graphics/shaders.hpp          |  191 ++---
 src/graphics/shadow_matrixes.cpp  |    4 +-
 src/graphics/stkbillboard.cpp     |    2 +-
 src/graphics/stkmeshscenenode.cpp |   10 +-
 17 files changed, 740 insertions(+), 740 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 27fe497eb..b2f6ed14a 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -36,7 +36,7 @@ static void drawTexColoredQuad(const video::ITexture *texture, const video::SCol
     glBindBuffer(GL_ARRAY_BUFFER, UIShader::ColoredTextureRectShader::getInstance()->colorvbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, 16 * sizeof(unsigned), colors);
 
-    glUseProgram(UIShader::ColoredTextureRectShader::getInstance()->Program);
+    UIShader::ColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(UIShader::ColoredTextureRectShader::getInstance()->vao);
 
     UIShader::ColoredTextureRectShader::getInstance()->SetTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
@@ -56,7 +56,7 @@ void drawTexQuad(GLuint texture, float width, float height,
 float center_pos_x, float center_pos_y, float tex_center_pos_x, float tex_center_pos_y,
 float tex_width, float tex_height)
 {
-    glUseProgram(UIShader::TextureRectShader::getInstance()->Program);
+    UIShader::TextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
     UIShader::TextureRectShader::getInstance()->SetTextureUnits(texture);
@@ -158,7 +158,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
             clipRect->getWidth(), clipRect->getHeight());
     }
 
-    glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
+    UIShader::UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
     UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
@@ -194,7 +194,7 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
         destRect, sourceRect, width, height, center_pos_x, center_pos_y,
         tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
 
-    glUseProgram(UIShader::UniformColoredTextureRectShader::getInstance()->Program);
+    UIShader::UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
     UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(texture);
@@ -281,7 +281,7 @@ void draw2DVertexPrimitiveList(video::ITexture *tex, const void* vertices,
 
     VertexUtils::bindVertexArrayAttrib(vType);
 
-    glUseProgram(UIShader::Primitive2DList::getInstance()->Program);
+    UIShader::Primitive2DList::getInstance()->use();
     UIShader::Primitive2DList::getInstance()->setUniforms();
     const video::SOverrideMaterial &m = irr_driver->getVideoDriver()->getOverrideMaterial();
     compressTexture(tex, false);
@@ -339,7 +339,7 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
             clip->getWidth(), clip->getHeight());
     }
 
-    glUseProgram(UIShader::ColoredRectShader::getInstance()->Program);
+    UIShader::ColoredRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
     UIShader::ColoredRectShader::getInstance()->setUniforms(core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), color);
 
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 5a733f21d..e48f657f4 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -320,7 +320,7 @@ GLuint generateSpecularCubemap(GLuint probe)
     glViewport(0, 0, cubemap_size, cubemap_size);
     GLenum bufs[] = { GL_COLOR_ATTACHMENT0 };
     glDrawBuffers(1, bufs);
-    glUseProgram(UtilShader::SpecularIBLGenerator::getInstance()->Program);
+    UtilShader::SpecularIBLGenerator::getInstance()->use();
 
     glDisable(GL_BLEND);
     glDisable(GL_DEPTH_TEST);
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index c1e308bab..cff3453ff 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -297,7 +297,7 @@ void draw3DLine(const core::vector3df& start,
     glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, 6 * sizeof(float), vertex);
 
-    glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+    UtilShader::ColoredLine::getInstance()->use();
     UtilShader::ColoredLine::getInstance()->setUniforms(color);
     glDrawArrays(GL_LINES, 0, 2);
 
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index d71ebf9ff..f82f1bf14 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -387,7 +387,7 @@ void ParticleSystemProxy::simulate()
     glEnable(GL_RASTERIZER_DISCARD);
     if (has_height_map)
     {
-        glUseProgram(HeightmapSimulationShader::getInstance()->Program);
+        HeightmapSimulationShader::getInstance()->use();
         glActiveTexture(GL_TEXTURE0 + HeightmapSimulationShader::getInstance()->TU_heightmap);
         glBindTexture(GL_TEXTURE_BUFFER, heightmaptexture);
         HeightmapSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor, track_x, track_x_len, track_z, track_z_len);
@@ -433,7 +433,7 @@ void ParticleSystemProxy::simulate()
 void ParticleSystemProxy::drawFlip()
 {
     glBlendFunc(GL_ONE, GL_ONE);
-    glUseProgram(FlipParticleRender::getInstance()->Program);
+    FlipParticleRender::getInstance()->use();
 
     FlipParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
     FlipParticleRender::getInstance()->setUniforms();
@@ -617,19 +617,19 @@ HeightmapSimulationShader::HeightmapSimulationShader()
         "new_particle_velocity",
         "new_size",
     };
-    Program = LoadTFBProgram(file_manager->getAsset("shaders/particlesimheightmap.vert").c_str(), varyings, 4);
+    loadTFBProgram("particlesimheightmap.vert", varyings, 4);
     TU_heightmap = 2;
-    AssignTextureUnit(Program, TexUnit(TU_heightmap, "heightmap"));
-    AssignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
+    AssignTextureUnit(m_program, TexUnit(TU_heightmap, "heightmap"));
+    assignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
 }
 
 FlipParticleRender::FlipParticleRender()
 {
-    Program = LoadProgram(PARTICLES_RENDERING,
-        GL_VERTEX_SHADER, file_manager->getAsset("shaders/flipparticle.vert").c_str(),
-        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-        GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/particle.frag").c_str());
-    AssignUniforms();
+    loadProgram(PARTICLES_RENDERING,
+        GL_VERTEX_SHADER, "flipparticle.vert",
+        GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+        GL_FRAGMENT_SHADER, "particle.frag");
+    assignUniforms();
 
-    AssignSamplerNames(Program, 0, "tex", 1, "dtex");
+    AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
 }
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index 458202040..d575e279e 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -43,7 +43,7 @@ public:
 
 // ============================================================================
 
-    class HeightmapSimulationShader : public ShaderHelperSingleton<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
+    class HeightmapSimulationShader : public Shader<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
     {
     public:
         GLuint TU_heightmap;
@@ -52,7 +52,7 @@ public:
     };
 
 
-    class FlipParticleRender : public ShaderHelperSingleton<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
+    class FlipParticleRender : public Shader<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
     {
     public:
         FlipParticleRender();
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 8e9b33c17..fe68514a8 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -222,7 +222,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
 
     if (UserConfigParams::m_degraded_IBL)
     {
-        glUseProgram(FullScreenShader::DegradedIBLShader::getInstance()->Program);
+        FullScreenShader::DegradedIBLShader::getInstance()->use();
         glBindVertexArray(SharedObject::FullScreenQuadVAO);
 
         FullScreenShader::DegradedIBLShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
@@ -230,7 +230,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
     }
     else
     {
-        glUseProgram(FullScreenShader::IBLShader::getInstance()->Program);
+        FullScreenShader::IBLShader::getInstance()->use();
         glBindVertexArray(SharedObject::FullScreenQuadVAO);
 
         FullScreenShader::IBLShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
@@ -249,7 +249,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
 void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, const core::matrix4 &rh_matrix, const core::vector3df &rh_extend)
 {
     glEnable(GL_PROGRAM_POINT_SIZE);
-    glUseProgram(FullScreenShader::RHDebug::getInstance()->Program);
+    FullScreenShader::RHDebug::getInstance()->use();
     glActiveTexture(GL_TEXTURE0 + FullScreenShader::RHDebug::getInstance()->TU_SHR);
     glBindTexture(GL_TEXTURE_3D, SHR);
     glActiveTexture(GL_TEXTURE0 + FullScreenShader::RHDebug::getInstance()->TU_SHG);
@@ -341,7 +341,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-        glUseProgram(FullScreenShader::ComputeShadowBlurVShader::getInstance()->Program);
+        FullScreenShader::ComputeShadowBlurVShader::getInstance()->use();
         FullScreenShader::ComputeShadowBlurVShader::getInstance()->SetTextureUnits(LayerTex);
         glBindSampler(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R32F);
@@ -350,7 +350,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
-        glUseProgram(FullScreenShader::ComputeShadowBlurHShader::getInstance()->Program);
+        FullScreenShader::ComputeShadowBlurHShader::getInstance()->use();
         FullScreenShader::ComputeShadowBlurHShader::getInstance()->SetTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
@@ -382,7 +382,7 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-        glUseProgram(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->Program);
+        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->use();
         FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
@@ -391,7 +391,7 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
-        glUseProgram(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->Program);
+        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->use();
         FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
@@ -436,7 +436,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         }
         else
         {
-            glUseProgram(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->Program);
+            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->use();
             glBindSampler(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, 0);
             FullScreenShader::ComputeGaussian17TapHShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             glBindImageTexture(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
@@ -456,7 +456,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         }
         else
         {
-            glUseProgram(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->Program);
+            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->use();
             glBindSampler(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, 0);
             FullScreenShader::ComputeGaussian17TapVShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             glBindImageTexture(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
@@ -476,7 +476,7 @@ void PostProcessing::renderPassThrough(GLuint tex, unsigned width, unsigned heig
 
 void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 {
-    glUseProgram(FullScreenShader::LayerPassThroughShader::getInstance()->Program);
+    FullScreenShader::LayerPassThroughShader::getInstance()->use();
     glBindVertexArray(FullScreenShader::LayerPassThroughShader::getInstance()->vao);
 
     glActiveTexture(GL_TEXTURE0 + FullScreenShader::LayerPassThroughShader::getInstance()->TU_texture);
@@ -490,7 +490,7 @@ void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 
 void PostProcessing::renderGlow(unsigned tex)
 {
-    glUseProgram(FullScreenShader::GlowShader::getInstance()->Program);
+    FullScreenShader::GlowShader::getInstance()->use();
     glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
 
     FullScreenShader::GlowShader::getInstance()->SetTextureUnits(tex);
@@ -590,7 +590,7 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
     // Pass 1: color edge detection
-    glUseProgram(FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->Program);
+    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->use();
     FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
     DrawFullScreenEffect<FullScreenShader::MLAAColorEdgeDetectionSHader>(PIXEL_SIZE);
 
@@ -601,7 +601,7 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_BLEND).Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    glUseProgram(FullScreenShader::MLAABlendWeightSHader::getInstance()->Program);
+    FullScreenShader::MLAABlendWeightSHader::getInstance()->use();
     FullScreenShader::MLAABlendWeightSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap));
     DrawFullScreenEffect<FullScreenShader::MLAABlendWeightSHader>(PIXEL_SIZE);
 
@@ -611,7 +611,7 @@ void PostProcessing::applyMLAA()
     // Pass 3: gather
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
-    glUseProgram(FullScreenShader::MLAAGatherSHader::getInstance()->Program);
+    FullScreenShader::MLAAGatherSHader::getInstance()->use();
     FullScreenShader::MLAAGatherSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
     DrawFullScreenEffect<FullScreenShader::MLAAGatherSHader>(PIXEL_SIZE);
 
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 7ccba658d..24dea82de 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -192,7 +192,7 @@ void IrrDriver::renderGLSL(float dt)
         // Render bounding boxes
         if (irr_driver->getBoundingBoxesViz())
         {
-            glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+            UtilShader::ColoredLine::getInstance()->use();
             glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
             glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
             UtilShader::ColoredLine::getInstance()->setUniforms(SColor(255, 255, 0, 0));
@@ -221,7 +221,7 @@ void IrrDriver::renderGLSL(float dt)
                 const std::map<video::SColor, std::vector<float> >& lines = debug_drawer->getLines();
                 std::map<video::SColor, std::vector<float> >::const_iterator it;
 
-                glUseProgram(UtilShader::ColoredLine::getInstance()->Program);
+                UtilShader::ColoredLine::getInstance()->use();
                 glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
                 glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
                 for (it = lines.begin(); it != lines.end(); it++)
@@ -625,7 +625,7 @@ void IrrDriver::renderParticles()
 
 static void renderWireFrameFrustrum(float *tmp, unsigned i)
 {
-    glUseProgram(MeshShader::ViewFrustrumShader::getInstance()->Program);
+    MeshShader::ViewFrustrumShader::getInstance()->use();
     glBindVertexArray(MeshShader::ViewFrustrumShader::getInstance()->frustrumvao);
     glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
 
@@ -689,7 +689,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     if (CVS->supportsIndirectInstancingRendering())
     {
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, GlowPassCmd::getInstance()->drawindirectcmd);
-        glUseProgram(MeshShader::InstancedColorizeShader::getInstance()->Program);
+        MeshShader::InstancedColorizeShader::getInstance()->use();
 
         glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeGlow));
         if (CVS->isAZDOEnabled())
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 1d40d8410..7a8047b3c 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -426,7 +426,7 @@ template<typename T, int ...List>
 void renderMeshes1stPass()
 {
     auto &meshes = T::List::getInstance()->SolidPass;
-    glUseProgram(T::FirstPassShader::getInstance()->Program);
+    T::FirstPassShader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
         glBindVertexArray(VAOManager::getInstance()->getVAO(T::VertexType));
     for (unsigned i = 0; i < meshes.size(); i++)
@@ -456,7 +456,7 @@ template<typename T, typename...Args>
 void renderInstancedMeshes1stPass(Args...args)
 {
     std::vector<GLMesh *> &meshes = T::InstancedList::getInstance()->SolidPass;
-    glUseProgram(T::InstancedFirstPassShader::getInstance()->Program);
+    T::InstancedFirstPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     for (unsigned i = 0; i < meshes.size(); i++)
     {
@@ -480,7 +480,7 @@ void renderInstancedMeshes1stPass(Args...args)
 template<typename T, typename...Args>
 void multidraw1stPass(Args...args)
 {
-    glUseProgram(T::InstancedFirstPassShader::getInstance()->Program);
+    T::InstancedFirstPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     if (SolidPassCmd::getInstance()->Size[T::MaterialType])
     {
@@ -546,7 +546,7 @@ void renderMeshes2ndPass( const std::vector<uint64_t> &Prefilled_Handle,
     const std::vector<GLuint> &Prefilled_Tex)
 {
     auto &meshes = T::List::getInstance()->SolidPass;
-    glUseProgram(T::SecondPassShader::getInstance()->Program);
+    T::SecondPassShader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
         glBindVertexArray(VAOManager::getInstance()->getVAO(T::VertexType));
     for (unsigned i = 0; i < meshes.size(); i++)
@@ -575,7 +575,7 @@ template<typename T, typename...Args>
 void renderInstancedMeshes2ndPass(const std::vector<GLuint> &Prefilled_tex, Args...args)
 {
     std::vector<GLMesh *> &meshes = T::InstancedList::getInstance()->SolidPass;
-    glUseProgram(T::InstancedSecondPassShader::getInstance()->Program);
+    T::InstancedSecondPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     for (unsigned i = 0; i < meshes.size(); i++)
     {
@@ -590,7 +590,7 @@ void renderInstancedMeshes2ndPass(const std::vector<GLuint> &Prefilled_tex, Args
 template<typename T, typename...Args>
 void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
 {
-    glUseProgram(T::InstancedSecondPassShader::getInstance()->Program);
+    T::InstancedSecondPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     uint64_t nulltex[10] = {};
     if (SolidPassCmd::getInstance()->Size[T::MaterialType])
@@ -664,7 +664,7 @@ void IrrDriver::renderSolidSecondPass()
 
             // template does not work with template due to extra depth texture
             {
-                glUseProgram(GrassMat::InstancedSecondPassShader::getInstance()->Program);
+                GrassMat::InstancedSecondPassShader::getInstance()->use();
                 glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(GrassMat::VertexType, GrassMat::Instance));
                 uint64_t nulltex[10] = {};
                 if (SolidPassCmd::getInstance()->Size[GrassMat::MaterialType])
@@ -690,7 +690,7 @@ void IrrDriver::renderSolidSecondPass()
             // template does not work with template due to extra depth texture
             {
                 std::vector<GLMesh *> &meshes = GrassMat::InstancedList::getInstance()->SolidPass;
-                glUseProgram(GrassMat::InstancedSecondPassShader::getInstance()->Program);
+                GrassMat::InstancedSecondPassShader::getInstance()->use();
                 glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(GrassMat::VertexType, GrassMat::Instance));
                 for (unsigned i = 0; i < meshes.size(); i++)
                 {
@@ -708,7 +708,7 @@ template<typename T>
 static void renderInstancedMeshNormals()
 {
     std::vector<GLMesh *> &meshes = T::InstancedList::getInstance()->SolidPass;
-    glUseProgram(MeshShader::NormalVisualizer::getInstance()->Program);
+    MeshShader::NormalVisualizer::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     for (unsigned i = 0; i < meshes.size(); i++)
     {
@@ -720,7 +720,7 @@ static void renderInstancedMeshNormals()
 template<typename T>
 static void renderMultiMeshNormals()
 {
-    glUseProgram(MeshShader::NormalVisualizer::getInstance()->Program);
+    MeshShader::NormalVisualizer::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     if (SolidPassCmd::getInstance()->Size[T::MaterialType])
     {
@@ -756,7 +756,7 @@ void IrrDriver::renderNormalsVisualisation()
 template<typename Shader, enum video::E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
 void renderTransparenPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
-    glUseProgram(Shader::getInstance()->Program);
+    Shader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
         glBindVertexArray(VAOManager::getInstance()->getVAO(VertexType));
     for (unsigned i = 0; i < meshes->size(); i++)
@@ -863,7 +863,7 @@ void IrrDriver::renderTransparent()
         GLenum itype = mesh.IndexType;
         size_t count = mesh.IndexCount;
 
-        glUseProgram(MeshShader::DisplaceMaskShader::getInstance()->Program);
+        MeshShader::DisplaceMaskShader::getInstance()->use();
         MeshShader::DisplaceMaskShader::getInstance()->setUniforms(AbsoluteTransformation);
         glDrawElementsBaseVertex(ptype, (int)count, itype,
                                  (GLvoid *)mesh.vaoOffset, (int)mesh.vaoBaseVertex);
@@ -890,7 +890,7 @@ void IrrDriver::renderTransparent()
             irr_driver->getRenderTargetTexture(RTT_COLOR),
             irr_driver->getRenderTargetTexture(RTT_TMP1),
             getTextureGLuint(mesh.textures[0]));
-        glUseProgram(MeshShader::DisplaceShader::getInstance()->Program);
+        MeshShader::DisplaceShader::getInstance()->use();
         MeshShader::DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
             core::vector2df(cb->getDirX(), cb->getDirY()),
             core::vector2df(cb->getDir2X(), cb->getDir2Y()));
@@ -944,7 +944,7 @@ template<typename T, int...List>
 void renderShadow(unsigned cascade)
 {
     auto &t = T::List::getInstance()->Shadows[cascade];
-    glUseProgram(T::ShadowPassShader::getInstance()->Program);
+    T::ShadowPassShader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
         glBindVertexArray(VAOManager::getInstance()->getVAO(T::VertexType));
     for (unsigned i = 0; i < t.size(); i++)
@@ -963,7 +963,7 @@ void renderShadow(unsigned cascade)
 template<typename T, typename...Args>
 void renderInstancedShadow(unsigned cascade, Args ...args)
 {
-    glUseProgram(T::InstancedShadowPassShader::getInstance()->Program);
+    T::InstancedShadowPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeShadow));
     std::vector<GLMesh *> &t = T::InstancedList::getInstance()->Shadows[cascade];
     for (unsigned i = 0; i < t.size(); i++)
@@ -981,7 +981,7 @@ void renderInstancedShadow(unsigned cascade, Args ...args)
 template<typename T, typename...Args>
 static void multidrawShadow(unsigned i, Args ...args)
 {
-    glUseProgram(T::InstancedShadowPassShader::getInstance()->Program);
+    T::InstancedShadowPassShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeShadow));
     if (ShadowPassCmd::getInstance()->Size[i][T::MaterialType])
     {
@@ -1096,7 +1096,7 @@ struct rsm_custom_unroll_args<N, List...>
 template<typename T, int... Selector>
 void drawRSM(const core::matrix4 & rsm_matrix)
 {
-    glUseProgram(T::RSMShader::getInstance()->Program);
+    T::RSMShader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
         glBindVertexArray(VAOManager::getInstance()->getVAO(T::VertexType));
     auto t = T::List::getInstance()->RSM;
@@ -1117,7 +1117,7 @@ void drawRSM(const core::matrix4 & rsm_matrix)
 template<typename T, typename...Args>
 void renderRSMShadow(Args ...args)
 {
-    glUseProgram(T::InstancedRSMShader::getInstance()->Program);
+    T::InstancedRSMShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeRSM));
     auto t = T::InstancedList::getInstance()->RSM;
     for (unsigned i = 0; i < t.size(); i++)
@@ -1134,7 +1134,7 @@ void renderRSMShadow(Args ...args)
 template<typename T, typename... Args>
 void multidrawRSM(Args...args)
 {
-    glUseProgram(T::InstancedRSMShader::getInstance()->Program);
+    T::InstancedRSMShader::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeRSM));
     if (RSMPassCmd::getInstance()->Size[T::MaterialType])
     {
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 97b4f28bc..0db45f205 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -42,7 +42,7 @@ static void renderPointLights(unsigned count)
     glEnable(GL_DEPTH_TEST);
     glDepthMask(GL_FALSE);
 
-    glUseProgram(LightShader::PointLightShader::getInstance()->Program);
+    LightShader::PointLightShader::getInstance()->use();
     glBindVertexArray(LightShader::PointLightShader::getInstance()->vao);
     glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(LightShader::PointLightInfo), PointLightsInfo);
@@ -158,7 +158,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         glBindVertexArray(SharedObject::FullScreenQuadVAO);
         if (CVS->needRHWorkaround())
         {
-            glUseProgram(FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->Program);
+            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->use();
             FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->SetTextureUnits(
                 m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture());
             for (unsigned i = 0; i < 32; i++)
@@ -169,7 +169,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         }
         else
         {
-            glUseProgram(FullScreenShader::RadianceHintsConstructionShader::getInstance()->Program);
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()->use();
             FullScreenShader::RadianceHintsConstructionShader::getInstance()->SetTextureUnits(
                     m_rtts->getRSM().getRTT()[0],
                     m_rtts->getRSM().getRTT()[1],
@@ -292,7 +292,7 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
     glEnable(GL_DEPTH_TEST);
     core::vector3df col2(1., 1., 1.);
 
-    glUseProgram(LightShader::PointLightScatterShader::getInstance()->Program);
+    LightShader::PointLightScatterShader::getInstance()->use();
     glBindVertexArray(LightShader::PointLightScatterShader::getInstance()->vao);
 
     LightShader::PointLightScatterShader::getInstance()->SetTextureUnits(irr_driver->getDepthStencilTexture());
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 236b810c8..81f9126bb 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -403,7 +403,7 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
 
     glDisable(GL_BLEND);
 
-    glUseProgram(MeshShader::SkyboxShader::getInstance()->Program);
+    MeshShader::SkyboxShader::getInstance()->use();
     glBindVertexArray(MeshShader::SkyboxShader::getInstance()->vao);
     MeshShader::SkyboxShader::getInstance()->setUniforms();
 
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index 123fb15db..ad61cff66 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -91,7 +91,7 @@ GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
     else
         Log::error("shader", "Can not open '%s'.", file.c_str());
 
-    Log::info("shader", "Compiling shader : %s", file);
+    Log::info("shader", "Compiling shader : %s", file.c_str());
     const std::string &source  = code.str();
     char const *source_pointer = source.c_str();
     int len                    = source.size();
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 4ba57160a..9e59032ba 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -161,7 +161,7 @@ private:
     template<unsigned N = 0, typename... Args>
     void setUniformsImpl(const irr::video::SColor &col, Args... arg) const
     {
-        glUniform4i(m_uniforms[N], col.getRed(), c ol.getGreen(),
+        glUniform4i(m_uniforms[N], col.getRed(), col.getGreen(),
                                    col.getBlue(), col.getAlpha());
         setUniformsImpl<N + 1>(arg...);
     }   // setUniformsImpl
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 2eaec8ee9..35e5e044e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -51,7 +51,7 @@
 
  \subsection shader_declaration_uniform_names Declare uniforms
 
- Use the AssignUniforms() function to pass name of the uniforms in the program.
+ Use the assignUniforms() function to pass name of the uniforms in the program.
  The order of name declaration is the same as the argument passed to setUniforms function.
 
  \subsection shader_declaration_bind_texture_unit Bind texture unit and name
@@ -129,7 +129,7 @@ Shaders::Shaders()
 static std::string LoadHeader()
 {
     std::string result;
-    std::ifstream Stream(file_manager->getAsset("shaders/header.txt").c_str(), std::ios::in);
+    std::ifstream Stream("header.txt", std::ios::in);
 
     if (Stream.is_open())
     {
@@ -558,11 +558,11 @@ namespace UtilShader
 {
     ColoredLine::ColoredLine()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "coloredquad.frag");
 
-        AssignUniforms("color");
+        assignUniforms("color");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -883,13 +883,13 @@ namespace UtilShader
 {
     SpecularIBLGenerator::SpecularIBLGenerator()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/importance_sampling_specular.frag").c_str());
-        AssignUniforms("PermutationMatrix", "ViewportSize");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
+        assignUniforms("PermutationMatrix", "ViewportSize");
         TU_Samples = 1;
-        AssignSamplerNames(Program, 0, "tex");
-        AssignTextureUnit(Program, TexUnit(TU_Samples, "samples"));
+        AssignSamplerNames(m_program, 0, "tex");
+        AssignTextureUnit(m_program, TexUnit(TU_Samples, "samples"));
     }
 }
 
@@ -898,226 +898,226 @@ namespace MeshShader
     // Solid Normal and depth pass shaders
     ObjectPass1Shader::ObjectPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass1.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(Program, 0, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "object_pass1.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     ObjectRefPass1Shader::ObjectRefPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "tex", 1, "glosstex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     GrassPass1Shader::GrassPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/grass_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass1.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        AssignSamplerNames(Program, 0, "tex", 1, "glosstex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "grass_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
+        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     NormalMapShader::NormalMapShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/normalmap.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(Program, 1, "normalMap", 0, "DiffuseForAlpha");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "normalmap.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix");
+        AssignSamplerNames(m_program, 1, "normalMap", 0, "DiffuseForAlpha");
     }
 
     InstancedObjectPass1Shader::InstancedObjectPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_pass1.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
 
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "glosstex");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "glosstex");
     }
 
     InstancedObjectRefPass1Shader::InstancedObjectRefPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass1.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
 
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "tex", 1, "glosstex");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     InstancedGrassPass1Shader::InstancedGrassPass1Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_grass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass1.frag").c_str());
-        AssignUniforms("windDir");
-        AssignSamplerNames(Program, 0, "tex", 1, "glosstex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_grass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
+        assignUniforms("windDir");
+        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     InstancedNormalMapShader::InstancedNormalMapShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/encode_normal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_normalmap.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "normalMap", 1, "glossMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+            GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "normalMap", 1, "glossMap");
     }
 
     // Solid Lit pass shaders
     ObjectPass2Shader::ObjectPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_pass2.frag").c_str());
-        AssignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "object_pass2.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedObjectPass2Shader::InstancedObjectPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_pass2.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedObjectRefPass2Shader::InstancedObjectRefPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectref_pass2.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     DetailledObjectPass2Shader::DetailledObjectPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/detailledobject_pass2.frag").c_str());
-        AssignUniforms("ModelMatrix");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "detailledobject_pass2.frag");
+        assignUniforms("ModelMatrix");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
     }
 
     InstancedDetailledObjectPass2Shader::InstancedDetailledObjectPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_detailledobject_pass2.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "instanced_detailledobject_pass2.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
     }
 
     ObjectUnlitShader::ObjectUnlitShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/object_unlit.frag").c_str());
-        AssignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "object_unlit.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     InstancedObjectUnlitShader::InstancedObjectUnlitShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_object_unlit.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     ObjectRefPass2Shader::ObjectRefPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectref_pass2.frag").c_str());
-        AssignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "objectref_pass2.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     GrassPass2Shader::GrassPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/grass_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/grass_pass2.frag").c_str());
-        AssignUniforms("ModelMatrix", "windDir");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "grass_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "grass_pass2.frag");
+        assignUniforms("ModelMatrix", "windDir");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedGrassPass2Shader::InstancedGrassPass2Shader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_grass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_grass_pass2.frag").c_str());
-        AssignUniforms("windDir", "SunDir");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo", 5, "SpecMap");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_grass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
+        assignUniforms("windDir", "SunDir");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo", 5, "SpecMap");
     }
 
     SphereMapShader::SphereMapShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/objectpass_spheremap.frag").c_str());
-        AssignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix");
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     InstancedSphereMapShader::InstancedSphereMapShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_objectpass_spheremap.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     SplattingShader::SplattingShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getLightFactor.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/splatting.frag").c_str());
-        AssignUniforms("ModelMatrix");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+            GL_FRAGMENT_SHADER, "splatting.frag");
+        assignUniforms("ModelMatrix");
 
-        AssignSamplerNames(Program,
+        AssignSamplerNames(m_program,
             0, "DiffuseMap",
             1, "SpecularMap",
             2, "SSAO",
@@ -1130,47 +1130,47 @@ namespace MeshShader
 
     TransparentShader::TransparentShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/transparent.frag").c_str());
-        AssignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "transparent.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     TransparentFogShader::TransparentFogShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/transparentfog.frag").c_str());
-        AssignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH", "endH", "start", "end", "col");
-        AssignSamplerNames(Program, 0, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "transparentfog.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH", "endH", "start", "end", "col");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     BillboardShader::BillboardShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/billboard.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/billboard.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "billboard.vert",
+            GL_FRAGMENT_SHADER, "billboard.frag");
 
-        AssignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     ColorizeShader::ColorizeShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/object_pass.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/colorize.frag").c_str());
-        AssignUniforms("ModelMatrix", "col");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "object_pass.vert",
+            GL_FRAGMENT_SHADER, "colorize.frag");
+        assignUniforms("ModelMatrix", "col");
     }
 
     InstancedColorizeShader::InstancedColorizeShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/glow_object.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/glow_object.frag").c_str());
-        AssignUniforms();
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "glow_object.vert",
+            GL_FRAGMENT_SHADER, "glow_object.frag");
+        assignUniforms();
     }
 
     ShadowShader::ShadowShader()
@@ -1180,49 +1180,49 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadow.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow.vert",
+                GL_FRAGMENT_SHADER, "shadow.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadow.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow.vert",
+                GL_GEOMETRY_SHADER, "shadow.geom",
+                GL_FRAGMENT_SHADER, "shadow.frag");
         }
-        AssignUniforms("layer", "ModelMatrix");
+        assignUniforms("layer", "ModelMatrix");
     }
 
     RSMShader::RSMShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/rsm.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rsm.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "rsm.vert",
+            GL_FRAGMENT_SHADER, "rsm.frag");
 
-        AssignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedRSMShader::InstancedRSMShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_rsm.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_rsm.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_rsm.vert",
+            GL_FRAGMENT_SHADER, "instanced_rsm.frag");
 
-        AssignUniforms("RSMMatrix");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("RSMMatrix");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     SplattingRSMShader::SplattingRSMShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/rsm.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/splatting_rsm.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "rsm.vert",
+            GL_FRAGMENT_SHADER, "splatting_rsm.frag");
 
-        AssignUniforms("RSMMatrix", "ModelMatrix");
-        AssignSamplerNames(Program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
+        assignUniforms("RSMMatrix", "ModelMatrix");
+        AssignSamplerNames(m_program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
     }
 
     InstancedShadowShader::InstancedShadowShader()
@@ -1232,20 +1232,20 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadow.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                GL_FRAGMENT_SHADER, "shadow.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadow.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                GL_FRAGMENT_SHADER, "shadow.frag");
         }
-        AssignUniforms("layer");
+        assignUniforms("layer");
     }
 
     RefShadowShader::RefShadowShader()
@@ -1255,19 +1255,19 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow.vert",
+                GL_FRAGMENT_SHADER, "shadowref.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow.vert",
+                GL_GEOMETRY_SHADER, "shadow.geom",
+                GL_FRAGMENT_SHADER, "shadowref.frag");
         }
-        AssignUniforms("layer", "ModelMatrix");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("layer", "ModelMatrix");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedRefShadowShader::InstancedRefShadowShader()
@@ -1277,21 +1277,21 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
-        AssignUniforms("layer");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("layer");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     GrassShadowShader::GrassShadowShader()
@@ -1301,19 +1301,19 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow_grass.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow_grass.vert",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/shadow_grass.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "shadow_grass.vert",
+                GL_GEOMETRY_SHADER, "shadow.geom",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
-        AssignUniforms("layer", "ModelMatrix", "windDir");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("layer", "ModelMatrix", "windDir");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedGrassShadowShader::InstancedGrassShadowShader()
@@ -1323,41 +1323,41 @@ namespace MeshShader
             return;
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedgrassshadow.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanciedgrassshadow.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/instanced_shadow.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/instanced_shadowref.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
+                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
 
-        AssignSamplerNames(Program, 0, "tex");
-        AssignUniforms("layer", "windDir");
+        AssignSamplerNames(m_program, 0, "tex");
+        assignUniforms("layer", "windDir");
     }
 
     DisplaceMaskShader::DisplaceMaskShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/displace.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/white.frag").c_str());
-        AssignUniforms("ModelMatrix");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "displace.vert",
+            GL_FRAGMENT_SHADER, "white.frag");
+        assignUniforms("ModelMatrix");
     }
 
 
     DisplaceShader::DisplaceShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/displace.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/displace.frag").c_str());
-        AssignUniforms("ModelMatrix", "dir", "dir2");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "displace.vert",
+            GL_FRAGMENT_SHADER, "displace.frag");
+        assignUniforms("ModelMatrix", "dir", "dir2");
 
-        AssignSamplerNames(Program,
+        AssignSamplerNames(m_program,
             0, "displacement_tex",
             1, "color_tex",
             2, "mask_tex",
@@ -1366,11 +1366,11 @@ namespace MeshShader
 
     SkyboxShader::SkyboxShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/sky.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sky.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "sky.vert",
+            GL_FRAGMENT_SHADER, "sky.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "tex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1382,21 +1382,21 @@ namespace MeshShader
 
     NormalVisualizer::NormalVisualizer()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/utils/getworldmatrix.vert").c_str(),
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/instanced_object_pass.vert").c_str(),
-            GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/normal_visualizer.geom").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
-        AssignUniforms("color");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+            GL_GEOMETRY_SHADER, "normal_visualizer.geom",
+            GL_FRAGMENT_SHADER, "coloredquad.frag");
+        assignUniforms("color");
     }
 
     ViewFrustrumShader::ViewFrustrumShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/frustrum.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "frustrum.vert",
+            GL_FRAGMENT_SHADER, "coloredquad.frag");
 
-        AssignUniforms("color", "idx");
+        assignUniforms("color", "idx");
 
         glGenVertexArrays(1, &frustrumvao);
         glBindVertexArray(frustrumvao);
@@ -1412,16 +1412,16 @@ namespace LightShader
 {
     PointLightShader::PointLightShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/pointlight.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/pointlight.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "pointlight.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "pointlight.frag");
 
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1430,10 +1430,10 @@ namespace LightShader
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0, GL_DYNAMIC_DRAW);
 
-        GLuint attrib_Position = glGetAttribLocation(Program, "Position");
-        GLuint attrib_Color = glGetAttribLocation(Program, "Color");
-        GLuint attrib_Energy = glGetAttribLocation(Program, "Energy");
-        GLuint attrib_Radius = glGetAttribLocation(Program, "Radius");
+        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
+        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
+        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
+        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
 
         glEnableVertexAttribArray(attrib_Position);
         glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), 0);
@@ -1452,23 +1452,23 @@ namespace LightShader
 
     PointLightScatterShader::PointLightScatterShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/pointlight.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/pointlightscatter.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "pointlight.vert",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "pointlightscatter.frag");
 
-        AssignUniforms("density", "fogcol");
-        AssignSamplerNames(Program, 0, "dtex");
+        assignUniforms("density", "fogcol");
+        AssignSamplerNames(m_program, 0, "dtex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
 
         glBindBuffer(GL_ARRAY_BUFFER, PointLightShader::getInstance()->vbo);
 
-        GLuint attrib_Position = glGetAttribLocation(Program, "Position");
-        GLuint attrib_Color = glGetAttribLocation(Program, "Color");
-        GLuint attrib_Energy = glGetAttribLocation(Program, "Energy");
-        GLuint attrib_Radius = glGetAttribLocation(Program, "Radius");
+        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
+        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
+        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
+        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
 
         glEnableVertexAttribArray(attrib_Position);
         glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), 0);
@@ -1508,473 +1508,472 @@ namespace FullScreenShader
 {
     BloomShader::BloomShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getCIEXYZ.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getRGBfromCIEXxy.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bloom.frag").c_str());
-        AssignUniforms();
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
+            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
+            GL_FRAGMENT_SHADER, "bloom.frag");
+        assignUniforms();
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     BloomBlendShader::BloomBlendShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bloomblend.frag").c_str());
-        AssignUniforms();
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "bloomblend.frag");
+        assignUniforms();
 
-        AssignSamplerNames(Program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        AssignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
     }
 	
 	LensBlendShader::LensBlendShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/lensblend.frag").c_str());
-        AssignUniforms();
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "lensblend.frag");
+        assignUniforms();
 
-        AssignSamplerNames(Program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        AssignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
     }
 
     ToneMapShader::ToneMapShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getRGBfromCIEXxy.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getCIEXYZ.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/tonemap.frag").c_str());
-        AssignUniforms("vignette_weight");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
+            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
+            GL_FRAGMENT_SHADER, "tonemap.frag");
+        assignUniforms("vignette_weight");
 
-        AssignSamplerNames(Program, 0, "text");
+        AssignSamplerNames(m_program, 0, "text");
     }
 
     DepthOfFieldShader::DepthOfFieldShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/dof.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "dof.frag");
 
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "tex", 1, "dtex");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
     }
 
     SunLightShader::SunLightShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SunMRP.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlight.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+            GL_FRAGMENT_SHADER, "sunlight.frag");
 
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex");
-        AssignUniforms("direction", "col");
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex");
+        assignUniforms("direction", "col");
     }
 
     IBLShader::IBLShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseIBL.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularIBL.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/IBL.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 2, "probe");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
+            GL_FRAGMENT_SHADER, "IBL.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "probe");
     }
 
     DegradedIBLShader::DegradedIBLShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseIBL.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularIBL.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/degraded_ibl.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "ntex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
+            GL_FRAGMENT_SHADER, "degraded_ibl.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "ntex");
     }
 
     ShadowedSunLightShaderPCF::ShadowedSunLightShaderPCF()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SunMRP.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlightshadow.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+            GL_FRAGMENT_SHADER, "sunlightshadow.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 8, "shadowtex");
-        AssignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
     }
 
     ShadowedSunLightShaderESM::ShadowedSunLightShaderESM()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SpecularBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/DiffuseBRDF.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/SunMRP.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/sunlightshadowesm.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+            GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 8, "shadowtex");
-        AssignUniforms("split0", "split1", "split2", "splitmax");
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignUniforms("split0", "split1", "split2", "splitmax");
     }
 
     RadianceHintsConstructionShader::RadianceHintsConstructionShader()
     {
         if (CVS->isAMDVertexShaderLayerUsable())
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/slicedscreenquad.vert").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rh.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "slicedscreenquad.vert",
+                GL_FRAGMENT_SHADER, "rh.frag");
         }
         else
         {
-            Program = LoadProgram(OBJECT,
-                GL_VERTEX_SHADER, file_manager->getAsset("shaders/slicedscreenquad.vert").c_str(),
-                GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/rhpassthrough.geom").c_str(),
-                GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rh.frag").c_str());
+            loadProgram(OBJECT,
+                GL_VERTEX_SHADER, "slicedscreenquad.vert",
+                GL_GEOMETRY_SHADER, "rhpassthrough.geom",
+                GL_FRAGMENT_SHADER, "rh.frag");
         }
 
-        AssignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
-        AssignSamplerNames(Program, 0, "ctex", 1, "ntex", 2, "dtex");
+        assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
+        AssignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/slicedscreenquad_nvworkaround.vert").c_str(),
-            GL_GEOMETRY_SHADER, file_manager->getAsset("shaders/rhpassthrough.geom").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rh.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "slicedscreenquad_nvworkaround.vert",
+            GL_GEOMETRY_SHADER, "rhpassthrough.geom",
+            GL_FRAGMENT_SHADER, "rh.frag");
 
-        AssignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
+        assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
 
-        AssignSamplerNames(Program, 0, "ctex", 1, "ntex", 2, "dtex");
+        AssignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     RHDebug::RHDebug()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/rhdebug.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/rhdebug.frag").c_str());
-        AssignUniforms("RHMatrix", "extents");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "rhdebug.vert",
+            GL_FRAGMENT_SHADER, "rhdebug.frag");
+        assignUniforms("RHMatrix", "extents");
         TU_SHR = 0;
         TU_SHG = 1;
         TU_SHB = 2;
-        AssignTextureUnit(Program, TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
+        AssignTextureUnit(m_program, TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
     }
 
     GlobalIlluminationReconstructionShader::GlobalIlluminationReconstructionShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gi.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "gi.frag");
 
-        AssignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        AssignSamplerNames(Program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
+        assignUniforms("RHMatrix", "InvRHMatrix", "extents");
+        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
     }
 
     Gaussian17TapHShader::Gaussian17TapHShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bilateralH.frag").c_str());
-        AssignUniforms("pixel");
-        AssignSamplerNames(Program, 0, "tex", 1, "depth");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "bilateralH.frag");
+        assignUniforms("pixel");
+        AssignSamplerNames(m_program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/bilateralH.comp").c_str());
+        loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
         TU_dest = 2;
-        AssignUniforms("pixel");
-        AssignSamplerNames(Program, 0, "source", 1, "depth");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel");
+        AssignSamplerNames(m_program, 0, "source", 1, "depth");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     ComputeGaussian6HBlurShader::ComputeGaussian6HBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/gaussian6h.comp").c_str());
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "gaussian6h.comp");
         TU_dest = 1;
-        AssignUniforms("pixel", "weights");
-        AssignSamplerNames(Program, 0, "source");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel", "weights");
+        AssignSamplerNames(m_program, 0, "source");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     ComputeShadowBlurHShader::ComputeShadowBlurHShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/blurshadowH.comp").c_str());
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "blurshadowH.comp");
         TU_dest = 1;
-        AssignUniforms("pixel", "weights");
-        AssignSamplerNames(Program, 0, "source");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel", "weights");
+        AssignSamplerNames(m_program, 0, "source");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     Gaussian6HBlurShader::Gaussian6HBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian6h.frag").c_str());
-        AssignUniforms("pixel", "sigma");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "gaussian6h.frag");
+        assignUniforms("pixel", "sigma");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 	
 	HorizontalBlurShader::HorizontalBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian6h.frag").c_str());
-        AssignUniforms("pixel");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "gaussian6h.frag");
+        assignUniforms("pixel");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian3HBlurShader::Gaussian3HBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian3h.frag").c_str());
-        AssignUniforms("pixel");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "gaussian3h.frag");
+        assignUniforms("pixel");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian17TapVShader::Gaussian17TapVShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/bilateralV.frag").c_str());
-        AssignUniforms("pixel");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "bilateralV.frag");
+        assignUniforms("pixel");
 
-        AssignSamplerNames(Program, 0, "tex", 1, "depth");
+        AssignSamplerNames(m_program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/bilateralV.comp").c_str());
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "bilateralV.comp");
         TU_dest = 2;
-        AssignUniforms("pixel");
-        AssignSamplerNames(Program, 0, "source", 1, "depth");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel");
+        AssignSamplerNames(m_program, 0, "source", 1, "depth");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     ComputeGaussian6VBlurShader::ComputeGaussian6VBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/gaussian6v.comp").c_str());
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "gaussian6v.comp");
         TU_dest = 1;
-        AssignUniforms("pixel", "weights");
-        AssignSamplerNames(Program, 0, "source");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel", "weights");
+        AssignSamplerNames(m_program, 0, "source");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     ComputeShadowBlurVShader::ComputeShadowBlurVShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/blurshadowV.comp").c_str());
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "blurshadowV.comp");
         TU_dest = 1;
-        AssignUniforms("pixel", "weights");
-        AssignSamplerNames(Program, 0, "source");
-        AssignTextureUnit(Program, TexUnit(TU_dest, "dest"));
+        assignUniforms("pixel", "weights");
+        AssignSamplerNames(m_program, 0, "source");
+        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
     }
 
     Gaussian6VBlurShader::Gaussian6VBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian6v.frag").c_str());
-        AssignUniforms("pixel", "sigma");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "gaussian6v.frag");
+        assignUniforms("pixel", "sigma");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian3VBlurShader::Gaussian3VBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/gaussian3v.frag").c_str());
-        AssignUniforms("pixel");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "gaussian3v.frag");
+        assignUniforms("pixel");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     PassThroughShader::PassThroughShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/passthrough.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "passthrough.frag");
 
-        AssignUniforms("width", "height");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("width", "height");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     LayerPassThroughShader::LayerPassThroughShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/layertexturequad.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "layertexturequad.frag");
         TU_texture = 0;
-        AssignUniforms("layer");
-        AssignTextureUnit(Program, TexUnit(TU_texture, "tex"));
-        vao = createVAO(Program);
+        assignUniforms("layer");
+        AssignTextureUnit(m_program, TexUnit(TU_texture, "tex"));
+        vao = createVAO(m_program);
     }
 
     LinearizeDepthShader::LinearizeDepthShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/linearizedepth.frag").c_str());
-        AssignUniforms("zn", "zf");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "linearizedepth.frag");
+        assignUniforms("zn", "zf");
 
-        AssignSamplerNames(Program, 0, "texture");
+        AssignSamplerNames(m_program, 0, "texture");
     }
 
 
     LightspaceBoundingBoxShader::LightspaceBoundingBoxShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/Lightspaceboundingbox.comp").c_str(),
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str());
-        AssignSamplerNames(Program, 0, "depth");
-        AssignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
-        GLuint block_idx = glGetProgramResourceIndex(Program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
-        glShaderStorageBlockBinding(Program, block_idx, 2);
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
+            GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
+        AssignSamplerNames(m_program, 0, "depth");
+        assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
+        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
+        glShaderStorageBlockBinding(m_program, block_idx, 2);
     }
 
     ShadowMatrixesGenerationShader::ShadowMatrixesGenerationShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/shadowmatrixgeneration.comp").c_str());
-        AssignUniforms("SunCamMatrix");
-        GLuint block_idx = glGetProgramResourceIndex(Program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
-        glShaderStorageBlockBinding(Program, block_idx, 2);
-        block_idx = glGetProgramResourceIndex(Program, GL_SHADER_STORAGE_BLOCK, "NewMatrixData");
-        glShaderStorageBlockBinding(Program, block_idx, 1);
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "shadowmatrixgeneration.comp");
+        assignUniforms("SunCamMatrix");
+        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
+        glShaderStorageBlockBinding(m_program, block_idx, 2);
+        block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "NewMatrixData");
+        glShaderStorageBlockBinding(m_program, block_idx, 1);
     }
 
     DepthHistogramShader::DepthHistogramShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/depthhistogram.comp").c_str(),
-            GL_COMPUTE_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str());
-        AssignSamplerNames(Program, 0, "depth");
+        loadProgram(OBJECT,
+            GL_COMPUTE_SHADER, "depthhistogram.comp",
+            GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
+        AssignSamplerNames(m_program, 0, "depth");
 
-        GLuint block_idx = glGetProgramResourceIndex(Program, GL_SHADER_STORAGE_BLOCK, "Histogram");
-        glShaderStorageBlockBinding(Program, block_idx, 1);
+        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "Histogram");
+        glShaderStorageBlockBinding(m_program, block_idx, 1);
     }
 
     GlowShader::GlowShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/glow.frag").c_str());
-        AssignUniforms();
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "glow.frag");
+        assignUniforms();
 
-        AssignSamplerNames(Program, 0, "tex");
-        vao = createVAO(Program);
+        AssignSamplerNames(m_program, 0, "tex");
+        vao = createVAO(m_program);
     }
 
     SSAOShader::SSAOShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/decodeNormal.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/ssao.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "ssao.frag");
 
-        AssignSamplerNames(Program, 0, "dtex");
-        AssignUniforms("radius", "k", "sigma");
+        assignUniforms("radius", "k", "sigma");
+        AssignSamplerNames(m_program, 0, "dtex");
     }
 
     FogShader::FogShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/fog.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "fog.frag");
 
-        AssignUniforms("density", "col");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("density", "col");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     MotionBlurShader::MotionBlurShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/utils/getPosFromUVDepth.frag").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/motion_blur.frag").c_str());
-        AssignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        AssignSamplerNames(Program, 0, "color_buffer", 1, "dtex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+            GL_FRAGMENT_SHADER, "motion_blur.frag");
+        assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
+        AssignSamplerNames(m_program, 0, "color_buffer", 1, "dtex");
     }
 
     GodFadeShader::GodFadeShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/godfade.frag").c_str());
-        AssignUniforms("col");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "godfade.frag");
+        assignUniforms("col");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     GodRayShader::GodRayShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/godray.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "godray.frag");
 
-        AssignUniforms("sunpos");
-        AssignSamplerNames(Program, 0, "tex");
+        assignUniforms("sunpos");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_color1.frag").c_str());
-        AssignUniforms("PIXEL_SIZE");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "mlaa_color1.frag");
+        assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(Program, 0, "colorMapG");
+        AssignSamplerNames(m_program, 0, "colorMapG");
     }
 
     MLAABlendWeightSHader::MLAABlendWeightSHader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_blend2.frag").c_str());
-        AssignUniforms("PIXEL_SIZE");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
+        assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(Program, 0, "edgesMap", 1, "areaMap");
+        AssignSamplerNames(m_program, 0, "edgesMap", 1, "areaMap");
     }
 
     MLAAGatherSHader::MLAAGatherSHader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/screenquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/mlaa_neigh3.frag").c_str());
-        AssignUniforms("PIXEL_SIZE");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
+        assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(Program, 0, "blendMap", 1, "colorMap");
+        AssignSamplerNames(m_program, 0, "blendMap", 1, "colorMap");
     }
 }
 
@@ -1983,42 +1982,42 @@ namespace UIShader
 
     Primitive2DList::Primitive2DList()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/primitive2dlist.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/transparent.frag").c_str());
-        AssignUniforms();
-        AssignSamplerNames(Program, 0, "tex");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "primitive2dlist.vert",
+            GL_FRAGMENT_SHADER, "transparent.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     TextureRectShader::TextureRectShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/texturedquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/texturedquad.frag").c_str());
-        AssignUniforms("center", "size", "texcenter", "texsize");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "texturedquad.vert",
+            GL_FRAGMENT_SHADER, "texturedquad.frag");
+        assignUniforms("center", "size", "texcenter", "texsize");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     UniformColoredTextureRectShader::UniformColoredTextureRectShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/texturedquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/uniformcolortexturedquad.frag").c_str());
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "texturedquad.vert",
+            GL_FRAGMENT_SHADER, "uniformcolortexturedquad.frag");
 
-        AssignUniforms("center", "size", "texcenter", "texsize", "color");
+        assignUniforms("center", "size", "texcenter", "texsize", "color");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
     }
 
     ColoredTextureRectShader::ColoredTextureRectShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/colortexturedquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/colortexturedquad.frag").c_str());
-        AssignUniforms("center", "size", "texcenter", "texsize");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "colortexturedquad.vert",
+            GL_FRAGMENT_SHADER, "colortexturedquad.frag");
+        assignUniforms("center", "size", "texcenter", "texsize");
 
-        AssignSamplerNames(Program, 0, "tex");
+        AssignSamplerNames(m_program, 0, "tex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -2043,9 +2042,9 @@ namespace UIShader
 
     ColoredRectShader::ColoredRectShader()
     {
-        Program = LoadProgram(OBJECT,
-            GL_VERTEX_SHADER, file_manager->getAsset("shaders/coloredquad.vert").c_str(),
-            GL_FRAGMENT_SHADER, file_manager->getAsset("shaders/coloredquad.frag").c_str());
-        AssignUniforms("center", "size", "color");
+        loadProgram(OBJECT,
+            GL_VERTEX_SHADER, "coloredquad.vert",
+            GL_FRAGMENT_SHADER, "coloredquad.frag");
+        assignUniforms("center", "size", "color");
     }
 }
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 45f6237dc..65b7f444d 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -18,11 +18,12 @@
 #ifndef HEADER_SHADERS_HPP
 #define HEADER_SHADERS_HPP
 
-#include <IShaderConstantSetCallBack.h>
-#include <IMeshSceneNode.h>
 #include "config/user_config.hpp"
+#include "graphics/shader.hpp"
+#include "graphics/shaders_util.hpp"
 
-#include "shaders_util.hpp"
+#include <IMeshSceneNode.h>
+#include <IShaderConstantSetCallBack.h>
 
 using namespace irr;
 class ParticleSystemProxy;
@@ -39,7 +40,7 @@ public:
 
 namespace UtilShader
 {
-class ColoredLine : public ShaderHelperSingleton<ColoredLine, video::SColor>
+class ColoredLine : public Shader<ColoredLine, video::SColor>
 {
 public:
     GLuint vao, vbo;
@@ -47,7 +48,7 @@ public:
     ColoredLine();
 };
 
-class SpecularIBLGenerator : public ShaderHelperSingleton<SpecularIBLGenerator, core::matrix4, float >, public TextureRead<Trilinear_cubemap>
+class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4, float >, public TextureRead<Trilinear_cubemap>
 {
 public:
     GLuint TU_Samples;
@@ -58,244 +59,244 @@ public:
 
 namespace MeshShader
 {
-class ObjectPass1Shader : public ShaderHelperSingleton<ObjectPass1Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class ObjectPass1Shader : public Shader<ObjectPass1Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectPass1Shader();
 };
 
-class ObjectRefPass1Shader : public ShaderHelperSingleton<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectRefPass1Shader();
 };
 
-class GrassPass1Shader : public ShaderHelperSingleton<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     GrassPass1Shader();
 };
 
-class NormalMapShader : public ShaderHelperSingleton<NormalMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     NormalMapShader();
 };
 
-class InstancedObjectPass1Shader : public ShaderHelperSingleton<InstancedObjectPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectPass1Shader();
 };
 
-class InstancedObjectRefPass1Shader : public ShaderHelperSingleton<InstancedObjectRefPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectRefPass1Shader();
 };
 
-class InstancedGrassPass1Shader : public ShaderHelperSingleton<InstancedGrassPass1Shader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedGrassPass1Shader();
 };
 
-class InstancedNormalMapShader : public ShaderHelperSingleton<InstancedNormalMapShader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedNormalMapShader();
 };
 
-class ObjectPass2Shader : public ShaderHelperSingleton<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectPass2Shader : public Shader<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectPass2Shader();
 };
 
-class InstancedObjectPass2Shader : public ShaderHelperSingleton<InstancedObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectPass2Shader();
 };
 
-class InstancedObjectRefPass2Shader : public ShaderHelperSingleton<InstancedObjectRefPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectRefPass2Shader();
 };
 
-class DetailledObjectPass2Shader : public ShaderHelperSingleton<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class DetailledObjectPass2Shader : public Shader<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     DetailledObjectPass2Shader();
 };
 
-class InstancedDetailledObjectPass2Shader : public ShaderHelperSingleton<InstancedDetailledObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedDetailledObjectPass2Shader : public Shader<InstancedDetailledObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedDetailledObjectPass2Shader();
 };
 
-class ObjectUnlitShader : public ShaderHelperSingleton<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectUnlitShader();
 };
 
-class InstancedObjectUnlitShader : public ShaderHelperSingleton<InstancedObjectUnlitShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedObjectUnlitShader();
 };
 
-class ObjectRefPass2Shader : public ShaderHelperSingleton<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectRefPass2Shader();
 };
 
-class GrassPass2Shader : public ShaderHelperSingleton<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     GrassPass2Shader();
 };
 
-class InstancedGrassPass2Shader : public ShaderHelperSingleton<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Nearest_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Nearest_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedGrassPass2Shader();
 };
 
-class SphereMapShader : public ShaderHelperSingleton<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class SphereMapShader : public Shader<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     SphereMapShader();
 };
 
-class InstancedSphereMapShader : public ShaderHelperSingleton<InstancedSphereMapShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedSphereMapShader();
 };
 
-class SplattingShader : public ShaderHelperSingleton<SplattingShader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class SplattingShader : public Shader<SplattingShader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     SplattingShader();
 };
 
-class TransparentShader : public ShaderHelperSingleton<TransparentShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class TransparentShader : public Shader<TransparentShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     TransparentShader();
 };
 
-class TransparentFogShader : public ShaderHelperSingleton<TransparentFogShader, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class TransparentFogShader : public Shader<TransparentFogShader, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     TransparentFogShader();
 };
 
-class BillboardShader : public ShaderHelperSingleton<BillboardShader, core::matrix4, core::matrix4, core::vector3df, core::dimension2df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class BillboardShader : public Shader<BillboardShader, core::matrix4, core::matrix4, core::vector3df, core::dimension2df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     BillboardShader();
 };
 
 
-class ColorizeShader : public ShaderHelperSingleton<ColorizeShader, core::matrix4, video::SColorf>
+class ColorizeShader : public Shader<ColorizeShader, core::matrix4, video::SColorf>
 {
 public:
     ColorizeShader();
 };
 
-class InstancedColorizeShader : public ShaderHelperSingleton<InstancedColorizeShader>
+class InstancedColorizeShader : public Shader<InstancedColorizeShader>
 {
 public:
     InstancedColorizeShader();
 };
 
-class ShadowShader : public ShaderHelperSingleton<ShadowShader, int, core::matrix4>, public TextureRead<>
+class ShadowShader : public Shader<ShadowShader, int, core::matrix4>, public TextureRead<>
 {
 public:
     ShadowShader();
 };
 
-class RSMShader : public ShaderHelperSingleton<RSMShader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     RSMShader();
 };
 
-class InstancedRSMShader : public ShaderHelperSingleton<InstancedRSMShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedRSMShader();
 };
 
-class SplattingRSMShader : public ShaderHelperSingleton<SplattingRSMShader, core::matrix4, core::matrix4>,
+class SplattingRSMShader : public Shader<SplattingRSMShader, core::matrix4, core::matrix4>,
     public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     SplattingRSMShader();
 };
 
-class InstancedShadowShader : public ShaderHelperSingleton<InstancedShadowShader, int>, public TextureRead<>
+class InstancedShadowShader : public Shader<InstancedShadowShader, int>, public TextureRead<>
 {
 public:
     InstancedShadowShader();
 };
 
-class RefShadowShader : public ShaderHelperSingleton<RefShadowShader, int, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class RefShadowShader : public Shader<RefShadowShader, int, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public ShaderHelperSingleton<InstancedRefShadowShader, int>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedRefShadowShader : public Shader<InstancedRefShadowShader, int>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedRefShadowShader();
 };
 
-class GrassShadowShader : public ShaderHelperSingleton<GrassShadowShader, int, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     GrassShadowShader();
 };
 
-class InstancedGrassShadowShader : public ShaderHelperSingleton<InstancedGrassShadowShader, int, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader, int, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     InstancedGrassShadowShader();
 };
 
-class DisplaceMaskShader : public ShaderHelperSingleton<DisplaceMaskShader, core::matrix4>
+class DisplaceMaskShader : public Shader<DisplaceMaskShader, core::matrix4>
 {
 public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public ShaderHelperSingleton<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class DisplaceShader : public Shader<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     DisplaceShader();
 };
 
-class SkyboxShader : public ShaderHelperSingleton<SkyboxShader>, public TextureRead<Trilinear_cubemap>
+class SkyboxShader : public Shader<SkyboxShader>, public TextureRead<Trilinear_cubemap>
 {
 public:
     SkyboxShader();
     GLuint vao;
 };
 
-class NormalVisualizer : public ShaderHelperSingleton<NormalVisualizer, video::SColor>
+class NormalVisualizer : public Shader<NormalVisualizer, video::SColor>
 {
 public:
     NormalVisualizer();
 };
 
-class ViewFrustrumShader : public ShaderHelperSingleton<ViewFrustrumShader, video::SColor, int>
+class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
 {
 public:
     GLuint frustrumvao;
@@ -322,7 +323,7 @@ namespace LightShader
     };
 
 
-    class PointLightShader : public ShaderHelperSingleton<PointLightShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+    class PointLightShader : public Shader<PointLightShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
     {
     public:
         GLuint vbo;
@@ -330,7 +331,7 @@ namespace LightShader
         PointLightShader();
     };
 
-    class PointLightScatterShader : public ShaderHelperSingleton<PointLightScatterShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
+    class PointLightScatterShader : public Shader<PointLightScatterShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
     {
     public:
         GLuint vbo;
@@ -343,7 +344,7 @@ namespace LightShader
 template<typename T, typename... Args>
 static void DrawFullScreenEffect(Args...args)
 {
-    glUseProgram(T::getInstance()->Program);
+    T::getInstance()->use();
     glBindVertexArray(SharedObject::FullScreenQuadVAO);
     T::getInstance()->setUniforms(args...);
     glDrawArrays(GL_TRIANGLES, 0, 3);
@@ -352,82 +353,82 @@ static void DrawFullScreenEffect(Args...args)
 namespace FullScreenShader
 {
 
-class BloomShader : public ShaderHelperSingleton<BloomShader>, public TextureRead<Nearest_Filtered>
+class BloomShader : public Shader<BloomShader>, public TextureRead<Nearest_Filtered>
 {
 public:
     BloomShader();
 };
 
-class BloomBlendShader : public ShaderHelperSingleton<BloomBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class BloomBlendShader : public Shader<BloomBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
     BloomBlendShader();
 };
 
-class LensBlendShader : public ShaderHelperSingleton<LensBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class LensBlendShader : public Shader<LensBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
     LensBlendShader();
 };
 
 
-class ToneMapShader : public ShaderHelperSingleton<ToneMapShader, float>, public TextureRead<Nearest_Filtered>
+class ToneMapShader : public Shader<ToneMapShader, float>, public TextureRead<Nearest_Filtered>
 {
 public:
 
     ToneMapShader();
 };
 
-class DepthOfFieldShader : public ShaderHelperSingleton<DepthOfFieldShader>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
+class DepthOfFieldShader : public Shader<DepthOfFieldShader>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
 {
 public:
     DepthOfFieldShader();
 };
 
-class SunLightShader : public ShaderHelperSingleton<SunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+class SunLightShader : public Shader<SunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
 {
 public:
     SunLightShader();
 };
 
-class IBLShader : public ShaderHelperSingleton<IBLShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_cubemap>
+class IBLShader : public Shader<IBLShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_cubemap>
 {
 public:
     IBLShader();
 };
 
-class DegradedIBLShader : public ShaderHelperSingleton<DegradedIBLShader>, public TextureRead<Nearest_Filtered>
+class DegradedIBLShader : public Shader<DegradedIBLShader>, public TextureRead<Nearest_Filtered>
 {
 public:
     DegradedIBLShader();
 };
 
-class ShadowedSunLightShaderPCF : public ShaderHelperSingleton<ShadowedSunLightShaderPCF, float, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Shadow_Sampler>
+class ShadowedSunLightShaderPCF : public Shader<ShadowedSunLightShaderPCF, float, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Shadow_Sampler>
 {
 public:
     ShadowedSunLightShaderPCF();
 };
 
-class ShadowedSunLightShaderESM : public ShaderHelperSingleton<ShadowedSunLightShaderESM, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_Clamped_Array2D>
+class ShadowedSunLightShaderESM : public Shader<ShadowedSunLightShaderESM, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_Clamped_Array2D>
 {
 public:
     ShadowedSunLightShaderESM();
 };
 
-class RadianceHintsConstructionShader : public ShaderHelperSingleton<RadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class RadianceHintsConstructionShader : public Shader<RadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
     RadianceHintsConstructionShader();
 };
 
 // Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public ShaderHelperSingleton<NVWorkaroundRadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, int, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class NVWorkaroundRadianceHintsConstructionShader : public Shader<NVWorkaroundRadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, int, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
 {
 public:
     NVWorkaroundRadianceHintsConstructionShader();
 };
 
-class RHDebug : public ShaderHelperSingleton<RHDebug, core::matrix4, core::vector3df>
+class RHDebug : public Shader<RHDebug, core::matrix4, core::vector3df>
 {
 public:
     GLuint TU_SHR, TU_SHG, TU_SHB;
@@ -435,65 +436,65 @@ public:
     RHDebug();
 };
 
-class GlobalIlluminationReconstructionShader : public ShaderHelperSingleton<GlobalIlluminationReconstructionShader, core::matrix4, core::matrix4, core::vector3df>,
+class GlobalIlluminationReconstructionShader : public Shader<GlobalIlluminationReconstructionShader, core::matrix4, core::matrix4, core::vector3df>,
     public TextureRead<Nearest_Filtered, Nearest_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered>
 {
 public:
     GlobalIlluminationReconstructionShader();
 };
 
-class Gaussian17TapHShader : public ShaderHelperSingleton<Gaussian17TapHShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
+class Gaussian17TapHShader : public Shader<Gaussian17TapHShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian17TapHShader();
 };
 
-class ComputeGaussian17TapHShader : public ShaderHelperSingleton<ComputeGaussian17TapHShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
+class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
     ComputeGaussian17TapHShader();
 };
 
-class ComputeGaussian6HBlurShader : public ShaderHelperSingleton<ComputeGaussian6HBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
+class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
     ComputeGaussian6HBlurShader();
 };
 
-class ComputeShadowBlurHShader : public ShaderHelperSingleton<ComputeShadowBlurHShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
+class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
     ComputeShadowBlurHShader();
 };
 
-class Gaussian6HBlurShader : public ShaderHelperSingleton<Gaussian6HBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian6HBlurShader();
 };
 
-class HorizontalBlurShader : public ShaderHelperSingleton<HorizontalBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class HorizontalBlurShader : public Shader<HorizontalBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     HorizontalBlurShader();
 };
 
-class Gaussian3HBlurShader : public ShaderHelperSingleton<Gaussian3HBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian3HBlurShader();
 };
 
-class Gaussian17TapVShader : public ShaderHelperSingleton<Gaussian17TapVShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
+class Gaussian17TapVShader : public Shader<Gaussian17TapVShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian17TapVShader();
 };
 
-class ComputeGaussian17TapVShader : public ShaderHelperSingleton<ComputeGaussian17TapVShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
+class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
@@ -501,39 +502,39 @@ public:
     ComputeGaussian17TapVShader();
 };
 
-class ComputeGaussian6VBlurShader : public ShaderHelperSingleton<ComputeGaussian6VBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
+class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
     ComputeGaussian6VBlurShader();
 };
 
-class ComputeShadowBlurVShader : public ShaderHelperSingleton<ComputeShadowBlurVShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
+class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
 {
 public:
     GLuint TU_dest;
     ComputeShadowBlurVShader();
 };
 
-class Gaussian6VBlurShader : public ShaderHelperSingleton<Gaussian6VBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian6VBlurShader();
 };
 
-class Gaussian3VBlurShader : public ShaderHelperSingleton<Gaussian3VBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
 {
 public:
     Gaussian3VBlurShader();
 };
 
-class PassThroughShader : public ShaderHelperSingleton<PassThroughShader, int, int>, public TextureRead<Bilinear_Filtered>
+class PassThroughShader : public Shader<PassThroughShader, int, int>, public TextureRead<Bilinear_Filtered>
 {
 public:
     PassThroughShader();
 };
 
-class LayerPassThroughShader : public ShaderHelperSingleton<LayerPassThroughShader, int>
+class LayerPassThroughShader : public Shader<LayerPassThroughShader, int>
 {
 public:
     GLuint TU_texture;
@@ -542,31 +543,31 @@ public:
     LayerPassThroughShader();
 };
 
-class LinearizeDepthShader : public ShaderHelperSingleton<LinearizeDepthShader, float, float>, public TextureRead<Bilinear_Filtered>
+class LinearizeDepthShader : public Shader<LinearizeDepthShader, float, float>, public TextureRead<Bilinear_Filtered>
 {
 public:
     LinearizeDepthShader();
 };
 
-class LightspaceBoundingBoxShader : public ShaderHelperSingleton<LightspaceBoundingBoxShader, core::matrix4, float, float, float, float>, public TextureRead < Nearest_Filtered >
+class LightspaceBoundingBoxShader : public Shader<LightspaceBoundingBoxShader, core::matrix4, float, float, float, float>, public TextureRead < Nearest_Filtered >
 {
 public:
     LightspaceBoundingBoxShader();
 };
 
-class ShadowMatrixesGenerationShader : public ShaderHelperSingleton <ShadowMatrixesGenerationShader, core::matrix4>
+class ShadowMatrixesGenerationShader : public Shader <ShadowMatrixesGenerationShader, core::matrix4>
 {
 public:
     ShadowMatrixesGenerationShader();
 };
 
-class DepthHistogramShader : public ShaderHelperSingleton<DepthHistogramShader>, public TextureRead <Nearest_Filtered>
+class DepthHistogramShader : public Shader<DepthHistogramShader>, public TextureRead <Nearest_Filtered>
 {
 public:
     DepthHistogramShader();
 };
 
-class GlowShader : public ShaderHelperSingleton<GlowShader>, public TextureRead<Bilinear_Filtered>
+class GlowShader : public Shader<GlowShader>, public TextureRead<Bilinear_Filtered>
 {
 public:
     GLuint vao;
@@ -574,49 +575,49 @@ public:
     GlowShader();
 };
 
-class SSAOShader : public ShaderHelperSingleton<SSAOShader, float, float, float>, public TextureRead<Semi_trilinear>
+class SSAOShader : public Shader<SSAOShader, float, float, float>, public TextureRead<Semi_trilinear>
 {
 public:
     SSAOShader();
 };
 
-class FogShader : public ShaderHelperSingleton<FogShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
+class FogShader : public Shader<FogShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
 {
 public:
     FogShader();
 };
 
-class MotionBlurShader : public ShaderHelperSingleton<MotionBlurShader, core::matrix4, core::vector2df, float, float>, public TextureRead<Bilinear_Clamped_Filtered, Nearest_Filtered>
+class MotionBlurShader : public Shader<MotionBlurShader, core::matrix4, core::vector2df, float, float>, public TextureRead<Bilinear_Clamped_Filtered, Nearest_Filtered>
 {
 public:
     MotionBlurShader();
 };
 
-class GodFadeShader : public ShaderHelperSingleton<GodFadeShader, video::SColorf>, public TextureRead<Bilinear_Filtered>
+class GodFadeShader : public Shader<GodFadeShader, video::SColorf>, public TextureRead<Bilinear_Filtered>
 {
 public:
     GodFadeShader();
 };
 
-class GodRayShader : public ShaderHelperSingleton<GodRayShader, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class GodRayShader : public Shader<GodRayShader, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
     GodRayShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public ShaderHelperSingleton<MLAAColorEdgeDetectionSHader, core::vector2df>, public TextureRead<Nearest_Filtered>
+class MLAAColorEdgeDetectionSHader : public Shader<MLAAColorEdgeDetectionSHader, core::vector2df>, public TextureRead<Nearest_Filtered>
 {
 public:
     MLAAColorEdgeDetectionSHader();
 };
 
-class MLAABlendWeightSHader : public ShaderHelperSingleton<MLAABlendWeightSHader, core::vector2df>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
+class MLAABlendWeightSHader : public Shader<MLAABlendWeightSHader, core::vector2df>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
 {
 public:
     MLAABlendWeightSHader();
 };
 
-class MLAAGatherSHader : public ShaderHelperSingleton<MLAAGatherSHader, core::vector2df>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+class MLAAGatherSHader : public Shader<MLAAGatherSHader, core::vector2df>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
 {
 public:
     MLAAGatherSHader();
@@ -627,25 +628,25 @@ public:
 namespace UIShader
 {
 
-class Primitive2DList : public ShaderHelperSingleton<Primitive2DList>, public TextureRead < Bilinear_Filtered >
+class Primitive2DList : public Shader<Primitive2DList>, public TextureRead < Bilinear_Filtered >
 {
 public:
     Primitive2DList();
 };
 
-class TextureRectShader : public ShaderHelperSingleton<TextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class TextureRectShader : public Shader<TextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
     TextureRectShader();
 };
 
-class UniformColoredTextureRectShader : public ShaderHelperSingleton<UniformColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df, video::SColor>, public TextureRead<Bilinear_Filtered>
+class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df, video::SColor>, public TextureRead<Bilinear_Filtered>
 {
 public:
     UniformColoredTextureRectShader();
 };
 
-class ColoredTextureRectShader : public ShaderHelperSingleton<ColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class ColoredTextureRectShader : public Shader<ColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
 {
 public:
     GLuint colorvbo;
@@ -654,7 +655,7 @@ public:
     ColoredTextureRectShader();
 };
 
-class ColoredRectShader : public ShaderHelperSingleton<ColoredRectShader, core::vector2df, core::vector2df, video::SColor>
+class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df, core::vector2df, video::SColor>
 {
 public:
     ColoredRectShader();
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index e973ce79e..0d60a3d5a 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -147,7 +147,7 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
     glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * sizeof(CascadeBoundingBox), InitialCBB, GL_STATIC_DRAW);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, CBBssbo);
 
-    glUseProgram(FullScreenShader::LightspaceBoundingBoxShader::getInstance()->Program);
+    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->use();
     FullScreenShader::LightspaceBoundingBoxShader::getInstance()->SetTextureUnits(getDepthStencilTexture());
     FullScreenShader::LightspaceBoundingBoxShader::getInstance()->setUniforms(m_suncam->getViewMatrix(), shadowSplit[1], shadowSplit[2], shadowSplit[3], shadowSplit[4]);
     glDispatchCompute((int)width / 64, (int)height / 64, 1);
@@ -158,7 +158,7 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
     glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * 16 * sizeof(float), 0, GL_STATIC_COPY);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, tempShadowMatssbo);
 
-    glUseProgram(FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->Program);
+    FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->use();
     FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->setUniforms(m_suncam->getViewMatrix());
     glDispatchCompute(4, 1, 1);
 
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 90c42572b..68d5fa978 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -68,7 +68,7 @@ void STKBillboard::render()
         return;
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
-    glUseProgram(MeshShader::BillboardShader::getInstance()->Program);
+    MeshShader::BillboardShader::getInstance()->use();
     MeshShader::BillboardShader::getInstance()->SetTextureUnits(texid);
     MeshShader::BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index bf4176402..1e96764e9 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -274,7 +274,7 @@ void STKMeshSceneNode::render()
         glDisable(GL_CULL_FACE);
         if (update_each_frame)
             updatevbo();
-        glUseProgram(MeshShader::ObjectPass1Shader::getInstance()->Program);
+        MeshShader::ObjectPass1Shader::getInstance()->use();
         // Only untextured
         for (unsigned i = 0; i < GLmeshes.size(); i++)
         {
@@ -313,7 +313,7 @@ void STKMeshSceneNode::render()
         glDisable(GL_CULL_FACE);
         if (update_each_frame && !CVS->isDefferedEnabled())
             updatevbo();
-        glUseProgram(MeshShader::ObjectPass2Shader::getInstance()->Program);
+        MeshShader::ObjectPass2Shader::getInstance()->use();
         // Only untextured
         for (unsigned i = 0; i < GLmeshes.size(); i++)
         {
@@ -366,7 +366,7 @@ void STKMeshSceneNode::render()
 
     if (irr_driver->getPhase() == GLOW_PASS)
     {
-        glUseProgram(MeshShader::ColorizeShader::getInstance()->Program);
+        MeshShader::ColorizeShader::getInstance()->use();
         for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
         {
             scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);
@@ -395,7 +395,7 @@ void STKMeshSceneNode::render()
 
             if (World::getWorld() && World::getWorld()->isFogEnabled())
             {
-                glUseProgram(MeshShader::TransparentFogShader::getInstance()->Program);
+                MeshShader::TransparentFogShader::getInstance()->use();
                 for (unsigned i = 0; i < GLmeshes.size(); i++)
                 {
                     GLMesh &mesh = GLmeshes[i];
@@ -439,7 +439,7 @@ void STKMeshSceneNode::render()
             }
             else
             {
-                glUseProgram(MeshShader::TransparentShader::getInstance()->Program);
+                MeshShader::TransparentShader::getInstance()->use();
                 for (unsigned i = 0; i < GLmeshes.size(); i++)
                 {
                     irr_driver->IncreaseObjectCount();

From 819156106d26b3ef3bba7da05c4a699860641edd Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Fri, 24 Apr 2015 03:45:05 +0200
Subject: [PATCH 131/331] Mark text as RTL when at least one character is RTL

---
 src/utils/translation.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index da9139bbb..cb62a58f1 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -422,9 +422,17 @@ bool Translations::isRTLText(const wchar_t *in_ptr)
         fribidi_get_bidi_types(fribidiInput, length, types);
         freeFribidiChar(fribidiInput);
 
-        FriBidiParType type = fribidi_get_par_direction(types, length);
+        // Declare as RTL if one character is RTL
+        for (std::size_t i = 0; i < length; i++)
+        {
+            if (types[i] == FRIBIDI_TYPE_RTL ||
+                types[i] == FRIBIDI_TYPE_RLO)
+            {
+                delete[] types;
+                return true;
+            }
+        }
         delete[] types;
-        return type == FRIBIDI_PAR_RTL;
     }
     return false;
 #else

From 865760ffa4b7a4ff772fa3fc6e72d5bc50368e1a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 24 Apr 2015 12:36:25 +1000
Subject: [PATCH 132/331] Fixed reloadShader functionality.

---
 src/graphics/irr_driver.hpp |  2 --
 src/graphics/shader.cpp     | 13 ++++++++++---
 src/graphics/shader.hpp     | 15 +++++++++------
 src/utils/debug.cpp         |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 5af343f98..cfe9feea0 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -560,8 +560,6 @@ public:
     // -----------------------------------------------------------------------
     inline video::E_MATERIAL_TYPE getShader(const ShaderType num)  {return m_shaders->getShader(num);}
     // -----------------------------------------------------------------------
-    inline void updateShaders()  {m_shaders->killShaders();}
-    // ------------------------------------------------------------------------
     inline video::IShaderConstantSetCallBack* getCallback(const ShaderType num)
     {
         return (m_shaders == NULL ? NULL : m_shaders->m_callbacks[num]);
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index ad61cff66..d728650f9 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -28,8 +28,8 @@
 #include <sstream>
 #include <stdio.h>
 
-std::string                ShaderBase::m_shader_header = "";
-std::vector<ShaderBase *>  ShaderBase::m_all_shaders;
+std::string             ShaderBase::m_shader_header = "";
+std::vector<void(*)()>  ShaderBase::m_all_kill_functions;
 
 // ----------------------------------------------------------------------------
 /** Returns a string with the content of header.txt (which contains basic
@@ -199,11 +199,18 @@ void ShaderBase::bypassUBO() const
  */
 ShaderBase::ShaderBase()
 {
-    m_all_shaders.push_back(this);
 }   // ShaderBase
 
 // ----------------------------------------------------------------------------
+void ShaderBase::updateShaders()
+{
+    for (unsigned int i = 0; i < m_all_kill_functions.size(); i++)
+    {
+        m_all_kill_functions[i]();
+    }
+}   // updateShaders
 
+// ----------------------------------------------------------------------------
 void ShaderBase::setAttribute(AttributeType type)
 {
     switch (type)
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 9e59032ba..de88a527a 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -37,10 +37,11 @@ private:
     *  this file repeatedly. */
     static std::string m_shader_header;
 
-    /** Maintains a list of all shaders. */
-    static std::vector<ShaderBase *> m_all_shaders;
 
 protected:
+    /** Maintains a list of all shaders. */
+    static std::vector<void (*)()> m_all_kill_functions;
+
     enum AttributeType
     {
         OBJECT,
@@ -53,7 +54,6 @@ protected:
 
     void bypassUBO() const;
 
-protected:
     // ------------------------------------------------------------------------
     // Ends vararg template
     template<typename ... Types>
@@ -81,9 +81,7 @@ protected:
     // ------------------------------------------------------------------------
 
     const std::string& getHeader();
-
     GLuint loadShader(const std::string &file, unsigned type);
-protected:
     void setAttribute(AttributeType type);
 
 public:
@@ -91,7 +89,7 @@ public:
     int loadTFBProgram(const std::string &vertex_file_path,
                        const char **varyings,
                        unsigned varyingscount);
-
+    static void updateShaders();
     // ------------------------------------------------------------------------
     /** Activates the shader calling glUseProgram. */
     void use() { glUseProgram(m_program); }
@@ -243,6 +241,11 @@ private:
 
 public:
 
+    Shader()
+    {
+        m_all_kill_functions.push_back(this->kill);
+    }
+
     template<typename ... Types>
     void loadProgram(AttributeType type, Types ... args)
     {
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index b40481a27..e552f9820 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -296,7 +296,7 @@ bool onEvent(const SEvent &event)
                 if(cmdID == DEBUG_GRAPHICS_RELOAD_SHADERS)
                 {
                     Log::info("Debug", "Reloading shaders...");
-                    irr_driver->updateShaders();
+                    ShaderBase::updateShaders();
                 }
                 else if (cmdID == DEBUG_GRAPHICS_RESET)
                 {

From 118233fb249ba17c584408b4ab0f706f505848f0 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 24 Apr 2015 14:57:36 +1000
Subject: [PATCH 133/331] Removed now duplicated code.

---
 src/graphics/shaders.cpp      |  60 -----------
 src/graphics/shaders_util.hpp | 187 ----------------------------------
 2 files changed, 247 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 35e5e044e..f847d4a5c 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -199,67 +199,7 @@ GLuint LoadShader(const char * file, unsigned type)
     return Id;
 }
 
-void setAttribute(AttributeType Tp, GLuint ProgramID)
-{
-    switch (Tp)
-    {
-    case OBJECT:
-        glBindAttribLocation(ProgramID, 0, "Position");
-        glBindAttribLocation(ProgramID, 1, "Normal");
-        glBindAttribLocation(ProgramID, 2, "Color");
-        glBindAttribLocation(ProgramID, 3, "Texcoord");
-        glBindAttribLocation(ProgramID, 4, "SecondTexcoord");
-        glBindAttribLocation(ProgramID, 5, "Tangent");
-        glBindAttribLocation(ProgramID, 6, "Bitangent");
-        glBindAttribLocation(ProgramID, 7, "Origin");
-        glBindAttribLocation(ProgramID, 8, "Orientation");
-        glBindAttribLocation(ProgramID, 9, "Scale");
-        break;
-    case PARTICLES_SIM:
-        glBindAttribLocation(ProgramID, 0, "particle_position");
-        glBindAttribLocation(ProgramID, 1, "lifetime");
-        glBindAttribLocation(ProgramID, 2, "particle_velocity");
-        glBindAttribLocation(ProgramID, 3, "size");
-        glBindAttribLocation(ProgramID, 4, "particle_position_initial");
-        glBindAttribLocation(ProgramID, 5, "lifetime_initial");
-        glBindAttribLocation(ProgramID, 6, "particle_velocity_initial");
-        glBindAttribLocation(ProgramID, 7, "size_initial");
-        break;
-    case PARTICLES_RENDERING:
-        glBindAttribLocation(ProgramID, 1, "lifetime");
-        glBindAttribLocation(ProgramID, 2, "size");
-        glBindAttribLocation(ProgramID, 4, "quadcorner");
-        glBindAttribLocation(ProgramID, 5, "rotationvec");
-        glBindAttribLocation(ProgramID, 6, "anglespeed");
-        break;
-    }
-}
 
-GLuint LoadTFBProgram(const char * vertex_file_path, const char **varyings, unsigned varyingscount)
-{
-    GLuint Program = glCreateProgram();
-    loadAndAttach(Program, GL_VERTEX_SHADER, vertex_file_path);
-    if (CVS->getGLSLVersion() < 330)
-        setAttribute(PARTICLES_SIM, Program);
-    glTransformFeedbackVaryings(Program, varyingscount, varyings, GL_INTERLEAVED_ATTRIBS);
-    glLinkProgram(Program);
-
-    GLint Result = GL_FALSE;
-    int InfoLogLength;
-    glGetProgramiv(Program, GL_LINK_STATUS, &Result);
-    if (Result == GL_FALSE)
-    {
-        glGetProgramiv(Program, GL_INFO_LOG_LENGTH, &InfoLogLength);
-        char *ErrorMessage = new char[InfoLogLength];
-        glGetProgramInfoLog(Program, InfoLogLength, NULL, ErrorMessage);
-        Log::error("GLWrap", ErrorMessage);
-        delete[] ErrorMessage;
-    }
-
-    glGetError();
-
-    return Program;
-}
 
 GLuint quad_vbo, tri_vbo;
 
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 1a5638b9c..cbba59bdd 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -30,36 +30,6 @@ bool needsUBO();
 
 unsigned getGLSLVersion();
 
-GLuint LoadShader(const char * file, unsigned type);
-GLuint LoadTFBProgram(const char * vertex_file_path, const char **varyings, unsigned varyingscount);
-
-template<typename ... Types>
-void loadAndAttach(GLint ProgramID)
-{
-    return;
-}
-
-template<typename ... Types>
-void loadAndAttach(GLint ProgramID, GLint ShaderType, const char *filepath, Types ... args)
-{
-    GLint ShaderID = LoadShader(filepath, ShaderType);
-    glAttachShader(ProgramID, ShaderID);
-    glDeleteShader(ShaderID);
-    loadAndAttach(ProgramID, args...);
-}
-
-template<typename ...Types>
-void oldPrintFileList()
-{
-    return;
-}
-
-template<typename ...Types>
-void oldPrintFileList(GLint ShaderType, const char *filepath, Types ... args)
-{
-    Log::error("GLWrapp", filepath);
-    oldPrintFileList(args...);
-}
 
 enum AttributeType
 {
@@ -70,165 +40,8 @@ enum AttributeType
 
 void setAttribute(AttributeType Tp, GLuint ProgramID);
 
-template<typename ... Types>
-GLint LoadProgram(AttributeType Tp, Types ... args)
-{
-    GLint ProgramID = glCreateProgram();
-    loadAndAttach(ProgramID, args...);
-    if (getGLSLVersion() < 330)
-        setAttribute(Tp, ProgramID);
-    glLinkProgram(ProgramID);
-
-    GLint Result = GL_FALSE;
-    int InfoLogLength;
-    glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
-    if (Result == GL_FALSE) {
-        Log::error("GLWrapp", "Error when linking these shaders :");
-        oldPrintFileList(args...);
-        glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-        char *ErrorMessage = new char[InfoLogLength];
-        glGetProgramInfoLog(ProgramID, InfoLogLength, NULL, ErrorMessage);
-        Log::error("GLWrapp", ErrorMessage);
-        delete[] ErrorMessage;
-    }
-
-    GLenum glErr = glGetError();
-    if (glErr != GL_NO_ERROR)
-    {
-        Log::warn("IrrDriver", "GLWrap : OpenGL error %i\n", glErr);
-    }
-
-    return ProgramID;
-}
-
-struct UniformHelper
-{
-    template<unsigned N = 0>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms)
-    {
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::core::matrix4 &mat, Args... arg)
-    {
-        glUniformMatrix4fv(uniforms[N], 1, GL_FALSE, mat.pointer());
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::video::SColorf &col, Args... arg)
-    {
-        glUniform3f(uniforms[N], col.r, col.g, col.b);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::video::SColor &col, Args... arg)
-    {
-        glUniform4i(uniforms[N], col.getRed(), col.getGreen(), col.getBlue(), col.getAlpha());
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::core::vector3df &v, Args... arg)
-    {
-        glUniform3f(uniforms[N], v.X, v.Y, v.Z);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::core::vector2df &v, Args... arg)
-    {
-        glUniform2f(uniforms[N], v.X, v.Y);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const irr::core::dimension2df &v, Args... arg)
-    {
-        glUniform2f(uniforms[N], v.Width, v.Height);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, float f, Args... arg)
-    {
-        glUniform1f(uniforms[N], f);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, int f, Args... arg)
-    {
-        glUniform1i(uniforms[N], f);
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-    template<unsigned N = 0, typename... Args>
-    static void setUniformsHelper(const std::vector<GLuint> &uniforms, const std::vector<float> &v, Args... arg)
-    {
-        glUniform1fv(uniforms[N], (int)v.size(), v.data());
-        setUniformsHelper<N + 1>(uniforms, arg...);
-    }
-
-};
-
 void bypassUBO(GLuint Program);
 
-extern std::vector<void(*)()> CleanTable;
-
-template<typename T, typename... Args>
-class ShaderHelperSingleton : public Singleton<T>
-{
-protected:
-    std::vector<GLuint> uniforms;
-
-    void AssignUniforms_impl()
-    {
-        GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData");
-        if (uniform_ViewProjectionMatrixesUBO != GL_INVALID_INDEX)
-            glUniformBlockBinding(Program, uniform_ViewProjectionMatrixesUBO, 0);
-        GLuint uniform_LightingUBO = glGetUniformBlockIndex(Program, "LightingData");
-        if (uniform_LightingUBO != GL_INVALID_INDEX)
-            glUniformBlockBinding(Program, uniform_LightingUBO, 1);
-    }
-
-    template<typename... U>
-    void AssignUniforms_impl(const char* name, U... rest)
-    {
-        uniforms.push_back(glGetUniformLocation(Program, name));
-        AssignUniforms_impl(rest...);
-    }
-
-    template<typename... U>
-    void AssignUniforms(U... rest)
-    {
-        static_assert(sizeof...(rest) == sizeof...(Args), "Count of Uniform's name mismatch");
-        AssignUniforms_impl(rest...);
-    }
-
-public:
-    GLuint Program;
-
-    ShaderHelperSingleton()
-    {
-        CleanTable.push_back(this->kill);
-    }
-
-    ~ShaderHelperSingleton()
-    {
-        glDeleteProgram(Program);
-    }
-
-    void setUniforms(const Args & ... args) const
-    {
-        if (!CVS->isARBUniformBufferObjectUsable())
-            bypassUBO(Program);
-        UniformHelper::setUniformsHelper(uniforms, args...);
-    }
-};
-
 enum SamplerType {
     Trilinear_Anisotropic_Filtered,
     Semi_trilinear,

From 45d6c863b31cb4f235ad477b6383d92f4e8cd845 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 25 Apr 2015 00:57:53 +1000
Subject: [PATCH 134/331] Moved AssignTextureUnit to new Shader base class.

---
 src/graphics/gpuparticles.cpp    | 185 ++++++++++++++-----------------
 src/graphics/gpuparticles.hpp    |  40 +------
 src/graphics/render_geometry.cpp |  10 +-
 src/graphics/shader.hpp          |  46 ++++++++
 src/graphics/shaders.cpp         |  68 +++---------
 src/graphics/shaders_util.hpp    |   1 +
 6 files changed, 157 insertions(+), 193 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index f82f1bf14..26db98880 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -28,6 +28,91 @@
 #include "../../lib/irrlicht/source/Irrlicht/os.h"
 #define COMPONENTCOUNT 8
 
+
+// ============================================================================
+/** Transform feedback shader that simulates the particles on GPU.
+*/
+class PointEmitterShader : public Shader
+    < PointEmitterShader, core::matrix4, int, int, float >
+{
+public:
+    PointEmitterShader()
+    {
+        const char *varyings[] = { "new_particle_position", "new_lifetime",
+                                   "new_particle_velocity",  "new_size"     };
+        loadTFBProgram("pointemitter.vert", varyings, 4);
+        assignUniforms("sourcematrix", "dt", "level", "size_increase_factor");
+    }   // PointEmitterShader
+
+};   // PointEmitterShader
+
+// ============================================================================
+
+/** A Shader to render particles.
+*/
+class SimpleParticleRender : public Shader<SimpleParticleRender, video::SColorf,
+                                           video::SColorf>,
+                             public TextureRead<Trilinear_Anisotropic_Filtered,
+                                                Nearest_Filtered>
+{
+public:
+    SimpleParticleRender()
+    {
+        loadProgram(PARTICLES_RENDERING,
+                    GL_VERTEX_SHADER,   "particle.vert",
+                    GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                    GL_FRAGMENT_SHADER, "particle.frag");
+
+        assignUniforms("color_from", "color_to");
+        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+    }   // SimpleParticleRender
+
+};   // SimpleParticleRender
+
+// ============================================================================
+
+class FlipParticleRender : public Shader<FlipParticleRender>, 
+                           public TextureRead < Trilinear_Anisotropic_Filtered,
+                                                Nearest_Filtered >
+{
+public:
+    FlipParticleRender()
+    {
+        loadProgram(PARTICLES_RENDERING,
+                    GL_VERTEX_SHADER,   "flipparticle.vert",
+                    GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                    GL_FRAGMENT_SHADER, "particle.frag");
+        assignUniforms();
+        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+    }
+
+};   // FlipParticleShader
+
+// ============================================================================
+/** */
+class HeightmapSimulationShader : public Shader <HeightmapSimulationShader,
+                                                 core::matrix4, int, int,
+                                                 float,float,float,float,float>
+{
+public:
+    GLuint m_TU_heightmap;
+
+    HeightmapSimulationShader()
+    {
+        const char *varyings[] = {"new_particle_position", "new_lifetime",
+                                  "new_particle_velocity", "new_size"      };
+        loadTFBProgram("particlesimheightmap.vert", varyings, 4);
+        assignUniforms("sourcematrix", "dt", "level", "size_increase_factor",
+                       "track_x", "track_x_len", "track_z", "track_z_len");
+        m_TU_heightmap = 2;
+        assignTextureUnit(TexUnit(m_TU_heightmap, "heightmap"));
+    }
+
+
+};
+
+// ============================================================================
+
 scene::IParticleSystemSceneNode *ParticleSystemProxy::addParticleNode(
     bool withDefaultEmitter, bool randomize_initial_y, ISceneNode* parent, s32 id,
     const core::vector3df& position,
@@ -388,7 +473,7 @@ void ParticleSystemProxy::simulate()
     if (has_height_map)
     {
         HeightmapSimulationShader::getInstance()->use();
-        glActiveTexture(GL_TEXTURE0 + HeightmapSimulationShader::getInstance()->TU_heightmap);
+        glActiveTexture(GL_TEXTURE0 + HeightmapSimulationShader::getInstance()->m_TU_heightmap);
         glBindTexture(GL_TEXTURE_BUFFER, heightmaptexture);
         HeightmapSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor, track_x, track_x_len, track_z, track_z_len);
     }
@@ -535,101 +620,3 @@ void ParticleSystemProxy::render() {
     simulate();
     draw();
 }
-
-
-// ============================================================================
-
-PointEmitterShader::PointEmitterShader()
-{
-    const char *varyings[] = {
-        "new_particle_position",
-        "new_lifetime",
-        "new_particle_velocity",
-        "new_size",
-    };
-    loadTFBProgram("pointemitter.vert", varyings, 4);
-    assignUniforms("sourcematrix", "dt", "level", "size_increase_factor");
-}   // PointEmitterShader
-
-// ============================================================================
-SimpleParticleRender::SimpleParticleRender()
-{
-    loadProgram(PARTICLES_RENDERING,
-                GL_VERTEX_SHADER,   "particle.vert",
-                GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-                GL_FRAGMENT_SHADER, "particle.frag");
-
-    assignUniforms("color_from", "color_to");
-
-    AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
-}   // SimpleParticleRender
-
-// ============================================================================
-
-
-struct TexUnit
-{
-    GLuint m_index;
-    const char* m_uniform;
-
-    TexUnit(GLuint index, const char* uniform)
-    {
-        m_index = index;
-        m_uniform = uniform;
-    }
-};
-static void
-AssignTextureUnit(GLuint Program, TexUnit texUnit)
-{
-    glUseProgram(Program);
-    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-    glUniform1i(uniform, texUnit.m_index);
-    glUseProgram(0);
-}
-
-template<typename... T>
-static void AssignTextureUnit(GLuint Program, TexUnit texUnit, T... rest)
-{
-    glUseProgram(Program);
-    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-    glUniform1i(uniform, texUnit.m_index);
-    AssignTextureUnit_Sub(Program, rest...);
-    glUseProgram(0);
-}
-
-static void AssignTextureUnit_Sub(GLuint Program) {}
-
-template<typename... T>
-static void AssignTextureUnit_Sub(GLuint Program, TexUnit texUnit, T... rest)
-{
-    GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-    glUniform1i(uniform, texUnit.m_index);
-    AssignTextureUnit_Sub(Program, rest...);
-}
-
-
-
-HeightmapSimulationShader::HeightmapSimulationShader()
-{
-    const char *varyings[] = {
-        "new_particle_position",
-        "new_lifetime",
-        "new_particle_velocity",
-        "new_size",
-    };
-    loadTFBProgram("particlesimheightmap.vert", varyings, 4);
-    TU_heightmap = 2;
-    AssignTextureUnit(m_program, TexUnit(TU_heightmap, "heightmap"));
-    assignUniforms("sourcematrix", "dt", "level", "size_increase_factor", "track_x", "track_x_len", "track_z", "track_z_len");
-}
-
-FlipParticleRender::FlipParticleRender()
-{
-    loadProgram(PARTICLES_RENDERING,
-        GL_VERTEX_SHADER, "flipparticle.vert",
-        GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-        GL_FRAGMENT_SHADER, "particle.frag");
-    assignUniforms();
-
-    AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
-}
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index d575e279e..f1b744964 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -19,48 +19,16 @@
 #define HEADER_GPU_PARTICLES_HPP
 
 #include "graphics/shader.hpp"
+
 #include "../lib/irrlicht/source/Irrlicht/CParticleSystemSceneNode.h"
 #include <ISceneManager.h>
 #include <IParticleSystemSceneNode.h>
 
-
-class PointEmitterShader : public Shader 
-                           < PointEmitterShader, core::matrix4, int, int, float >
-{
-public:
-    PointEmitterShader();
-};   // PointEmitterShader
-
-// ============================================================================
-class SimpleParticleRender : public Shader<SimpleParticleRender, video::SColorf,
-                                           video::SColorf>,
-                             public TextureRead<Trilinear_Anisotropic_Filtered,
-                                                Nearest_Filtered>
-{
-public:
-    SimpleParticleRender();
-};   // SimpleParticleRender
-
-// ============================================================================
-
-    class HeightmapSimulationShader : public Shader<HeightmapSimulationShader, core::matrix4, int, int, float, float, float, float, float>
-    {
-    public:
-        GLuint TU_heightmap;
-
-        HeightmapSimulationShader();
-    };
-
-
-    class FlipParticleRender : public Shader<FlipParticleRender>, public TextureRead<Trilinear_Anisotropic_Filtered, Nearest_Filtered>
-    {
-    public:
-        FlipParticleRender();
-    };
-
-
 namespace irr { namespace video{ class ITexture; } }
 
+
+
+
 class ParticleSystemProxy : public scene::CParticleSystemSceneNode
 {
 protected:
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 7a8047b3c..bb03e5eb7 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -754,7 +754,7 @@ void IrrDriver::renderNormalsVisualisation()
 }
 
 template<typename Shader, enum video::E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
-void renderTransparenPass(const std::vector<TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     Shader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
@@ -802,19 +802,19 @@ void IrrDriver::renderTransparent()
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(0, true)), ListBlendTransparentFog::getInstance());
+            RenderGeometry::TexUnit(0, true)), ListBlendTransparentFog::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
         renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            TexUnit(0, true)), ListAdditiveTransparentFog::getInstance());
+            RenderGeometry::TexUnit(0, true)), ListAdditiveTransparentFog::getInstance());
     }
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(0, true)), ListBlendTransparent::getInstance());
+            RenderGeometry::TexUnit(0, true)), ListBlendTransparent::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
         renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            TexUnit(0, true)), ListAdditiveTransparent::getInstance());
+            RenderGeometry::TexUnit(0, true)), ListAdditiveTransparent::getInstance());
     }
 
     for (unsigned i = 0; i < BillBoardList::getInstance()->size(); i++)
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index de88a527a..fd8b9967c 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -238,6 +238,52 @@ private:
         Log::error("shader", filepath);
         printFileList(args...);
     }   // printFileList
+protected:
+
+    /** Stores texture index and uniform. */
+    class TexUnit
+    {
+    public:
+        GLuint      m_index;
+        const char* m_uniform;
+
+        TexUnit(GLuint index, const char* uniform)
+        {
+            m_index    = index;
+            m_uniform = uniform;
+        }   // TexUnit
+    };   // class TexUnit
+
+    // ========================================================================
+    void assignTextureUnit(TexUnit tex_unit)
+    {
+        glUseProgram(m_program);
+        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
+        glUniform1i(uniform, tex_unit.m_index);
+        glUseProgram(0);
+    }   // assignTextureUnit
+    // ------------------------------------------------------------------------
+    template<typename... T> 
+    void assignTextureUnit(TexUnit tex_unit, T... rest)
+    {
+        glUseProgram(m_program);
+        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
+        glUniform1i(uniform, tex_unit.m_index);
+        assignTextureUnitNoUse(rest...);
+        glUseProgram(0);
+    }   // assignTextureUnit
+    // ------------------------------------------------------------------------
+
+    void assignTextureUnitNoUse() {}
+    // ------------------------------------------------------------------------
+    template<typename... T>
+    void assignTextureUnitNoUse(TexUnit tex_unit, T... rest)
+    {
+        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
+        glUniform1i(uniform, tex_unit.m_index);
+        assignTextureUnitNoUse(rest...);
+    }
+
 
 public:
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index f847d4a5c..6c48d9680 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -57,7 +57,7 @@
  \subsection shader_declaration_bind_texture_unit Bind texture unit and name
 
  Texture are optional but if you have one, you must give them determined texture unit (up to 32).
- You can do this using the AssignTextureUnit function that takes pair of texture unit and sampler name
+ You can do this using the assignTextureUnit function that takes pair of texture unit and sampler name
  as argument.
 
  \section shader_usage
@@ -97,6 +97,7 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/gpuparticles.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shaders_util.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 #include "graphics/glwrap.hpp"
@@ -515,20 +516,9 @@ namespace UtilShader
         glBindBuffer(GL_ARRAY_BUFFER, 0);
     }
 
-    struct TexUnit
-    {
-        GLuint m_index;
-        const char* m_uniform;
-
-        TexUnit(GLuint index, const char* uniform)
-        {
-            m_index = index;
-            m_uniform = uniform;
-        }
-    };
 
     template <typename T>
-    std::vector<TexUnit> TexUnits(T curr) // required on older clang versions
+    std::vector<Shader::TexUnit> TexUnits(T curr) // required on older clang versions
     {
         std::vector<TexUnit> v;
         v.push_back(curr);
@@ -536,7 +526,7 @@ namespace UtilShader
     }
 
     template <typename T, typename... R>
-    std::vector<TexUnit> TexUnits(T curr, R... rest) // required on older clang versions
+    std::vector<Shader::TexUnit> TexUnits(T curr, R... rest) // required on older clang versions
     {
         std::vector<TexUnit> v;
         v.push_back(curr);
@@ -545,46 +535,18 @@ namespace UtilShader
     }
 
     template <typename T, typename... R>
-    void VTexUnits(std::vector<TexUnit>& v, T curr, R... rest) // required on older clang versions
+    void VTexUnits(std::vector<Shader::TexUnit>& v, T curr, R... rest) // required on older clang versions
     {
         v.push_back(curr);
         VTexUnits(v, rest...);
     }
 
     template <typename T>
-    void VTexUnits(std::vector<TexUnit>& v, T curr)
+    void VTexUnits(std::vector<Shader::TexUnit>& v, T curr)
     {
         v.push_back(curr);
     }
 
-    static void
-    AssignTextureUnit(GLuint Program, TexUnit texUnit)
-    {
-        glUseProgram(Program);
-        GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-        glUniform1i(uniform, texUnit.m_index);
-        glUseProgram(0);
-    }
-
-    template<typename... T>
-    static void AssignTextureUnit(GLuint Program, TexUnit texUnit, T... rest)
-    {
-        glUseProgram(Program);
-        GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-        glUniform1i(uniform, texUnit.m_index);
-        AssignTextureUnit_Sub(Program, rest...);
-        glUseProgram(0);
-    }
-
-    static void AssignTextureUnit_Sub(GLuint Program) {}
-
-    template<typename... T>
-    static void AssignTextureUnit_Sub(GLuint Program, TexUnit texUnit, T... rest)
-    {
-        GLuint uniform = glGetUniformLocation(Program, texUnit.m_uniform);
-        glUniform1i(uniform, texUnit.m_index);
-        AssignTextureUnit_Sub(Program, rest...);
-    }
 }
 using namespace UtilShader;
 
@@ -829,7 +791,7 @@ namespace UtilShader
         assignUniforms("PermutationMatrix", "ViewportSize");
         TU_Samples = 1;
         AssignSamplerNames(m_program, 0, "tex");
-        AssignTextureUnit(m_program, TexUnit(TU_Samples, "samples"));
+        assignTextureUnit(TexUnit(TU_Samples, "samples"));
     }
 }
 
@@ -1614,7 +1576,7 @@ namespace FullScreenShader
         TU_SHR = 0;
         TU_SHG = 1;
         TU_SHB = 2;
-        AssignTextureUnit(m_program, TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
+        assignTextureUnit(TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
     }
 
     GlobalIlluminationReconstructionShader::GlobalIlluminationReconstructionShader()
@@ -1644,7 +1606,7 @@ namespace FullScreenShader
         TU_dest = 2;
         assignUniforms("pixel");
         AssignSamplerNames(m_program, 0, "source", 1, "depth");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     ComputeGaussian6HBlurShader::ComputeGaussian6HBlurShader()
@@ -1654,7 +1616,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     ComputeShadowBlurHShader::ComputeShadowBlurHShader()
@@ -1664,7 +1626,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     Gaussian6HBlurShader::Gaussian6HBlurShader()
@@ -1714,7 +1676,7 @@ namespace FullScreenShader
         TU_dest = 2;
         assignUniforms("pixel");
         AssignSamplerNames(m_program, 0, "source", 1, "depth");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     ComputeGaussian6VBlurShader::ComputeGaussian6VBlurShader()
@@ -1724,7 +1686,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     ComputeShadowBlurVShader::ComputeShadowBlurVShader()
@@ -1734,7 +1696,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        AssignTextureUnit(m_program, TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TexUnit(TU_dest, "dest"));
     }
 
     Gaussian6VBlurShader::Gaussian6VBlurShader()
@@ -1774,7 +1736,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "layertexturequad.frag");
         TU_texture = 0;
         assignUniforms("layer");
-        AssignTextureUnit(m_program, TexUnit(TU_texture, "tex"));
+        assignTextureUnit(TexUnit(TU_texture, "tex"));
         vao = createVAO(m_program);
     }
 
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index cbba59bdd..60adfa715 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -369,6 +369,7 @@ protected:
     std::vector<GLuint> TextureUnits;
     std::vector<GLenum> TextureType;
     std::vector<GLenum> TextureLocation;
+public:
     template<typename...Args>
     void AssignSamplerNames(GLuint Program, Args...args)
     {

From 30431adc69a397dcd54f02e7f18c023a33c9d316 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 24 Apr 2015 20:17:22 -0400
Subject: [PATCH 135/331] Add forgotten credit to Divvy81

---
 data/CREDITS | Bin 14122 -> 14142 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index 60b065e4d4c572f2cb681bc5aa77662bc6528742..6f517dea5fb6062ee967553b250f5a13486ea0bb 100644
GIT binary patch
delta 26
gcmZ3Lw=ZwQ18!ayhD?SsAgpAtU@+W#lRHow0D<NRdjJ3c

delta 12
Tcmdm&w<>SL1MbaVxV^LiEI|eb


From fc942433e28312706660e41f1c27b92670ef31a6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 24 Apr 2015 20:17:55 -0400
Subject: [PATCH 136/331] Tweak over previous commit

---
 data/CREDITS | Bin 14142 -> 14170 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/CREDITS b/data/CREDITS
index 6f517dea5fb6062ee967553b250f5a13486ea0bb..54c5227802df5054c83a77fa70e54c7a53e6a7c7 100644
GIT binary patch
delta 48
zcmdm&cPnqhGj8QdhC~Jh25*K^hHN0K2*}o8NMXoiC<DSu1`7s52F=ZHxdXKURqYI9

delta 20
bcmcbWw=ZwQGj8@WhDrtt2E)yqJb~H(SsMnq


From 9f883db6f7a65ec3dde21427eca40276401a0689 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 24 Apr 2015 20:59:32 -0400
Subject: [PATCH 137/331] Start work to enable scripting

---
 lib/angelscript/source/as_context.cpp      |   2 +-
 src/scriptengine/script_engine.cpp         | 120 +++++++++++++--------
 src/scriptengine/script_engine.hpp         |   1 +
 src/scriptengine/script_track.cpp          |   2 +-
 src/scriptengine/scriptstdstring_utils.cpp | 109 +++++++++++++++++--
 src/tracks/track.cpp                       |   4 +
 src/tracks/track_object_presentation.cpp   |   9 +-
 src/utils/string_utils.cpp                 |  28 ++++-
 src/utils/string_utils.hpp                 |   7 +-
 src/utils/translation.cpp                  |  42 +++-----
 10 files changed, 230 insertions(+), 94 deletions(-)

diff --git a/lib/angelscript/source/as_context.cpp b/lib/angelscript/source/as_context.cpp
index e3eec61de..25a1e376c 100644
--- a/lib/angelscript/source/as_context.cpp
+++ b/lib/angelscript/source/as_context.cpp
@@ -339,7 +339,7 @@ int asCContext::Prepare(asIScriptFunction *func)
 		asASSERT( m_engine );
 
 		// Make sure the function is from the same engine as the context to avoid mixups
-		if( m_engine != func->GetEngine() )
+		if (m_engine != func->GetEngine())
 		{
 			asCString str;
 			str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, "Prepare", func->GetDeclaration(true, true), asINVALID_ARG);
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 2d6bf293b..646bd6b28 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -29,7 +29,7 @@
 #include "states_screens/dialogs/tutorial_message_dialog.hpp"
 #include "tracks/track_object_manager.hpp"
 #include "tracks/track.hpp"
-
+#include "utils/profiler.hpp"
 
 
 using namespace Scripting;
@@ -38,8 +38,7 @@ namespace Scripting
 {
 
 
-//Line Callback
-void MessageCallback(const asSMessageInfo *msg, void *param)
+void AngelScript_ErrorCallback (const asSMessageInfo *msg, void *param)
 {
     const char *type = "ERR ";
     if (msg->type == asMSGTYPE_WARNING)
@@ -47,7 +46,7 @@ void MessageCallback(const asSMessageInfo *msg, void *param)
     else if (msg->type == asMSGTYPE_INFORMATION)
         type = "INFO";
 
-    printf("%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
+    Log::warn("Scripting", "%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
 }
 
 
@@ -56,19 +55,19 @@ ScriptEngine::ScriptEngine()
 {
     // Create the script engine
     m_engine = asCreateScriptEngine(ANGELSCRIPT_VERSION);
-    if( m_engine == 0 )
+    if (m_engine == NULL)
     {
-        std::cout << "Failed to create script engine." << std::endl;
+        Log::error("Scripting", "Failed to create script engine.");
     }
 
     // The script compiler will write any compiler messages to the callback.
-    //m_engine->SetMessageCallback(asFUNCTION(MessageCallback), 0, asCALL_CDECL);
+    m_engine->SetMessageCallback(asFUNCTION(AngelScript_ErrorCallback), 0, asCALL_CDECL);
 
     // Configure the script engine with all the functions, 
     // and variables that the script should be able to use.
     configureEngine(m_engine);
-
 }
+
 ScriptEngine::~ScriptEngine()
 {
     // Release the engine
@@ -85,12 +84,15 @@ std::string getScript(std::string scriptName)
 {
     std::string script_dir = file_manager->getAsset(FileManager::SCRIPT, "");
     script_dir += World::getWorld()->getTrack()->getIdent() + "/";
-    if (scriptName != "update" && scriptName != "collisions" && scriptName!="start") scriptName = "triggers";
+    if (scriptName != "update" && scriptName != "collisions" && scriptName != "start")
+        scriptName = "triggers";
+
     script_dir += scriptName + ".as";
     FILE *f = fopen(script_dir.c_str(), "rb");
-    if( f == 0 )
+    if (f == NULL)
     {
-        std::cout << "Failed to open the script file " + scriptName + ".as" << std::endl;
+        Log::debug("Scripting", "File does not exist : {0}.as", scriptName.c_str());
+        return "";
     }
 
     // Determine the size of the file   
@@ -103,25 +105,27 @@ std::string getScript(std::string scriptName)
     script.resize(len);
     int c = fread(&script[0], len, 1, f);
     fclose(f);
-    if( c == 0 ) 
+    if (c == NULL)
     {
-        std::cout << "Failed to load script file." << std::endl;
+        Log::error("Scripting", "Failed to load script file.");
+        return "";
     }
     return script;
 }
+
 //-----------------------------------------------------------------------------
 /** runs the specified script
 *  \param string scriptName = name of script to run
 */
 void ScriptEngine::runScript(std::string scriptName)
 {
-    return; // Scripting disabled for now
+    PROFILER_PUSH_CPU_MARKER("RunScript", 255, 0, 0);
 
     // Create a context that will execute the script.
     asIScriptContext *ctx = m_engine->CreateContext();
-    if (ctx == 0)
+    if (ctx == NULL)
     {
-        std::cout << "Failed to create the context." << std::endl;
+        Log::error("Scripting", "Failed to create the context.");
         //m_engine->Release();
         return;
     }
@@ -132,16 +136,12 @@ void ScriptEngine::runScript(std::string scriptName)
     if (m_script_cache.find(scriptName) == m_script_cache.end())
     {
         // Compile the script code
+        Log::debug("Scripting", "Compiling script '%s' (was not in cache)", scriptName.c_str());
         r = compileScript(m_engine, scriptName);
         if (r < 0)
         {
-            return;
-        }
-
-        //set line callback here soon
-        if (r < 0)
-        {
-            std::cout << "Failed to set the line callback function." << std::endl;
+            Log::debug("Scripting", "Script '%s' is not available", scriptName.c_str());
+            m_script_cache[scriptName] = NULL; // remember that this script is unavaiable
             ctx->Release();
             return;
         }
@@ -166,32 +166,40 @@ void ScriptEngine::runScript(std::string scriptName)
             //trigger type can have different names
             func = Scripting::Track::registerScriptCallbacks(m_engine, scriptName);
         }
-        if (func == 0)
+
+        if (func == NULL)
         {
-            std::cout << "The required function was not found." << std::endl;
+            Log::warn("Scripting", "The required function was not found : %s", scriptName.c_str());
             ctx->Release();
-            //m_engine->Release();
             return;
         }
 
         //CACHE UPDATE
         m_script_cache[scriptName] = func;
+        func->AddRef();
     }
     else
     {
         //Script present in cache
+        // TODO: clear when done
         func = m_script_cache[scriptName];
-        std::cout << "FOUND CACHED : " << scriptName << std::endl;
     }
+
+    if (func == NULL)
+    {
+        PROFILER_POP_CPU_MARKER();
+        return; // script unavailable
+    }
+
     // Prepare the script context with the function we wish to execute. Prepare()
     // must be called on the context before each new script function that will be
     // executed. Note, that if because we intend to execute the same function 
     // several times, we will store the function returned by 
     // GetFunctionByDecl(), so that this relatively slow call can be skipped.
     r = ctx->Prepare(func);
-    if( r < 0 ) 
+    if (r < 0)
     {
-        std::cout << "Failed to prepare the context." << std::endl;
+        Log::error("Scripting", "Failed to prepare the context.");
         ctx->Release();
         //m_engine->Release();
         return;
@@ -204,25 +212,29 @@ void ScriptEngine::runScript(std::string scriptName)
 
     // Execute the function
     r = ctx->Execute();
-    if( r != asEXECUTION_FINISHED )
+    if (r != asEXECUTION_FINISHED)
     {
         // The execution didn't finish as we had planned. Determine why.
-        if( r == asEXECUTION_ABORTED )
-            std::cout << "The script was aborted before it could finish. Probably it timed out." << std::endl;
-        else if( r == asEXECUTION_EXCEPTION )
+        if (r == asEXECUTION_ABORTED)
         {
-            std::cout << "The script ended with an exception." << std::endl;
+            Log::error("Scripting", "The script was aborted before it could finish. Probably it timed out.");
+        }
+        else if (r == asEXECUTION_EXCEPTION)
+        {
+            Log::error("Scripting", "The script ended with an exception.");
 
             // Write some information about the script exception
             asIScriptFunction *func = ctx->GetExceptionFunction();
-            std::cout << "func: " << func->GetDeclaration() << std::endl;
-            std::cout << "modl: " << func->GetModuleName() << std::endl;
-            std::cout << "sect: " << func->GetScriptSectionName() << std::endl;
-            std::cout << "line: " << ctx->GetExceptionLineNumber() << std::endl;
-            std::cout << "desc: " << ctx->GetExceptionString() << std::endl;
+            //std::cout << "func: " << func->GetDeclaration() << std::endl;
+            //std::cout << "modl: " << func->GetModuleName() << std::endl;
+            //std::cout << "sect: " << func->GetScriptSectionName() << std::endl;
+            //std::cout << "line: " << ctx->GetExceptionLineNumber() << std::endl;
+            //std::cout << "desc: " << ctx->GetExceptionString() << std::endl;
         }
         else
-            std::cout << "The script ended for some unforeseen reason (" << r << ")." << std::endl;
+        {
+            Log::error("Scripting", "The script ended for some unforeseen reason (%i)", r);
+        }
     }
     else
     {
@@ -234,8 +246,19 @@ void ScriptEngine::runScript(std::string scriptName)
     // We must release the contexts when no longer using them
     ctx->Release();
 
+    PROFILER_POP_CPU_MARKER();
 }
 
+//-----------------------------------------------------------------------------
+
+void ScriptEngine::cleanupCache()
+{
+    for (auto curr : m_script_cache)
+    {
+        curr.second->Release();
+    }
+    m_script_cache.clear();
+}
 
 //-----------------------------------------------------------------------------
 /** Configures the script engine by binding functions, enums
@@ -245,6 +268,7 @@ void ScriptEngine::configureEngine(asIScriptEngine *engine)
 {
     // Register the script string type
     RegisterStdString(engine); //register std::string
+    RegisterStdStringUtils(engine);
     RegisterVec3(engine);      //register Vec3
 
     Scripting::Track::registerScriptFunctions(m_engine);
@@ -266,13 +290,17 @@ void ScriptEngine::configureEngine(asIScriptEngine *engine)
 
 //-----------------------------------------------------------------------------
 
-
-
 int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
 {
     int r;
 
     std::string script = getScript(scriptName);
+    if (script.size() == 0)
+    {
+        // No such file
+        return -1;
+    }
+
     // Add the script sections that will be compiled into executable code.
     // If we want to combine more than one file into the same script, then 
     // we can call AddScriptSection() several times for the same module and
@@ -280,9 +308,9 @@ int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
     // section name, will allow us to localize any errors in the script code.
     asIScriptModule *mod = engine->GetModule(0, asGM_ALWAYS_CREATE);
     r = mod->AddScriptSection("script", &script[0], script.size());
-    if( r < 0 ) 
+    if (r < 0)
     {
-        std::cout << "AddScriptSection() failed" << std::endl;
+        Log::error("Scripting", "AddScriptSection() failed");
         return -1;
     }
     
@@ -291,9 +319,9 @@ int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
     // script engine. If there are no errors, and no warnings, nothing will
     // be written to the stream.
     r = mod->Build();
-    if( r < 0 )
+    if (r < 0)
     {
-        std::cout << "Build() failed" << std::endl;
+        Log::error("Scripting", "Build() failed");
         return -1;
     }
 
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 6d742ccc5..2affef764 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -65,6 +65,7 @@ namespace Scripting
         ~ScriptEngine();
         
         void runScript(std::string scriptName);
+        void cleanupCache();
         
     private:
         asIScriptEngine *m_engine;
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 26db06ce8..41d6702ee 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -156,7 +156,7 @@ namespace Scripting
         void displayMessage(asIScriptGeneric *gen)
         {
             std::string *input = (std::string*)gen->GetArgAddress(0);
-            irr::core::stringw out = irr::core::stringw((*input).c_str()); //irr::core::stringw supported by message dialogs
+            irr::core::stringw out = StringUtils::utf8_to_wide(input->c_str());
             new TutorialMessageDialog((out), true);
         }
         //generic disable method for track objects
diff --git a/src/scriptengine/scriptstdstring_utils.cpp b/src/scriptengine/scriptstdstring_utils.cpp
index 27ba927c1..1436e8479 100644
--- a/src/scriptengine/scriptstdstring_utils.cpp
+++ b/src/scriptengine/scriptstdstring_utils.cpp
@@ -20,6 +20,7 @@
 #include "scriptarray.hpp"
 #include <stdio.h>
 #include <string.h>
+#include "utils/translation.hpp"
 
 using namespace std;
 
@@ -125,22 +126,110 @@ static void StringJoin_Generic(asIScriptGeneric *gen)
     new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
 }
 
+void translate(asIScriptGeneric *gen)
+{
+    // Get the arguments
+    std::string *input = (std::string*)gen->GetArgAddress(0);
+
+    irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
+
+    // Return the string
+    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
+}
+
+void insertValues1(asIScriptGeneric *gen)
+{
+    // Get the arguments
+    std::string *input = (std::string*)gen->GetArgAddress(0);
+    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+
+    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+        StringUtils::utf8_to_wide(arg1->c_str()));
+
+    // Return the string
+    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
+}
+
+void insertValues2(asIScriptGeneric *gen)
+{
+    // Get the arguments
+    std::string *input = (std::string*)gen->GetArgAddress(0);
+    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+    std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+
+    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+        StringUtils::utf8_to_wide(arg1->c_str()),
+        StringUtils::utf8_to_wide(arg2->c_str()));
+
+    // Return the string
+    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
+}
+
+void insertValues3(asIScriptGeneric *gen)
+{
+    // Get the arguments
+    std::string *input = (std::string*)gen->GetArgAddress(0);
+    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+    std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+    std::string *arg3 = (std::string*)gen->GetArgAddress(3);
+
+    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+        StringUtils::utf8_to_wide(arg1->c_str()),
+        StringUtils::utf8_to_wide(arg2->c_str()),
+        StringUtils::utf8_to_wide(arg3->c_str()));
+
+    // Return the string
+    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
+}
+
+/*
+void insertValues(asIScriptGeneric *gen)
+{
+    // Get the arguments
+    std::string *input = (std::string*)gen->GetArgAddress(0);
+    CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(1);
+
+    int size = array->GetSize();
+    vector<string> all_values;
+    for (int i = 0; i < size; i++)
+    {
+        string* curr = (string*)array->At(i);
+        all_values.push_back(curr);
+    }
+
+    StringUtils::insertValues(*input, all_values);
+
+    irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
+
+    // Return the string
+    new(gen->GetAddressOfReturnLocation()) string(irr::core::stringc(out).c_str());
+}
+*/
+
 // This is where the utility functions are registered.
 // The string type must have been registered first.
 void RegisterStdStringUtils(asIScriptEngine *engine)
 {
 	int r;
 
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-	{
-		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
-		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
-	}
-	else
-	{
-		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
-		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
-	}
+	//if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
+	//{
+		//r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
+		//r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_GENERIC); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(insertValues1), asCALL_GENERIC); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(insertValues2), asCALL_GENERIC); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(insertValues3), asCALL_GENERIC); assert(r >= 0);
+    //}
+	//else
+	//{
+	//	//r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	//	//r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
+    //    r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_CDECL); assert(r >= 0);
+    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1)", asFUNCTION(insertValues1), asCALL_CDECL); assert(r >= 0);
+    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1, const string &arg2)", asFUNCTION(insertValues2), asCALL_CDECL); assert(r >= 0);
+    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1, const string &arg2, const string &arg3)", asFUNCTION(insertValues3), asCALL_CDECL); assert(r >= 0);
+	//}
 }
 
 END_AS_NAMESPACE
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index dc54d4896..3645fe53a 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -448,6 +448,10 @@ void Track::cleanup()
         Log::info("CACHE", "[%i] %s", i, path.getPath().c_str());
     }
 #endif
+
+    Scripting::ScriptEngine* script_engine =
+        World::getWorld()->getScriptEngine();
+    script_engine->cleanupCache();
 }   // cleanup
 
 //-----------------------------------------------------------------------------
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 5e2ba515a..30ca9a2d0 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -921,6 +921,7 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
                   _("Complete all challenges to unlock the big door!"), true);
         }
     }
+    /*
     else if (m_action == "tutorial_drive")
     {
         //if (World::getWorld()->getPhase() == World::RACE_PHASE)
@@ -1036,19 +1037,19 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
 
         new TutorialMessageDialog(_("You are now ready to race. Good luck!"),
             true);
-    }
+    }*/
     else if (m_action == "tutorial_exit")
     {
+        // TODO: move to scripting
         World::getWorld()->scheduleExitRace();
         return;
     }
     else
     {	
-        //TODO move all above functions into scripts and remove the ifs
-        Scripting::ScriptEngine* m_script_engine =
+        Scripting::ScriptEngine* script_engine =
             World::getWorld()->getScriptEngine();
         m_action_active = false;
-        m_script_engine->runScript(m_action);
+        script_engine->runScript(m_action);
         
         /*
         Catch exception -> script not found
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 3984e874d..f5e6e8ea3 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -22,7 +22,7 @@
 
 #include "utils/log.hpp"
 #include "utils/time.hpp"
-
+#include "utils/utf8.h"
 #include "coreutil.h"
 
 #include <math.h>
@@ -684,6 +684,32 @@ namespace StringUtils
         return output.str();
     }   // xmlEncode
 
+    // ------------------------------------------------------------------------
+
+    std::string wide_to_utf8(const wchar_t* input)
+    {
+        static std::vector<char> utf8line;
+        utf8line.clear();
+
+        utf8::utf16to8(input, input + wcslen(input), back_inserter(utf8line));
+        utf8line.push_back(0);
+
+        return std::string(&utf8line[0]);
+    }
+
+    // ------------------------------------------------------------------------
+
+    irr::core::stringw utf8_to_wide(const char* input)
+    {
+        static std::vector<wchar_t> utf16line;
+        utf16line.clear();
+
+        utf8::utf8to16(input, input + strlen(input), back_inserter(utf16line));
+        utf16line.push_back(0);
+
+        return irr::core::stringw(&utf16line[0]);
+    }
+
     // ------------------------------------------------------------------------
     /** Converts a version string (in the form of 'X.Y.Za-rcU' into an
      *  integer number.
diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp
index ebcc28895..95128c45d 100644
--- a/src/utils/string_utils.hpp
+++ b/src/utils/string_utils.hpp
@@ -259,7 +259,7 @@ namespace StringUtils
             all_vals.push_back(irr::core::stringw(std::forward<T>(v)));
             __Fill(all_vals, std::forward<Args>(args)...);
         }
-
+    
         static void __Fill(std::vector<irr::core::stringw>&) {}
     };
 
@@ -363,6 +363,11 @@ namespace StringUtils
         return parseString(input.c_str(), output);
     }   // parseString
 
+    // ------------------------------------------------------------------------
+    
+    std::string wide_to_utf8(const wchar_t* input);
+    irr::core::stringw utf8_to_wide(const char* input);
+
 } // namespace StringUtils
 
 #endif
diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index da9139bbb..6d45faa73 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -42,7 +42,6 @@
 #include "io/file_manager.hpp"
 #include "utils/constants.hpp"
 #include "utils/log.hpp"
-#include "utils/utf8.h"
 
 
 // set to 1 to debug i18n
@@ -71,29 +70,6 @@ const LanguageList* Translations::getLanguageList() const
     return &g_language_list;
 }
 
-
-char* wide_to_utf8(const wchar_t* input)
-{
-    static std::vector<char> utf8line;
-    utf8line.clear();
-
-    utf8::utf16to8(input, input + wcslen(input), back_inserter(utf8line));
-    utf8line.push_back(0);
-
-    return &utf8line[0];
-}
-
-wchar_t* utf8_to_wide(const char* input)
-{
-    static std::vector<wchar_t> utf16line;
-    utf16line.clear();
-
-    utf8::utf8to16(input, input + strlen(input), back_inserter(utf16line));
-    utf16line.push_back(0);
-
-    return &utf16line[0];
-}
-
 // ----------------------------------------------------------------------------
 /** Frees the memory allocated for the result of toFribidiChar(). */
 void freeFribidiChar(FriBidiChar *str)
@@ -439,7 +415,8 @@ bool Translations::isRTLText(const wchar_t *in_ptr)
  */
 const wchar_t* Translations::w_gettext(const wchar_t* original, const char* context)
 {
-    return w_gettext( wide_to_utf8(original), context );
+    std::string in = StringUtils::wide_to_utf8(original);
+    return w_gettext(in.c_str(), context);
 }
 
 /**
@@ -461,7 +438,7 @@ const wchar_t* Translations::w_gettext(const char* original, const char* context
 
     if (original_t == original)
     {
-        m_converted_string = utf8_to_wide(original);
+        m_converted_string = StringUtils::utf8_to_wide(original);
 
 #if TRANSLATE_VERBOSE
         std::wcout << L"  translation : " << m_converted_string << std::endl;
@@ -472,9 +449,10 @@ const wchar_t* Translations::w_gettext(const char* original, const char* context
     // print
     //for (int n=0;; n+=4)
 
-    wchar_t* original_tw = utf8_to_wide(original_t.c_str());
+    static core::stringw original_tw;
+    original_tw = StringUtils::utf8_to_wide(original_t.c_str());
 
-    wchar_t* out_ptr = original_tw;
+    const wchar_t* out_ptr = original_tw.c_str();
     if (REMOVE_BOM) out_ptr++;
 
 #if TRANSLATE_VERBOSE
@@ -493,7 +471,9 @@ const wchar_t* Translations::w_gettext(const char* original, const char* context
  */
 const wchar_t* Translations::w_ngettext(const wchar_t* singular, const wchar_t* plural, int num, const char* context)
 {
-    return w_ngettext( wide_to_utf8(singular), wide_to_utf8(plural), num, context);
+    std::string in = StringUtils::wide_to_utf8(singular);
+    std::string in2 = StringUtils::wide_to_utf8(plural);
+    return w_ngettext(in.c_str(), in2.c_str(), num, context);
 }
 
 /**
@@ -509,7 +489,9 @@ const wchar_t* Translations::w_ngettext(const char* singular, const char* plural
                               m_dictionary.translate_plural(singular, plural, num) :
                               m_dictionary.translate_ctxt_plural(context, singular, plural, num));
 
-    wchar_t* out_ptr = utf8_to_wide(res.c_str());
+    static core::stringw str_buffer;
+    str_buffer = StringUtils::utf8_to_wide(res.c_str());
+    const wchar_t* out_ptr = str_buffer.c_str();
     if (REMOVE_BOM) out_ptr++;
 
 #if TRANSLATE_VERBOSE

From e1ef2aa30564f60c3bf0e5bda0c6ffb6bcdc04d1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 25 Apr 2015 18:49:18 +1000
Subject: [PATCH 138/331] Removed TexUnit data structure.

---
 src/graphics/gpuparticles.cpp |  6 ++--
 src/graphics/shader.hpp       | 34 +++++++----------------
 src/graphics/shaders.cpp      | 52 ++++++++---------------------------
 3 files changed, 24 insertions(+), 68 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 26db98880..1b4839f62 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -105,11 +105,11 @@ public:
         assignUniforms("sourcematrix", "dt", "level", "size_increase_factor",
                        "track_x", "track_x_len", "track_z", "track_z_len");
         m_TU_heightmap = 2;
-        assignTextureUnit(TexUnit(m_TU_heightmap, "heightmap"));
-    }
+        assignTextureUnit(m_TU_heightmap, "heightmap");
+    }   // HeightmapSimulationShader
 
 
-};
+};   // class HeightmapSimulationShader
 
 // ============================================================================
 
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index fd8b9967c..5685e0828 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -240,35 +240,21 @@ private:
     }   // printFileList
 protected:
 
-    /** Stores texture index and uniform. */
-    class TexUnit
-    {
-    public:
-        GLuint      m_index;
-        const char* m_uniform;
-
-        TexUnit(GLuint index, const char* uniform)
-        {
-            m_index    = index;
-            m_uniform = uniform;
-        }   // TexUnit
-    };   // class TexUnit
-
     // ========================================================================
-    void assignTextureUnit(TexUnit tex_unit)
+    void assignTextureUnit(GLuint index, const char* uniform)
     {
         glUseProgram(m_program);
-        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
-        glUniform1i(uniform, tex_unit.m_index);
+        GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
+        glUniform1i(uniform_loc, index);
         glUseProgram(0);
     }   // assignTextureUnit
     // ------------------------------------------------------------------------
     template<typename... T> 
-    void assignTextureUnit(TexUnit tex_unit, T... rest)
+    void assignTextureUnit(GLuint index, const char* uniform, T... rest)
     {
         glUseProgram(m_program);
-        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
-        glUniform1i(uniform, tex_unit.m_index);
+        GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
+        glUniform1i(uniform_loc, index);
         assignTextureUnitNoUse(rest...);
         glUseProgram(0);
     }   // assignTextureUnit
@@ -277,12 +263,12 @@ protected:
     void assignTextureUnitNoUse() {}
     // ------------------------------------------------------------------------
     template<typename... T>
-    void assignTextureUnitNoUse(TexUnit tex_unit, T... rest)
+    void assignTextureUnitNoUse(GLuint index, const char* uniform, T... rest)
     {
-        GLuint uniform = glGetUniformLocation(m_program, tex_unit.m_uniform);
-        glUniform1i(uniform, tex_unit.m_index);
+        GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
+        glUniform1i(uniform_loc, index);
         assignTextureUnitNoUse(rest...);
-    }
+    }   // assignTextureUnitNoUse
 
 
 public:
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 6c48d9680..5381660b5 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -515,39 +515,9 @@ namespace UtilShader
         glBindVertexArray(0);
         glBindBuffer(GL_ARRAY_BUFFER, 0);
     }
-
-
-    template <typename T>
-    std::vector<Shader::TexUnit> TexUnits(T curr) // required on older clang versions
-    {
-        std::vector<TexUnit> v;
-        v.push_back(curr);
-        return v;
-    }
-
-    template <typename T, typename... R>
-    std::vector<Shader::TexUnit> TexUnits(T curr, R... rest) // required on older clang versions
-    {
-        std::vector<TexUnit> v;
-        v.push_back(curr);
-        VTexUnits(v, rest...);
-        return v;
-    }
-
-    template <typename T, typename... R>
-    void VTexUnits(std::vector<Shader::TexUnit>& v, T curr, R... rest) // required on older clang versions
-    {
-        v.push_back(curr);
-        VTexUnits(v, rest...);
-    }
-
-    template <typename T>
-    void VTexUnits(std::vector<Shader::TexUnit>& v, T curr)
-    {
-        v.push_back(curr);
-    }
-
 }
+
+
 using namespace UtilShader;
 
 
@@ -791,7 +761,7 @@ namespace UtilShader
         assignUniforms("PermutationMatrix", "ViewportSize");
         TU_Samples = 1;
         AssignSamplerNames(m_program, 0, "tex");
-        assignTextureUnit(TexUnit(TU_Samples, "samples"));
+        assignTextureUnit(TU_Samples, "samples");
     }
 }
 
@@ -1576,7 +1546,7 @@ namespace FullScreenShader
         TU_SHR = 0;
         TU_SHG = 1;
         TU_SHB = 2;
-        assignTextureUnit(TexUnit(TU_SHR, "SHR"), TexUnit(TU_SHG, "SHG"), TexUnit(TU_SHB, "SHB"));
+        assignTextureUnit(TU_SHR, "SHR",  TU_SHG, "SHG",  TU_SHB, "SHB");
     }
 
     GlobalIlluminationReconstructionShader::GlobalIlluminationReconstructionShader()
@@ -1606,7 +1576,7 @@ namespace FullScreenShader
         TU_dest = 2;
         assignUniforms("pixel");
         AssignSamplerNames(m_program, 0, "source", 1, "depth");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     ComputeGaussian6HBlurShader::ComputeGaussian6HBlurShader()
@@ -1616,7 +1586,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     ComputeShadowBlurHShader::ComputeShadowBlurHShader()
@@ -1626,7 +1596,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     Gaussian6HBlurShader::Gaussian6HBlurShader()
@@ -1676,7 +1646,7 @@ namespace FullScreenShader
         TU_dest = 2;
         assignUniforms("pixel");
         AssignSamplerNames(m_program, 0, "source", 1, "depth");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     ComputeGaussian6VBlurShader::ComputeGaussian6VBlurShader()
@@ -1686,7 +1656,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     ComputeShadowBlurVShader::ComputeShadowBlurVShader()
@@ -1696,7 +1666,7 @@ namespace FullScreenShader
         TU_dest = 1;
         assignUniforms("pixel", "weights");
         AssignSamplerNames(m_program, 0, "source");
-        assignTextureUnit(TexUnit(TU_dest, "dest"));
+        assignTextureUnit(TU_dest, "dest");
     }
 
     Gaussian6VBlurShader::Gaussian6VBlurShader()
@@ -1736,7 +1706,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "layertexturequad.frag");
         TU_texture = 0;
         assignUniforms("layer");
-        assignTextureUnit(TexUnit(TU_texture, "tex"));
+        assignTextureUnit(TU_texture, "tex");
         vao = createVAO(m_program);
     }
 

From 6e0b96c21f3b2382ba64429671d7b759598cca3d Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 25 Apr 2015 16:01:50 +0200
Subject: [PATCH 139/331] Fix TEST_BIDI option

---
 src/utils/translation.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index 6197baaf9..c3b8655f6 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -147,9 +147,10 @@ FriBidiChar* toFribidiChar(const wchar_t* str)
     // Prepend a character that forces RTL style
     FriBidiChar *tmp = result;
     result = new FriBidiChar[++length + 1];
-    std::memcpy(result + 1, tmp, length * sizeof(FriBidiChar));
+    memcpy(result + 1, tmp, length * sizeof(FriBidiChar));
     result[0] = L'\u202E';
-    freeFribidiChar(tmp);
+    if (sizeof(wchar_t) != sizeof(FriBidiChar))
+        delete[] tmp;
 #endif
 
     return result;

From 56aecdb6929687e25e85b677f16c0907ca011655 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 25 Apr 2015 16:10:54 +0200
Subject: [PATCH 140/331] Fix achievements RTL display

---
 src/achievements/achievement_info.hpp              | 2 +-
 src/states_screens/online_profile_achievements.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/achievements/achievement_info.hpp b/src/achievements/achievement_info.hpp
index d79caa2d0..fa3e3d24c 100644
--- a/src/achievements/achievement_info.hpp
+++ b/src/achievements/achievement_info.hpp
@@ -113,7 +113,7 @@ public:
     irr::core::stringw getDescription() const { return _(m_description.c_str()); }
     // ------------------------------------------------------------------------
     /** Returns the name of this achievement. */
-    irr::core::stringw getName() const { return _(m_name.c_str()); }
+    irr::core::stringw getName() const { return _LTR(m_name.c_str()); }
     // ------------------------------------------------------------------------
     bool needsResetAfterRace() const { return m_reset_type == AFTER_RACE; }
     // ------------------------------------------------------------------------
diff --git a/src/states_screens/online_profile_achievements.cpp b/src/states_screens/online_profile_achievements.cpp
index 0cddada26..7e660ca5f 100644
--- a/src/states_screens/online_profile_achievements.cpp
+++ b/src/states_screens/online_profile_achievements.cpp
@@ -107,7 +107,7 @@ void BaseOnlineProfileAchievements::init()
             const Achievement *a = it->second;
             if(a->getInfo()->isSecret() && !a->isAchieved())
                 continue;
-            ListWidget::ListCell title(a->getInfo()->getName(), -1, 2);
+            ListWidget::ListCell title(translations->fribidize(a->getInfo()->getName()), -1, 2);
             ListWidget::ListCell progress(a->getProgressAsString(), -1, 1);
             row.push_back(title);
             row.push_back(progress);

From fae12f3714472092152d08f221e22b56bce90478 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 26 Apr 2015 22:29:59 +0200
Subject: [PATCH 141/331] Fix RTL texts with multiple lines

---
 src/utils/translation.cpp | 134 +++++++++++++++++++++++++-------------
 src/utils/translation.hpp |   3 +
 2 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index c3b8655f6..f6d7981da 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -144,11 +144,28 @@ FriBidiChar* toFribidiChar(const wchar_t* str)
     }
 
 #ifdef TEST_BIDI
-    // Prepend a character that forces RTL style
+    // Prepend a character in each line that forces RTL style
+    int lines = 1;
+    for (std::size_t i = 0; i <= length; i++)
+    {
+        if (str[i] == L'\n')
+            lines++;
+    }
     FriBidiChar *tmp = result;
-    result = new FriBidiChar[++length + 1];
-    memcpy(result + 1, tmp, length * sizeof(FriBidiChar));
+    length += lines;
+    result = new FriBidiChar[length + 1];
+    lines = 1;
     result[0] = L'\u202E';
+    for (std::size_t i = 1; i <= length; i++)
+    {
+        result[i] = tmp[i - lines];
+        if (str[i - lines] == L'\n')
+        {
+            lines++;
+            i++;
+            result[i] = L'\u202E';
+        }
+    }
     if (sizeof(wchar_t) != sizeof(FriBidiChar))
         delete[] tmp;
 #endif
@@ -367,54 +384,31 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
 
 const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
 {
-#if ENABLE_BIDI
-    if(this->isRTLLanguage())
+    if (isRTLText(in_ptr))
     {
-        FriBidiChar *fribidiInput = toFribidiChar(in_ptr);
-        std::size_t length = 0;
-        while (fribidiInput[length])
-            length++;
+        // Split text into lines
+        std::vector<core::stringw> input_lines = StringUtils::split(in_ptr, '\n');
+        // Reverse lines for RTL strings, irrlicht will reverse them back
+        // This is needed because irrlicht inserts line breaks itself if a text
+        // is too long for one line and then reverses the lines again.
+        std::reverse(input_lines.begin(), input_lines.end());
 
-        // Assume right to left as start direction.
-#if FRIBIDI_MINOR_VERSION==10
-        // While the doc for older fribidi versions is somewhat sparse,
-        // using the RIGHT-TO-LEFT EMBEDDING character here appears to
-        // work correct.
-        FriBidiCharType pbase_dir = L'\u202B';
-#else
-        FriBidiCharType pbase_dir = FRIBIDI_PAR_ON;
-#endif
-
-        FriBidiChar *fribidiOutput = new FriBidiChar[length + 1];
-        memset(fribidiOutput, 0, (length + 1) * sizeof(FriBidiChar));
-        fribidi_boolean result = fribidi_log2vis(fribidiInput,
-                                                 length,
-                                                 &pbase_dir,
-                                                 fribidiOutput,
-              /* gint   *position_L_to_V_list */ NULL,
-              /* gint   *position_V_to_L_list */ NULL,
-              /* gint8  *embedding_level_list */ NULL
-                                                               );
-
-        freeFribidiChar(fribidiInput);
-
-        if (!result)
+        // Fribidize and concat lines
+        for (std::vector<core::stringw>::iterator it = input_lines.begin();
+             it != input_lines.end(); it++)
         {
-            delete[] fribidiOutput;
-            Log::error("Translations::fribidize", "Fribidi failed in 'fribidi_log2vis' =(");
-            m_converted_string = core::stringw(in_ptr);
-            return m_converted_string.c_str();
+            if (it == input_lines.begin())
+                m_converted_string = fribidizeLine(*it);
+            else
+            {
+                m_converted_string += "\n";
+                m_converted_string += fribidizeLine(*it);
+            }
         }
-
-        wchar_t *convertedString = fromFribidiChar(fribidiOutput);
-        m_converted_string = core::stringw(convertedString);
-        freeFribidiChar(convertedString);
-        delete[] fribidiOutput;
         return m_converted_string.c_str();
     }
-
-#endif // ENABLE_BIDI
-    return in_ptr;
+    else
+        return in_ptr;
 }
 
 bool Translations::isRTLText(const wchar_t *in_ptr)
@@ -546,3 +540,53 @@ std::string Translations::getCurrentLanguageName()
     //return m_dictionary_manager.get_language().get_name();
 }
 
+core::stringw Translations::fribidizeLine(const core::stringw &str)
+{
+#if ENABLE_BIDI
+    FriBidiChar *fribidiInput = toFribidiChar(str.c_str());
+    std::size_t length = 0;
+    while (fribidiInput[length])
+        length++;
+
+    // Assume right to left as start direction.
+#if FRIBIDI_MINOR_VERSION==10
+    // While the doc for older fribidi versions is somewhat sparse,
+    // using the RIGHT-TO-LEFT EMBEDDING character here appears to
+    // work correct.
+    FriBidiCharType pbase_dir = L'\u202B';
+#else
+    FriBidiCharType pbase_dir = FRIBIDI_PAR_ON;
+#endif
+
+    // Reverse text line by line
+    FriBidiChar *fribidiOutput = new FriBidiChar[length + 1];
+    memset(fribidiOutput, 0, (length + 1) * sizeof(FriBidiChar));
+    fribidi_boolean result = fribidi_log2vis(fribidiInput,
+                                                length,
+                                                &pbase_dir,
+                                                fribidiOutput,
+            /* gint   *position_L_to_V_list */ NULL,
+            /* gint   *position_V_to_L_list */ NULL,
+            /* gint8  *embedding_level_list */ NULL
+                                                            );
+
+    freeFribidiChar(fribidiInput);
+
+    if (!result)
+    {
+        delete[] fribidiOutput;
+        Log::error("Translations::fribidize", "Fribidi failed in 'fribidi_log2vis' =(");
+        return core::stringw(str);
+    }
+
+    wchar_t *convertedString = fromFribidiChar(fribidiOutput);
+    core::stringw converted_string(convertedString);
+    freeFribidiChar(convertedString);
+    delete[] fribidiOutput;
+    return converted_string;
+
+#else
+    return core::stringw(str);
+#endif // ENABLE_BIDI
+}
+
diff --git a/src/utils/translation.hpp b/src/utils/translation.hpp
index eeeec161b..23d589bad 100644
--- a/src/utils/translation.hpp
+++ b/src/utils/translation.hpp
@@ -70,6 +70,9 @@ public:
     const std::vector<std::string>* getLanguageList() const;
 
     std::string        getCurrentLanguageName();
+
+private:
+    irr::core::stringw fribidizeLine(const irr::core::stringw &str);
 };   // Translations
 
 

From 0b9876c53ec7cb08b850e511dde1466b04117881 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 26 Apr 2015 22:55:28 +0200
Subject: [PATCH 142/331] Use isRTLText in the BubbleWidget

---
 src/guiengine/widgets/bubble_widget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/widgets/bubble_widget.cpp b/src/guiengine/widgets/bubble_widget.cpp
index 65fec72a1..0e51478d4 100644
--- a/src/guiengine/widgets/bubble_widget.cpp
+++ b/src/guiengine/widgets/bubble_widget.cpp
@@ -74,7 +74,7 @@ void BubbleWidget::replaceText()
     EGUI_ALIGNMENT align = EGUIA_UPPERLEFT;
     if      (m_properties[PROP_TEXT_ALIGN] == "center") align = EGUIA_CENTER;
     else if (m_properties[PROP_TEXT_ALIGN] == "right")  align = EGUIA_LOWERRIGHT;
-    else if (translations->isRTLLanguage())             align = EGUIA_LOWERRIGHT;
+    else if (translations->isRTLText(message))          align = EGUIA_LOWERRIGHT;
 
     EGUI_ALIGNMENT valign = EGUIA_CENTER ; //TODO: make label v-align configurable through XML file?
 
@@ -90,7 +90,7 @@ void BubbleWidget::replaceText()
         m_expanded_size.LowerRightCorner.Y += additionalNeededSize/2 + 10;
 
         // reduce text to fit in the available space if it's too long
-        if (translations->isRTLLanguage())
+        if (translations->isRTLText(message))
         {
             while (text_height > m_shrinked_size.getHeight() && message.size() > 10)
             {

From af88b4a16f7a8930cd371715af6d1451f25a8d65 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 26 Apr 2015 23:31:57 +0200
Subject: [PATCH 143/331] Fix translation issues with grand-prixs

---
 src/race/grand_prix_data.hpp                    | 2 +-
 src/states_screens/grand_prix_editor_screen.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp
index b720a7d3a..a788aed53 100644
--- a/src/race/grand_prix_data.hpp
+++ b/src/race/grand_prix_data.hpp
@@ -148,7 +148,7 @@ public:
     // ------------------------------------------------------------------------
     /** @return the (potentially translated) user-visible name of the Grand
      *  Prix (apply fribidi as needed) */
-    irr::core::stringw getName()      const { return _LTR(m_name.c_str());   }
+    irr::core::stringw getName()      const { return m_editable ? m_name.c_str() : _LTR(m_name.c_str());   }
 
     // ------------------------------------------------------------------------
     /** @return the internal indentifier of the Grand Prix (not translated) */
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 3366057df..8a666a11b 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -161,7 +161,7 @@ void GrandPrixEditorScreen::setSelection (const GrandPrixData* gpdata)
     if (gpdata == NULL)
     {
         m_selection = NULL;
-        gpname_widget->setText (L"Please select a Grand Prix", true);
+        gpname_widget->setText (_("Please select a Grand Prix"), true);
         tracks_widget->clearItems();
         tracks_widget->updateItemDisplay();
     }

From 5462a62c75c99ba9425544bb245adf7f033695b0 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 27 Apr 2015 00:13:23 +0200
Subject: [PATCH 144/331] Fix TEST_BIDI in multiplayer KartSelection

---
 src/guiengine/widgets/player_kart_widget.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index d9d0a6115..062400dba 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -344,6 +344,7 @@ void PlayerKartWidget::add()
         name = m_associated_player->getProfile()->getName();
     if (m_associated_user)
         name = m_associated_user->getUserName();
+    core::stringw label = translations->fribidize(name);
 
     if (m_parent_screen->m_multiplayer)
     {
@@ -357,21 +358,21 @@ void PlayerKartWidget::add()
             {
                 // I18N: 'handicapped' indicates that per-player handicaps are
                 //       activated for this kart (i.e. it will drive slower)
-                label = _("%s (handicapped)", label);
+                label = _("%s (handicapped)", name);
                 m_player_ident_spinner->addLabel(label);
             }
         }
 
         // select the right player profile in the spinner
-        m_player_ident_spinner->setValue(name);
+        m_player_ident_spinner->setValue(label);
     }
     else
     {
-        m_player_ident_spinner->addLabel(name);
+        m_player_ident_spinner->addLabel(label);
         m_player_ident_spinner->setVisible(false);
     }
 
-    assert(m_player_ident_spinner->getStringValue() == name);
+    assert(m_player_ident_spinner->getStringValue() == label);
 }   // add
 
 // ------------------------------------------------------------------------

From d19112760f2ae2bdf5ca793c6d0392cb4593ab5f Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Mon, 27 Apr 2015 00:14:52 +0200
Subject: [PATCH 145/331] Include algorithm in translation.cpp

---
 src/utils/translation.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp
index f6d7981da..4a58be123 100644
--- a/src/utils/translation.cpp
+++ b/src/utils/translation.cpp
@@ -25,6 +25,7 @@
 
 #include "utils/translation.hpp"
 
+#include <algorithm>
 #include <assert.h>
 #include <locale.h>
 #include <stdio.h>

From b14acf2a67799adb5a1a6ef61bfe8645f6f76e83 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 27 Apr 2015 09:03:33 +1000
Subject: [PATCH 146/331] Moved TextureRead into a new file, fixed coding
 style.

---
 src/graphics/2dutils.cpp          |  10 +-
 src/graphics/IBL.cpp              |   2 +-
 src/graphics/gpuparticles.cpp     |   8 +-
 src/graphics/post_processing.cpp  |  70 ++++++-------
 src/graphics/render_geometry.cpp  |  18 ++--
 src/graphics/render_lighting.cpp  |  14 +--
 src/graphics/render_skybox.cpp    |   2 +-
 src/graphics/shader.hpp           |   1 +
 src/graphics/shaders.cpp          | 158 ++++++++++++++---------------
 src/graphics/shaders.hpp          |  10 +-
 src/graphics/shaders_util.hpp     |  88 ----------------
 src/graphics/shadow_matrixes.cpp  |   2 +-
 src/graphics/stkbillboard.cpp     |   2 +-
 src/graphics/stkmesh.cpp          |   4 +-
 src/graphics/stkmeshscenenode.cpp |  32 +++---
 src/graphics/texture_read.hpp     | 160 ++++++++++++++++++++++++++++++
 16 files changed, 329 insertions(+), 252 deletions(-)
 create mode 100644 src/graphics/texture_read.hpp

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index b2f6ed14a..ad98fd905 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -39,7 +39,7 @@ static void drawTexColoredQuad(const video::ITexture *texture, const video::SCol
     UIShader::ColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(UIShader::ColoredTextureRectShader::getInstance()->vao);
 
-    UIShader::ColoredTextureRectShader::getInstance()->SetTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
+    UIShader::ColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
     UIShader::ColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height));
@@ -59,7 +59,7 @@ float tex_width, float tex_height)
     UIShader::TextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::TextureRectShader::getInstance()->SetTextureUnits(texture);
+    UIShader::TextureRectShader::getInstance()->setTextureUnits(texture);
     UIShader::TextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -161,7 +161,7 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
     UIShader::UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
+    UIShader::UniformColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height), colors);
 
@@ -197,7 +197,7 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
     UIShader::UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->SetTextureUnits(texture);
+    UIShader::UniformColoredTextureRectShader::getInstance()->setTextureUnits(texture);
     UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height),
@@ -285,7 +285,7 @@ void draw2DVertexPrimitiveList(video::ITexture *tex, const void* vertices,
     UIShader::Primitive2DList::getInstance()->setUniforms();
     const video::SOverrideMaterial &m = irr_driver->getVideoDriver()->getOverrideMaterial();
     compressTexture(tex, false);
-    UIShader::Primitive2DList::getInstance()->SetTextureUnits(getTextureGLuint(tex));
+    UIShader::Primitive2DList::getInstance()->setTextureUnits(getTextureGLuint(tex));
     glDrawElements(GL_TRIANGLE_FAN, primitiveCount, GL_UNSIGNED_SHORT, 0);
 
     glDeleteVertexArrays(1, &tmpvao);
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index e48f657f4..20e4e0956 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -369,7 +369,7 @@ GLuint generateSpecularCubemap(GLuint probe)
             GLuint status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
             assert(status == GL_FRAMEBUFFER_COMPLETE);
 
-            UtilShader::SpecularIBLGenerator::getInstance()->SetTextureUnits(probe);
+            UtilShader::SpecularIBLGenerator::getInstance()->setTextureUnits(probe);
             UtilShader::SpecularIBLGenerator::getInstance()->setUniforms(M[face], viewportSize);
 
             glDrawArrays(GL_TRIANGLES, 0, 3);
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 1b4839f62..a63225994 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -64,7 +64,7 @@ public:
                     GL_FRAGMENT_SHADER, "particle.frag");
 
         assignUniforms("color_from", "color_to");
-        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
     }   // SimpleParticleRender
 
 };   // SimpleParticleRender
@@ -83,7 +83,7 @@ public:
                     GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                     GL_FRAGMENT_SHADER, "particle.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
     }
 
 };   // FlipParticleShader
@@ -520,7 +520,7 @@ void ParticleSystemProxy::drawFlip()
     glBlendFunc(GL_ONE, GL_ONE);
     FlipParticleRender::getInstance()->use();
 
-    FlipParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
+    FlipParticleRender::getInstance()->setTextureUnits(texture, irr_driver->getDepthStencilTexture());
     FlipParticleRender::getInstance()->setUniforms();
 
     glBindVertexArray(current_rendering_vao);
@@ -535,7 +535,7 @@ void ParticleSystemProxy::drawNotFlip()
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     SimpleParticleRender::getInstance()->use();
 
-    SimpleParticleRender::getInstance()->SetTextureUnits(texture, irr_driver->getDepthStencilTexture());
+    SimpleParticleRender::getInstance()->setTextureUnits(texture, irr_driver->getDepthStencilTexture());
     video::SColorf ColorFrom = video::SColorf(getColorFrom()[0], getColorFrom()[1], getColorFrom()[2]);
     video::SColorf ColorTo = video::SColorf(getColorTo()[0], getColorTo()[1], getColorTo()[2]);
 
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index fe68514a8..74f8c4c72 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -209,7 +209,7 @@ void PostProcessing::update(float dt)
 static
 void renderBloom(GLuint in)
 {
-    FullScreenShader::BloomShader::getInstance()->SetTextureUnits(in);
+    FullScreenShader::BloomShader::getInstance()->setTextureUnits(in);
     DrawFullScreenEffect<FullScreenShader::BloomShader>();
 }
 
@@ -225,7 +225,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
         FullScreenShader::DegradedIBLShader::getInstance()->use();
         glBindVertexArray(SharedObject::FullScreenQuadVAO);
 
-        FullScreenShader::DegradedIBLShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
+        FullScreenShader::DegradedIBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
         FullScreenShader::DegradedIBLShader::getInstance()->setUniforms();
     }
     else
@@ -233,7 +233,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
         FullScreenShader::IBLShader::getInstance()->use();
         glBindVertexArray(SharedObject::FullScreenQuadVAO);
 
-        FullScreenShader::IBLShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
+        FullScreenShader::IBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
         FullScreenShader::IBLShader::getInstance()->setUniforms();
     }
 
@@ -266,7 +266,7 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->SetTextureUnits(
+    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->setTextureUnits(
         irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb);
     DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>(RHMatrix, InvRHMatrix, rh_extend);
 }
@@ -278,7 +278,7 @@ void PostProcessing::renderSunlight(const core::vector3df &direction, const vide
     glBlendFunc(GL_ONE, GL_ONE);
     glBlendEquation(GL_FUNC_ADD);
 
-    FullScreenShader::SunLightShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
+    FullScreenShader::SunLightShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::SunLightShader>(direction, col);
 }
 
@@ -311,13 +311,13 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian3VBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0]);
+        FullScreenShader::Gaussian3VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian3HBlurShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0]);
+        FullScreenShader::Gaussian3HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
@@ -331,10 +331,10 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
     {
         // Used as temp
         irr_driver->getFBO(FBO_SCALAR_1024).Bind();
-        FullScreenShader::Gaussian6VBlurShader::getInstance()->SetTextureUnits(LayerTex);
+        FullScreenShader::Gaussian6VBlurShader::getInstance()->setTextureUnits(LayerTex);
         DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaV);
         in_fbo.BindLayer(layer);
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaH);
     }
     else
@@ -342,7 +342,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
         FullScreenShader::ComputeShadowBlurVShader::getInstance()->use();
-        FullScreenShader::ComputeShadowBlurVShader::getInstance()->SetTextureUnits(LayerTex);
+        FullScreenShader::ComputeShadowBlurVShader::getInstance()->setTextureUnits(LayerTex);
         glBindSampler(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R32F);
         FullScreenShader::ComputeShadowBlurVShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsV);
@@ -351,7 +351,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         FullScreenShader::ComputeShadowBlurHShader::getInstance()->use();
-        FullScreenShader::ComputeShadowBlurHShader::getInstance()->SetTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        FullScreenShader::ComputeShadowBlurHShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
         FullScreenShader::ComputeShadowBlurHShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsH);
@@ -370,12 +370,12 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian6VBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0]);
+        FullScreenShader::Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height), sigmaV);
 
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0]);
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), sigmaH);
     }
     else
@@ -383,7 +383,7 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
         FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->use();
-        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0]);
+        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
         FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsV);
@@ -392,7 +392,7 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->use();
-        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0]);
+        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         glBindSampler(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, 0);
         glBindImageTexture(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
         FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsH);
@@ -409,13 +409,13 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxi
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0]);
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
     }
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0]);
+        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
     }
 }
@@ -431,14 +431,14 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         if (!CVS->supportsComputeShadersFiltering())
         {
             auxiliary.Bind();
-            FullScreenShader::Gaussian17TapHShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            FullScreenShader::Gaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
         }
         else
         {
             FullScreenShader::ComputeGaussian17TapHShader::getInstance()->use();
             glBindSampler(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, 0);
-            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             glBindImageTexture(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
             FullScreenShader::ComputeGaussian17TapHShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
             glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
@@ -451,14 +451,14 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         {
             in_fbo.Bind();
 
-            FullScreenShader::Gaussian17TapVShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            FullScreenShader::Gaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             DrawFullScreenEffect<FullScreenShader::Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
         }
         else
         {
             FullScreenShader::ComputeGaussian17TapVShader::getInstance()->use();
             glBindSampler(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, 0);
-            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->SetTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
             glBindImageTexture(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
             FullScreenShader::ComputeGaussian17TapVShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
             glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
@@ -470,7 +470,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
 
 void PostProcessing::renderPassThrough(GLuint tex, unsigned width, unsigned height)
 {
-    FullScreenShader::PassThroughShader::getInstance()->SetTextureUnits(tex);
+    FullScreenShader::PassThroughShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::PassThroughShader>(width, height);
 }
 
@@ -493,7 +493,7 @@ void PostProcessing::renderGlow(unsigned tex)
     FullScreenShader::GlowShader::getInstance()->use();
     glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
 
-    FullScreenShader::GlowShader::getInstance()->SetTextureUnits(tex);
+    FullScreenShader::GlowShader::getInstance()->setTextureUnits(tex);
     FullScreenShader::GlowShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -506,11 +506,11 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    FullScreenShader::LinearizeDepthShader::getInstance()->SetTextureUnits(irr_driver->getDepthStencilTexture());
+    FullScreenShader::LinearizeDepthShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>(irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), irr_driver->getSceneManager()->getActiveCamera()->getFarValue());
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    FullScreenShader::SSAOShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
+    FullScreenShader::SSAOShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
     glGenerateMipmap(GL_TEXTURE_2D);
 
     DrawFullScreenEffect<FullScreenShader::SSAOShader>(irr_driver->getSSAORadius(), irr_driver->getSSAOK(), irr_driver->getSSAOSigma());
@@ -543,7 +543,7 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffe
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    FullScreenShader::MotionBlurShader::getInstance()->SetTextureUnits(in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture());
+    FullScreenShader::MotionBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::MotionBlurShader>(
                                   // Todo : use a previousPVMatrix per cam, not global
                                   cam->getPreviousPVMatrix(),
@@ -554,27 +554,27 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffe
 
 static void renderGodFade(GLuint tex, const SColor &col)
 {
-    FullScreenShader::GodFadeShader::getInstance()->SetTextureUnits(tex);
+    FullScreenShader::GodFadeShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::GodFadeShader>(col);
 }
 
 static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 {
-    FullScreenShader::GodRayShader::getInstance()->SetTextureUnits(tex);
+    FullScreenShader::GodRayShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::GodRayShader>(sunpos);
 }
 
 static void toneMap(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
 {
     fbo.Bind();
-    FullScreenShader::ToneMapShader::getInstance()->SetTextureUnits(rtt);
+    FullScreenShader::ToneMapShader::getInstance()->setTextureUnits(rtt);
     DrawFullScreenEffect<FullScreenShader::ToneMapShader>(vignette_weight);
 }
 
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    FullScreenShader::DepthOfFieldShader::getInstance()->SetTextureUnits(rtt, irr_driver->getDepthStencilTexture());
+    FullScreenShader::DepthOfFieldShader::getInstance()->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::DepthOfFieldShader>();
 }
 
@@ -591,7 +591,7 @@ void PostProcessing::applyMLAA()
 
     // Pass 1: color edge detection
     FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->use();
-    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
+    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
     DrawFullScreenEffect<FullScreenShader::MLAAColorEdgeDetectionSHader>(PIXEL_SIZE);
 
     glStencilFunc(GL_EQUAL, 1, ~0);
@@ -602,7 +602,7 @@ void PostProcessing::applyMLAA()
     glClear(GL_COLOR_BUFFER_BIT);
 
     FullScreenShader::MLAABlendWeightSHader::getInstance()->use();
-    FullScreenShader::MLAABlendWeightSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap));
+    FullScreenShader::MLAABlendWeightSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap));
     DrawFullScreenEffect<FullScreenShader::MLAABlendWeightSHader>(PIXEL_SIZE);
 
     // Blit in to tmp1
@@ -612,7 +612,7 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
     FullScreenShader::MLAAGatherSHader::getInstance()->use();
-    FullScreenShader::MLAAGatherSHader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
+    FullScreenShader::MLAAGatherSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
     DrawFullScreenEffect<FullScreenShader::MLAAGatherSHader>(PIXEL_SIZE);
 
     // Done.
@@ -753,11 +753,11 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
             
-            FullScreenShader::BloomBlendShader::getInstance()->SetTextureUnits(
+            FullScreenShader::BloomBlendShader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
             DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
 
-            FullScreenShader::LensBlendShader::getInstance()->SetTextureUnits(
+            FullScreenShader::LensBlendShader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_LENS_128), irr_driver->getRenderTargetTexture(RTT_LENS_256), irr_driver->getRenderTargetTexture(RTT_LENS_512));
             DrawFullScreenEffect<FullScreenShader::LensBlendShader>();
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index bb03e5eb7..c349f5000 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -376,7 +376,7 @@ struct TexExpander_impl<T, 0>
     template<typename...TupleArgs, typename... Args>
     static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
     {
-        T::getInstance()->SetTextureUnits(args...);
+        T::getInstance()->setTextureUnits(args...);
     }
 };
 
@@ -408,7 +408,7 @@ struct HandleExpander_impl<T, 0>
     template<typename...TupleArgs, typename... Args>
     static void Expand(uint64_t *TextureHandles, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
     {
-        T::getInstance()->SetTextureHandles(args...);
+        T::getInstance()->setTextureHandles(args...);
     }
 };
 
@@ -614,19 +614,19 @@ void IrrDriver::renderSolidSecondPass()
 
     if (CVS->isAZDOEnabled())
     {
-        DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+        DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
         if (!glIsTextureHandleResidentARB(DiffuseHandle))
             glMakeTextureHandleResidentARB(DiffuseHandle);
 
-        SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+        SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
         if (!glIsTextureHandleResidentARB(SpecularHandle))
             glMakeTextureHandleResidentARB(SpecularHandle);
 
-        SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+        SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
         if (!glIsTextureHandleResidentARB(SSAOHandle))
             glMakeTextureHandleResidentARB(SSAOHandle);
 
-        DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[3]);
+        DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[3]);
         if (!glIsTextureHandleResidentARB(DepthHandle))
             glMakeTextureHandleResidentARB(DepthHandle);
     }
@@ -773,9 +773,9 @@ void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits,
         }
 
         if (CVS->isAZDOEnabled())
-            Shader::getInstance()->SetTextureHandles(mesh.TextureHandles[0]);
+            Shader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
         else
-            Shader::getInstance()->SetTextureUnits(getTextureGLuint(mesh.textures[0]));
+            Shader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
 }
@@ -885,7 +885,7 @@ void IrrDriver::renderTransparent()
         GLenum itype = mesh.IndexType;
         size_t count = mesh.IndexCount;
         // Render the effect
-        MeshShader::DisplaceShader::getInstance()->SetTextureUnits(
+        MeshShader::DisplaceShader::getInstance()->setTextureUnits(
             getTextureGLuint(displaceTex),
             irr_driver->getRenderTargetTexture(RTT_COLOR),
             irr_driver->getRenderTargetTexture(RTT_TMP1),
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 0db45f205..4a8e23f5e 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -47,7 +47,7 @@ static void renderPointLights(unsigned count)
     glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::getInstance()->vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(LightShader::PointLightInfo), PointLightsInfo);
 
-    LightShader::PointLightShader::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
+    LightShader::PointLightShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
     LightShader::PointLightShader::getInstance()->setUniforms();
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, count);
@@ -159,7 +159,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         if (CVS->needRHWorkaround())
         {
             FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->use();
-            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->SetTextureUnits(
+            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->setTextureUnits(
                 m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture());
             for (unsigned i = 0; i < 32; i++)
             {
@@ -170,7 +170,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         else
         {
             FullScreenShader::RadianceHintsConstructionShader::getInstance()->use();
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()->SetTextureUnits(
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()->setTextureUnits(
                     m_rtts->getRSM().getRTT()[0],
                     m_rtts->getRSM().getRTT()[1],
                     m_rtts->getRSM().getDepthTexture()
@@ -212,12 +212,12 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 
             if (CVS->isESMEnabled())
             {
-                FullScreenShader::ShadowedSunLightShaderESM::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getRTT()[0]);
+                FullScreenShader::ShadowedSunLightShaderESM::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getRTT()[0]);
                 DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShaderESM>(shadowSplit[1], shadowSplit[2], shadowSplit[3], shadowSplit[4]);
             }
             else
             {
-                FullScreenShader::ShadowedSunLightShaderPCF::getInstance()->SetTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getDepthTexture());
+                FullScreenShader::ShadowedSunLightShaderPCF::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getDepthTexture());
                 DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShaderPCF>(shadowSplit[1],
                                                                                   shadowSplit[2],
                                                                                   shadowSplit[3],
@@ -264,7 +264,7 @@ void IrrDriver::renderAmbientScatter()
     glBlendEquation(GL_FUNC_ADD);
     glBlendFunc(GL_ONE, GL_ONE);
 
-    FullScreenShader::FogShader::getInstance()->SetTextureUnits(irr_driver->getDepthStencilTexture());
+    FullScreenShader::FogShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::FogShader>(1.f / (40.f * start), col);
 }
 
@@ -295,7 +295,7 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
     LightShader::PointLightScatterShader::getInstance()->use();
     glBindVertexArray(LightShader::PointLightScatterShader::getInstance()->vao);
 
-    LightShader::PointLightScatterShader::getInstance()->SetTextureUnits(irr_driver->getDepthStencilTexture());
+    LightShader::PointLightScatterShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
     LightShader::PointLightScatterShader::getInstance()->setUniforms(1.f / (40.f * start), col2);
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, MIN2(pointlightcount, MAXLIGHT));
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 81f9126bb..b722f6a65 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -407,7 +407,7 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
     glBindVertexArray(MeshShader::SkyboxShader::getInstance()->vao);
     MeshShader::SkyboxShader::getInstance()->setUniforms();
 
-    MeshShader::SkyboxShader::getInstance()->SetTextureUnits(SkyboxCubeMap);
+    MeshShader::SkyboxShader::getInstance()->setTextureUnits(SkyboxCubeMap);
 
     glDrawArrays(GL_TRIANGLES, 0, 3);
     glBindVertexArray(0);
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 5685e0828..5eccba626 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -325,4 +325,5 @@ public:
 };   // Shader
 
 // ============================================================================
+
 #endif
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 5381660b5..309fd6df6 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -760,7 +760,7 @@ namespace UtilShader
             GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
         assignUniforms("PermutationMatrix", "ViewportSize");
         TU_Samples = 1;
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
         assignTextureUnit(TU_Samples, "samples");
     }
 }
@@ -775,7 +775,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "object_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     ObjectRefPass1Shader::ObjectRefPass1Shader()
@@ -785,7 +785,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     GrassPass1Shader::GrassPass1Shader()
@@ -795,7 +795,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     NormalMapShader::NormalMapShader()
@@ -805,7 +805,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "normalmap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(m_program, 1, "normalMap", 0, "DiffuseForAlpha");
+        assignSamplerNames(m_program, 1, "normalMap", 0, "DiffuseForAlpha");
     }
 
     InstancedObjectPass1Shader::InstancedObjectPass1Shader()
@@ -817,7 +817,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
 
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "glosstex");
+        assignSamplerNames(m_program, 0, "glosstex");
     }
 
     InstancedObjectRefPass1Shader::InstancedObjectRefPass1Shader()
@@ -829,7 +829,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
 
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     InstancedGrassPass1Shader::InstancedGrassPass1Shader()
@@ -840,7 +840,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
         assignUniforms("windDir");
-        AssignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
     }
 
     InstancedNormalMapShader::InstancedNormalMapShader()
@@ -851,7 +851,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "normalMap", 1, "glossMap");
+        assignSamplerNames(m_program, 0, "normalMap", 1, "glossMap");
     }
 
     // Solid Lit pass shaders
@@ -862,7 +862,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "object_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedObjectPass2Shader::InstancedObjectPass2Shader()
@@ -873,7 +873,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedObjectRefPass2Shader::InstancedObjectRefPass2Shader()
@@ -884,7 +884,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     DetailledObjectPass2Shader::DetailledObjectPass2Shader()
@@ -894,7 +894,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "detailledobject_pass2.frag");
         assignUniforms("ModelMatrix");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
     }
 
     InstancedDetailledObjectPass2Shader::InstancedDetailledObjectPass2Shader()
@@ -905,7 +905,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_detailledobject_pass2.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
     }
 
     ObjectUnlitShader::ObjectUnlitShader()
@@ -914,7 +914,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "object_unlit.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     InstancedObjectUnlitShader::InstancedObjectUnlitShader()
@@ -924,7 +924,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "instanced_object_pass.vert",
             GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     ObjectRefPass2Shader::ObjectRefPass2Shader()
@@ -934,7 +934,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "objectref_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     GrassPass2Shader::GrassPass2Shader()
@@ -944,7 +944,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "grass_pass2.frag");
         assignUniforms("ModelMatrix", "windDir");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
     }
 
     InstancedGrassPass2Shader::InstancedGrassPass2Shader()
@@ -955,7 +955,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
         assignUniforms("windDir", "SunDir");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo", 5, "SpecMap");
     }
 
     SphereMapShader::SphereMapShader()
@@ -966,7 +966,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     InstancedSphereMapShader::InstancedSphereMapShader()
@@ -978,7 +978,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
     }
 
     SplattingShader::SplattingShader()
@@ -989,7 +989,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "splatting.frag");
         assignUniforms("ModelMatrix");
 
-        AssignSamplerNames(m_program,
+        assignSamplerNames(m_program,
             0, "DiffuseMap",
             1, "SpecularMap",
             2, "SSAO",
@@ -1006,7 +1006,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     TransparentFogShader::TransparentFogShader()
@@ -1015,7 +1015,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "transparentfog.frag");
         assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH", "endH", "start", "end", "col");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     BillboardShader::BillboardShader()
@@ -1025,7 +1025,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "billboard.frag");
 
         assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     ColorizeShader::ColorizeShader()
@@ -1073,7 +1073,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedRSMShader::InstancedRSMShader()
@@ -1084,7 +1084,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_rsm.frag");
 
         assignUniforms("RSMMatrix");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     SplattingRSMShader::SplattingRSMShader()
@@ -1094,7 +1094,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "splatting_rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix");
-        AssignSamplerNames(m_program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
+        assignSamplerNames(m_program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
     }
 
     InstancedShadowShader::InstancedShadowShader()
@@ -1139,7 +1139,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedRefShadowShader::InstancedRefShadowShader()
@@ -1163,7 +1163,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     GrassShadowShader::GrassShadowShader()
@@ -1185,7 +1185,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix", "windDir");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     InstancedGrassShadowShader::InstancedGrassShadowShader()
@@ -1209,7 +1209,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
         assignUniforms("layer", "windDir");
     }
 
@@ -1229,7 +1229,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "displace.frag");
         assignUniforms("ModelMatrix", "dir", "dir2");
 
-        AssignSamplerNames(m_program,
+        assignSamplerNames(m_program,
             0, "displacement_tex",
             1, "color_tex",
             2, "mask_tex",
@@ -1242,7 +1242,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "sky.vert",
             GL_FRAGMENT_SHADER, "sky.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1293,7 +1293,7 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlight.frag");
 
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1330,7 +1330,7 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlightscatter.frag");
 
         assignUniforms("density", "fogcol");
-        AssignSamplerNames(m_program, 0, "dtex");
+        assignSamplerNames(m_program, 0, "dtex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1387,7 +1387,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bloom.frag");
         assignUniforms();
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     BloomBlendShader::BloomBlendShader()
@@ -1397,7 +1397,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bloomblend.frag");
         assignUniforms();
 
-        AssignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        assignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
     }
 	
 	LensBlendShader::LensBlendShader()
@@ -1407,7 +1407,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "lensblend.frag");
         assignUniforms();
 
-        AssignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        assignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
     }
 
     ToneMapShader::ToneMapShader()
@@ -1419,7 +1419,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "tonemap.frag");
         assignUniforms("vignette_weight");
 
-        AssignSamplerNames(m_program, 0, "text");
+        assignSamplerNames(m_program, 0, "text");
     }
 
     DepthOfFieldShader::DepthOfFieldShader()
@@ -1429,7 +1429,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "dof.frag");
 
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
     }
 
     SunLightShader::SunLightShader()
@@ -1443,7 +1443,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
             GL_FRAGMENT_SHADER, "sunlight.frag");
 
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex");
         assignUniforms("direction", "col");
     }
 
@@ -1457,7 +1457,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
             GL_FRAGMENT_SHADER, "IBL.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "probe");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "probe");
     }
 
     DegradedIBLShader::DegradedIBLShader()
@@ -1470,7 +1470,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
             GL_FRAGMENT_SHADER, "degraded_ibl.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "ntex");
+        assignSamplerNames(m_program, 0, "ntex");
     }
 
     ShadowedSunLightShaderPCF::ShadowedSunLightShaderPCF()
@@ -1485,7 +1485,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadow.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
         assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
     }
 
@@ -1501,7 +1501,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
         assignUniforms("split0", "split1", "split2", "splitmax");
     }
 
@@ -1522,7 +1522,7 @@ namespace FullScreenShader
         }
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
-        AssignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
+        assignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
@@ -1534,7 +1534,7 @@ namespace FullScreenShader
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
 
-        AssignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
+        assignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
     }
 
     RHDebug::RHDebug()
@@ -1558,7 +1558,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gi.frag");
 
         assignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        AssignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
+        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
     }
 
     Gaussian17TapHShader::Gaussian17TapHShader()
@@ -1567,7 +1567,7 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, "screenquad.vert",
             GL_FRAGMENT_SHADER, "bilateralH.frag");
         assignUniforms("pixel");
-        AssignSamplerNames(m_program, 0, "tex", 1, "depth");
+        assignSamplerNames(m_program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
@@ -1575,7 +1575,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
         TU_dest = 2;
         assignUniforms("pixel");
-        AssignSamplerNames(m_program, 0, "source", 1, "depth");
+        assignSamplerNames(m_program, 0, "source", 1, "depth");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1585,7 +1585,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "gaussian6h.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        AssignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1595,7 +1595,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "blurshadowH.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        AssignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1606,7 +1606,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel", "sigma");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 	
 	HorizontalBlurShader::HorizontalBlurShader()
@@ -1616,7 +1616,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian3HBlurShader::Gaussian3HBlurShader()
@@ -1626,7 +1626,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian3h.frag");
         assignUniforms("pixel");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian17TapVShader::Gaussian17TapVShader()
@@ -1636,7 +1636,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bilateralV.frag");
         assignUniforms("pixel");
 
-        AssignSamplerNames(m_program, 0, "tex", 1, "depth");
+        assignSamplerNames(m_program, 0, "tex", 1, "depth");
     }
 
     ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
@@ -1645,7 +1645,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "bilateralV.comp");
         TU_dest = 2;
         assignUniforms("pixel");
-        AssignSamplerNames(m_program, 0, "source", 1, "depth");
+        assignSamplerNames(m_program, 0, "source", 1, "depth");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1655,7 +1655,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "gaussian6v.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        AssignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1665,7 +1665,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "blurshadowV.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        AssignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source");
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1676,7 +1676,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6v.frag");
         assignUniforms("pixel", "sigma");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     Gaussian3VBlurShader::Gaussian3VBlurShader()
@@ -1686,7 +1686,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian3v.frag");
         assignUniforms("pixel");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     PassThroughShader::PassThroughShader()
@@ -1696,7 +1696,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "passthrough.frag");
 
         assignUniforms("width", "height");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     LayerPassThroughShader::LayerPassThroughShader()
@@ -1717,7 +1717,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "linearizedepth.frag");
         assignUniforms("zn", "zf");
 
-        AssignSamplerNames(m_program, 0, "texture");
+        assignSamplerNames(m_program, 0, "texture");
     }
 
 
@@ -1726,7 +1726,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        AssignSamplerNames(m_program, 0, "depth");
+        assignSamplerNames(m_program, 0, "depth");
         assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
         glShaderStorageBlockBinding(m_program, block_idx, 2);
@@ -1748,7 +1748,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "depthhistogram.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        AssignSamplerNames(m_program, 0, "depth");
+        assignSamplerNames(m_program, 0, "depth");
 
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "Histogram");
         glShaderStorageBlockBinding(m_program, block_idx, 1);
@@ -1761,7 +1761,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "glow.frag");
         assignUniforms();
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
         vao = createVAO(m_program);
     }
 
@@ -1774,7 +1774,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "ssao.frag");
 
         assignUniforms("radius", "k", "sigma");
-        AssignSamplerNames(m_program, 0, "dtex");
+        assignSamplerNames(m_program, 0, "dtex");
     }
 
     FogShader::FogShader()
@@ -1785,7 +1785,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "fog.frag");
 
         assignUniforms("density", "col");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     MotionBlurShader::MotionBlurShader()
@@ -1795,7 +1795,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "motion_blur.frag");
         assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        AssignSamplerNames(m_program, 0, "color_buffer", 1, "dtex");
+        assignSamplerNames(m_program, 0, "color_buffer", 1, "dtex");
     }
 
     GodFadeShader::GodFadeShader()
@@ -1805,7 +1805,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godfade.frag");
         assignUniforms("col");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     GodRayShader::GodRayShader()
@@ -1815,7 +1815,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godray.frag");
 
         assignUniforms("sunpos");
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
@@ -1825,7 +1825,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_color1.frag");
         assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(m_program, 0, "colorMapG");
+        assignSamplerNames(m_program, 0, "colorMapG");
     }
 
     MLAABlendWeightSHader::MLAABlendWeightSHader()
@@ -1835,7 +1835,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
         assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(m_program, 0, "edgesMap", 1, "areaMap");
+        assignSamplerNames(m_program, 0, "edgesMap", 1, "areaMap");
     }
 
     MLAAGatherSHader::MLAAGatherSHader()
@@ -1845,7 +1845,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
         assignUniforms("PIXEL_SIZE");
 
-        AssignSamplerNames(m_program, 0, "blendMap", 1, "colorMap");
+        assignSamplerNames(m_program, 0, "blendMap", 1, "colorMap");
     }
 }
 
@@ -1858,7 +1858,7 @@ namespace UIShader
             GL_VERTEX_SHADER, "primitive2dlist.vert",
             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms();
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     TextureRectShader::TextureRectShader()
@@ -1868,7 +1868,7 @@ namespace UIShader
             GL_FRAGMENT_SHADER, "texturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     UniformColoredTextureRectShader::UniformColoredTextureRectShader()
@@ -1879,7 +1879,7 @@ namespace UIShader
 
         assignUniforms("center", "size", "texcenter", "texsize", "color");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
     }
 
     ColoredTextureRectShader::ColoredTextureRectShader()
@@ -1889,7 +1889,7 @@ namespace UIShader
             GL_FRAGMENT_SHADER, "colortexturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        AssignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex");
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 65b7f444d..d2976b54a 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -21,6 +21,7 @@
 #include "config/user_config.hpp"
 #include "graphics/shader.hpp"
 #include "graphics/shaders_util.hpp"
+#include "graphics/texture_read.hpp"
 
 #include <IMeshSceneNode.h>
 #include <IShaderConstantSetCallBack.h>
@@ -48,7 +49,8 @@ public:
     ColoredLine();
 };
 
-class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4, float >, public TextureRead<Trilinear_cubemap>
+class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4, float >,
+                             public TextureRead<Trilinear_cubemap>
 {
 public:
     GLuint TU_Samples;
@@ -59,13 +61,15 @@ public:
 
 namespace MeshShader
 {
-class ObjectPass1Shader : public Shader<ObjectPass1Shader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class ObjectPass1Shader : public Shader<ObjectPass1Shader, core::matrix4, core::matrix4>, 
+                          public TextureRead<Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectPass1Shader();
 };
 
-class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>,
+                             public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
 {
 public:
     ObjectRefPass1Shader();
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 60adfa715..2fafb8f4a 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -344,92 +344,4 @@ struct BindTexture<Trilinear_Clamped_Array2D, tp...>
     }
 };
 
-
-template<SamplerType...tp>
-class TextureRead
-{
-private:
-    template<unsigned N, typename...Args>
-    void AssignTextureNames_impl(GLuint)
-    {
-        static_assert(N == sizeof...(tp), "Wrong number of texture name");
-    }
-
-    template<unsigned N, typename...Args>
-    void AssignTextureNames_impl(GLuint Program, GLuint TexUnit, const char *name, Args...args)
-    {
-        GLuint location = glGetUniformLocation(Program, name);
-        TextureLocation.push_back(location);
-        glUniform1i(location, TexUnit);
-        TextureUnits.push_back(TexUnit);
-        AssignTextureNames_impl<N + 1>(Program, args...);
-    }
-
-protected:
-    std::vector<GLuint> TextureUnits;
-    std::vector<GLenum> TextureType;
-    std::vector<GLenum> TextureLocation;
-public:
-    template<typename...Args>
-    void AssignSamplerNames(GLuint Program, Args...args)
-    {
-        CreateSamplers<tp...>::exec(SamplersId, TextureType);
-
-        glUseProgram(Program);
-        AssignTextureNames_impl<0>(Program, args...);
-        glUseProgram(0);
-    }
-
-    template<int N>
-    void SetTextureUnits_impl()
-    {
-        static_assert(N == sizeof...(tp), "Not enough texture set");
-    }
-
-    template<int N, typename... TexIds>
-    void SetTextureUnits_impl(GLuint texid, TexIds... args)
-    {
-        setTextureSampler(TextureType[N], TextureUnits[N], texid, SamplersId[N]);
-        SetTextureUnits_impl<N + 1>(args...);
-    }
-
-
-    template<int N>
-    void SetTextureHandles_impl()
-    {
-        static_assert(N == sizeof...(tp), "Not enough handle set");
-    }
-
-    template<int N, typename... HandlesId>
-    void SetTextureHandles_impl(uint64_t handle, HandlesId... args)
-    {
-        if (handle)
-            glUniformHandleui64ARB(TextureLocation[N], handle);
-        SetTextureHandles_impl<N + 1>(args...);
-    }
-
-public:
-    std::vector<GLuint> SamplersId;
-
-    template<typename... TexIds>
-    void SetTextureUnits(TexIds... args)
-    {
-        if (getGLSLVersion() >= 330)
-            SetTextureUnits_impl<0>(args...);
-        else
-            BindTexture<tp...>::template exec<0>(TextureUnits, args...);
-    }
-
-    ~TextureRead()
-    {
-        for (unsigned i = 0; i < SamplersId.size(); i++)
-            glDeleteSamplers(1, &SamplersId[i]);
-    }
-
-    template<typename... HandlesId>
-    void SetTextureHandles(HandlesId... ids)
-    {
-        SetTextureHandles_impl<0>(ids...);
-    }
-};
 #endif
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 0d60a3d5a..77f7a663d 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -148,7 +148,7 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, CBBssbo);
 
     FullScreenShader::LightspaceBoundingBoxShader::getInstance()->use();
-    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->SetTextureUnits(getDepthStencilTexture());
+    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->setTextureUnits(getDepthStencilTexture());
     FullScreenShader::LightspaceBoundingBoxShader::getInstance()->setUniforms(m_suncam->getViewMatrix(), shadowSplit[1], shadowSplit[2], shadowSplit[3], shadowSplit[4]);
     glDispatchCompute((int)width / 64, (int)height / 64, 1);
 
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 68d5fa978..7b8c336b5 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -69,7 +69,7 @@ void STKBillboard::render()
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
     MeshShader::BillboardShader::getInstance()->use();
-    MeshShader::BillboardShader::getInstance()->SetTextureUnits(texid);
+    MeshShader::BillboardShader::getInstance()->setTextureUnits(texid);
     MeshShader::BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index fc264fccf..fd9338d33 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -308,7 +308,7 @@ SetTexture(GLMesh &mesh, unsigned i, bool isSrgb, const std::string &matname)
     if (CVS->isAZDOEnabled())
     {
         if (!mesh.TextureHandles[i])
-            mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[i]), MeshShader::ObjectPass1Shader::getInstance()->SamplersId[0]);
+            mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[i]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[i]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[i]);
     }
@@ -381,7 +381,7 @@ void InitTexturesTransparent(GLMesh &mesh)
     if (CVS->isAZDOEnabled())
     {
         if (!mesh.TextureHandles[0])
-            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->SamplersId[0]);
+            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
     }
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 1e96764e9..4a5e75f25 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -288,13 +288,13 @@ void STKMeshSceneNode::render()
             if (CVS->isAZDOEnabled())
             {
                 if (!mesh.TextureHandles[0])
-                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->SamplersId[0]);
+                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                MeshShader::ObjectPass1Shader::getInstance()->SetTextureHandles(mesh.TextureHandles[0]);
+                MeshShader::ObjectPass1Shader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
             }
             else
-                MeshShader::ObjectPass1Shader::getInstance()->SetTextureUnits(getTextureGLuint(mesh.textures[0]));
+                MeshShader::ObjectPass1Shader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
             MeshShader::ObjectPass1Shader::getInstance()->setUniforms(AbsoluteTransformation, invmodel);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);
@@ -325,30 +325,30 @@ void STKMeshSceneNode::render()
 
             if (CVS->isAZDOEnabled())
             {
-                GLuint64 DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                GLuint64 DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(DiffuseHandle))
                     glMakeTextureHandleResidentARB(DiffuseHandle);
 
-                GLuint64 SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+                GLuint64 SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
                 if (!glIsTextureHandleResidentARB(SpecularHandle))
                     glMakeTextureHandleResidentARB(SpecularHandle);
 
-                GLuint64 SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+                GLuint64 SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
                 if (!glIsTextureHandleResidentARB(SSAOHandle))
                     glMakeTextureHandleResidentARB(SSAOHandle);
 
                 if (!mesh.TextureHandles[0])
-                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
                 if (!mesh.TextureHandles[1])
-                    mesh.TextureHandles[1] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[1]), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                    mesh.TextureHandles[1] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[1]), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[1]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[1]);
-                MeshShader::ObjectPass2Shader::getInstance()->SetTextureHandles(DiffuseHandle, SpecularHandle, SSAOHandle, mesh.TextureHandles[0], mesh.TextureHandles[1]);
+                MeshShader::ObjectPass2Shader::getInstance()->setTextureHandles(DiffuseHandle, SpecularHandle, SSAOHandle, mesh.TextureHandles[0], mesh.TextureHandles[1]);
             }
             else
-                MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(
+                MeshShader::ObjectPass2Shader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_DIFFUSE),
                 irr_driver->getRenderTargetTexture(RTT_SPECULAR),
                 irr_driver->getRenderTargetTexture(RTT_HALF1_R),
@@ -422,13 +422,13 @@ void STKMeshSceneNode::render()
                     if (CVS->isAZDOEnabled())
                     {
                         if (!mesh.TextureHandles[0])
-                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->m_sampler_ids[0]);
                         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                        MeshShader::TransparentFogShader::getInstance()->SetTextureHandles(mesh.TextureHandles[0]);
+                        MeshShader::TransparentFogShader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
                     }
                     else
-                        MeshShader::TransparentFogShader::getInstance()->SetTextureUnits(getTextureGLuint(mesh.textures[0]));
+                        MeshShader::TransparentFogShader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
                     MeshShader::TransparentFogShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix, fogmax, startH, endH, start, end, col);
 
                     assert(mesh.vao);
@@ -452,13 +452,13 @@ void STKMeshSceneNode::render()
                     if (CVS->isAZDOEnabled())
                     {
                         if (!mesh.TextureHandles[0])
-                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentShader::getInstance()->SamplersId[0]);
+                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentShader::getInstance()->m_sampler_ids[0]);
                         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                        MeshShader::TransparentShader::getInstance()->SetTextureHandles(mesh.TextureHandles[0]);
+                        MeshShader::TransparentShader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
                     }
                     else
-                        MeshShader::TransparentShader::getInstance()->SetTextureUnits(getTextureGLuint(mesh.textures[0]));
+                        MeshShader::TransparentShader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
 
                     MeshShader::TransparentShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                     assert(mesh.vao);
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
new file mode 100644
index 000000000..5063ed98d
--- /dev/null
+++ b/src/graphics/texture_read.hpp
@@ -0,0 +1,160 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_TEXTURE_READ_HPP
+#define HEADER_TEXTURE_READ_HPP
+
+#include "shaders_util.hpp"
+
+template<SamplerType...tp>
+class TextureRead
+{
+protected:
+    std::vector<GLuint> m_texture_units;
+    std::vector<GLenum> m_texture_type;
+    std::vector<GLenum> m_texture_location;
+
+public:
+    std::vector<GLuint> m_sampler_ids;
+
+    // A variadic template to assign texture names
+    // ===========================================
+private:
+    /** End of recursive variadic template AssigTextureNames. It just
+     *  checks if the number of arguments is correct.*/
+    template<unsigned N, typename...Args>
+    void assignTextureNamesImpl(GLuint)
+    {
+        static_assert(N == sizeof...(tp), "Wrong number of texture name");
+    }   // assignTextureNamesImpl
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation, peeling the texture unit and name off the
+     *  list of arguments.
+     */
+    template<unsigned N, typename...Args>
+    void assignTextureNamesImpl(GLuint program, GLuint tex_unit, 
+                                const char *name, Args...args)
+    {
+        GLuint location = glGetUniformLocation(program, name);
+        m_texture_location.push_back(location);
+        glUniform1i(location, tex_unit);
+        m_texture_units.push_back(tex_unit);
+        assignTextureNamesImpl<N + 1>(program, args...);
+    }   // assignTextureNamesImpl
+
+    // ------------------------------------------------------------------------
+protected:
+    /** The protected interface for setting sampler names - it is only called
+    *  from instances.
+    */
+    template<typename...Args>
+    void assignSamplerNames(GLuint program, Args...args)
+    {
+        CreateSamplers<tp...>::exec(m_sampler_ids, m_texture_type);
+
+        glUseProgram(program);
+        assignTextureNamesImpl<0>(program, args...);
+        glUseProgram(0);
+    }   // AssignSamplerNames
+
+
+    // Variadic template implementation of setTextureUnits
+    // ===================================================
+    /** End of recursion, just check if number of arguments is correct. */
+    template<int N>
+    void setTextureUnitsImpl()
+    {
+        static_assert(N == sizeof...(tp), "Not enough texture set");
+    }   // setTextureUnitsImpl
+
+    // ------------------------------------------------------------------------
+    /** The recursive implementation.
+     */
+    template<int N, typename... TexIds>
+    void setTextureUnitsImpl(GLuint texid, TexIds... args)
+    {
+        setTextureSampler(m_texture_type[N], m_texture_units[N], texid, 
+                          m_sampler_ids[N]);
+        setTextureUnitsImpl<N + 1>(args...);
+    }   // setTextureUnitsImpl
+
+    // ------------------------------------------------------------------------
+public:
+    /** Public implementation of setTextureUnits.
+     */
+    template<typename... TexIds>
+    void setTextureUnits(TexIds... args)
+    {
+        if (getGLSLVersion() >= 330)
+            setTextureUnitsImpl<0>(args...);
+        else
+            BindTexture<tp...>::template exec<0>(m_texture_units, args...);
+    }   // SetTextureUnits
+
+
+    // ========================================================================
+    // Variadic template implementation of setTextureHandles.
+
+    /** End of recursion, just checks at compile time if number of arguments
+     *  is correct.
+     *  \param N number of arguments. */
+    template<int N>
+    void setTextureHandlesImpl()
+    {
+        static_assert(N == sizeof...(tp), "Not enough handle set");
+    }   // setTextureHandlesImpl
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation of setTextureHandles.
+     * \param N The number of the current argument in the recursion (or the
+     *          recursion depth).
+     *  \param handle The texture handle to set.
+     */
+    template<int N, typename... HandlesId>
+    void setTextureHandlesImpl(uint64_t handle, HandlesId... args)
+    {
+        if (handle)
+            glUniformHandleui64ARB(m_texture_location[N], handle);
+        setTextureHandlesImpl<N + 1>(args...);
+    }   // setTextureHandlesImpl
+
+    // ------------------------------------------------------------------------
+public:
+    /** The protected interface.
+     *  \param ids The ids of all texture handls.
+     */
+    template<typename... HandlesId>
+    void setTextureHandles(HandlesId... ids)
+    {
+        setTextureHandlesImpl<0>(ids...);
+    }   // SetTextureHandles
+
+public:
+    // ------------------------------------------------------------------------
+    /** Destructor which frees al lsampler ids.
+     */
+    ~TextureRead()
+    {
+        for (unsigned i = 0; i < m_sampler_ids.size(); i++)
+            glDeleteSamplers(1, &m_sampler_ids[i]);
+    }   // ~TextureRead
+
+
+};   // class TextureRead
+
+#endif

From eacd599b9374ca8cb7c89f2d3ba1fa080162ceed Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 27 Apr 2015 09:04:16 +1000
Subject: [PATCH 147/331] Removed version number warning for Radeon cards on
 osx (since they have completely different version numbers).

---
 data/graphical_restrictions.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml
index e742452dc..16bb60729 100644
--- a/data/graphical_restrictions.xml
+++ b/data/graphical_restrictions.xml
@@ -17,6 +17,9 @@
   <card contains="Gallium"        os="linux"    version="<10.3"    disable="DriverRecentEnough"/>
   <card contains="Gallium"        os="linux"    version="<10.6"    disable="GeometryShader4"/>
   <card contains="Gallium"        os="linux"                       disable="TextureCompressionS3TC"/>
-  <card contains="Radeon"                       version="<14.300"  disable="DriverRecentEnough"/>
+  <!-- On osx radeon appears to have different version numbers, e.g.
+       1.32.20 -->
+  <card contains="Radeon"         os="linux"    version="<14.300"  disable="DriverRecentEnough"/>
+  <card contains="Radeon"         os="windows"  version="<14.300"  disable="DriverRecentEnough"/>
 </graphical-restrictions>
 

From dfcaf44058951b7833d13f2e218a4b3cd95558a2 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 26 Apr 2015 19:06:51 -0400
Subject: [PATCH 148/331] Scripting work

---
 src/scriptengine/script_engine.cpp         |  21 +-
 src/scriptengine/script_gui.cpp            | 214 +++++++++++++++++++++
 src/scriptengine/script_gui.hpp            |  38 ++++
 src/scriptengine/script_kart.cpp           |   1 +
 src/scriptengine/script_physics.cpp        |   1 +
 src/scriptengine/script_track.cpp          |  33 +---
 src/scriptengine/script_track.hpp          |   6 -
 src/scriptengine/scriptstdstring_utils.cpp | 153 +++------------
 src/tracks/track_object_presentation.cpp   | 117 -----------
 9 files changed, 298 insertions(+), 286 deletions(-)
 create mode 100644 src/scriptengine/script_gui.cpp
 create mode 100644 src/scriptengine/script_gui.hpp

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 646bd6b28..35efa63e5 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -16,16 +16,17 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <assert.h>  // assert()
+#include <assert.h>
 #include <angelscript.h>
 #include "io/file_manager.hpp"
-#include <iostream>  // cout
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
-#include "script_engine.hpp"
-#include "scriptstdstring.hpp"
-#include "scriptvec3.hpp"
-#include <string.h>  // strstr()
+#include "scriptengine/script_engine.hpp"
+#include "scriptengine/script_gui.hpp"
+#include "scriptengine/script_track.hpp"
+#include "scriptengine/scriptstdstring.hpp"
+#include "scriptengine/scriptvec3.hpp"
+#include <string.h>
 #include "states_screens/dialogs/tutorial_message_dialog.hpp"
 #include "tracks/track_object_manager.hpp"
 #include "tracks/track.hpp"
@@ -255,7 +256,8 @@ void ScriptEngine::cleanupCache()
 {
     for (auto curr : m_script_cache)
     {
-        curr.second->Release();
+        if (curr.second != NULL)
+            curr.second->Release();
     }
     m_script_cache.clear();
 }
@@ -268,17 +270,16 @@ void ScriptEngine::configureEngine(asIScriptEngine *engine)
 {
     // Register the script string type
     RegisterStdString(engine); //register std::string
-    RegisterStdStringUtils(engine);
     RegisterVec3(engine);      //register Vec3
 
     Scripting::Track::registerScriptFunctions(m_engine);
 
-    Scripting::Track::registerScriptEnums(m_engine);
-
     Scripting::Kart::registerScriptFunctions(m_engine);
 
     Scripting::Physics::registerScriptFunctions(m_engine);
 
+    Scripting::GUI::registerScriptFunctions(m_engine);
+    Scripting::GUI::registerScriptEnums(m_engine);
     
     // It is possible to register the functions, properties, and types in 
     // configuration groups as well. When compiling the scripts it can then
diff --git a/src/scriptengine/script_gui.cpp b/src/scriptengine/script_gui.cpp
new file mode 100644
index 000000000..62ccc2d02
--- /dev/null
+++ b/src/scriptengine/script_gui.cpp
@@ -0,0 +1,214 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "script_track.hpp"
+
+#include "animations/three_d_animation.hpp"
+#include "input/device_manager.hpp"
+#include "input/input_device.hpp"
+#include "input/input_manager.hpp"
+#include "modes/world.hpp"
+#include "states_screens/dialogs/tutorial_message_dialog.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
+#include "tracks/track_object_manager.hpp"
+
+#include <angelscript.h>
+#include "scriptarray.hpp"
+
+#include <assert.h>
+#include <iostream> //debug
+
+namespace Scripting
+{
+    namespace GUI
+    {
+        //getter for key binding for player action enums
+        void getKeyBinding(asIScriptGeneric *gen)
+        {
+            int Enum_value = (int)gen->GetArgDWord(0);
+            InputDevice* device = input_manager->getDeviceManager()->getLatestUsedDevice();
+            DeviceConfig* config = device->getConfiguration();
+            irr::core::stringw control;
+            PlayerAction ScriptAction = (PlayerAction)Enum_value;
+            control = config->getBindingAsString(ScriptAction);
+            std::string key = std::string(irr::core::stringc(control).c_str());
+            void *key_pointer = &key;
+            gen->SetReturnObject(key_pointer);
+        }
+
+        // Displays the message specified in displayMessage( string message ) within the script
+        void displayMessage(asIScriptGeneric *gen)
+        {
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            irr::core::stringw out = StringUtils::utf8_to_wide(input->c_str());
+            new TutorialMessageDialog((out), true);
+        }
+
+
+        void translate(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+
+            irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void insertValues1(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()));
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void insertValues2(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()));
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void insertValues3(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+            std::string *arg3 = (std::string*)gen->GetArgAddress(3);
+
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()),
+                StringUtils::utf8_to_wide(arg3->c_str()));
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void translateAndInsertValues1(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+
+            irr::core::stringw out = translations->w_gettext(input->c_str());
+
+            out = StringUtils::insertValues(out,
+                StringUtils::utf8_to_wide(arg1->c_str()));
+
+            out = translations->fribidize(out);
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void translateAndInsertValues2(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+
+            irr::core::stringw out = translations->w_gettext(input->c_str());
+
+            out = StringUtils::insertValues(out,
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()));
+
+            out = translations->fribidize(out);
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+
+        void translateAndInsertValues3(asIScriptGeneric *gen)
+        {
+            // Get the arguments
+            std::string *input = (std::string*)gen->GetArgAddress(0);
+            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
+            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
+            std::string *arg3 = (std::string*)gen->GetArgAddress(3);
+
+            irr::core::stringw out = translations->w_gettext(input->c_str());
+
+            out = StringUtils::insertValues(out,
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()),
+                StringUtils::utf8_to_wide(arg3->c_str()));
+
+            out = translations->fribidize(out);
+
+            // Return the string
+            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+        }
+        
+        void registerScriptFunctions(asIScriptEngine *engine)
+        {
+            int r; // of type asERetCodes
+            engine->SetDefaultNamespace("GUI");
+            r = engine->RegisterGlobalFunction("void displayMessage(string &in)", asFUNCTION(displayMessage), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string getKeyBinding(int input)", asFUNCTION(getKeyBinding), asCALL_GENERIC); assert(r >= 0);
+
+            r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in)", asFUNCTION(translateAndInsertValues1), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues2), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues3), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(insertValues1), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(insertValues2), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(insertValues3), asCALL_GENERIC); assert(r >= 0);
+        }
+
+        void registerScriptEnums(asIScriptEngine *engine)
+        {
+            engine->RegisterEnum("PA");
+            engine->RegisterEnumValue("PA", "STEER_LEFT", PA_STEER_LEFT);
+            engine->RegisterEnumValue("PA", "STEER_RIGHT", PA_STEER_RIGHT);
+            engine->RegisterEnumValue("PA", "ACCEL", PA_ACCEL);
+            engine->RegisterEnumValue("PA", "BRAKE", PA_BRAKE);
+            engine->RegisterEnumValue("PA", "NITRO", PA_NITRO);
+            engine->RegisterEnumValue("PA", "DRIFT", PA_DRIFT);
+            engine->RegisterEnumValue("PA", "RESCUE", PA_RESCUE);
+            engine->RegisterEnumValue("PA", "FIRE", PA_FIRE);
+            engine->RegisterEnumValue("PA", "LOOK_BACK", PA_LOOK_BACK);
+            engine->RegisterEnumValue("PA", "PAUSE_RACE", PA_PAUSE_RACE);
+            engine->RegisterEnumValue("PA", "MENU_UP", PA_MENU_UP);
+            engine->RegisterEnumValue("PA", "MENU_DOWN", PA_MENU_DOWN);
+            engine->RegisterEnumValue("PA", "MENU_LEFT", PA_MENU_LEFT);
+            engine->RegisterEnumValue("PA", "MENU_RIGHT", PA_MENU_RIGHT);
+            engine->RegisterEnumValue("PA", "MENU_SELECT", PA_MENU_SELECT);
+            engine->RegisterEnumValue("PA", "MENU_CANCEL", PA_MENU_CANCEL);
+        }
+    }
+}
diff --git a/src/scriptengine/script_gui.hpp b/src/scriptengine/script_gui.hpp
new file mode 100644
index 000000000..f5d5434f6
--- /dev/null
+++ b/src/scriptengine/script_gui.hpp
@@ -0,0 +1,38 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SCRIPT_GUI_HPP
+#define HEADER_SCRIPT_GUI_HPP
+
+#include <angelscript.h>
+
+#include <string>
+
+namespace Scripting
+{
+    namespace GUI
+    {
+        //script engine functions
+        void registerScriptFunctions(asIScriptEngine *engine);
+        asIScriptFunction*
+            registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
+        void registerScriptEnums(asIScriptEngine *engine);
+    }
+
+}
+#endif
diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index 458168e4f..8642fbf00 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -112,6 +112,7 @@ namespace Scripting
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
+            engine->SetDefaultNamespace("Karts");
             r = engine->RegisterGlobalFunction("void squashKart(int id, float time)", asFUNCTION(squashKart), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void teleportKart(int id, Vec3 &in)", asFUNCTION(teleportKart), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void setVelocity(int id, Vec3 &in)", asFUNCTION(setVelocity), asCALL_GENERIC); assert(r >= 0);
diff --git a/src/scriptengine/script_physics.cpp b/src/scriptengine/script_physics.cpp
index 7f33d7617..2dfabf7b4 100644
--- a/src/scriptengine/script_physics.cpp
+++ b/src/scriptengine/script_physics.cpp
@@ -82,6 +82,7 @@ namespace Scripting
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
+            engine->SetDefaultNamespace("Physics");
             r = engine->RegisterGlobalFunction("uint getCollidingKart1()", asFUNCTION(getCollidingKart1), asCALL_GENERIC); assert( r >= 0 );
             r = engine->RegisterGlobalFunction("uint getCollidingKart2()", asFUNCTION(getCollidingKart2), asCALL_GENERIC); assert( r >= 0 );
             r = engine->RegisterGlobalFunction("string getCollisionType()", asFUNCTION(getCollisionType), asCALL_GENERIC); assert(r >= 0);
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 41d6702ee..3b95f39af 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -207,15 +207,13 @@ namespace Scripting
         {
             int r;
 
-            r = engine->RegisterGlobalFunction("void displayMessage(string &in)", asFUNCTION(displayMessage), asCALL_GENERIC); assert(r >= 0);
+            engine->SetDefaultNamespace("Track");
             r = engine->RegisterGlobalFunction("void disable(string &in)", asFUNCTION(disableTrackObject), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void enable(string &in)", asFUNCTION(enableTrackObject), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void enableTrigger(string &in)", asFUNCTION(enableTrigger), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void disableTrigger(string &in)", asFUNCTION(disableTrigger), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void createTrigger(string &in,Vec3 &in, float distance)",
                 asFUNCTION(createTrigger), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string getKeyBinding(int input)", asFUNCTION(getKeyBinding), asCALL_GENERIC); assert(r >= 0);
-
 
             /*
             //Test singleton, and various calling conventions
@@ -275,35 +273,6 @@ namespace Scripting
             r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asFUNCTION( setPaused ), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
             r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_GENERIC); assert(r >= 0);
-
         }
-
-        void registerScriptEnums(asIScriptEngine *engine)
-        {
-
-            engine->RegisterEnum("PA");
-            engine->RegisterEnumValue("PA", "STEER_LEFT", PA_STEER_LEFT);
-            engine->RegisterEnumValue("PA", "STEER_RIGHT", PA_STEER_RIGHT);
-            engine->RegisterEnumValue("PA", "ACCEL", PA_ACCEL);
-            engine->RegisterEnumValue("PA", "BRAKE", PA_BRAKE);
-            engine->RegisterEnumValue("PA", "NITRO", PA_NITRO);
-            engine->RegisterEnumValue("PA", "DRIFT", PA_DRIFT);
-            engine->RegisterEnumValue("PA", "RESCUE", PA_RESCUE);
-            engine->RegisterEnumValue("PA", "FIRE", PA_FIRE);
-            engine->RegisterEnumValue("PA", "LOOK_BACK", PA_LOOK_BACK);
-            engine->RegisterEnumValue("PA", "PAUSE_RACE", PA_PAUSE_RACE);
-            engine->RegisterEnumValue("PA", "MENU_UP", PA_MENU_UP);
-            engine->RegisterEnumValue("PA", "MENU_DOWN", PA_MENU_DOWN);
-            engine->RegisterEnumValue("PA", "MENU_LEFT", PA_MENU_LEFT);
-            engine->RegisterEnumValue("PA", "MENU_RIGHT", PA_MENU_RIGHT);
-            engine->RegisterEnumValue("PA", "MENU_SELECT", PA_MENU_SELECT);
-            engine->RegisterEnumValue("PA", "MENU_CANCEL", PA_MENU_CANCEL);
-
-        }
-
-
-
-
-
     }
 }
diff --git a/src/scriptengine/script_track.hpp b/src/scriptengine/script_track.hpp
index ddea74408..9b2b77c70 100644
--- a/src/scriptengine/script_track.hpp
+++ b/src/scriptengine/script_track.hpp
@@ -25,25 +25,19 @@
 
 namespace Scripting
 {
-
     namespace Track
     {
-
         //script engine functions
         void registerScriptFunctions(asIScriptEngine *engine);
         asIScriptFunction*
             registerScriptCallbacks(asIScriptEngine *engine , std::string scriptName);
-        void registerScriptEnums(asIScriptEngine *engine);
-
 
         //script-bound functions
-        void displayMessage(asIScriptGeneric *gen);
         void disableAnimation(asIScriptGeneric *gen);
         void enableAnimation(asIScriptGeneric *gen);
         void enableTrigger(asIScriptGeneric *gen);
         void disableTrigger(asIScriptGeneric *gen);
         void createTrigger(asIScriptGeneric *gen);
-
     }
 
 }
diff --git a/src/scriptengine/scriptstdstring_utils.cpp b/src/scriptengine/scriptstdstring_utils.cpp
index 1436e8479..fe8986b31 100644
--- a/src/scriptengine/scriptstdstring_utils.cpp
+++ b/src/scriptengine/scriptstdstring_utils.cpp
@@ -20,7 +20,6 @@
 #include "scriptarray.hpp"
 #include <stdio.h>
 #include <string.h>
-#include "utils/translation.hpp"
 
 using namespace std;
 
@@ -45,19 +44,19 @@ static CScriptArray *StringSplit(const string &delim, const string &str)
     asIScriptEngine *engine = ctx->GetEngine();
 
     // TODO: This should only be done once
-	// TODO: This assumes that CScriptArray was already registered
-	asIObjectType *arrayType = engine->GetObjectTypeById(engine->GetTypeIdByDecl("array<string>"));
+    // TODO: This assumes that CScriptArray was already registered
+    asIObjectType *arrayType = engine->GetObjectTypeById(engine->GetTypeIdByDecl("array<string>"));
 
     // Create the array object
     CScriptArray *array = new CScriptArray(0, arrayType);
 
     // Find the existence of the delimiter in the input string
     int pos = 0, prev = 0, count = 0;
-    while( (pos = (int)str.find(delim, prev)) != (int)string::npos )
+    while ((pos = (int)str.find(delim, prev)) != (int)string::npos)
     {
         // Add the part to the array
-        array->Resize(array->GetSize()+1);
-        ((string*)array->At(count))->assign(&str[prev], pos-prev);
+        array->Resize(array->GetSize() + 1);
+        ((string*)array->At(count))->assign(&str[prev], pos - prev);
 
         // Find the next part
         count++;
@@ -65,16 +64,16 @@ static CScriptArray *StringSplit(const string &delim, const string &str)
     }
 
     // Add the remaining part
-    array->Resize(array->GetSize()+1);
+    array->Resize(array->GetSize() + 1);
     ((string*)array->At(count))->assign(&str[prev]);
 
-	return array;
+    return array;
 }
 
 static void StringSplit_Generic(asIScriptGeneric *gen)
 {
     // Get the arguments
-    string *str   = (string*)gen->GetObject();
+    string *str = (string*)gen->GetObject();
     string *delim = *(string**)gen->GetAddressOfArg(0);
 
     // Return the array by handle
@@ -100,20 +99,20 @@ static string StringJoin(const CScriptArray &array, const string &delim)
 {
     // Create the new string
     string str = "";
-	if( array.GetSize() )
-	{
-		int n;
-		for( n = 0; n < (int)array.GetSize() - 1; n++ )
-		{
-			str += *(string*)array.At(n);
-			str += delim;
-		}
+    if (array.GetSize())
+    {
+        int n;
+        for (n = 0; n < (int)array.GetSize() - 1; n++)
+        {
+            str += *(string*)array.At(n);
+            str += delim;
+        }
 
-		// Add the last part
-		str += *(string*)array.At(n);
-	}
+        // Add the last part
+        str += *(string*)array.At(n);
+    }
 
-	return str;
+    return str;
 }
 
 static void StringJoin_Generic(asIScriptGeneric *gen)
@@ -126,110 +125,22 @@ static void StringJoin_Generic(asIScriptGeneric *gen)
     new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
 }
 
-void translate(asIScriptGeneric *gen)
-{
-    // Get the arguments
-    std::string *input = (std::string*)gen->GetArgAddress(0);
-
-    irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
-
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
-}
-
-void insertValues1(asIScriptGeneric *gen)
-{
-    // Get the arguments
-    std::string *input = (std::string*)gen->GetArgAddress(0);
-    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-
-    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-        StringUtils::utf8_to_wide(arg1->c_str()));
-
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
-}
-
-void insertValues2(asIScriptGeneric *gen)
-{
-    // Get the arguments
-    std::string *input = (std::string*)gen->GetArgAddress(0);
-    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-    std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-
-    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-        StringUtils::utf8_to_wide(arg1->c_str()),
-        StringUtils::utf8_to_wide(arg2->c_str()));
-
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
-}
-
-void insertValues3(asIScriptGeneric *gen)
-{
-    // Get the arguments
-    std::string *input = (std::string*)gen->GetArgAddress(0);
-    std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-    std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-    std::string *arg3 = (std::string*)gen->GetArgAddress(3);
-
-    irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-        StringUtils::utf8_to_wide(arg1->c_str()),
-        StringUtils::utf8_to_wide(arg2->c_str()),
-        StringUtils::utf8_to_wide(arg3->c_str()));
-
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(StringUtils::wide_to_utf8(out.c_str()));
-}
-
-/*
-void insertValues(asIScriptGeneric *gen)
-{
-    // Get the arguments
-    std::string *input = (std::string*)gen->GetArgAddress(0);
-    CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(1);
-
-    int size = array->GetSize();
-    vector<string> all_values;
-    for (int i = 0; i < size; i++)
-    {
-        string* curr = (string*)array->At(i);
-        all_values.push_back(curr);
-    }
-
-    StringUtils::insertValues(*input, all_values);
-
-    irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
-
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(irr::core::stringc(out).c_str());
-}
-*/
-
 // This is where the utility functions are registered.
 // The string type must have been registered first.
 void RegisterStdStringUtils(asIScriptEngine *engine)
 {
-	int r;
+    int r;
 
-	//if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
-	//{
-		//r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
-		//r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_GENERIC); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(insertValues1), asCALL_GENERIC); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(insertValues2), asCALL_GENERIC); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(insertValues3), asCALL_GENERIC); assert(r >= 0);
-    //}
-	//else
-	//{
-	//	//r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	//	//r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
-    //    r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_CDECL); assert(r >= 0);
-    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1)", asFUNCTION(insertValues1), asCALL_CDECL); assert(r >= 0);
-    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1, const string &arg2)", asFUNCTION(insertValues2), asCALL_CDECL); assert(r >= 0);
-    //    r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &arg1, const string &arg2, const string &arg3)", asFUNCTION(insertValues3), asCALL_CDECL); assert(r >= 0);
-	//}
+    if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
+    {
+        r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
+    }
+    else
+    {
+        r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
+        r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
+    }
 }
 
-END_AS_NAMESPACE
+END_AS_NAMESPACE
\ No newline at end of file
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 30ca9a2d0..308ecc17f 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -921,123 +921,6 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
                   _("Complete all challenges to unlock the big door!"), true);
         }
     }
-    /*
-    else if (m_action == "tutorial_drive")
-    {
-        //if (World::getWorld()->getPhase() == World::RACE_PHASE)
-        {
-            m_action_active = false;
-            //World::getWorld()->getRaceGUI()->clearAllMessages();
-
-            InputDevice* device = input_manager->getDeviceManager()
-                                               ->getLatestUsedDevice();
-            DeviceConfig* config = device->getConfiguration();
-            irr::core::stringw accel = config->getBindingAsString(PA_ACCEL);
-            irr::core::stringw left = config->getBindingAsString(PA_STEER_LEFT);
-            irr::core::stringw right = config->getBindingAsString(PA_STEER_RIGHT);
-
-            new TutorialMessageDialog(_("Accelerate with <%s> and steer with "
-                                        "<%s> and <%s>", accel, left, right),
-                false);
-        }
-    }
-    else if (m_action == "tutorial_bananas")
-    {
-        m_action_active = false;
-
-        new TutorialMessageDialog(_("Avoid bananas!"), true);
-    }
-    else if (m_action == "tutorial_giftboxes")
-    {
-        m_action_active = false;
-        InputDevice* device = input_manager->getDeviceManager()
-                                           ->getLatestUsedDevice();
-        DeviceConfig* config = device->getConfiguration();
-        irr::core::stringw fire = config->getBindingAsString(PA_FIRE);
-
-        new TutorialMessageDialog(_("Collect gift boxes, and fire the weapon "
-                                    "with <%s> to blow away these boxes!",
-                                    fire),true);
-    }
-    else if (m_action == "tutorial_backgiftboxes")
-    {
-        m_action_active = false;
-        InputDevice* device = input_manager->getDeviceManager()
-                                           ->getLatestUsedDevice();
-        DeviceConfig* config = device->getConfiguration();
-        irr::core::stringw fire = config->getBindingAsString(PA_FIRE);
-        irr::core::stringw back = config->getBindingAsString(PA_LOOK_BACK);
-
-    new TutorialMessageDialog(
-           _("Press <%s> to look behind, and fire the weapon with <%s> while "
-             "pressing <%s> to fire behind!", back, fire, back),
-            true);
-    }
-    else if (m_action == "tutorial_nitro_collect")
-    {
-        m_action_active = false;
-
-        new TutorialMessageDialog(_("Collect nitro bottles (we will use them "
-                                    "after the curve)"), true);
-    }
-    else if (m_action == "tutorial_nitro_use")
-    {
-        m_action_active = false;
-        InputDevice* device = input_manager->getDeviceManager()
-                                           ->getLatestUsedDevice();
-        DeviceConfig* config = device->getConfiguration();
-        irr::core::stringw nitro = config->getBindingAsString(PA_NITRO);
-
-        new TutorialMessageDialog(_("Use the nitro you collected by "
-                                    "pressing <%s>!", nitro), true);
-    }
-    else if (m_action == "tutorial_rescue")
-    {
-        m_action_active = false;
-        InputDevice* device = input_manager->getDeviceManager()
-                                           ->getLatestUsedDevice();
-        DeviceConfig* config = device->getConfiguration();
-        irr::core::stringw rescue = config->getBindingAsString(PA_RESCUE);
-
-        new TutorialMessageDialog(_("Oops! When you're in trouble, press <%s> "
-                                    "to be rescued", rescue),
-                                  false);
-    }
-    else if (m_action == "tutorial_skidding")
-    {
-        m_action_active = false;
-        //World::getWorld()->getRaceGUI()->clearAllMessages();
-
-        InputDevice* device = input_manager->getDeviceManager()
-                                           ->getLatestUsedDevice();
-        DeviceConfig* config = device->getConfiguration();
-        irr::core::stringw skid = config->getBindingAsString(PA_DRIFT);
-
-
-        new TutorialMessageDialog(_("Accelerate and press the <%s> key while "
-                                    "turning to skid. Skidding for a short "
-                                    "while can help you turn faster to take "
-                                    "sharp turns.", skid),
-            true);
-    }
-    else if (m_action == "tutorial_skidding2")
-    {
-        m_action_active = false;
-        World::getWorld()->getRaceGUI()->clearAllMessages();
-
-        new TutorialMessageDialog(_("Note that if you manage to skid for "
-                                    "several seconds, you will receive a bonus "
-                                    "speedup as a reward!"),
-            true);
-    }
-    else if (m_action == "tutorial_endmessage")
-    {
-        m_action_active = false;
-        World::getWorld()->getRaceGUI()->clearAllMessages();
-
-        new TutorialMessageDialog(_("You are now ready to race. Good luck!"),
-            true);
-    }*/
     else if (m_action == "tutorial_exit")
     {
         // TODO: move to scripting

From 0b7c03b34c7980f2df853b00f62eff4c1084eddc Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 27 Apr 2015 09:40:12 +1000
Subject: [PATCH 149/331] Fixed linux compilation.

---
 src/graphics/shader.cpp |  2 +-
 src/graphics/shader.hpp | 46 ++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index d728650f9..817141aaf 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -103,7 +103,7 @@ GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
     if (result == GL_FALSE)
     {
         int info_length;
-        Log::error("GLWrap", "Error in shader %s", file);
+        Log::error("GLWrap", "Error in shader %s", file.c_str());
         glGetShaderiv(id, GL_INFO_LOG_LENGTH, &info_length);
         if (info_length<0)
             info_length = 1024;
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 5eccba626..934687c8c 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -138,8 +138,8 @@ private:
     }   // setUniformImpl
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a matrix uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::core::matrix4 &mat, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::core::matrix4 &mat, Args1... arg) const
     {
         glUniformMatrix4fv(m_uniforms[N], 1, GL_FALSE, mat.pointer());
         setUniformsImpl<N + 1>(arg...);
@@ -147,8 +147,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a matrix SColorF values. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::video::SColorf &col, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::video::SColorf &col, Args1... arg) const
     {
         glUniform3f(m_uniforms[N], col.r, col.g, col.b);
         setUniformsImpl<N + 1>(arg...);
@@ -156,8 +156,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a SColor uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::video::SColor &col, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::video::SColor &col, Args1... arg) const
     {
         glUniform4i(m_uniforms[N], col.getRed(), col.getGreen(),
                                    col.getBlue(), col.getAlpha());
@@ -166,8 +166,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a vector3df uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::core::vector3df &v, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::core::vector3df &v, Args1... arg) const
     {
         glUniform3f(m_uniforms[N], v.X, v.Y, v.Z);
         setUniformsImpl<N + 1>(arg...);
@@ -175,8 +175,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a vector2df uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::core::vector2df &v, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::core::vector2df &v, Args1... arg) const
     {
         glUniform2f(m_uniforms[N], v.X, v.Y);
         setUniformsImpl<N + 1>(arg...);
@@ -184,8 +184,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a dimension2df uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const irr::core::dimension2df &v, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const irr::core::dimension2df &v, Args1... arg) const
     {
         glUniform2f(m_uniforms[N], v.Width, v.Height);
         setUniformsImpl<N + 1>(arg...);
@@ -193,8 +193,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a float uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(float f, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(float f, Args1... arg) const
     {
         glUniform1f(m_uniforms[N], f);
         setUniformsImpl<N + 1>(arg...);
@@ -202,8 +202,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for an int uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(int f, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(int f, Args1... arg) const
     {
         glUniform1i(m_uniforms[N], f);
         setUniformsImpl<N + 1>(arg...);
@@ -211,8 +211,8 @@ private:
 
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a vector<float> uniform. */
-    template<unsigned N = 0, typename... Args>
-    void setUniformsImpl(const std::vector<float> &v, Args... arg) const
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const std::vector<float> &v, Args1... arg) const
     {
         glUniform1fv(m_uniforms[N], (int)v.size(), v.data());
         setUniformsImpl<N + 1>(arg...);
@@ -249,8 +249,8 @@ protected:
         glUseProgram(0);
     }   // assignTextureUnit
     // ------------------------------------------------------------------------
-    template<typename... T> 
-    void assignTextureUnit(GLuint index, const char* uniform, T... rest)
+    template<typename... T1> 
+    void assignTextureUnit(GLuint index, const char* uniform, T1... rest)
     {
         glUseProgram(m_program);
         GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
@@ -262,8 +262,8 @@ protected:
 
     void assignTextureUnitNoUse() {}
     // ------------------------------------------------------------------------
-    template<typename... T>
-    void assignTextureUnitNoUse(GLuint index, const char* uniform, T... rest)
+    template<typename... T1>
+    void assignTextureUnitNoUse(GLuint index, const char* uniform, T1... rest)
     {
         GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
         glUniform1i(uniform_loc, index);
@@ -283,7 +283,7 @@ public:
     {
         m_program = glCreateProgram();
         loadAndAttachShader(args...);
-        if (getGLSLVersion() < 330)
+        if (CVS->getGLSLVersion() < 330)
             setAttribute(type);
         glLinkProgram(m_program);
 

From aaf20dc9194c0347d8369f66743a255241d69859 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 27 Apr 2015 17:14:23 +1000
Subject: [PATCH 150/331] Fixed #2118.

---
 src/achievements/achievement.cpp | 11 ++++++-----
 src/achievements/achievement.hpp |  3 ++-
 src/config/player_manager.hpp    | 23 +++++++++++++++++------
 src/physics/physics.cpp          |  5 ++++-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
index 9fd6e6ba7..d6dbb3589 100644
--- a/src/achievements/achievement.cpp
+++ b/src/achievements/achievement.cpp
@@ -151,20 +151,21 @@ irr::core::stringw Achievement::getProgressAsString() const
  *  \param key The key whose value is increased.
  *  \param increase Amount to add to the value of this key.
  */
-void Achievement::increase(const std::string & key, int increase)
+void Achievement::increase(const std::string & key, 
+                           const std::string &goal_key, int increase)
 {
     std::map<std::string, int>::iterator it;
     it = m_progress_map.find(key);
     if (it != m_progress_map.end())
     {
         it->second += increase;
-        if (it->second > m_achievement_info->getGoalValue(key))
-            it->second = m_achievement_info->getGoalValue(key);
+        if (it->second > m_achievement_info->getGoalValue(goal_key))
+            it->second = m_achievement_info->getGoalValue(goal_key);
     }
     else
     {
-        if (increase>m_achievement_info->getGoalValue(key))
-            increase = m_achievement_info->getGoalValue(key);
+        if (increase>m_achievement_info->getGoalValue(goal_key))
+            increase = m_achievement_info->getGoalValue(goal_key);
         m_progress_map[key] = increase;
     }
     check();
diff --git a/src/achievements/achievement.hpp b/src/achievements/achievement.hpp
index a1618a2d4..5802d963b 100644
--- a/src/achievements/achievement.hpp
+++ b/src/achievements/achievement.hpp
@@ -65,7 +65,8 @@ public:
     virtual void load(const XMLNode *node);
     virtual void save(UTFWriter &out);
     virtual int getValue(const std::string & key);
-    void increase(const std::string & key, int increase = 1);
+    void increase(const std::string & key, const std::string &goal_key,
+                  int increase = 1);
 
     virtual void reset();
     virtual irr::core::stringw getProgressAsString() const;
diff --git a/src/config/player_manager.hpp b/src/config/player_manager.hpp
index f11912534..929d55f90 100644
--- a/src/config/player_manager.hpp
+++ b/src/config/player_manager.hpp
@@ -143,16 +143,27 @@ public:
     }   // getCurrentAchievementsStatus
     // ------------------------------------------------------------------------
     /** A handy shortcut to increase points for an achievement key of the
-     *  current player. */
-    static void increaseAchievement(unsigned int index, const std::string &key,
-                                    int increase = 1)
+     *  current player.
+     *  \param achievement_id The achievement id.
+     *  \param key The key of the current value to increase.
+     *  \param increase How much to increase the current value.
+     *  \param goal_key Optional: The goal key to compare the current value
+     *         with. If not set, defaults to key.
+     */
+    static void increaseAchievement(unsigned int achievement_id,
+                                    const std::string &key,
+                                    int increase = 1, 
+                                    const std::string &goal_key="")
     {
-        Achievement *a = getCurrentAchievementsStatus()->getAchievement(index);
+        Achievement *a = getCurrentAchievementsStatus()
+                       ->getAchievement(achievement_id);
         if (!a)
         {
-            Log::fatal("PlayerManager", "Achievement '%d' not found.", index);
+            Log::fatal("PlayerManager", "Achievement '%d' not found.",
+                        achievement_id);
         }
-        a->increase(key, increase);
+        a->increase(key, goal_key.empty() ? key : goal_key, increase);
+
     }   // increaseAchievement
     // ------------------------------------------------------------------------
 };   // PlayerManager
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 7935282f3..5c72cdafd 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -301,8 +301,11 @@ void Physics::update(float dt)
                 if (target_kart != kart && c &&
                     c->getPlayer()->getConstProfile() == PlayerManager::getCurrentPlayer())
                 {
+                    // Compare the current value of hits with the 'hit' goal value
+                    // (otherwise it would be compared with the kart id goal value,
+                    // which doesn't exist.
                     PlayerManager::increaseAchievement(AchievementInfo::ACHIEVE_ARCH_ENEMY,
-                                                       target_kart->getIdent(), 1);
+                                                       target_kart->getIdent(), 1, "hit");
                     if (type == PowerupManager::POWERUP_BOWLING)
                     {
                         PlayerManager::increaseAchievement(AchievementInfo::ACHIEVE_STRIKE,

From 75b24c96adeba7b9faddc85ce641fa2f36ef4038 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 29 Apr 2015 08:07:06 +1000
Subject: [PATCH 151/331] Unlock all tracks and GPs in split screen mode.

---
 src/states_screens/tracks_screen.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 32bd92abf..aeb8693b7 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -82,7 +82,7 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
             }   // if clicked_track
 
         }   // selection=="random_track"
-        else if (selection == "locked")
+        else if (selection == "locked" && race_manager->getNumLocalPlayers() == 1)
         {
             unlock_manager->playLockSound();
         }
@@ -105,7 +105,7 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name,
         const std::string &selection =
                        gps_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
-        if (selection == "locked")
+        if (selection == "locked" && race_manager->getNumLocalPlayers()==1)
         {
             unlock_manager->playLockSound();
         }
@@ -196,7 +196,8 @@ void TracksScreen::init()
         }
         assert(screenshots.size() > 0);
 
-        if (PlayerManager::getCurrentPlayer()->isLocked(gp->getId()))
+        if (PlayerManager::getCurrentPlayer()->isLocked(gp->getId()) && 
+            race_manager->getNumLocalPlayers() == 1)
         {
             gps_widget->addAnimatedItem(_("Locked!"), "locked",
                                         screenshots, 1.5f,
@@ -277,7 +278,8 @@ void TracksScreen::buildTrackList()
     for (unsigned int i = 0; i < tracks.size(); i++)
     {
         Track *curr = tracks.get(i);
-        if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()))
+        if (PlayerManager::getCurrentPlayer()->isLocked(curr->getIdent()) &&
+            race_manager->getNumLocalPlayers() == 1)
         {
             tracks_widget->addItem(
                 _("Locked : solve active challenges to gain access to more!"),

From c91f9655d82e1fdcf4fabae794cb2bb26da1d98a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 29 Apr 2015 08:18:52 +1000
Subject: [PATCH 152/331] Unlock all karts in multiplayer mode.

---
 src/states_screens/kart_selection.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 05269388b..a7dd5fddf 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -711,7 +711,7 @@ void KartSelectionScreen::playerConfirm(const int player_id)
     DynamicRibbonWidget* w = getWidget<DynamicRibbonWidget>("karts");
     assert(w != NULL);
     const std::string selection = w->getSelectionIDString(player_id);
-    if (StringUtils::startsWith(selection, ID_LOCKED))
+    if (StringUtils::startsWith(selection, ID_LOCKED) && !m_multiplayer)
     {
         unlock_manager->playLockSound();
         return;
@@ -839,7 +839,7 @@ void KartSelectionScreen::updateKartWidgetModel(uint8_t widget_id,
         ->setText( _("Random Kart"), false );
     }
     // selection contains the name of the kart, so check only for substr
-    else if (StringUtils::startsWith(selection, ID_LOCKED))
+    else if (StringUtils::startsWith(selection, ID_LOCKED) && !m_multiplayer)
     {
         w3->clearModels();
         w3->addModel(irr_driver->getAnimatedMesh(
@@ -1009,13 +1009,13 @@ void KartSelectionScreen::eventCallback(Widget* widget,
                     {
                         // FIXME: two players may be given the same kart by
                         // the use of random
-                        const int randomID = random.get( count );
+                        const int random_id = random.get( count );
 
                         // select kart for players > 0 (player 0 is the one
                         // that can change the groups, so focus for player 0
                         // must remain on the tabs)
                         const bool success =
-                            w->setSelection( randomID, n,
+                            w->setSelection( random_id, n,
                                              n != PLAYER_ID_GAME_MASTER );
                         if (!success)
                             Log::warn("KartSelectionScreen",
@@ -1155,21 +1155,23 @@ void KartSelectionScreen::allPlayersDone()
         if (selected_kart == RANDOM_KART_ID)
         {
             // don't select an already selected kart
-            int randomID;
+            int random_id;
             // to prevent infinite loop in case they are all locked
             int count = 0;
             bool done = false;
             do
             {
-                randomID = random.get(item_count);
-                if (items[randomID].m_code_name != ID_DONT_USE &&
-                        !StringUtils::startsWith(items[randomID].m_code_name,
-                                                 ID_LOCKED))
+                random_id = random.get(item_count);
+                // valid kart if it can bt used, and is either not locked,
+                // or it's a multiplayer race.
+                if (items[random_id].m_code_name != ID_DONT_USE &&
+                    (!StringUtils::startsWith(items[random_id].m_code_name, ID_LOCKED)
+                    || m_multiplayer)                                                 )
                 {
-                    selected_kart = items[randomID].m_code_name;
+                    selected_kart = items[random_id].m_code_name;
                     done = true;
                 }
-                items[randomID].m_code_name = ID_DONT_USE;
+                items[random_id].m_code_name = ID_DONT_USE;
                 count++;
                 if (count > 100) return;
             }
@@ -1444,7 +1446,8 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
     for(unsigned int i=0; i<karts.size(); i++)
     {
         const KartProperties* prop = karts.get(i);
-        if (PlayerManager::getCurrentPlayer()->isLocked(prop->getIdent()))
+        if (PlayerManager::getCurrentPlayer()->isLocked(prop->getIdent()) &&
+            !m_multiplayer)
         {
             w->addItem(_("Locked : solve active challenges to gain access to more!"),
                        ID_LOCKED + prop->getIdent(),

From d32a76cd16d86971d488d12f008e48243a1f48d6 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 29 Apr 2015 16:36:48 +1000
Subject: [PATCH 153/331] Rearranged order of functions in header to have the
 dependent/recursive functions closer to each other. Removed unnecessary
 assignTextureUnit function (with one argument).

---
 src/graphics/shader.hpp | 134 ++++++++++++++++++++++++----------------
 1 file changed, 81 insertions(+), 53 deletions(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 934687c8c..7585a2bb6 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -109,6 +109,22 @@ private:
         if (block_index != GL_INVALID_INDEX)
             glUniformBlockBinding(m_program, block_index, index);
     }   // bindPoint
+
+
+    // ========================================================================
+    // assignUniforms: Variadic Template
+protected:
+    /** This variadic template collects all names of uniforms in
+     *  a std::vector. It used assignUnfiromsImpl for the actual recursive
+     *  implementation. */
+    template<typename... U>
+    void assignUniforms(U... rest)
+    {
+        static_assert(sizeof...(rest) == sizeof...(Args),
+                      "Count of Uniform's name mismatch");
+        assignUniformsImpl(rest...);
+    }   // assignUniforms
+private:
     // ------------------------------------------------------------------------
     /** End of recursive implementation of assignUniforms. */
     void assignUniformsImpl()
@@ -129,6 +145,28 @@ private:
         assignUniformsImpl(rest...);
     }   // assignUniformsImpl
 
+
+    // ==============================================
+    // setUniforms: Variadic template implementation.
+
+protected:
+    /** Sets the uniforms for this shader. */
+    void setUniforms(const Args & ... args) const
+    {
+        if (!CVS->isARBUniformBufferObjectUsable())
+            bypassUBO();
+        setUniformsImpl(args...);
+    }   // setUniforms
+    // ------------------------------------------------------------------------
+private:
+    /** Implementation for setUniforms for a vector<float> uniform. */
+    template<unsigned N = 0, typename... Args1>
+    void setUniformsImpl(const std::vector<float> &v, Args1... arg) const
+    {
+        glUniform1fv(m_uniforms[N], (int)v.size(), v.data());
+        setUniformsImpl<N + 1>(arg...);
+    }   // setUniformsImpl
+
     // ------------------------------------------------------------------------
     /** End of recursion for setUniforms implementation.
      */
@@ -136,6 +174,7 @@ private:
     void setUniformsImpl() const
     {
     }   // setUniformImpl
+
     // ------------------------------------------------------------------------
     /** Implementation for setUniforms for a matrix uniform. */
     template<unsigned N = 0, typename... Args1>
@@ -209,59 +248,60 @@ private:
         setUniformsImpl<N + 1>(arg...);
     }   // setUniformsImpl
 
-    // ------------------------------------------------------------------------
-    /** Implementation for setUniforms for a vector<float> uniform. */
-    template<unsigned N = 0, typename... Args1>
-    void setUniformsImpl(const std::vector<float> &v, Args1... arg) const
-    {
-        glUniform1fv(m_uniforms[N], (int)v.size(), v.data());
-        setUniformsImpl<N + 1>(arg...);
-    }   // setUniformsImpl
 
-    // ------------------------------------------------------------------------
-    /** End recursion for variadic template. */
-    template<typename ...Types>
-    void printFileList()
-    {
-        return;
-    }   // printFileList
-
-    // ------------------------------------------------------------------------
+    // printFileList: Variadic template for printing a list of shader filenames
+    // ========================================================================
     /** Variadic template to print a list of file names.
-     *  \param shader_type Ignored (used since the variadic calling function
-     *         has this parameter).
-     *  \param filepath Name of the file to print.
-     */
+    *  \param shader_type Ignored (used since the variadic calling function
+    *         has this parameter).
+    *  \param filepath Name of the file to print.
+    */
+protected:
     template<typename ...Types>
     void printFileList(GLint shader_type, const char *filepath, Types ... args)
     {
         Log::error("shader", filepath);
         printFileList(args...);
     }   // printFileList
-protected:
 
-    // ========================================================================
-    void assignTextureUnit(GLuint index, const char* uniform)
-    {
-        glUseProgram(m_program);
-        GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
-        glUniform1i(uniform_loc, index);
-        glUseProgram(0);
-    }   // assignTextureUnit
     // ------------------------------------------------------------------------
+    /** End recursion for variadic template. */
+private:
+    template<typename ...Types>
+    void printFileList()
+    {
+        return;
+    }   // printFileList
+
+
+    // Variadic template implementation of assignTextureUnig
+    // ========================================================================
+public:
+    /** Variadic top level/public interface. It does the calls to glUseProgram
+     *  and uses assignTextureUnitNoUse() in recursion to avoid unnecessary
+     *  calls to glUseProgram.
+     *  \param index Index of the texture.
+     *  \param uniform Uniform name.
+     */
     template<typename... T1> 
     void assignTextureUnit(GLuint index, const char* uniform, T1... rest)
     {
         glUseProgram(m_program);
         GLuint uniform_loc = glGetUniformLocation(m_program, uniform);
         glUniform1i(uniform_loc, index);
+        // Avoid doing any additional glUseProgram for the remaining calls
         assignTextureUnitNoUse(rest...);
         glUseProgram(0);
     }   // assignTextureUnit
-    // ------------------------------------------------------------------------
 
-    void assignTextureUnitNoUse() {}
+private:
     // ------------------------------------------------------------------------
+    /** End of recursion. */
+    void assignTextureUnitNoUse() {}
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation of assignTextureUnit, but without the call
+     *  to gluseProgram (which is done by the public interface). */
     template<typename... T1>
     void assignTextureUnitNoUse(GLuint index, const char* uniform, T1... rest)
     {
@@ -270,14 +310,22 @@ protected:
         assignTextureUnitNoUse(rest...);
     }   // assignTextureUnitNoUse
 
+    // ========================================================================
 
 public:
 
+    /** Constructor. Adds the static kill function of this shader to the list
+     *  of all kill function, which is used for the debugging feature of
+     *  reloading all shaders.
+     */
     Shader()
     {
         m_all_kill_functions.push_back(this->kill);
-    }
+    }   // Shader
 
+    // ------------------------------------------------------------------------
+    /** Load a list of shaders and links them all together.
+     */
     template<typename ... Types>
     void loadProgram(AttributeType type, Types ... args)
     {
@@ -301,26 +349,6 @@ public:
         }
     }   // loadProgram
 
-    // ------------------------------------------------------------------------
-    /** This variadic template collects all names of uniforms in
-     *  a std::vector. */
-    template<typename... U>
-    void assignUniforms(U... rest)
-    {
-        static_assert(sizeof...(rest) == sizeof...(Args),
-                      "Count of Uniform's name mismatch");
-        assignUniformsImpl(rest...);
-    }   // assignUniforms
-
-    // ------------------------------------------------------------------------
-    /** Sets the uniforms for this shader. */
-    void setUniforms(const Args & ... args) const
-    {
-        if (!CVS->isARBUniformBufferObjectUsable())
-            bypassUBO();
-        setUniformsImpl(args...);
-    }   // setUniforms
-
 
 };   // Shader
 

From 85cf5b181e7f438552587108dc93306c1ce79f12 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 30 Apr 2015 19:03:54 -0400
Subject: [PATCH 154/331] Support extracting translations from scripts

---
 data/po/update_pot.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/po/update_pot.sh b/data/po/update_pot.sh
index 848ee1ede..f15520492 100755
--- a/data/po/update_pot.sh
+++ b/data/po/update_pot.sh
@@ -17,11 +17,13 @@ XML_FILE_LIST="`find ./data ../stk-assets/tracks ../stk-assets/karts \
                      -name '*.grandprix' -or                     \
                      -name '*.stkgui'                            \
               `"
+ANGELSCRIPT_FILE_LIST="`find ./data ../stk-assets/tracks -name '*.as'`"
 
 echo "--------------------"
 echo "    Source Files :"
 echo "--------------------"
 echo $CPP_FILE_LIST
+echo $ANGELSCRIPT_FILE_LIST
 
 echo "--------------------"
 echo "    XML Files :"
@@ -49,6 +51,10 @@ xgettext  -j  -d supertuxkart -s --keyword=_ --keyword=N_ --keyword=_LTR \
                                -p ./data/po -o supertuxkart.pot $CPP_FILE_LIST \
                                --package-name=supertuxkart
 
+# Angelscript files (xgettext doesn't support AS so pretend it's c++)
+xgettext  -j  -d supertuxkart -s --keyword="translate" --add-comments="I18N:" \
+                               -p ./data/po -o supertuxkart.pot $ANGELSCRIPT_FILE_LIST \
+                               --package-name=supertuxkart --language=c++
 
 
 echo "    Done"

From 585d1c50169c267966aa98db6d01e912583cd63c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 30 Apr 2015 19:37:11 -0400
Subject: [PATCH 155/331] Scripting cleanup, remove hardcoded stuff in favor of
 more generic approaches

---
 src/physics/physics.cpp             | 26 +++++++++-----------
 src/scriptengine/script_engine.cpp  | 38 +++++++++--------------------
 src/scriptengine/script_engine.hpp  |  9 -------
 src/scriptengine/script_gui.cpp     | 25 +++++++++++++++++++
 src/scriptengine/script_physics.cpp | 17 -------------
 src/scriptengine/script_track.cpp   | 12 ---------
 src/tracks/track.cpp                |  4 +--
 7 files changed, 50 insertions(+), 81 deletions(-)

diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 7935282f3..056044f7d 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -171,9 +171,9 @@ void Physics::update(float dt)
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             int kartid1 = p->getUserPointer(0)->getPointerKart()->getWorldKartId();
             int kartid2 = p->getUserPointer(1)->getPointerKart()->getWorldKartId();
+            // TODO: do not use globals this way, pass directly as function paramters
             Scripting::Physics::setCollision(kartid1,kartid2);
-            Scripting::Physics::setCollisionType("KartKart");
-            script_engine->runScript("collisions");
+            script_engine->runScript("onKartKartCollision");
             continue;
         }  // if kart-kart collision
 
@@ -183,16 +183,15 @@ void Physics::update(float dt)
             // -------------------------
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             Scripting::Physics::setCollision(0, 0);
-            Scripting::Physics::setCollisionType("KartObject"); //object as in physical object
-            Scripting::Physics::setCollision
-                (
+            //Scripting::Physics::setCollisionType("KartObject"); //object as in physical object
+            Scripting::Physics::setCollision(
                 p->getUserPointer(0)->getPointerPhysicalObject()->getID(),
                 "kart"
-                );
-            script_engine->runScript("collisions");
+            );
+            script_engine->runScript("onKartObjectCollision");
             PhysicalObject *obj = p->getUserPointer(0)
                                    ->getPointerPhysicalObject();
-            if(obj->isCrashReset())
+            if (obj->isCrashReset())
             {
                 AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
                 new RescueAnimation(kart);
@@ -219,7 +218,7 @@ void Physics::update(float dt)
             continue;
         }
 
-        if(p->getUserPointer(0)->is(UserPointer::UP_ANIMATION))
+        if (p->getUserPointer(0)->is(UserPointer::UP_ANIMATION))
         {
             // Kart hits animation
             ThreeDAnimation *anim=p->getUserPointer(0)->getPointerAnimation();
@@ -257,13 +256,12 @@ void Physics::update(float dt)
             // -------------------------------
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             Scripting::Physics::setCollision(0,0); //TODO : support item types etc
-            Scripting::Physics::setCollisionType("ItemObject");
-            Scripting::Physics::setCollision
-                (
+            //Scripting::Physics::setCollisionType("ItemObject");
+            Scripting::Physics::setCollision(
                 p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
                 "item"
-                );
-            script_engine->runScript("collisions");
+            );
+            script_engine->runScript("onItemObjectCollision");
             p->getUserPointer(0)->getPointerFlyable()
                 ->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
             PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 35efa63e5..13aa1ac42 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -85,10 +85,9 @@ std::string getScript(std::string scriptName)
 {
     std::string script_dir = file_manager->getAsset(FileManager::SCRIPT, "");
     script_dir += World::getWorld()->getTrack()->getIdent() + "/";
-    if (scriptName != "update" && scriptName != "collisions" && scriptName != "start")
-        scriptName = "triggers";
 
-    script_dir += scriptName + ".as";
+    // TODO: allow splitting in multiple files
+    script_dir += "scripting.as";
     FILE *f = fopen(script_dir.c_str(), "rb");
     if (f == NULL)
     {
@@ -134,7 +133,8 @@ void ScriptEngine::runScript(std::string scriptName)
 
 
     asIScriptFunction *func;
-    if (m_script_cache.find(scriptName) == m_script_cache.end())
+    auto cached_script = m_script_cache.find(scriptName);
+    if (cached_script == m_script_cache.end())
     {
         // Compile the script code
         Log::debug("Scripting", "Compiling script '%s' (was not in cache)", scriptName.c_str());
@@ -142,7 +142,7 @@ void ScriptEngine::runScript(std::string scriptName)
         if (r < 0)
         {
             Log::debug("Scripting", "Script '%s' is not available", scriptName.c_str());
-            m_script_cache[scriptName] = NULL; // remember that this script is unavaiable
+            m_script_cache[scriptName] = NULL; // remember that this script is unavailable
             ctx->Release();
             return;
         }
@@ -150,27 +150,12 @@ void ScriptEngine::runScript(std::string scriptName)
         // Find the function for the function we want to execute.
         //This is how you call a normal function with arguments
         //asIScriptFunction *func = engine->GetModule(0)->GetFunctionByDecl("void func(arg1Type, arg2Type)");
-        if (scriptName == "collisions")
-        {
-            func = Scripting::Physics::registerScriptCallbacks(m_engine);
-        }
-        else if (scriptName == "update")
-        {
-            func = Scripting::Track::registerUpdateScriptCallbacks(m_engine);
-        }
-        else if (scriptName == "start")
-        {
-            func = Scripting::Track::registerStartScriptCallbacks(m_engine);
-        }
-        else
-        {
-            //trigger type can have different names
-            func = Scripting::Track::registerScriptCallbacks(m_engine, scriptName);
-        }
-
+        func = Scripting::Track::registerScriptCallbacks(m_engine, scriptName);
+        
         if (func == NULL)
         {
-            Log::warn("Scripting", "The required function was not found : %s", scriptName.c_str());
+            Log::debug("Scripting", "Scripting function was not found : %s", scriptName.c_str());
+            m_script_cache[scriptName] = NULL; // remember that this script is unavailable
             ctx->Release();
             return;
         }
@@ -181,9 +166,8 @@ void ScriptEngine::runScript(std::string scriptName)
     }
     else
     {
-        //Script present in cache
-        // TODO: clear when done
-        func = m_script_cache[scriptName];
+        // Script present in cache
+        func = cached_script->second;
     }
 
     if (func == NULL)
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 2affef764..67b145b38 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -30,10 +30,7 @@ namespace Scripting
     namespace Physics
     {
         void registerScriptFunctions(asIScriptEngine *engine);
-        asIScriptFunction*
-            registerScriptCallbacks(asIScriptEngine *engine);
         void setCollision(int collider1,int collider2);
-        void setCollisionType(std::string collisionType);
         void setCollision(std::string collider1, std::string collider2);
     }
 
@@ -50,12 +47,6 @@ namespace Scripting
 
         asIScriptFunction*
             registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
-
-        asIScriptFunction*
-            registerUpdateScriptCallbacks(asIScriptEngine *engine);
-
-        asIScriptFunction*
-            registerStartScriptCallbacks(asIScriptEngine *engine);
     }
         
     class ScriptEngine
diff --git a/src/scriptengine/script_gui.cpp b/src/scriptengine/script_gui.cpp
index 62ccc2d02..60118cd71 100644
--- a/src/scriptengine/script_gui.cpp
+++ b/src/scriptengine/script_gui.cpp
@@ -174,6 +174,24 @@ namespace Scripting
             new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
         }
         
+        void scriptLogInfo(asIScriptGeneric *gen)
+        {
+            std::string input = *(std::string*)gen->GetArgAddress(0);
+            Log::info("Script", "%s", input.c_str());
+        }
+
+        void scriptLogWarning(asIScriptGeneric *gen)
+        {
+            std::string input = *(std::string*)gen->GetArgAddress(0);
+            Log::warn("Script", "%s", input.c_str());
+        }
+
+        void scriptLogError(asIScriptGeneric *gen)
+        {
+            std::string input = *(std::string*)gen->GetArgAddress(0);
+            Log::error("Script", "%s", input.c_str());
+        }
+
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r; // of type asERetCodes
@@ -185,13 +203,20 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in)", asFUNCTION(translateAndInsertValues1), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues2), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues3), asCALL_GENERIC); assert(r >= 0);
+            
+            engine->SetDefaultNamespace("Utils");
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(insertValues1), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(insertValues2), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(insertValues3), asCALL_GENERIC); assert(r >= 0);
+
+            r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(scriptLogInfo), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(scriptLogWarning), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void logError(const string &in)", asFUNCTION(scriptLogError), asCALL_GENERIC); assert(r >= 0);
         }
 
         void registerScriptEnums(asIScriptEngine *engine)
         {
+            engine->SetDefaultNamespace("GUI");
             engine->RegisterEnum("PA");
             engine->RegisterEnumValue("PA", "STEER_LEFT", PA_STEER_LEFT);
             engine->RegisterEnumValue("PA", "STEER_RIGHT", PA_STEER_RIGHT);
diff --git a/src/scriptengine/script_physics.cpp b/src/scriptengine/script_physics.cpp
index 2dfabf7b4..893f32624 100644
--- a/src/scriptengine/script_physics.cpp
+++ b/src/scriptengine/script_physics.cpp
@@ -51,11 +51,6 @@ namespace Scripting
             void *pointer = &m_collider1;
             gen->SetReturnObject(pointer);
         }
-        void getCollisionType(asIScriptGeneric *gen)
-        {
-            void *pointer = &m_collisionType;
-            gen->SetReturnObject(pointer);
-        }
 
         //Callbacks from Physics Engine, for collisions
         void setCollision(int collider1,int collider2)
@@ -68,24 +63,12 @@ namespace Scripting
             m_collider1 = collider1;
             m_collider2 = collider2;
         }
-        void setCollisionType(std::string collisionType)
-        {
-            m_collisionType = collisionType;
-        }
-        asIScriptFunction* registerScriptCallbacks(asIScriptEngine *engine)
-        {
-            asIScriptFunction *func;
-            std::string function_name = "void on" + m_collisionType + "Collision()";
-            func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
-            return func;
-        }
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
             engine->SetDefaultNamespace("Physics");
             r = engine->RegisterGlobalFunction("uint getCollidingKart1()", asFUNCTION(getCollidingKart1), asCALL_GENERIC); assert( r >= 0 );
             r = engine->RegisterGlobalFunction("uint getCollidingKart2()", asFUNCTION(getCollidingKart2), asCALL_GENERIC); assert( r >= 0 );
-            r = engine->RegisterGlobalFunction("string getCollisionType()", asFUNCTION(getCollisionType), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string getCollidingID()", asFUNCTION(getCollidingID), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string createExplosion(Vec3 &in)", asFUNCTION(createExplosion), asCALL_GENERIC); assert(r >= 0);
         }
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 3b95f39af..090bc9e18 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -46,18 +46,6 @@ namespace Scripting
             func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
             return func;
         }
-        asIScriptFunction* registerStartScriptCallbacks(asIScriptEngine *engine)
-        {
-            asIScriptFunction *func;
-            func = engine->GetModule(0)->GetFunctionByDecl("void onStart()");
-            return func;
-        }
-        asIScriptFunction* registerUpdateScriptCallbacks(asIScriptEngine *engine)
-        {
-            asIScriptFunction *func;
-            func = engine->GetModule(0)->GetFunctionByDecl("void onUpdate()");
-            return func;
-        }
         /*
         void disableAnimation(std::string *name, void *memory)
         {
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 3645fe53a..49fe9b9bd 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1486,7 +1486,7 @@ void Track::update(float dt)
     if (!m_startup_run) // first time running update = good point to run startup script
     {
         Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-        script_engine->runScript("start");
+        script_engine->runScript("onStart");
         m_startup_run = true;
     }
     m_track_object_manager->update(dt);
@@ -1498,7 +1498,7 @@ void Track::update(float dt)
     CheckManager::get()->update(dt);
     ItemManager::get()->update(dt);
     Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-    script_engine->runScript("update");
+    script_engine->runScript("onUpdate");
 }   // update
 
 // ----------------------------------------------------------------------------

From 1559d03ea130cd3be4827329244fe963037be4d9 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 30 Apr 2015 20:24:02 -0400
Subject: [PATCH 156/331] More work on scripting, test ways to pass arguments
 to script functions

---
 src/physics/physics.cpp                  |  6 ++--
 src/scriptengine/script_engine.cpp       | 38 ++++++++++++++----------
 src/scriptengine/script_engine.hpp       |  5 +++-
 src/scriptengine/script_track.cpp        |  4 +--
 src/tracks/track.cpp                     |  8 +++--
 src/tracks/track_object_presentation.cpp | 16 +++++-----
 6 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 056044f7d..0ad5d29e3 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -173,7 +173,7 @@ void Physics::update(float dt)
             int kartid2 = p->getUserPointer(1)->getPointerKart()->getWorldKartId();
             // TODO: do not use globals this way, pass directly as function paramters
             Scripting::Physics::setCollision(kartid1,kartid2);
-            script_engine->runScript("onKartKartCollision");
+            script_engine->runScript("void onKartKartCollision()");
             continue;
         }  // if kart-kart collision
 
@@ -188,7 +188,7 @@ void Physics::update(float dt)
                 p->getUserPointer(0)->getPointerPhysicalObject()->getID(),
                 "kart"
             );
-            script_engine->runScript("onKartObjectCollision");
+            script_engine->runScript("void onKartObjectCollision()");
             PhysicalObject *obj = p->getUserPointer(0)
                                    ->getPointerPhysicalObject();
             if (obj->isCrashReset())
@@ -261,7 +261,7 @@ void Physics::update(float dt)
                 p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
                 "item"
             );
-            script_engine->runScript("onItemObjectCollision");
+            script_engine->runScript("void onItemObjectCollision()");
             p->getUserPointer(0)->getPointerFlyable()
                 ->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
             PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 13aa1ac42..885bd22a2 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -114,24 +114,25 @@ std::string getScript(std::string scriptName)
 }
 
 //-----------------------------------------------------------------------------
+
 /** runs the specified script
 *  \param string scriptName = name of script to run
 */
 void ScriptEngine::runScript(std::string scriptName)
 {
-    PROFILER_PUSH_CPU_MARKER("RunScript", 255, 0, 0);
+    std::function<void(asIScriptContext*)> callback;
+    runScript(scriptName, callback);
+}
 
-    // Create a context that will execute the script.
-    asIScriptContext *ctx = m_engine->CreateContext();
-    if (ctx == NULL)
-    {
-        Log::error("Scripting", "Failed to create the context.");
-        //m_engine->Release();
-        return;
-    }
+//-----------------------------------------------------------------------------
+
+/** runs the specified script
+*  \param string scriptName = name of script to run
+*/
+void ScriptEngine::runScript(std::string scriptName, std::function<void(asIScriptContext*)> callback)
+{
     int r; //int for error checking
 
-
     asIScriptFunction *func;
     auto cached_script = m_script_cache.find(scriptName);
     if (cached_script == m_script_cache.end())
@@ -143,7 +144,6 @@ void ScriptEngine::runScript(std::string scriptName)
         {
             Log::debug("Scripting", "Script '%s' is not available", scriptName.c_str());
             m_script_cache[scriptName] = NULL; // remember that this script is unavailable
-            ctx->Release();
             return;
         }
 
@@ -156,7 +156,6 @@ void ScriptEngine::runScript(std::string scriptName)
         {
             Log::debug("Scripting", "Scripting function was not found : %s", scriptName.c_str());
             m_script_cache[scriptName] = NULL; // remember that this script is unavailable
-            ctx->Release();
             return;
         }
 
@@ -172,10 +171,19 @@ void ScriptEngine::runScript(std::string scriptName)
 
     if (func == NULL)
     {
-        PROFILER_POP_CPU_MARKER();
         return; // script unavailable
     }
 
+
+    // Create a context that will execute the script.
+    asIScriptContext *ctx = m_engine->CreateContext();
+    if (ctx == NULL)
+    {
+        Log::error("Scripting", "Failed to create the context.");
+        //m_engine->Release();
+        return;
+    }
+
     // Prepare the script context with the function we wish to execute. Prepare()
     // must be called on the context before each new script function that will be
     // executed. Note, that if because we intend to execute the same function 
@@ -194,6 +202,8 @@ void ScriptEngine::runScript(std::string scriptName)
     //ctx->setArgType(index, value);
     //for example : ctx->SetArgFloat(0, 3.14159265359f);
 
+    if (callback)
+        callback(ctx);
 
     // Execute the function
     r = ctx->Execute();
@@ -230,8 +240,6 @@ void ScriptEngine::runScript(std::string scriptName)
 
     // We must release the contexts when no longer using them
     ctx->Release();
-
-    PROFILER_POP_CPU_MARKER();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 67b145b38..41c2c65cd 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -21,6 +21,7 @@
 
 #include <string>
 #include <angelscript.h>
+#include <functional>
 
 class TrackObjectPresentation;
 
@@ -48,14 +49,16 @@ namespace Scripting
         asIScriptFunction*
             registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
     }
-        
+    
     class ScriptEngine
     {
     public:
+
         ScriptEngine();
         ~ScriptEngine();
         
         void runScript(std::string scriptName);
+        void runScript(std::string scriptName, std::function<void(asIScriptContext*)> callback);
         void cleanupCache();
         
     private:
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 090bc9e18..7cfb2602b 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -39,10 +39,10 @@ namespace Scripting
     namespace Track
     {
         //register callbacks
-        asIScriptFunction* registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName)
+        // TODO: move this out of Track namespace, it's not specific to tracks
+        asIScriptFunction* registerScriptCallbacks(asIScriptEngine *engine, std::string function_name)
         {
             asIScriptFunction *func;
-            std::string function_name = "void " + scriptName + "()";
             func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
             return func;
         }
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 49fe9b9bd..deaf53440 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1486,7 +1486,7 @@ void Track::update(float dt)
     if (!m_startup_run) // first time running update = good point to run startup script
     {
         Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-        script_engine->runScript("onStart");
+        script_engine->runScript("void onStart()");
         m_startup_run = true;
     }
     m_track_object_manager->update(dt);
@@ -1497,8 +1497,10 @@ void Track::update(float dt)
     }
     CheckManager::get()->update(dt);
     ItemManager::get()->update(dt);
-    Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-    script_engine->runScript("onUpdate");
+
+    // TODO: enable onUpdate scripts if we ever find a compelling use for them
+    //Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+    //script_engine->runScript("void onUpdate()");
 }   // update
 
 // ----------------------------------------------------------------------------
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 308ecc17f..9780c1242 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -22,6 +22,7 @@
 #include "audio/sfx_buffer.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/camera.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/mesh_tools.hpp"
@@ -34,6 +35,7 @@
 #include "input/input_device.hpp"
 #include "input/input_manager.hpp"
 #include "items/item_manager.hpp"
+#include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"
 #include "scriptengine/script_engine.hpp"
 #include "states_screens/dialogs/race_paused_dialog.hpp"
@@ -932,13 +934,11 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
         Scripting::ScriptEngine* script_engine =
             World::getWorld()->getScriptEngine();
         m_action_active = false;
-        script_engine->runScript(m_action);
-        
-        /*
-        Catch exception -> script not found
-        fprintf(stderr, "[TrackObject] WARNING: unknown action <%s>\n",
-                m_action.c_str());
-        
-         */
+        int idKart = 0;
+        Camera* camera = Camera::getActiveCamera();
+        if (camera != NULL && camera->getKart() != NULL)
+            idKart = camera->getKart()->getWorldKartId();
+        script_engine->runScript("void " + m_action + "(int)",
+            [=](asIScriptContext* ctx) { ctx->SetArgDWord(0, idKart); });
     }
 }   // onTriggerItemApproached

From d98c1044e6d4bbee031a432a1257665cd58834f3 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 30 Apr 2015 20:36:54 -0400
Subject: [PATCH 157/331] More work on scripting

---
 src/physics/physics.cpp             | 39 ++++++++++++++---------------
 src/scriptengine/script_engine.hpp  |  2 --
 src/scriptengine/script_physics.cpp | 30 ----------------------
 src/scriptengine/script_physics.hpp | 25 +-----------------
 4 files changed, 20 insertions(+), 76 deletions(-)

diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 0ad5d29e3..5481f763e 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -171,9 +171,11 @@ void Physics::update(float dt)
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             int kartid1 = p->getUserPointer(0)->getPointerKart()->getWorldKartId();
             int kartid2 = p->getUserPointer(1)->getPointerKart()->getWorldKartId();
-            // TODO: do not use globals this way, pass directly as function paramters
-            Scripting::Physics::setCollision(kartid1,kartid2);
-            script_engine->runScript("void onKartKartCollision()");
+            script_engine->runScript("void onKartKartCollision(int, int)",
+                [=](asIScriptContext* ctx) {
+                    ctx->SetArgDWord(0, kartid1);
+                    ctx->SetArgDWord(1, kartid2);
+                });
             continue;
         }  // if kart-kart collision
 
@@ -182,28 +184,27 @@ void Physics::update(float dt)
             // Kart hits physical object
             // -------------------------
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-            Scripting::Physics::setCollision(0, 0);
-            //Scripting::Physics::setCollisionType("KartObject"); //object as in physical object
-            Scripting::Physics::setCollision(
-                p->getUserPointer(0)->getPointerPhysicalObject()->getID(),
-                "kart"
-            );
-            script_engine->runScript("void onKartObjectCollision()");
+            AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
+            int kartId = kart->getWorldKartId();
+            std::string obj_id = p->getUserPointer(0)->getPointerPhysicalObject()->getID();
+            
+            // TODO: pass obj_id as arguent
+            script_engine->runScript("void onKartObjectCollision(int)",
+                [=](asIScriptContext* ctx) {
+                    ctx->SetArgDWord(0, kartId);
+                });
             PhysicalObject *obj = p->getUserPointer(0)
                                    ->getPointerPhysicalObject();
             if (obj->isCrashReset())
             {
-                AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
                 new RescueAnimation(kart);
             }
             else if (obj->isExplodeKartObject())
             {
-                AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
                 ExplosionAnimation::create(kart);
             }
             else if (obj->isFlattenKartObject())
             {
-                AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
                 const KartProperties* kp = kart->getKartProperties();
                 kart->setSquash(kp->getSquashDuration() * kart->getPlayerDifficulty()->getSquashDuration(),
                     kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
@@ -211,7 +212,6 @@ void Physics::update(float dt)
             else if(obj->isSoccerBall() && 
                     race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)
             {
-                int kartId = p->getUserPointer(1)->getPointerKart()->getWorldKartId();
                 SoccerWorld* soccerWorld = (SoccerWorld*)World::getWorld();
                 soccerWorld->setLastKartTohitBall(kartId);
             }
@@ -255,12 +255,11 @@ void Physics::update(float dt)
             // Projectile hits physical object
             // -------------------------------
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-            Scripting::Physics::setCollision(0,0); //TODO : support item types etc
-            //Scripting::Physics::setCollisionType("ItemObject");
-            Scripting::Physics::setCollision(
-                p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
-                "item"
-            );
+            // TODO: pass arguments
+            //Scripting::Physics::setColl0ision(
+            //    p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
+            //    "item"
+            //);
             script_engine->runScript("void onItemObjectCollision()");
             p->getUserPointer(0)->getPointerFlyable()
                 ->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 41c2c65cd..e1c596454 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -31,8 +31,6 @@ namespace Scripting
     namespace Physics
     {
         void registerScriptFunctions(asIScriptEngine *engine);
-        void setCollision(int collider1,int collider2);
-        void setCollision(std::string collider1, std::string collider2);
     }
 
     namespace Kart
diff --git a/src/scriptengine/script_physics.cpp b/src/scriptengine/script_physics.cpp
index 893f32624..60fc0ce68 100644
--- a/src/scriptengine/script_physics.cpp
+++ b/src/scriptengine/script_physics.cpp
@@ -36,40 +36,10 @@ namespace Scripting
             HitEffect *he = new Explosion(*explosion_loc, "explosion", "explosion_bomb.xml");
             projectile_manager->addHitEffect(he);
         }
-        //Bind getters for colliding karts
-        void getCollidingKart1(asIScriptGeneric *gen)
-        {
-            gen->SetReturnDWord(m_collidingkartid1);
-        }
-        void getCollidingKart2(asIScriptGeneric *gen)
-        {
-            gen->SetReturnDWord(m_collidingkartid2);
-        }
-        //Bind getter for colliding objects
-        void getCollidingID(asIScriptGeneric *gen)
-        {
-            void *pointer = &m_collider1;
-            gen->SetReturnObject(pointer);
-        }
-
-        //Callbacks from Physics Engine, for collisions
-        void setCollision(int collider1,int collider2)
-        {
-            m_collidingkartid1 = collider1;
-            m_collidingkartid2 = collider2;
-        }
-        void setCollision(std::string collider1, std::string collider2)
-        {
-            m_collider1 = collider1;
-            m_collider2 = collider2;
-        }
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
             engine->SetDefaultNamespace("Physics");
-            r = engine->RegisterGlobalFunction("uint getCollidingKart1()", asFUNCTION(getCollidingKart1), asCALL_GENERIC); assert( r >= 0 );
-            r = engine->RegisterGlobalFunction("uint getCollidingKart2()", asFUNCTION(getCollidingKart2), asCALL_GENERIC); assert( r >= 0 );
-            r = engine->RegisterGlobalFunction("string getCollidingID()", asFUNCTION(getCollidingID), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string createExplosion(Vec3 &in)", asFUNCTION(createExplosion), asCALL_GENERIC); assert(r >= 0);
         }
     }
diff --git a/src/scriptengine/script_physics.hpp b/src/scriptengine/script_physics.hpp
index d6f47534d..51fbaa9c7 100644
--- a/src/scriptengine/script_physics.hpp
+++ b/src/scriptengine/script_physics.hpp
@@ -27,34 +27,11 @@ namespace Scripting
     
     namespace Physics
     {
-        
-        //IDs of kart collisions
-        int m_collidingkartid1;
-        int m_collidingkartid2;
-
-        //Details of collision
-        std::string m_collider1;
-        std::string m_collider2;
-        std::string m_collisionType;
-        
+       
         //script engine functions
         void registerScriptFunctions(asIScriptEngine *engine);
         asIScriptFunction* 
             registerScriptCallbacks(asIScriptEngine *engine);
-
-
-        //game engine functions
-        void setCollision(int collider1, int collider2);
-        void setCollisionType(std::string);
-
-
-
-        //script-bound functions
-        void getCollidingKart1(asIScriptGeneric *gen);
-        void getCollidingKart2(asIScriptGeneric *gen);
-        void getCollsionType(asIScriptGeneric *gen);
-        void getCollidingID(asIScriptGeneric *gen);
-
     }
     
     

From eea90692652e2d7e3de0952c2f830b37d482a43b Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sun, 3 May 2015 02:52:15 +0200
Subject: [PATCH 158/331] Fix #2171 - Font tool build failure with CMake 3.2

---
 tools/font_tool/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/font_tool/CMakeLists.txt b/tools/font_tool/CMakeLists.txt
index e67e6fbce..fce46bf16 100644
--- a/tools/font_tool/CMakeLists.txt
+++ b/tools/font_tool/CMakeLists.txt
@@ -11,6 +11,7 @@ if(FONT_TOOL)
         if(UNIX AND NOT APPLE)
             find_package(Xrandr REQUIRED)
             find_package(X11 REQUIRED)
+            include_directories(${X11_INCLUDE_DIR})
             if(NOT XRANDR_FOUND)
                 message(STATUS "XRANDR not found.")
             endif()
@@ -27,6 +28,7 @@ if(FONT_TOOL)
             if(UNIX AND NOT APPLE)
                 target_link_libraries(font_tool ${XRANDR_LIBRARIES})
                 target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm)
+                target_link_libraries(font_tool ${X11_LIBRARIES})
             endif()
         else()
             message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)")

From 0ace0aeb5be060eb28b02d4c6f86117bcd3dbe1c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 4 May 2015 16:51:50 +1000
Subject: [PATCH 159/331] Added comments.

---
 src/graphics/shader.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 7585a2bb6..2ff315750 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -54,8 +54,8 @@ protected:
 
     void bypassUBO() const;
 
-    // ------------------------------------------------------------------------
-    // Ends vararg template
+    // ========================================================================
+    /** Ends recursion. */
     template<typename ... Types>
     void loadAndAttachShader()
     {
@@ -72,6 +72,7 @@ protected:
         loadAndAttachShader(args...);
     }   // loadAndAttachShader
     // ------------------------------------------------------------------------
+    /** Convenience interface using const char. */
     template<typename ... Types>
     void loadAndAttachShader(GLint shader_type, const char *name,
                              Types ... args)
@@ -149,7 +150,7 @@ private:
     // ==============================================
     // setUniforms: Variadic template implementation.
 
-protected:
+public:
     /** Sets the uniforms for this shader. */
     void setUniforms(const Args & ... args) const
     {

From f019f8622c93e57c12c0763dba44416c580f85a7 Mon Sep 17 00:00:00 2001
From: deve <deveee@gmail.com>
Date: Mon, 4 May 2015 11:09:53 +0200
Subject: [PATCH 160/331] Make sure that window size is larger than 0

---
 src/graphics/irr_driver.cpp | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 92608912a..d3409f2c9 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -109,7 +109,7 @@ IrrDriver::IrrDriver()
     m_phase               = SOLID_NORMAL_AND_DEPTH_PASS;
     m_device              = createDevice(video::EDT_NULL,
                                          irr::core::dimension2d<u32>(640, 480),
-                                         /*bits*/16U, /**fullscreen*/ false, 
+                                         /*bits*/16U, /**fullscreen*/ false,
                                          /*stencilBuffer*/ false,
                                          /*vsync*/false,
                                          /*event receiver*/ NULL,
@@ -349,8 +349,13 @@ void IrrDriver::initDevice()
 
         video::IVideoModeList* modes = m_device->getVideoModeList();
         const core::dimension2d<u32> ssize = modes->getDesktopResolution();
-        if (UserConfigParams::m_width > (int)ssize.Width ||
-            UserConfigParams::m_height > (int)ssize.Height)
+
+        if (ssize.Width < 1 || ssize.Height < 1)
+        {
+            Log::warn("irr_driver", "Unknown desktop resolution.");
+        }
+        else if (UserConfigParams::m_width > (int)ssize.Width ||
+                 UserConfigParams::m_height > (int)ssize.Height)
         {
             Log::warn("irr_driver", "The window size specified in "
                       "user config is larger than your screen!");
@@ -358,13 +363,13 @@ void IrrDriver::initDevice()
             UserConfigParams::m_height = (int)ssize.Height;
         }
 
-        core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width,
-                                                    UserConfigParams::m_height);
-
         if (UserConfigParams::m_fullscreen)
         {
             if (modes->getVideoModeCount() > 0)
             {
+                core::dimension2d<u32> res = core::dimension2du(
+                                                    UserConfigParams::m_width,
+                                                    UserConfigParams::m_height);
                 res = modes->getVideoModeResolution(res, res);
 
                 UserConfigParams::m_width = res.Width;
@@ -372,13 +377,20 @@ void IrrDriver::initDevice()
             }
             else
             {
-                Log::verbose("irr_driver", "Cannot get information about "
-                             "resolutions. Try to use the default one.");
-                UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
-                UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
+                Log::warn("irr_driver", "Cannot get information about "
+                          "resolutions. Disable fullscreen.");
+                UserConfigParams::m_fullscreen = false;
             }
         }
 
+        if (UserConfigParams::m_width < 1 || UserConfigParams::m_height < 1)
+        {
+            Log::warn("irr_driver", "Invalid window size. "
+                         "Try to use the default one.");
+            UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
+            UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
+        }
+
         m_device->closeDevice();
         m_video_driver  = NULL;
         m_gui_env       = NULL;
@@ -703,7 +715,7 @@ bool IrrDriver::moveWindow(int x, int y)
     }
 #elif defined(__linux__) && !defined(ANDROID)
     const video::SExposedVideoData& videoData = m_video_driver->getExposedVideoData();
-    
+
     Display* display = (Display*)videoData.OpenGLLinux.X11Display;
     int screen = DefaultScreen(display);
     int screen_w = DisplayWidth(display, screen);
@@ -713,7 +725,7 @@ bool IrrDriver::moveWindow(int x, int y)
     {
         x = screen_w - UserConfigParams::m_width;
     }
-    
+
     if (y + UserConfigParams::m_height > screen_h)
     {
         y = screen_h - UserConfigParams::m_height;

From dfe4f09ed55f4643c50d5093c4541adc66ae5b9d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 6 May 2015 16:51:54 +1000
Subject: [PATCH 161/331] Start to re-implement TextureRead without variadic
 templates for BindTexture and CreateSampler. VERY MESSY ATM, work in
 progress.

---
 sources.cmake                 |   2 +-
 src/graphics/gpuparticles.cpp |   7 +-
 src/graphics/shaders.cpp      |   4 +-
 src/graphics/texture_read.cpp | 159 +++++++++++++++++++++++++
 src/graphics/texture_read.hpp | 212 ++++++++++++++++++++++++++++++++++
 5 files changed, 378 insertions(+), 6 deletions(-)
 create mode 100644 src/graphics/texture_read.cpp

diff --git a/sources.cmake b/sources.cmake
index dfc0e3774..5b3d0c21e 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.  
+# This will then trigger a new cmake run automatically.   
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index a63225994..bc1e8e962 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -52,8 +52,8 @@ public:
 */
 class SimpleParticleRender : public Shader<SimpleParticleRender, video::SColorf,
                                            video::SColorf>,
-                             public TextureRead<Trilinear_Anisotropic_Filtered,
-                                                Nearest_Filtered>
+                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                                   ST_NEAREST_FILTERED>
 {
 public:
     SimpleParticleRender()
@@ -64,7 +64,8 @@ public:
                     GL_FRAGMENT_SHADER, "particle.frag");
 
         assignUniforms("color_from", "color_to");
-        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
     }   // SimpleParticleRender
 
 };   // SimpleParticleRender
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 309fd6df6..ee4e84dcb 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -531,7 +531,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 }
 
 
-GLuint createNearestSampler()
+GLuint XXXcreateNearestSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -631,7 +631,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
 }
 
-GLuint createTrilinearSampler()
+GLuint XXXcreateTrilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
new file mode 100644
index 000000000..d7e5090a0
--- /dev/null
+++ b/src/graphics/texture_read.cpp
@@ -0,0 +1,159 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//            (C) 2015      Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/texture_read.hpp"
+
+#include "config/user_config.hpp"
+
+TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] = 
+{ &bindTextureNearest, 
+  &bindTextureTrilinearAnisotropic };
+GLuint TextureReadBaseNew::m_all_texture_types[] = { GL_TEXTURE_2D, GL_TEXTURE_2D };
+
+// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
+{
+    switch (sampler_type)
+    {
+    case ST_NEAREST_FILTERED:
+        return createNearestSampler();
+    case ST_TRILINEAR_ANISOTROPIC_FILTERED:
+        return createTrilinearSampler();
+
+    default:
+        assert(false);
+    }   // switch
+}   // createSamplers
+
+// ----------------------------------------------------------------------------
+void bindTextureNearest(GLuint texture_unit, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + texture_unit);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureNearest
+
+// ----------------------------------------------------------------------------
+void bindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+}   // bindTextureTrilinearAnisotropic
+
+// ----------------------------------------------------------------------------
+GLuint createNearestSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+#endif
+}   // createNearestSampler
+
+// ----------------------------------------------------------------------------
+void bindTextureNearesClamped(GLuint texture_unit,
+                                                  GLuint tex_id)
+{
+    glActiveTexture(GL_TEXTURE0 + texture_unit);
+    glBindTexture(GL_TEXTURE_2D, tex_id);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureNearesClamped
+
+// ----------------------------------------------------------------------------
+void bindTextureBilinear(GLuint texture_unit, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + texture_unit);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureBilinear
+
+// ----------------------------------------------------------------------------
+void bindTextureBilinearClamped(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureBilinearClamped
+
+// ----------------------------------------------------------------------------
+void bindTextureSemiTrilinear(GLuint TU, GLuint tex)
+{
+    glActiveTexture(GL_TEXTURE0 + TU);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureSemiTrilinear
+
+// ----------------------------------------------------------------------------
+GLuint createTrilinearSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+    return id;
+#endif
+}   // createTrilinearSampler
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 5063ed98d..0baf704cb 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -20,6 +20,218 @@
 
 #include "shaders_util.hpp"
 
+
+void   bindTextureNearest(unsigned TU, unsigned tid);
+GLuint createNearestSampler();
+void   bindTextureTrilinearAnisotropic(unsigned, unsigned);
+GLuint createTrilinearSampler();
+void   bindTextureNearesClamped(GLuint texture_unit, GLuint tex);
+
+
+enum SamplerTypeNew {
+    ST_NEAREST_FILTERED,
+    ST_TRILINEAR_ANISOTROPIC_FILTERED,
+    ST_SEMI_TRILINEAR,
+    ST_BILINEAR_FILTERED,
+    ST_BILINEAR_CLAMPED_FILTERED,
+    ST_NEARED_CLAMPED_FILTERED,
+    ST_SHADOW_SAMPLER,
+    ST_VOLUME_LINEAR_FILTERED,
+    ST_TRILINEAR_CUBEMAP,
+    ST_TRILINEAR_CLAMPED_ARRAY2D,
+};
+
+
+class TextureReadBaseNew
+{
+protected:
+
+private:
+
+    typedef void(*BindFunction)(unsigned, unsigned);
+
+protected:
+    static BindFunction m_all_bind_functions[2];
+    std::vector<BindFunction> m_bind_functions;
+    static GLuint m_all_texture_types[];
+
+    GLuint createSamplers(SamplerTypeNew);
+};   // TextureReadBaseNew
+
+// ============================================================================
+
+template<SamplerTypeNew...tp>
+class TextureReadNew : public TextureReadBaseNew
+{
+
+private:
+    static void bindTextureNearest(unsigned TU, unsigned tid);
+//    static void bindTextureTrilinearAnisotropic(unsigned , unsigned );
+
+    //typedef void(TextureReadBaseNew::*BindFunction)(unsigned, unsigned);
+
+    //static void(*)(unsigned, unsigned) m_all_bind_functions[2];
+    
+//    std::vector<BindFunction> m_bind_functions;
+
+    std::vector<GLuint> m_texture_units;
+    std::vector<GLenum> m_texture_type;
+    std::vector<GLenum> m_texture_location;
+
+public:
+    std::vector<GLuint> m_sampler_ids;
+
+    // A variadic template to assign texture names
+    // ===========================================
+private:
+    /** End of recursive variadic template AssigTextureNames. It just
+     *  checks if the number of arguments is correct.*/
+    template<unsigned N, typename...Args>
+    void assignTextureNamesImpl(GLuint)
+    {
+        static_assert(N == sizeof...(tp), "Wrong number of texture name");
+    }   // assignTextureNamesImpl
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation, peeling the texture unit and name off the
+     *  list of arguments.
+     */
+    template<unsigned N, typename...Args>
+    void assignTextureNamesImpl(GLuint program, GLuint tex_unit,
+                                const char *name, SamplerTypeNew sampler_type,
+                                Args...args)
+    {
+
+        m_sampler_ids.push_back(createSamplers(sampler_type));
+        m_texture_type.push_back(m_all_texture_types[sampler_type]);
+        GLuint location = glGetUniformLocation(program, name);
+        m_texture_location.push_back(location);
+        glUniform1i(location, tex_unit);
+        m_texture_units.push_back(tex_unit);
+        m_bind_functions.push_back( m_all_bind_functions[sampler_type]);
+        assignTextureNamesImpl<N + 1>(program, args...);
+    }   // assignTextureNamesImpl
+
+    // ------------------------------------------------------------------------
+public:
+    /** The protected interface for setting sampler names - it is only called
+    *  from instances.
+    */
+    template<typename...Args>
+    void assignSamplerNames(GLuint program, Args...args)
+    {
+        glUseProgram(program);
+        assignTextureNamesImpl<0>(program, args...);
+        glUseProgram(0);
+    }   // AssignSamplerNames
+
+
+    // Variadic template implementation of setTextureUnits
+    // ===================================================
+    /** End of recursion, just check if number of arguments is correct. */
+    template<int N>
+    void setTextureUnitsImpl()
+    {
+        static_assert(N == sizeof...(tp), "Not enough texture set");
+    }   // setTextureUnitsImpl
+
+    // ------------------------------------------------------------------------
+    /** The recursive implementation.
+     */
+    template<int N, typename... TexIds>
+    void setTextureUnitsImpl(GLuint texid, TexIds... args)
+    {
+        if (getGLSLVersion() >= 330)
+        {
+            setTextureSampler(m_texture_type[N], m_texture_units[N], texid,
+                              m_sampler_ids[N]);
+        }
+        else
+        {
+            m_bind_functions[N](m_texture_units[N], texid);
+        }
+        setTextureUnitsImpl<N + 1>(args...);
+    }   // setTextureUnitsImpl
+
+    // ------------------------------------------------------------------------
+public:
+    /** Public implementation of setTextureUnits.
+     */
+    template<typename... TexIds>
+    void setTextureUnits(TexIds... args)
+    {
+        setTextureUnitsImpl<0>(args...);
+    }   // setTextureUnits
+
+
+    // ========================================================================
+    // Variadic template implementation of setTextureHandles.
+
+    /** End of recursion, just checks at compile time if number of arguments
+     *  is correct.
+     *  \param N number of arguments. */
+    template<int N>
+    void setTextureHandlesImpl()
+    {
+        static_assert(N == sizeof...(tp), "Not enough handle set");
+    }   // setTextureHandlesImpl
+
+    // ------------------------------------------------------------------------
+    /** Recursive implementation of setTextureHandles.
+     * \param N The number of the current argument in the recursion (or the
+     *          recursion depth).
+     *  \param handle The texture handle to set.
+     */
+    template<int N, typename... HandlesId>
+    void setTextureHandlesImpl(uint64_t handle, HandlesId... args)
+    {
+        if (handle)
+            glUniformHandleui64ARB(m_texture_location[N], handle);
+        setTextureHandlesImpl<N + 1>(args...);
+    }   // setTextureHandlesImpl
+
+    // ------------------------------------------------------------------------
+public:
+    /** The protected interface.
+     *  \param ids The ids of all texture handls.
+     */
+    template<typename... HandlesId>
+    void setTextureHandles(HandlesId... ids)
+    {
+        setTextureHandlesImpl<0>(ids...);
+    }   // SetTextureHandles
+
+public:
+    // ------------------------------------------------------------------------
+    /** Destructor which frees al lsampler ids.
+     */
+    ~TextureReadNew()
+    {
+        for (unsigned i = 0; i < m_sampler_ids.size(); i++)
+            glDeleteSamplers(1, &m_sampler_ids[i]);
+    }   // ~TextureReadNew
+
+
+};   // class TextureReadNew
+
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+// ============================================================================
+
+
+
+
+
+
+
+
+
 template<SamplerType...tp>
 class TextureRead
 {

From a6b8783d4699c7c3685a015d4f4728c7c0d51664 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 6 May 2015 22:08:03 +1000
Subject: [PATCH 162/331] Moved bind functions into TextureRead class.

---
 src/graphics/texture_read.cpp | 26 ++++++++++++++------------
 src/graphics/texture_read.hpp | 24 ++++++++----------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index d7e5090a0..22d8a8e85 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -20,9 +20,10 @@
 
 #include "config/user_config.hpp"
 
-TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] = 
-{ &bindTextureNearest, 
-  &bindTextureTrilinearAnisotropic };
+TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
+{ &TextureReadBaseNew::bindTextureNearest,
+  &TextureReadBaseNew::bindTextureTrilinearAnisotropic };
+
 GLuint TextureReadBaseNew::m_all_texture_types[] = { GL_TEXTURE_2D, GL_TEXTURE_2D };
 
 // ----------------------------------------------------------------------------
@@ -37,11 +38,12 @@ GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
 
     default:
         assert(false);
+        return 0;
     }   // switch
 }   // createSamplers
 
 // ----------------------------------------------------------------------------
-void bindTextureNearest(GLuint texture_unit, GLuint tex)
+void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -53,9 +55,9 @@ void bindTextureNearest(GLuint texture_unit, GLuint tex)
 }   // bindTextureNearest
 
 // ----------------------------------------------------------------------------
-void bindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
+void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex)
 {
-    glActiveTexture(GL_TEXTURE0 + TU);
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
@@ -83,8 +85,8 @@ GLuint createNearestSampler()
 }   // createNearestSampler
 
 // ----------------------------------------------------------------------------
-void bindTextureNearesClamped(GLuint texture_unit,
-                                                  GLuint tex_id)
+void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
+                                                   GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex_id);
@@ -108,9 +110,9 @@ void bindTextureBilinear(GLuint texture_unit, GLuint tex)
 }   // bindTextureBilinear
 
 // ----------------------------------------------------------------------------
-void bindTextureBilinearClamped(GLuint TU, GLuint tex)
+void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 {
-    glActiveTexture(GL_TEXTURE0 + TU);
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -120,9 +122,9 @@ void bindTextureBilinearClamped(GLuint TU, GLuint tex)
 }   // bindTextureBilinearClamped
 
 // ----------------------------------------------------------------------------
-void bindTextureSemiTrilinear(GLuint TU, GLuint tex)
+void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
 {
-    glActiveTexture(GL_TEXTURE0 + TU);
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 0baf704cb..2d34724fb 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -20,12 +20,10 @@
 
 #include "shaders_util.hpp"
 
+#include <functional>
 
-void   bindTextureNearest(unsigned TU, unsigned tid);
 GLuint createNearestSampler();
-void   bindTextureTrilinearAnisotropic(unsigned, unsigned);
 GLuint createTrilinearSampler();
-void   bindTextureNearesClamped(GLuint texture_unit, GLuint tex);
 
 
 enum SamplerTypeNew {
@@ -44,13 +42,15 @@ enum SamplerTypeNew {
 
 class TextureReadBaseNew
 {
-protected:
-
-private:
-
-    typedef void(*BindFunction)(unsigned, unsigned);
+public:
+    typedef  std::function<void(unsigned, unsigned)> BindFunction;
 
 protected:
+    static void   bindTextureNearest(GLuint TU, GLuint tid);
+    static void   bindTextureNearestClamped(GLuint texture_unit, GLuint tex);
+    static void   bindTextureTrilinearAnisotropic(GLuint, GLuint);
+
+
     static BindFunction m_all_bind_functions[2];
     std::vector<BindFunction> m_bind_functions;
     static GLuint m_all_texture_types[];
@@ -65,14 +65,6 @@ class TextureReadNew : public TextureReadBaseNew
 {
 
 private:
-    static void bindTextureNearest(unsigned TU, unsigned tid);
-//    static void bindTextureTrilinearAnisotropic(unsigned , unsigned );
-
-    //typedef void(TextureReadBaseNew::*BindFunction)(unsigned, unsigned);
-
-    //static void(*)(unsigned, unsigned) m_all_bind_functions[2];
-    
-//    std::vector<BindFunction> m_bind_functions;
 
     std::vector<GLuint> m_texture_units;
     std::vector<GLenum> m_texture_type;

From 08ea768e168537a72dd73557d63a75b038ffdf92 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 6 May 2015 22:33:15 +1000
Subject: [PATCH 163/331] Moved create*Sampler functions into TextureRead.

---
 src/graphics/shaders.cpp      |  4 ++--
 src/graphics/texture_read.cpp | 10 +++++-----
 src/graphics/texture_read.hpp | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index ee4e84dcb..309fd6df6 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -531,7 +531,7 @@ void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
 }
 
 
-GLuint XXXcreateNearestSampler()
+GLuint createNearestSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -631,7 +631,7 @@ void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
 }
 
-GLuint XXXcreateTrilinearSampler()
+GLuint createTrilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index 22d8a8e85..b75e3c17e 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -70,7 +70,7 @@ void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint
 }   // bindTextureTrilinearAnisotropic
 
 // ----------------------------------------------------------------------------
-GLuint createNearestSampler()
+GLuint TextureReadBaseNew::createNearestSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -98,7 +98,7 @@ void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
 }   // bindTextureNearesClamped
 
 // ----------------------------------------------------------------------------
-void bindTextureBilinear(GLuint texture_unit, GLuint tex)
+void TextureReadBaseNew::bindTextureBilinear(GLuint texture_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -110,7 +110,7 @@ void bindTextureBilinear(GLuint texture_unit, GLuint tex)
 }   // bindTextureBilinear
 
 // ----------------------------------------------------------------------------
-void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
+void TextureReadBaseNew::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -122,7 +122,7 @@ void bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 }   // bindTextureBilinearClamped
 
 // ----------------------------------------------------------------------------
-void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
+void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -134,7 +134,7 @@ void bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
 }   // bindTextureSemiTrilinear
 
 // ----------------------------------------------------------------------------
-GLuint createTrilinearSampler()
+GLuint TextureReadBaseNew::createTrilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 2d34724fb..508af5ade 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -22,9 +22,6 @@
 
 #include <functional>
 
-GLuint createNearestSampler();
-GLuint createTrilinearSampler();
-
 
 enum SamplerTypeNew {
     ST_NEAREST_FILTERED,
@@ -46,16 +43,24 @@ public:
     typedef  std::function<void(unsigned, unsigned)> BindFunction;
 
 protected:
-    static void   bindTextureNearest(GLuint TU, GLuint tid);
-    static void   bindTextureNearestClamped(GLuint texture_unit, GLuint tex);
-    static void   bindTextureTrilinearAnisotropic(GLuint, GLuint);
+    static void   bindTextureNearest(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureBilinear(GLuint texture_unit, GLuint tex);
+    static void   bindTextureBilinearClamped(GLuint tex_unit, GLuint tex);
+    static void   bindTextureNearestClamped(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
 
+    GLuint        createSamplers(SamplerTypeNew sampler_type);
+private:
 
+    static GLuint createNearestSampler();
+    static GLuint createTrilinearSampler();
+
+protected:
     static BindFunction m_all_bind_functions[2];
     std::vector<BindFunction> m_bind_functions;
     static GLuint m_all_texture_types[];
 
-    GLuint createSamplers(SamplerTypeNew);
 };   // TextureReadBaseNew
 
 // ============================================================================

From a311281aa79c64b9784ee22aa2b95ab374be0eb3 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 6 May 2015 20:39:40 +0200
Subject: [PATCH 164/331] Fix Random Grand Prix being reversed

---
 src/race/grand_prix_data.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp
index a788aed53..3e4ee4327 100644
--- a/src/race/grand_prix_data.hpp
+++ b/src/race/grand_prix_data.hpp
@@ -145,30 +145,30 @@ public:
                                        unsigned int laps, bool reverse);
     void                     remove(const unsigned int track);
 
-    // ------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     /** @return the (potentially translated) user-visible name of the Grand
      *  Prix (apply fribidi as needed) */
     irr::core::stringw getName()      const { return m_editable ? m_name.c_str() : _LTR(m_name.c_str());   }
 
-    // ------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     /** @return the internal indentifier of the Grand Prix (not translated) */
-    const std::string& getId()        const { return m_id;                   }
+    const std::string& getId()        const { return m_id;                     }
 
-    // ------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     /** Returns true if this GP is a random GP. */
-    bool isRandomGP()                 const { return m_id==getRandomGPID();  }
-    // ------------------------------------------------------------------------
+    bool isRandomGP()                 const { return m_id==getRandomGPID();    }
+    // -------------------------------------------------------------------------
     /** Returns the filename of the grand prix xml file. */
-    const std::string& getFilename()  const { return m_filename;             }
+    const std::string& getFilename()  const { return m_filename;               }
 
     // ------------------------------------------------------------------------
-    enum GPGroupType getGroup()       const { return m_group;                }
+    enum GPGroupType getGroup()       const { return m_group;                  }
 
-    // ------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     enum GPReverseType getReverseType()
-                                      const { return m_reverse_type;         }
-    static const char*    getRandomGPID()   { return "random";               }
-    static const wchar_t* getRandomGPName() { return _("Random Grand Prix"); }
+                                      const { return m_reverse_type;           }
+    static const char*    getRandomGPID()   { return "random";                 }
+    static const wchar_t* getRandomGPName() { return _LTR("Random Grand Prix");}
 };   // GrandPrixData
 
 #endif

From 8b9e5acd1a4529781440d63bcdf48b20efce47fb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 7 May 2015 07:41:51 +1000
Subject: [PATCH 165/331] Converted more shaders to use the new template.

---
 src/graphics/gpuparticles.cpp | 9 +++++----
 src/graphics/shaders.cpp      | 2 +-
 src/graphics/shaders.hpp      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index bc1e8e962..f1570e58a 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -33,7 +33,7 @@
 /** Transform feedback shader that simulates the particles on GPU.
 */
 class PointEmitterShader : public Shader
-    < PointEmitterShader, core::matrix4, int, int, float >
+                           < PointEmitterShader, core::matrix4, int, int, float >
 {
 public:
     PointEmitterShader()
@@ -73,8 +73,8 @@ public:
 // ============================================================================
 
 class FlipParticleRender : public Shader<FlipParticleRender>, 
-                           public TextureRead < Trilinear_Anisotropic_Filtered,
-                                                Nearest_Filtered >
+                           public TextureReadNew < ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                                   ST_NEAREST_FILTERED >
 {
 public:
     FlipParticleRender()
@@ -84,7 +84,8 @@ public:
                     GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                     GL_FRAGMENT_SHADER, "particle.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
     }
 
 };   // FlipParticleShader
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 309fd6df6..884d3e08e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -775,7 +775,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "object_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     ObjectRefPass1Shader::ObjectRefPass1Shader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index d2976b54a..fe3a777af 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -62,7 +62,7 @@ public:
 namespace MeshShader
 {
 class ObjectPass1Shader : public Shader<ObjectPass1Shader, core::matrix4, core::matrix4>, 
-                          public TextureRead<Trilinear_Anisotropic_Filtered>
+                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     ObjectPass1Shader();

From 4338fe614425b87471434fb72008ec2e1ae2b5db Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 7 May 2015 09:54:29 +1000
Subject: [PATCH 166/331] Migrated more TextureReads to the new shader
 infrastructure.

---
 src/graphics/shaders.cpp      | 21 ++-------
 src/graphics/shaders.hpp      |  7 +--
 src/graphics/shaders_util.hpp | 25 ----------
 src/graphics/texture_read.cpp | 86 ++++++++++++++++++++++-------------
 src/graphics/texture_read.hpp | 19 ++++++--
 5 files changed, 78 insertions(+), 80 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 884d3e08e..0a135b580 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -662,19 +662,6 @@ void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
 }
 
-void BindCubemapTrilinear(unsigned TU, unsigned tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-    int aniso = UserConfigParams::m_anisotropic;
-    if (aniso == 0) aniso = 1;
-    glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
-}
 
 GLuint createShadowSampler()
 {
@@ -760,7 +747,7 @@ namespace UtilShader
             GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
         assignUniforms("PermutationMatrix", "ViewportSize");
         TU_Samples = 1;
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
         assignTextureUnit(TU_Samples, "samples");
     }
 }
@@ -1242,7 +1229,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "sky.vert",
             GL_FRAGMENT_SHADER, "sky.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1457,7 +1444,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
             GL_FRAGMENT_SHADER, "IBL.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "probe");
+        assignSamplerNames(m_program, 0, "ntex",  ST_NEAREST_FILTERED,
+                                      1, "dtex",  ST_NEAREST_FILTERED,
+                                      2, "probe", ST_TRILINEAR_CUBEMAP);
     }
 
     DegradedIBLShader::DegradedIBLShader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index fe3a777af..27c98d817 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -50,7 +50,7 @@ public:
 };
 
 class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4, float >,
-                             public TextureRead<Trilinear_cubemap>
+                             public TextureReadNew<ST_TRILINEAR_CUBEMAP>
 {
 public:
     GLuint TU_Samples;
@@ -287,7 +287,7 @@ public:
     DisplaceShader();
 };
 
-class SkyboxShader : public Shader<SkyboxShader>, public TextureRead<Trilinear_cubemap>
+class SkyboxShader : public Shader<SkyboxShader>, public TextureReadNew<ST_TRILINEAR_CUBEMAP>
 {
 public:
     SkyboxShader();
@@ -395,7 +395,8 @@ public:
     SunLightShader();
 };
 
-class IBLShader : public Shader<IBLShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_cubemap>
+class IBLShader : public Shader<IBLShader>,
+                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_TRILINEAR_CUBEMAP>
 {
 public:
     IBLShader();
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
index 2fafb8f4a..2c654cf19 100644
--- a/src/graphics/shaders_util.hpp
+++ b/src/graphics/shaders_util.hpp
@@ -51,7 +51,6 @@ enum SamplerType {
     Nearest_Filtered,
     Shadow_Sampler,
     Volume_Linear_Filtered,
-    Trilinear_cubemap,
     Trilinear_Clamped_Array2D,
 };
 
@@ -233,30 +232,6 @@ struct CreateSamplers<Trilinear_Anisotropic_Filtered, tp...>
 
 void BindTextureTrilinearAnisotropic(unsigned TU, unsigned tex);
 
-template<SamplerType...tp>
-struct CreateSamplers<Trilinear_cubemap, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createTrilinearSampler());
-        e.push_back(GL_TEXTURE_CUBE_MAP);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindCubemapTrilinear(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Trilinear_cubemap, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindCubemapTrilinear(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
 template<SamplerType...tp>
 struct BindTexture<Trilinear_Anisotropic_Filtered, tp...>
 {
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index b75e3c17e..f32f4f10f 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -21,26 +21,15 @@
 #include "config/user_config.hpp"
 
 TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
-{ &TextureReadBaseNew::bindTextureNearest,
-  &TextureReadBaseNew::bindTextureTrilinearAnisotropic };
+{ /* ST_NEAREST_FILTERED               */ &TextureReadBaseNew::bindTextureNearest,
+  /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureReadBaseNew::bindTextureTrilinearAnisotropic,
+  /* ST_TRILINEAR_CUBEMAP              */ &TextureReadBaseNew::bindCubemapTrilinear
+};
 
-GLuint TextureReadBaseNew::m_all_texture_types[] = { GL_TEXTURE_2D, GL_TEXTURE_2D };
-
-// ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
-{
-    switch (sampler_type)
-    {
-    case ST_NEAREST_FILTERED:
-        return createNearestSampler();
-    case ST_TRILINEAR_ANISOTROPIC_FILTERED:
-        return createTrilinearSampler();
-
-    default:
-        assert(false);
-        return 0;
-    }   // switch
-}   // createSamplers
+GLuint TextureReadBaseNew::m_all_texture_types[] = 
+{ /* ST_NEAREST_FILTERED               */ GL_TEXTURE_2D,
+  /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ GL_TEXTURE_2D,
+  /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP };
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
@@ -70,23 +59,24 @@ void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint
 }   // bindTextureTrilinearAnisotropic
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createNearestSampler()
+void TextureReadBaseNew::bindCubemapTrilinear(unsigned tex_unit, unsigned tex)
 {
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-    return id;
-#endif
-}   // createNearestSampler
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+                    (float)aniso);
+}   // bindCubemapTrilinear
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
-                                                   GLuint tex_id)
+    GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex_id);
@@ -133,6 +123,38 @@ void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
 }   // bindTextureSemiTrilinear
 
+// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
+{
+    switch (sampler_type)
+    {
+    case ST_NEAREST_FILTERED:
+        return createNearestSampler();
+    case ST_TRILINEAR_ANISOTROPIC_FILTERED:
+        return createTrilinearSampler();
+    case ST_TRILINEAR_CUBEMAP:
+        return createTrilinearSampler();
+    default:
+        assert(false);
+        return 0;
+    }   // switch
+}   // createSamplers
+
+// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createNearestSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+#endif
+}   // createNearestSampler
+
 // ----------------------------------------------------------------------------
 GLuint TextureReadBaseNew::createTrilinearSampler()
 {
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 508af5ade..2a5034c6f 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -24,16 +24,19 @@
 
 
 enum SamplerTypeNew {
-    ST_NEAREST_FILTERED,
+    ST_MIN,
+    ST_NEAREST_FILTERED = ST_MIN,
     ST_TRILINEAR_ANISOTROPIC_FILTERED,
+    ST_TRILINEAR_CUBEMAP,
+    ST_MAX = ST_TRILINEAR_CUBEMAP,
+
     ST_SEMI_TRILINEAR,
     ST_BILINEAR_FILTERED,
     ST_BILINEAR_CLAMPED_FILTERED,
     ST_NEARED_CLAMPED_FILTERED,
     ST_SHADOW_SAMPLER,
     ST_VOLUME_LINEAR_FILTERED,
-    ST_TRILINEAR_CUBEMAP,
-    ST_TRILINEAR_CLAMPED_ARRAY2D,
+    ST_TRILINEAR_CLAMPED_ARRAY2D
 };
 
 
@@ -49,6 +52,7 @@ protected:
     static void   bindTextureNearestClamped(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
+    static void   bindCubemapTrilinear(unsigned tex_unit, unsigned tex);
 
     GLuint        createSamplers(SamplerTypeNew sampler_type);
 private:
@@ -57,7 +61,7 @@ private:
     static GLuint createTrilinearSampler();
 
 protected:
-    static BindFunction m_all_bind_functions[2];
+    static BindFunction m_all_bind_functions[];
     std::vector<BindFunction> m_bind_functions;
     static GLuint m_all_texture_types[];
 
@@ -100,12 +104,19 @@ private:
     {
 
         m_sampler_ids.push_back(createSamplers(sampler_type));
+
+        assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_texture_type.push_back(m_all_texture_types[sampler_type]);
+
         GLuint location = glGetUniformLocation(program, name);
         m_texture_location.push_back(location);
         glUniform1i(location, tex_unit);
         m_texture_units.push_back(tex_unit);
+
+        // Duplicated assert
+        assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_bind_functions.push_back( m_all_bind_functions[sampler_type]);
+
         assignTextureNamesImpl<N + 1>(program, args...);
     }   // assignTextureNamesImpl
 

From b441dba764b2a4b8da1ab528fea6cb64bd78bffb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 7 May 2015 16:40:38 +1000
Subject: [PATCH 167/331] More shaders converted.

---
 src/graphics/shaders.cpp | 14 +++++++++-----
 src/graphics/shaders.hpp | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 0a135b580..13c623b11 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -772,7 +772,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex",     ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "glosstex",ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     GrassPass1Shader::GrassPass1Shader()
@@ -782,7 +783,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     NormalMapShader::NormalMapShader()
@@ -792,7 +794,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "normalmap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 1, "normalMap", 0, "DiffuseForAlpha");
+        assignSamplerNames(m_program, 1, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      0, "DiffuseForAlpha", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedObjectPass1Shader::InstancedObjectPass1Shader()
@@ -804,7 +807,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "glosstex");
+        assignSamplerNames(m_program, 0, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedObjectRefPass1Shader::InstancedObjectRefPass1Shader()
@@ -816,7 +819,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedGrassPass1Shader::InstancedGrassPass1Shader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 27c98d817..5e076430d 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -69,31 +69,35 @@ public:
 };
 
 class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>,
-                             public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     ObjectRefPass1Shader();
 };
 
-class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>,
+                         public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     GrassPass1Shader();
 };
 
-class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>,
+                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     NormalMapShader();
 };
 
-class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>,
+                                   public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedObjectPass1Shader();
 };
 
-class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>,
+                                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedObjectRefPass1Shader();

From 38a1deeff5e6538d33c9509b3a6d8808dd27009c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 7 May 2015 19:18:24 +1000
Subject: [PATCH 168/331] Converted more shaders.

---
 src/graphics/shaders.cpp      | 93 ++++++++++++++++++++++++++---------
 src/graphics/shaders.hpp      | 63 ++++++++++++++++++------
 src/graphics/texture_read.cpp | 21 +++++++-
 src/graphics/texture_read.hpp |  5 +-
 4 files changed, 141 insertions(+), 41 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 13c623b11..7f60a1ae0 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -831,7 +831,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
         assignUniforms("windDir");
-        assignSamplerNames(m_program, 0, "tex", 1, "glosstex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedNormalMapShader::InstancedNormalMapShader()
@@ -842,7 +843,8 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "normalMap", 1, "glossMap");
+        assignSamplerNames(m_program, 0, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "glossMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     // Solid Lit pass shaders
@@ -853,7 +855,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "object_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+            assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                          1, "SpecularMap", ST_NEAREST_FILTERED,
+                                          2, "SSAO", ST_BILINEAR_FILTERED,
+                                          3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                          4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedObjectPass2Shader::InstancedObjectPass2Shader()
@@ -864,7 +870,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+            assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                          1, "SpecularMap", ST_NEAREST_FILTERED,
+                                          2, "SSAO", ST_BILINEAR_FILTERED,
+                                          3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                          4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedObjectRefPass2Shader::InstancedObjectRefPass2Shader()
@@ -875,7 +885,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     DetailledObjectPass2Shader::DetailledObjectPass2Shader()
@@ -885,7 +899,12 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "detailledobject_pass2.frag");
         assignUniforms("ModelMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
     }
 
     InstancedDetailledObjectPass2Shader::InstancedDetailledObjectPass2Shader()
@@ -896,7 +915,12 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_detailledobject_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "Detail", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                     1, "SpecularMap", ST_NEAREST_FILTERED,
+                                     2, "SSAO", ST_BILINEAR_FILTERED,
+                                     3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                     4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                     5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     ObjectUnlitShader::ObjectUnlitShader()
@@ -905,7 +929,10 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "object_unlit.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedObjectUnlitShader::InstancedObjectUnlitShader()
@@ -915,7 +942,10 @@ namespace MeshShader
             GL_VERTEX_SHADER, "instanced_object_pass.vert",
             GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     ObjectRefPass2Shader::ObjectRefPass2Shader()
@@ -925,7 +955,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "objectref_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     GrassPass2Shader::GrassPass2Shader()
@@ -935,7 +969,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "grass_pass2.frag");
         assignUniforms("ModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "Albedo", 4, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedGrassPass2Shader::InstancedGrassPass2Shader()
@@ -946,7 +984,12 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
         assignUniforms("windDir", "SunDir");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "dtex", 4, "Albedo", 5, "SpecMap");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "dtex", ST_NEAREST_FILTERED,
+                                      4, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     SphereMapShader::SphereMapShader()
@@ -957,7 +1000,10 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedSphereMapShader::InstancedSphereMapShader()
@@ -969,7 +1015,10 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", 1, "SpecularMap", 2, "SSAO", 3, "tex");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                                      1, "SpecularMap", ST_NEAREST_FILTERED,
+                                      2, "SSAO", ST_BILINEAR_FILTERED,
+                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     SplattingShader::SplattingShader()
@@ -981,14 +1030,14 @@ namespace MeshShader
         assignUniforms("ModelMatrix");
 
         assignSamplerNames(m_program,
-            0, "DiffuseMap",
-            1, "SpecularMap",
-            2, "SSAO",
-            3, "tex_layout",
-            4, "tex_detail0",
-            5, "tex_detail1",
-            6, "tex_detail2",
-            7, "tex_detail3");
+            0, "DiffuseMap", ST_NEAREST_FILTERED,
+            1, "SpecularMap", ST_NEAREST_FILTERED,
+            2, "SSAO", ST_BILINEAR_FILTERED,
+            3, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+            4, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+            5, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+            6, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+            7, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
     }
 
     TransparentShader::TransparentShader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 5e076430d..5cfa8d68c 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -103,91 +103,124 @@ public:
     InstancedObjectRefPass1Shader();
 };
 
-class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader, core::vector3df>,
+                                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedGrassPass1Shader();
 };
 
-class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>, public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>,
+    public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedNormalMapShader();
 };
 
-class ObjectPass2Shader : public Shader<ObjectPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectPass2Shader : public Shader<ObjectPass2Shader, core::matrix4, core::matrix4>,
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                        ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     ObjectPass2Shader();
 };
 
-class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>,
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedObjectPass2Shader();
 };
 
-class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, 
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedObjectRefPass2Shader();
 };
 
-class DetailledObjectPass2Shader : public Shader<DetailledObjectPass2Shader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class DetailledObjectPass2Shader : public Shader<DetailledObjectPass2Shader, core::matrix4>, 
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                         ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                         ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     DetailledObjectPass2Shader();
 };
 
-class InstancedDetailledObjectPass2Shader : public Shader<InstancedDetailledObjectPass2Shader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedDetailledObjectPass2Shader : public Shader<InstancedDetailledObjectPass2Shader>,
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                          ST_TRILINEAR_ANISOTROPIC_FILTERED >
 {
 public:
     InstancedDetailledObjectPass2Shader();
 };
 
-class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, core::matrix4>,
+                          public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
+                                                ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED >
 {
 public:
     ObjectUnlitShader();
 };
 
-class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>,
+                                   public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
+                                                         ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedObjectUnlitShader();
 };
 
-class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4, core::matrix4>,
+                             public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                                                   ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     ObjectRefPass2Shader();
 };
 
-class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4, core::vector3df>,
+                         public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                                               ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     GrassPass2Shader();
 };
 
-class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader, core::vector3df, core::vector3df>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Nearest_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader, core::vector3df, core::vector3df>,
+                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                                                        ST_NEAREST_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED, 
+                                                        ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedGrassPass2Shader();
 };
 
-class SphereMapShader : public Shader<SphereMapShader, core::matrix4, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class SphereMapShader : public Shader<SphereMapShader, core::matrix4, core::matrix4>,
+                        public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
+                                              ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     SphereMapShader();
 };
 
-class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>,
+                                 public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
+                                                       ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedSphereMapShader();
 };
 
-class SplattingShader : public Shader<SplattingShader, core::matrix4>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+class SplattingShader : public Shader<SplattingShader, core::matrix4>, 
+                        public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+                                              ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                              ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     SplattingShader();
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index f32f4f10f..9dedb92cf 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -23,13 +23,15 @@
 TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
 { /* ST_NEAREST_FILTERED               */ &TextureReadBaseNew::bindTextureNearest,
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureReadBaseNew::bindTextureTrilinearAnisotropic,
-  /* ST_TRILINEAR_CUBEMAP              */ &TextureReadBaseNew::bindCubemapTrilinear
+  /* ST_TRILINEAR_CUBEMAP              */ &TextureReadBaseNew::bindCubemapTrilinear,
+  /* ST_BILINEAR_FILTERED              */ &TextureReadBaseNew::bindTextureBilinear
 };
 
 GLuint TextureReadBaseNew::m_all_texture_types[] = 
 { /* ST_NEAREST_FILTERED               */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ GL_TEXTURE_2D,
-  /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP };
+  /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP,
+  /* ST_BILINEAR_FILTERED              */ GL_TEXTURE_2D };
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
@@ -134,6 +136,8 @@ GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
         return createTrilinearSampler();
     case ST_TRILINEAR_CUBEMAP:
         return createTrilinearSampler();
+    case ST_BILINEAR_FILTERED:
+        return createBilinearSampler();
     default:
         assert(false);
         return 0;
@@ -174,6 +178,19 @@ GLuint TextureReadBaseNew::createTrilinearSampler()
 }   // createTrilinearSampler
 
 // ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createBilinearSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+#endif
+}   // createBilinearSampler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 2a5034c6f..65f369e08 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -28,10 +28,10 @@ enum SamplerTypeNew {
     ST_NEAREST_FILTERED = ST_MIN,
     ST_TRILINEAR_ANISOTROPIC_FILTERED,
     ST_TRILINEAR_CUBEMAP,
-    ST_MAX = ST_TRILINEAR_CUBEMAP,
+    ST_BILINEAR_FILTERED,
+    ST_MAX = ST_BILINEAR_FILTERED,
 
     ST_SEMI_TRILINEAR,
-    ST_BILINEAR_FILTERED,
     ST_BILINEAR_CLAMPED_FILTERED,
     ST_NEARED_CLAMPED_FILTERED,
     ST_SHADOW_SAMPLER,
@@ -59,6 +59,7 @@ private:
 
     static GLuint createNearestSampler();
     static GLuint createTrilinearSampler();
+    static GLuint createBilinearSampler();
 
 protected:
     static BindFunction m_all_bind_functions[];

From 5070531ad77e3a9b44fac040006beb45a534e980 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 08:02:56 +1000
Subject: [PATCH 169/331] Converted more shaders.

---
 src/graphics/shaders.cpp      |  90 ++++++++++++++--------
 src/graphics/shaders.hpp      | 107 ++++++++++++++++++--------
 src/graphics/texture_read.cpp | 137 ++++++++++++++++++++++++++++++++--
 src/graphics/texture_read.hpp |  26 ++++---
 4 files changed, 279 insertions(+), 81 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 7f60a1ae0..62a1a2575 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1046,7 +1046,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     TransparentFogShader::TransparentFogShader()
@@ -1054,8 +1054,9 @@ namespace MeshShader
         loadProgram(OBJECT,
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "transparentfog.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH", "endH", "start", "end", "col");
-        assignSamplerNames(m_program, 0, "tex");
+        assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH",
+                       "endH", "start", "end", "col");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     BillboardShader::BillboardShader()
@@ -1065,7 +1066,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "billboard.frag");
 
         assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     ColorizeShader::ColorizeShader()
@@ -1113,7 +1114,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedRSMShader::InstancedRSMShader()
@@ -1124,7 +1125,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "instanced_rsm.frag");
 
         assignUniforms("RSMMatrix");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     SplattingRSMShader::SplattingRSMShader()
@@ -1134,7 +1135,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "splatting_rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix");
-        assignSamplerNames(m_program, 0, "tex_layout", 1, "tex_detail0", 2, "tex_detail1", 3, "tex_detail2", 4, "tex_detail3");
+        assignSamplerNames(m_program, 0, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      1, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      2, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      3, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                      4, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
     }
 
     InstancedShadowShader::InstancedShadowShader()
@@ -1179,7 +1184,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedRefShadowShader::InstancedRefShadowShader()
@@ -1203,7 +1208,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     GrassShadowShader::GrassShadowShader()
@@ -1225,7 +1230,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedGrassShadowShader::InstancedGrassShadowShader()
@@ -1249,7 +1254,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
         assignUniforms("layer", "windDir");
     }
 
@@ -1270,10 +1275,10 @@ namespace MeshShader
         assignUniforms("ModelMatrix", "dir", "dir2");
 
         assignSamplerNames(m_program,
-            0, "displacement_tex",
-            1, "color_tex",
-            2, "mask_tex",
-            3, "tex");
+            0, "displacement_tex", ST_BILINEAR_FILTERED, 
+            1, "color_tex", ST_BILINEAR_FILTERED,
+            2, "mask_tex", ST_BILINEAR_FILTERED,
+            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     SkyboxShader::SkyboxShader()
@@ -1333,8 +1338,8 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlight.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex");
-
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED, 
+                                     1, "dtex", ST_NEAREST_FILTERED);
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
 
@@ -1370,7 +1375,7 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlightscatter.frag");
 
         assignUniforms("density", "fogcol");
-        assignSamplerNames(m_program, 0, "dtex");
+        assignSamplerNames(m_program, 0, "dtex", ST_NEAREST_FILTERED);
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -1427,7 +1432,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bloom.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
     }
 
     BloomBlendShader::BloomBlendShader()
@@ -1437,7 +1442,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bloomblend.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
+                                      1, "tex_256", ST_BILINEAR_FILTERED,
+                                      2, "tex_512", ST_BILINEAR_FILTERED);
     }
 	
 	LensBlendShader::LensBlendShader()
@@ -1447,7 +1454,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "lensblend.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex_128", 1, "tex_256", 2, "tex_512");
+        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
+                                      1, "tex_256", ST_BILINEAR_FILTERED,
+                                      2, "tex_512", ST_BILINEAR_FILTERED);
     }
 
     ToneMapShader::ToneMapShader()
@@ -1459,7 +1468,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "tonemap.frag");
         assignUniforms("vignette_weight");
 
-        assignSamplerNames(m_program, 0, "text");
+        assignSamplerNames(m_program, 0, "text", ST_NEAREST_FILTERED);
     }
 
     DepthOfFieldShader::DepthOfFieldShader()
@@ -1469,7 +1478,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "dof.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
     }
 
     SunLightShader::SunLightShader()
@@ -1483,7 +1493,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
             GL_FRAGMENT_SHADER, "sunlight.frag");
 
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex");
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
         assignUniforms("direction", "col");
     }
 
@@ -1512,7 +1523,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
             GL_FRAGMENT_SHADER, "degraded_ibl.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex");
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED);
     }
 
     ShadowedSunLightShaderPCF::ShadowedSunLightShaderPCF()
@@ -1527,7 +1538,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadow.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED,
+                                      8, "shadowtex", ST_SHADOW_SAMPLER);
         assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
     }
 
@@ -1543,7 +1556,10 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 8, "shadowtex");
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED,
+                                      8, "shadowtex", ST_TRILINEAR_CLAMPED_ARRAY2D);
+            
         assignUniforms("split0", "split1", "split2", "splitmax");
     }
 
@@ -1564,7 +1580,9 @@ namespace FullScreenShader
         }
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
-        assignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
+        assignSamplerNames(m_program, 0, "ctex", ST_BILINEAR_FILTERED,
+                                      1, "ntex", ST_BILINEAR_FILTERED,
+                                      2, "dtex", ST_BILINEAR_FILTERED);
     }
 
     NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
@@ -1576,7 +1594,9 @@ namespace FullScreenShader
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
 
-        assignSamplerNames(m_program, 0, "ctex", 1, "ntex", 2, "dtex");
+        assignSamplerNames(m_program, 0, "ctex", ST_BILINEAR_FILTERED,
+                                      1, "ntex", ST_BILINEAR_FILTERED,
+                                      2, "dtex", ST_BILINEAR_FILTERED);
     }
 
     RHDebug::RHDebug()
@@ -1600,7 +1620,11 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gi.frag");
 
         assignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        assignSamplerNames(m_program, 0, "ntex", 1, "dtex", 2, "SHR", 3, "SHG", 4, "SHB");
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED,
+                                      2, "SHR", ST_VOLUME_LINEAR_FILTERED,
+                                      3, "SHG", ST_VOLUME_LINEAR_FILTERED,
+                                      4, "SHB", ST_VOLUME_LINEAR_FILTERED);
     }
 
     Gaussian17TapHShader::Gaussian17TapHShader()
@@ -1609,7 +1633,8 @@ namespace FullScreenShader
             GL_VERTEX_SHADER, "screenquad.vert",
             GL_FRAGMENT_SHADER, "bilateralH.frag");
         assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "tex", 1, "depth");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                                      1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
@@ -1617,7 +1642,8 @@ namespace FullScreenShader
         loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
         TU_dest = 2;
         assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", 1, "depth");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
+                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 5cfa8d68c..2f6e50ffb 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -226,19 +226,24 @@ public:
     SplattingShader();
 };
 
-class TransparentShader : public Shader<TransparentShader, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class TransparentShader : public Shader<TransparentShader, core::matrix4, core::matrix4>,
+                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     TransparentShader();
 };
 
-class TransparentFogShader : public Shader<TransparentFogShader, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class TransparentFogShader : public Shader<TransparentFogShader, core::matrix4, core::matrix4, float, float, 
+                                           float, float, float, video::SColorf>,
+                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     TransparentFogShader();
 };
 
-class BillboardShader : public Shader<BillboardShader, core::matrix4, core::matrix4, core::vector3df, core::dimension2df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class BillboardShader : public Shader<BillboardShader, core::matrix4, core::matrix4,
+                                      core::vector3df, core::dimension2df>, 
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     BillboardShader();
@@ -257,56 +262,64 @@ public:
     InstancedColorizeShader();
 };
 
-class ShadowShader : public Shader<ShadowShader, int, core::matrix4>, public TextureRead<>
+class ShadowShader : public Shader<ShadowShader, int, core::matrix4>, public TextureReadNew<>
 {
 public:
     ShadowShader();
 };
 
-class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, core::matrix4>,
+                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     RSMShader();
 };
 
-class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>,
+                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedRSMShader();
 };
 
 class SplattingRSMShader : public Shader<SplattingRSMShader, core::matrix4, core::matrix4>,
-    public TextureRead<Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered, Trilinear_Anisotropic_Filtered>
+                           public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                                 ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                                 ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     SplattingRSMShader();
 };
 
-class InstancedShadowShader : public Shader<InstancedShadowShader, int>, public TextureRead<>
+class InstancedShadowShader : public Shader<InstancedShadowShader, int>, public TextureReadNew<>
 {
 public:
     InstancedShadowShader();
 };
 
-class RefShadowShader : public Shader<RefShadowShader, int, core::matrix4>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class RefShadowShader : public Shader<RefShadowShader, int, core::matrix4>,
+                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public Shader<InstancedRefShadowShader, int>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedRefShadowShader : public Shader<InstancedRefShadowShader, int>,
+                                 public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedRefShadowShader();
 };
 
-class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4, core::vector3df>,
+                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     GrassShadowShader();
 };
 
-class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader, int, core::vector3df>, public TextureRead<Trilinear_Anisotropic_Filtered>
+class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader, int, core::vector3df>,
+                                   public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     InstancedGrassShadowShader();
@@ -318,13 +331,16 @@ public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public Shader<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered, Trilinear_Anisotropic_Filtered>
+class DisplaceShader : public Shader<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>,
+                       public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
+                                             ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
     DisplaceShader();
 };
 
-class SkyboxShader : public Shader<SkyboxShader>, public TextureReadNew<ST_TRILINEAR_CUBEMAP>
+class SkyboxShader : public Shader<SkyboxShader>,
+                     public TextureReadNew<ST_TRILINEAR_CUBEMAP>
 {
 public:
     SkyboxShader();
@@ -364,7 +380,8 @@ namespace LightShader
     };
 
 
-    class PointLightShader : public Shader<PointLightShader>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+    class PointLightShader : public Shader<PointLightShader>,
+                             public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
     {
     public:
         GLuint vbo;
@@ -372,7 +389,8 @@ namespace LightShader
         PointLightShader();
     };
 
-    class PointLightScatterShader : public Shader<PointLightScatterShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
+    class PointLightScatterShader : public Shader<PointLightScatterShader, float, core::vector3df>,
+                                     public TextureReadNew<ST_NEAREST_FILTERED>
     {
     public:
         GLuint vbo;
@@ -394,39 +412,47 @@ static void DrawFullScreenEffect(Args...args)
 namespace FullScreenShader
 {
 
-class BloomShader : public Shader<BloomShader>, public TextureRead<Nearest_Filtered>
+class BloomShader : public Shader<BloomShader>,
+                    public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
     BloomShader();
 };
 
-class BloomBlendShader : public Shader<BloomBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class BloomBlendShader : public Shader<BloomBlendShader>,
+                         public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
+                                               ST_BILINEAR_FILTERED>
 {
 public:
     BloomBlendShader();
 };
 
-class LensBlendShader : public Shader<LensBlendShader>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class LensBlendShader : public Shader<LensBlendShader>, 
+                        public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
+                                              ST_BILINEAR_FILTERED>
 {
 public:
     LensBlendShader();
 };
 
 
-class ToneMapShader : public Shader<ToneMapShader, float>, public TextureRead<Nearest_Filtered>
+class ToneMapShader : public Shader<ToneMapShader, float>,
+                      public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
 
     ToneMapShader();
 };
 
-class DepthOfFieldShader : public Shader<DepthOfFieldShader>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
+class DepthOfFieldShader : public Shader<DepthOfFieldShader>,
+                           public TextureReadNew<ST_BILINEAR_FILTERED, ST_NEAREST_FILTERED>
 {
 public:
     DepthOfFieldShader();
 };
 
-class SunLightShader : public Shader<SunLightShader, core::vector3df, video::SColorf>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+class SunLightShader : public Shader<SunLightShader, core::vector3df, video::SColorf>,
+                       public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
 {
 public:
     SunLightShader();
@@ -439,32 +465,43 @@ public:
     IBLShader();
 };
 
-class DegradedIBLShader : public Shader<DegradedIBLShader>, public TextureRead<Nearest_Filtered>
+class DegradedIBLShader : public Shader<DegradedIBLShader>,
+                          public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
     DegradedIBLShader();
 };
 
-class ShadowedSunLightShaderPCF : public Shader<ShadowedSunLightShaderPCF, float, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Shadow_Sampler>
+class ShadowedSunLightShaderPCF : public Shader<ShadowedSunLightShaderPCF, float, float, float, float, float>,
+                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_SHADOW_SAMPLER>
 {
 public:
     ShadowedSunLightShaderPCF();
 };
 
-class ShadowedSunLightShaderESM : public Shader<ShadowedSunLightShaderESM, float, float, float, float>, public TextureRead<Nearest_Filtered, Nearest_Filtered, Trilinear_Clamped_Array2D>
+class ShadowedSunLightShaderESM : public Shader<ShadowedSunLightShaderESM, float, float, float, float>,
+                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
+                                                        ST_TRILINEAR_CLAMPED_ARRAY2D>
 {
 public:
     ShadowedSunLightShaderESM();
 };
 
-class RadianceHintsConstructionShader : public Shader<RadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class RadianceHintsConstructionShader : public Shader<RadianceHintsConstructionShader, core::matrix4, 
+                                                      core::matrix4, core::vector3df, video::SColorf>,
+                                        public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED>
 {
 public:
     RadianceHintsConstructionShader();
 };
 
 // Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public Shader<NVWorkaroundRadianceHintsConstructionShader, core::matrix4, core::matrix4, core::vector3df, int, video::SColorf>, public TextureRead<Bilinear_Filtered, Bilinear_Filtered, Bilinear_Filtered>
+class NVWorkaroundRadianceHintsConstructionShader : public Shader<NVWorkaroundRadianceHintsConstructionShader,
+                                                                   core::matrix4, core::matrix4, core::vector3df,
+                                                                   int, video::SColorf>,
+                                                    public TextureReadNew<ST_BILINEAR_FILTERED,
+                                                                          ST_BILINEAR_FILTERED,
+                                                                          ST_BILINEAR_FILTERED>
 {
 public:
     NVWorkaroundRadianceHintsConstructionShader();
@@ -478,20 +515,28 @@ public:
     RHDebug();
 };
 
-class GlobalIlluminationReconstructionShader : public Shader<GlobalIlluminationReconstructionShader, core::matrix4, core::matrix4, core::vector3df>,
-    public TextureRead<Nearest_Filtered, Nearest_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered, Volume_Linear_Filtered>
+class GlobalIlluminationReconstructionShader : public Shader<GlobalIlluminationReconstructionShader,
+                                                             core::matrix4, core::matrix4, core::vector3df>,
+                                               public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
+                                                                     ST_VOLUME_LINEAR_FILTERED,
+                                                                     ST_VOLUME_LINEAR_FILTERED,
+                                                                     ST_VOLUME_LINEAR_FILTERED>
 {
 public:
     GlobalIlluminationReconstructionShader();
 };
 
-class Gaussian17TapHShader : public Shader<Gaussian17TapHShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
+class Gaussian17TapHShader : public Shader<Gaussian17TapHShader, core::vector2df>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
+                                                   ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian17TapHShader();
 };
 
-class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
+class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader, core::vector2df>,
+                                    public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
+                                                          ST_NEARED_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index 9dedb92cf..9fb2eaf35 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -24,14 +24,25 @@ TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
 { /* ST_NEAREST_FILTERED               */ &TextureReadBaseNew::bindTextureNearest,
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureReadBaseNew::bindTextureTrilinearAnisotropic,
   /* ST_TRILINEAR_CUBEMAP              */ &TextureReadBaseNew::bindCubemapTrilinear,
-  /* ST_BILINEAR_FILTERED              */ &TextureReadBaseNew::bindTextureBilinear
+  /* ST_BILINEAR_FILTERED              */ &TextureReadBaseNew::bindTextureBilinear,
+  /* ST_SHADOW_SAMPLER                 */ &TextureReadBaseNew::bindTextureShadow,
+  /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ &TextureReadBaseNew::bindTrilinearClampedArrayTexture,
+  /* ST_VOLUME_LINEAR_FILTERED         */ &TextureReadBaseNew::bindTextureVolume,
+  /* ST_NEARED_CLAMPED_FILTERED        */ &TextureReadBaseNew::bindTextureNearestClamped,
+  /* ST_BILINEAR_CLAMPED_FILTERED      */ &TextureReadBaseNew::bindTextureBilinearClamped,
 };
 
 GLuint TextureReadBaseNew::m_all_texture_types[] = 
 { /* ST_NEAREST_FILTERED               */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP,
-  /* ST_BILINEAR_FILTERED              */ GL_TEXTURE_2D };
+  /* ST_BILINEAR_FILTERED              */ GL_TEXTURE_2D ,
+  /* ST_SHADOW_SAMPLER                 */ GL_TEXTURE_2D_ARRAY,
+  /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ GL_TEXTURE_2D_ARRAY,
+  /* ST_VOLUME_LINEAR_FILTERED         */ GL_TEXTURE_3D,
+  /* ST_NEARED_CLAMPED_FILTERED        */ GL_TEXTURE_2D,
+  /* ST_BILINEAR_CLAMPED_FILTERED      */ GL_TEXTURE_2D,
+};
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
@@ -43,6 +54,7 @@ void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+
 }   // bindTextureNearest
 
 // ----------------------------------------------------------------------------
@@ -78,7 +90,7 @@ void TextureReadBaseNew::bindCubemapTrilinear(unsigned tex_unit, unsigned tex)
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
-    GLuint tex_id)
+                                                   GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex_id);
@@ -87,7 +99,9 @@ void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}   // bindTextureNearesClamped
+}   // bindTextureNearestClamped
+
+// ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 void TextureReadBaseNew::bindTextureBilinear(GLuint texture_unit, GLuint tex)
@@ -114,10 +128,10 @@ void TextureReadBaseNew::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 }   // bindTextureBilinearClamped
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
+void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
-    glBindTexture(GL_TEXTURE_2D, tex);
+    glBindTexture(GL_TEXTURE_2D, tex_id);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -125,6 +139,47 @@ void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
 }   // bindTextureSemiTrilinear
 
+// ----------------------------------------------------------------------------
+void TextureReadBaseNew::bindTextureShadow(GLuint tex_unit, GLuint tex_id)
+{
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex_id);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+}   // bindTextureShadow
+
+// ----------------------------------------------------------------------------
+void TextureReadBaseNew::bindTrilinearClampedArrayTexture(unsigned tex_unit,
+                                                          unsigned tex_id)
+{
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex_id);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+}   // bindTrilinearClampedArrayTexture
+
+// ----------------------------------------------------------------------------
+void TextureReadBaseNew::bindTextureVolume(unsigned tex_unit, unsigned tex_id)
+{
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
+    glBindTexture(GL_TEXTURE_3D, tex_id);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+}   // bindTextureVolume
+
 // ----------------------------------------------------------------------------
 GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
 {
@@ -138,6 +193,26 @@ GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
         return createTrilinearSampler();
     case ST_BILINEAR_FILTERED:
         return createBilinearSampler();
+    case ST_SHADOW_SAMPLER:
+        return createShadowSampler();
+    case ST_TRILINEAR_CLAMPED_ARRAY2D:
+        return createTrilinearClampedArray();
+    case ST_VOLUME_LINEAR_FILTERED:
+        return createBilinearSampler();
+    case ST_NEARED_CLAMPED_FILTERED:
+    {
+        // WHAT'S THAT??????????????????
+        unsigned id;
+        glGenSamplers(1, &id);
+        glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+        return createNearestSampler();
+    }
+    case ST_BILINEAR_CLAMPED_FILTERED:
+        return createBilinearClampedSampler();
     default:
         assert(false);
         return 0;
@@ -192,8 +267,54 @@ GLuint TextureReadBaseNew::createBilinearSampler()
 #endif
 }   // createBilinearSampler
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createShadowSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+    glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+    return id;
+#endif
+}   // createShadowSampler
+
+// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createBilinearClampedSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+#endif
+}   // createBilinearClampedSampler
+
+
+// ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createTrilinearClampedArray()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    int aniso = UserConfigParams::m_anisotropic;
+    if (aniso == 0) aniso = 1;
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
+    return id;
+#endif
+}   // createTrilinearClampedArray
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 65f369e08..619d0ba22 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -29,14 +29,15 @@ enum SamplerTypeNew {
     ST_TRILINEAR_ANISOTROPIC_FILTERED,
     ST_TRILINEAR_CUBEMAP,
     ST_BILINEAR_FILTERED,
-    ST_MAX = ST_BILINEAR_FILTERED,
-
-    ST_SEMI_TRILINEAR,
-    ST_BILINEAR_CLAMPED_FILTERED,
-    ST_NEARED_CLAMPED_FILTERED,
     ST_SHADOW_SAMPLER,
+    ST_TRILINEAR_CLAMPED_ARRAY2D,
     ST_VOLUME_LINEAR_FILTERED,
-    ST_TRILINEAR_CLAMPED_ARRAY2D
+    ST_NEARED_CLAMPED_FILTERED,
+    ST_BILINEAR_CLAMPED_FILTERED,
+    ST_MAX = ST_BILINEAR_CLAMPED_FILTERED,
+
+    XST_SEMI_TRILINEAR,
+    XST_TRILINEAR_CLAMPED_ARRAY2D
 };
 
 
@@ -47,19 +48,24 @@ public:
 
 protected:
     static void   bindTextureNearest(GLuint tex_unit, GLuint tex_id);
-    static void   bindTextureBilinear(GLuint texture_unit, GLuint tex);
-    static void   bindTextureBilinearClamped(GLuint tex_unit, GLuint tex);
+    static void   bindTextureBilinear(GLuint texture_unit, GLuint tex_id);
+    static void   bindTextureBilinearClamped(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureNearestClamped(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
-    static void   bindCubemapTrilinear(unsigned tex_unit, unsigned tex);
-
+    static void   bindCubemapTrilinear(unsigned tex_unit, unsigned tex_id);
+    static void   bindTextureShadow(unsigned tex_unit, unsigned tex_id);
+    static void   bindTrilinearClampedArrayTexture(unsigned tex_unit, unsigned tex_id);
+    static void   bindTextureVolume(unsigned tex_unit, unsigned tex_id);
     GLuint        createSamplers(SamplerTypeNew sampler_type);
 private:
 
     static GLuint createNearestSampler();
     static GLuint createTrilinearSampler();
     static GLuint createBilinearSampler();
+    static GLuint createShadowSampler();
+    static GLuint createTrilinearClampedArray();
+    static GLuint createBilinearClampedSampler();
 
 protected:
     static BindFunction m_all_bind_functions[];

From a16bbf71a4cc98b669de60ea93e80c5845fcbc8e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 08:30:51 +1000
Subject: [PATCH 170/331] Converted remaining shaders.

---
 src/graphics/shaders.cpp      | 61 ++++++++++++----------
 src/graphics/shaders.hpp      | 96 ++++++++++++++++++++++++-----------
 src/graphics/texture_read.cpp | 19 +++++++
 src/graphics/texture_read.hpp | 19 ++++---
 4 files changed, 128 insertions(+), 67 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 62a1a2575..243f04969 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1653,7 +1653,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "gaussian6h.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source", ST_BILINEAR_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1663,7 +1663,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "blurshadowH.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1674,7 +1674,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel", "sigma");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 	
 	HorizontalBlurShader::HorizontalBlurShader()
@@ -1684,7 +1684,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     Gaussian3HBlurShader::Gaussian3HBlurShader()
@@ -1694,7 +1694,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian3h.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     Gaussian17TapVShader::Gaussian17TapVShader()
@@ -1704,7 +1704,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "bilateralV.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex", 1, "depth");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                                      1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
@@ -1713,7 +1714,8 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "bilateralV.comp");
         TU_dest = 2;
         assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", 1, "depth");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
+                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1723,7 +1725,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "gaussian6v.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source", ST_BILINEAR_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1733,7 +1735,7 @@ namespace FullScreenShader
             GL_COMPUTE_SHADER, "blurshadowV.comp");
         TU_dest = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(TU_dest, "dest");
     }
 
@@ -1744,7 +1746,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6v.frag");
         assignUniforms("pixel", "sigma");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     Gaussian3VBlurShader::Gaussian3VBlurShader()
@@ -1754,7 +1756,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian3v.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     PassThroughShader::PassThroughShader()
@@ -1764,7 +1766,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "passthrough.frag");
 
         assignUniforms("width", "height");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     LayerPassThroughShader::LayerPassThroughShader()
@@ -1785,7 +1787,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "linearizedepth.frag");
         assignUniforms("zn", "zf");
 
-        assignSamplerNames(m_program, 0, "texture");
+        assignSamplerNames(m_program, 0, "texture", ST_BILINEAR_FILTERED);
     }
 
 
@@ -1794,7 +1796,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(m_program, 0, "depth");
+        assignSamplerNames(m_program, 0, "depth", ST_NEAREST_FILTERED);
         assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
         glShaderStorageBlockBinding(m_program, block_idx, 2);
@@ -1816,7 +1818,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "depthhistogram.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(m_program, 0, "depth");
+        assignSamplerNames(m_program, 0, "depth", ST_NEAREST_FILTERED);
 
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "Histogram");
         glShaderStorageBlockBinding(m_program, block_idx, 1);
@@ -1829,7 +1831,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "glow.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
         vao = createVAO(m_program);
     }
 
@@ -1842,7 +1844,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "ssao.frag");
 
         assignUniforms("radius", "k", "sigma");
-        assignSamplerNames(m_program, 0, "dtex");
+        assignSamplerNames(m_program, 0, "dtex", ST_SEMI_TRILINEAR);
     }
 
     FogShader::FogShader()
@@ -1853,7 +1855,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "fog.frag");
 
         assignUniforms("density", "col");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
     }
 
     MotionBlurShader::MotionBlurShader()
@@ -1863,7 +1865,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "motion_blur.frag");
         assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        assignSamplerNames(m_program, 0, "color_buffer", 1, "dtex");
+        assignSamplerNames(m_program, 0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
     }
 
     GodFadeShader::GodFadeShader()
@@ -1873,7 +1876,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godfade.frag");
         assignUniforms("col");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     GodRayShader::GodRayShader()
@@ -1883,7 +1886,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godray.frag");
 
         assignUniforms("sunpos");
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
@@ -1893,7 +1896,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_color1.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "colorMapG");
+        assignSamplerNames(m_program, 0, "colorMapG", ST_NEAREST_FILTERED);
     }
 
     MLAABlendWeightSHader::MLAABlendWeightSHader()
@@ -1903,7 +1906,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "edgesMap", 1, "areaMap");
+        assignSamplerNames(m_program, 0, "edgesMap", ST_BILINEAR_FILTERED,
+                                      1, "areaMap", ST_NEAREST_FILTERED);
     }
 
     MLAAGatherSHader::MLAAGatherSHader()
@@ -1913,7 +1917,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "blendMap", 1, "colorMap");
+        assignSamplerNames(m_program, 0, "blendMap", ST_NEAREST_FILTERED,
+                                      1, "colorMap", ST_NEAREST_FILTERED);
     }
 }
 
@@ -1926,7 +1931,7 @@ namespace UIShader
             GL_VERTEX_SHADER, "primitive2dlist.vert",
             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     TextureRectShader::TextureRectShader()
@@ -1936,7 +1941,7 @@ namespace UIShader
             GL_FRAGMENT_SHADER, "texturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     UniformColoredTextureRectShader::UniformColoredTextureRectShader()
@@ -1947,7 +1952,7 @@ namespace UIShader
 
         assignUniforms("center", "size", "texcenter", "texsize", "color");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
     ColoredTextureRectShader::ColoredTextureRectShader()
@@ -1957,7 +1962,7 @@ namespace UIShader
             GL_FRAGMENT_SHADER, "colortexturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        assignSamplerNames(m_program, 0, "tex");
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 2f6e50ffb..6b185e1e1 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -543,45 +543,52 @@ public:
     ComputeGaussian17TapHShader();
 };
 
-class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
+class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader, core::vector2df, std::vector<float> >,
+                                    public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
     ComputeGaussian6HBlurShader();
 };
 
-class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
+class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader, core::vector2df, std::vector<float> >,
+                                public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
     ComputeShadowBlurHShader();
 };
 
-class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader, core::vector2df, float>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian6HBlurShader();
 };
 
-class HorizontalBlurShader : public Shader<HorizontalBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class HorizontalBlurShader : public Shader<HorizontalBlurShader, core::vector2df>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     HorizontalBlurShader();
 };
 
-class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader, core::vector2df>,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian3HBlurShader();
 };
 
-class Gaussian17TapVShader : public Shader<Gaussian17TapVShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered, Bilinear_Clamped_Filtered>
+class Gaussian17TapVShader : public Shader<Gaussian17TapVShader, core::vector2df>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED, ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian17TapVShader();
 };
 
-class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, core::vector2df>, public TextureRead<Neared_Clamped_Filtered, Neared_Clamped_Filtered>
+class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, core::vector2df>,
+                                    public TextureReadNew<ST_NEARED_CLAMPED_FILTERED, ST_NEARED_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
@@ -589,33 +596,38 @@ public:
     ComputeGaussian17TapVShader();
 };
 
-class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader, core::vector2df, std::vector<float> >, public TextureRead<Bilinear_Clamped_Filtered>
+class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader, core::vector2df, std::vector<float> >,
+                                    public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
     ComputeGaussian6VBlurShader();
 };
 
-class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader, core::vector2df, std::vector<float> >, public TextureRead<Neared_Clamped_Filtered>
+class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader, core::vector2df, std::vector<float> >,
+                                 public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
 {
 public:
     GLuint TU_dest;
     ComputeShadowBlurVShader();
 };
 
-class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader, core::vector2df, float>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader, core::vector2df, float>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian6VBlurShader();
 };
 
-class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader, core::vector2df>, public TextureRead<Bilinear_Clamped_Filtered>
+class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader, core::vector2df>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
 public:
     Gaussian3VBlurShader();
 };
 
-class PassThroughShader : public Shader<PassThroughShader, int, int>, public TextureRead<Bilinear_Filtered>
+class PassThroughShader : public Shader<PassThroughShader, int, int>,
+                          public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     PassThroughShader();
@@ -630,13 +642,17 @@ public:
     LayerPassThroughShader();
 };
 
-class LinearizeDepthShader : public Shader<LinearizeDepthShader, float, float>, public TextureRead<Bilinear_Filtered>
+class LinearizeDepthShader : public Shader<LinearizeDepthShader, float, float>,
+                             public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     LinearizeDepthShader();
 };
 
-class LightspaceBoundingBoxShader : public Shader<LightspaceBoundingBoxShader, core::matrix4, float, float, float, float>, public TextureRead < Nearest_Filtered >
+class LightspaceBoundingBoxShader : public Shader<LightspaceBoundingBoxShader, 
+                                                  core::matrix4, float, float,
+                                                  float, float>,
+                                    public TextureReadNew<ST_NEAREST_FILTERED >
 {
 public:
     LightspaceBoundingBoxShader();
@@ -648,13 +664,15 @@ public:
     ShadowMatrixesGenerationShader();
 };
 
-class DepthHistogramShader : public Shader<DepthHistogramShader>, public TextureRead <Nearest_Filtered>
+class DepthHistogramShader : public Shader<DepthHistogramShader>, 
+                             public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
     DepthHistogramShader();
 };
 
-class GlowShader : public Shader<GlowShader>, public TextureRead<Bilinear_Filtered>
+class GlowShader : public Shader<GlowShader>,
+                   public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     GLuint vao;
@@ -662,49 +680,57 @@ public:
     GlowShader();
 };
 
-class SSAOShader : public Shader<SSAOShader, float, float, float>, public TextureRead<Semi_trilinear>
+class SSAOShader : public Shader<SSAOShader, float, float, float>,
+                   public TextureReadNew<ST_SEMI_TRILINEAR>
 {
 public:
     SSAOShader();
 };
 
-class FogShader : public Shader<FogShader, float, core::vector3df>, public TextureRead<Nearest_Filtered>
+class FogShader : public Shader<FogShader, float, core::vector3df>,
+                  public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
     FogShader();
 };
 
-class MotionBlurShader : public Shader<MotionBlurShader, core::matrix4, core::vector2df, float, float>, public TextureRead<Bilinear_Clamped_Filtered, Nearest_Filtered>
+class MotionBlurShader : public Shader<MotionBlurShader, core::matrix4, core::vector2df, float, float>,
+                         public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED, ST_NEAREST_FILTERED>
 {
 public:
     MotionBlurShader();
 };
 
-class GodFadeShader : public Shader<GodFadeShader, video::SColorf>, public TextureRead<Bilinear_Filtered>
+class GodFadeShader : public Shader<GodFadeShader, video::SColorf>,
+                      public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     GodFadeShader();
 };
 
-class GodRayShader : public Shader<GodRayShader, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class GodRayShader : public Shader<GodRayShader, core::vector2df>,
+                     public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     GodRayShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public Shader<MLAAColorEdgeDetectionSHader, core::vector2df>, public TextureRead<Nearest_Filtered>
+class MLAAColorEdgeDetectionSHader : public Shader<MLAAColorEdgeDetectionSHader, core::vector2df>,
+                                    public TextureReadNew<ST_NEAREST_FILTERED>
 {
 public:
     MLAAColorEdgeDetectionSHader();
 };
 
-class MLAABlendWeightSHader : public Shader<MLAABlendWeightSHader, core::vector2df>, public TextureRead<Bilinear_Filtered, Nearest_Filtered>
+class MLAABlendWeightSHader : public Shader<MLAABlendWeightSHader, core::vector2df>,
+                              public TextureReadNew<ST_BILINEAR_FILTERED, ST_NEAREST_FILTERED>
 {
 public:
     MLAABlendWeightSHader();
 };
 
-class MLAAGatherSHader : public Shader<MLAAGatherSHader, core::vector2df>, public TextureRead<Nearest_Filtered, Nearest_Filtered>
+class MLAAGatherSHader : public Shader<MLAAGatherSHader, core::vector2df>,
+                         public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
 {
 public:
     MLAAGatherSHader();
@@ -715,25 +741,36 @@ public:
 namespace UIShader
 {
 
-class Primitive2DList : public Shader<Primitive2DList>, public TextureRead < Bilinear_Filtered >
+class Primitive2DList : public Shader<Primitive2DList>,
+                        public TextureReadNew<ST_BILINEAR_FILTERED >
 {
 public:
     Primitive2DList();
 };
 
-class TextureRectShader : public Shader<TextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
+                                        core::vector2df, core::vector2df,
+                                        core::vector2df>,
+                          public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     TextureRectShader();
 };
 
-class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df, video::SColor>, public TextureRead<Bilinear_Filtered>
+class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader,
+                                                      core::vector2df, core::vector2df,
+                                                      core::vector2df, core::vector2df,
+                                                      video::SColor>,
+                                        public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     UniformColoredTextureRectShader();
 };
 
-class ColoredTextureRectShader : public Shader<ColoredTextureRectShader, core::vector2df, core::vector2df, core::vector2df, core::vector2df>, public TextureRead<Bilinear_Filtered>
+class ColoredTextureRectShader : public Shader<ColoredTextureRectShader, core::vector2df, 
+                                               core::vector2df, core::vector2df,
+                                               core::vector2df>,
+                                 public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 public:
     GLuint colorvbo;
@@ -742,7 +779,8 @@ public:
     ColoredTextureRectShader();
 };
 
-class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df, core::vector2df, video::SColor>
+class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
+                                        core::vector2df, video::SColor>
 {
 public:
     ColoredRectShader();
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index 9fb2eaf35..f0b692da7 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -30,6 +30,7 @@ TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
   /* ST_VOLUME_LINEAR_FILTERED         */ &TextureReadBaseNew::bindTextureVolume,
   /* ST_NEARED_CLAMPED_FILTERED        */ &TextureReadBaseNew::bindTextureNearestClamped,
   /* ST_BILINEAR_CLAMPED_FILTERED      */ &TextureReadBaseNew::bindTextureBilinearClamped,
+  /* ST_SEMI_TRILINEAR                 */ &TextureReadBaseNew::bindTextureSemiTrilinear
 };
 
 GLuint TextureReadBaseNew::m_all_texture_types[] = 
@@ -42,6 +43,7 @@ GLuint TextureReadBaseNew::m_all_texture_types[] =
   /* ST_VOLUME_LINEAR_FILTERED         */ GL_TEXTURE_3D,
   /* ST_NEARED_CLAMPED_FILTERED        */ GL_TEXTURE_2D,
   /* ST_BILINEAR_CLAMPED_FILTERED      */ GL_TEXTURE_2D,
+  /* ST_SEMI_TRILINEAR                 */ GL_TEXTURE_2D
 };
 
 // ----------------------------------------------------------------------------
@@ -181,6 +183,7 @@ void TextureReadBaseNew::bindTextureVolume(unsigned tex_unit, unsigned tex_id)
 }   // bindTextureVolume
 
 // ----------------------------------------------------------------------------
+
 GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
 {
     switch (sampler_type)
@@ -213,6 +216,8 @@ GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
     }
     case ST_BILINEAR_CLAMPED_FILTERED:
         return createBilinearClampedSampler();
+    case ST_SEMI_TRILINEAR:
+        return createSemiTrilinearSampler();
     default:
         assert(false);
         return 0;
@@ -316,6 +321,20 @@ GLuint TextureReadBaseNew::createTrilinearClampedArray()
 #endif
 }   // createTrilinearClampedArray
 // ----------------------------------------------------------------------------
+GLuint TextureReadBaseNew::createSemiTrilinearSampler()
+{
+#ifdef GL_VERSION_3_3
+    unsigned id;
+    glGenSamplers(1, &id);
+    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
+    return id;
+#endif
+}
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 619d0ba22..93eee1c48 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -34,17 +34,15 @@ enum SamplerTypeNew {
     ST_VOLUME_LINEAR_FILTERED,
     ST_NEARED_CLAMPED_FILTERED,
     ST_BILINEAR_CLAMPED_FILTERED,
-    ST_MAX = ST_BILINEAR_CLAMPED_FILTERED,
-
-    XST_SEMI_TRILINEAR,
-    XST_TRILINEAR_CLAMPED_ARRAY2D
+    ST_SEMI_TRILINEAR,
+    ST_MAX = ST_SEMI_TRILINEAR
 };
 
 
 class TextureReadBaseNew
 {
 public:
-    typedef  std::function<void(unsigned, unsigned)> BindFunction;
+    typedef  std::function<void(GLuint, GLuint)> BindFunction;
 
 protected:
     static void   bindTextureNearest(GLuint tex_unit, GLuint tex_id);
@@ -53,10 +51,11 @@ protected:
     static void   bindTextureNearestClamped(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
-    static void   bindCubemapTrilinear(unsigned tex_unit, unsigned tex_id);
-    static void   bindTextureShadow(unsigned tex_unit, unsigned tex_id);
-    static void   bindTrilinearClampedArrayTexture(unsigned tex_unit, unsigned tex_id);
-    static void   bindTextureVolume(unsigned tex_unit, unsigned tex_id);
+    static void   bindCubemapTrilinear(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureShadow(GLuint tex_unit, GLuint tex_id);
+    static void   bindTrilinearClampedArrayTexture(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureVolume(GLuint tex_unit, GLuint tex_id);
+    
     GLuint        createSamplers(SamplerTypeNew sampler_type);
 private:
 
@@ -66,7 +65,7 @@ private:
     static GLuint createShadowSampler();
     static GLuint createTrilinearClampedArray();
     static GLuint createBilinearClampedSampler();
-
+    static GLuint createSemiTrilinearSampler();
 protected:
     static BindFunction m_all_bind_functions[];
     std::vector<BindFunction> m_bind_functions;

From 310a58541d45cd353b58173277715f6051a9e35a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 13:21:08 +1000
Subject: [PATCH 171/331] Cleanup, part 1 - shaders_util is gone :)

---
 src/graphics/gpuparticles.cpp |   1 -
 src/graphics/shaders.cpp      | 211 ----------------------
 src/graphics/shaders.hpp      |   1 -
 src/graphics/shaders_util.hpp | 322 ----------------------------------
 src/graphics/texture_read.cpp |   3 +-
 src/graphics/texture_read.hpp | 177 ++-----------------
 6 files changed, 14 insertions(+), 701 deletions(-)
 delete mode 100644 src/graphics/shaders_util.hpp

diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index f1570e58a..ad8f753d8 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -17,7 +17,6 @@
 
 #include "graphics/irr_driver.hpp"
 #include "graphics/glwrap.hpp"
-#include "graphics/shaders_util.hpp"
 #include "gpuparticles.hpp"
 #include "io/file_manager.hpp"
 #include "config/user_config.hpp"
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 243f04969..d91add179 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -97,7 +97,6 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/gpuparticles.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/shaders_util.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 #include "graphics/glwrap.hpp"
@@ -521,218 +520,8 @@ namespace UtilShader
 using namespace UtilShader;
 
 
-void setTextureSampler(GLenum tp, GLuint texunit, GLuint tid, GLuint sid)
-{
-#ifdef GL_VERSION_3_3
-    glActiveTexture(GL_TEXTURE0 + texunit);
-    glBindTexture(tp, tid);
-    glBindSampler(texunit, sid);
-#endif
-}
 
 
-GLuint createNearestSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-    return id;
-#endif
-}
-
-void BindTextureNearest(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}
-
-GLuint createBilinearSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-    return id;
-#endif
-}
-
-void BindTextureBilinear(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}
-
-GLuint createBilinearClampedSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-    return id;
-#endif
-}
-
-void BindTextureBilinearClamped(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}
-
-GLuint createSemiTrilinearSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-    return id;
-#endif
-}
-
-void BindTextureSemiTrilinear(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}
-
-GLuint createTrilinearSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-    int aniso = UserConfigParams::m_anisotropic;
-    if (aniso == 0) aniso = 1;
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
-    return id;
-#endif
-}
-
-void BindTextureTrilinearAnisotropic(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-    int aniso = UserConfigParams::m_anisotropic;
-    if (aniso == 0) aniso = 1;
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
-}
-
-
-GLuint createShadowSampler()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glSamplerParameterf(id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
-    glSamplerParameterf(id, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
-    return id;
-#endif
-}
-
-void BindTextureShadow(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
-    glTexParameterf(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
-}
-
-
-GLuint createTrilinearClampedArray()
-{
-#ifdef GL_VERSION_3_3
-    unsigned id;
-    glGenSamplers(1, &id);
-    glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    int aniso = UserConfigParams::m_anisotropic;
-    if (aniso == 0) aniso = 1;
-    glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
-    return id;
-#endif
-}
-
-void BindTrilinearClampedArrayTexture(unsigned TU, unsigned tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    int aniso = UserConfigParams::m_anisotropic;
-    if (aniso == 0) aniso = 1;
-    glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)aniso);
-}
-
-void BindTextureVolume(GLuint TU, GLuint tex)
-{
-    glActiveTexture(GL_TEXTURE0 + TU);
-    glBindTexture(GL_TEXTURE_3D, tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-}
-
 unsigned getGLSLVersion()
 {
     return CVS->getGLSLVersion();
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 6b185e1e1..d97699e89 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -20,7 +20,6 @@
 
 #include "config/user_config.hpp"
 #include "graphics/shader.hpp"
-#include "graphics/shaders_util.hpp"
 #include "graphics/texture_read.hpp"
 
 #include <IMeshSceneNode.h>
diff --git a/src/graphics/shaders_util.hpp b/src/graphics/shaders_util.hpp
deleted file mode 100644
index 2c654cf19..000000000
--- a/src/graphics/shaders_util.hpp
+++ /dev/null
@@ -1,322 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef SHADERS_UTIL_HPP
-#define SHADERS_UTIL_HPP
-
-#include "graphics/central_settings.hpp"
-#include "utils/singleton.hpp"
-#include <vector>
-#include <matrix4.h>
-#include <SColor.h>
-#include <vector3d.h>
-#include "gl_headers.hpp"
-
-bool needsUBO();
-
-unsigned getGLSLVersion();
-
-
-enum AttributeType
-{
-    OBJECT,
-    PARTICLES_SIM,
-    PARTICLES_RENDERING,
-};
-
-void setAttribute(AttributeType Tp, GLuint ProgramID);
-
-void bypassUBO(GLuint Program);
-
-enum SamplerType {
-    Trilinear_Anisotropic_Filtered,
-    Semi_trilinear,
-    Bilinear_Filtered,
-    Bilinear_Clamped_Filtered,
-    Neared_Clamped_Filtered,
-    Nearest_Filtered,
-    Shadow_Sampler,
-    Volume_Linear_Filtered,
-    Trilinear_Clamped_Array2D,
-};
-
-void setTextureSampler(GLenum, GLuint, GLuint, GLuint);
-
-template<SamplerType...tp>
-struct CreateSamplers;
-
-template<SamplerType...tp>
-struct BindTexture;
-
-template<>
-struct CreateSamplers<>
-{
-    static void exec(std::vector<unsigned> &, std::vector<GLenum> &e)
-    {}
-};
-
-template<>
-struct BindTexture<>
-{
-    template<int N>
-    static void exec(const std::vector<unsigned> &TU)
-    {}
-};
-
-GLuint createNearestSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Nearest_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createNearestSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureNearest(unsigned TU, unsigned tid);
-
-template<SamplerType...tp>
-struct BindTexture<Nearest_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureNearest(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-template<SamplerType...tp>
-struct CreateSamplers<Neared_Clamped_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        unsigned id;
-        glGenSamplers(1, &id);
-        glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-
-        v.push_back(createNearestSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-template<SamplerType...tp>
-struct BindTexture<Neared_Clamped_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        glActiveTexture(GL_TEXTURE0 + TU[N]);
-        glBindTexture(GL_TEXTURE_2D, TexId);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createBilinearSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Bilinear_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createBilinearSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureBilinear(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Bilinear_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureBilinear(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createBilinearClampedSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Bilinear_Clamped_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createBilinearClampedSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureBilinearClamped(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Bilinear_Clamped_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureBilinearClamped(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createSemiTrilinearSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Semi_trilinear, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createSemiTrilinearSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureSemiTrilinear(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Semi_trilinear, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureSemiTrilinear(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createTrilinearSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Trilinear_Anisotropic_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createTrilinearSampler());
-        e.push_back(GL_TEXTURE_2D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureTrilinearAnisotropic(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Trilinear_Anisotropic_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureTrilinearAnisotropic(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-template<SamplerType...tp>
-struct CreateSamplers<Volume_Linear_Filtered, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createBilinearSampler());
-        e.push_back(GL_TEXTURE_3D);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureVolume(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Volume_Linear_Filtered, tp...>
-{
-    template<int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureVolume(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createShadowSampler();
-
-template<SamplerType...tp>
-struct CreateSamplers<Shadow_Sampler, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createShadowSampler());
-        e.push_back(GL_TEXTURE_2D_ARRAY);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTextureShadow(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Shadow_Sampler, tp...>
-{
-    template <int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTextureShadow(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-GLuint createTrilinearClampedArray();
-
-template<SamplerType...tp>
-struct CreateSamplers<Trilinear_Clamped_Array2D, tp...>
-{
-    static void exec(std::vector<unsigned> &v, std::vector<GLenum> &e)
-    {
-        v.push_back(createTrilinearClampedArray());
-        e.push_back(GL_TEXTURE_2D_ARRAY);
-        CreateSamplers<tp...>::exec(v, e);
-    }
-};
-
-void BindTrilinearClampedArrayTexture(unsigned TU, unsigned tex);
-
-template<SamplerType...tp>
-struct BindTexture<Trilinear_Clamped_Array2D, tp...>
-{
-    template <int N, typename...Args>
-    static void exec(const std::vector<unsigned> &TU, GLuint TexId, Args... args)
-    {
-        BindTrilinearClampedArrayTexture(TU[N], TexId);
-        BindTexture<tp...>::template exec<N + 1>(TU, args...);
-    }
-};
-
-#endif
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_read.cpp
index f0b692da7..ecc986948 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_read.cpp
@@ -333,8 +333,7 @@ GLuint TextureReadBaseNew::createSemiTrilinearSampler()
     glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
     return id;
 #endif
-}
+}   // createSemiTrilinearSampler
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index 93eee1c48..b18fb4a75 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -18,12 +18,13 @@
 #ifndef HEADER_TEXTURE_READ_HPP
 #define HEADER_TEXTURE_READ_HPP
 
-#include "shaders_util.hpp"
-
+#include "graphics/gl_headers.hpp"
 #include <functional>
+#include <vector>
 
 
-enum SamplerTypeNew {
+enum SamplerTypeNew
+{
     ST_MIN,
     ST_NEAREST_FILTERED = ST_MIN,
     ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -36,7 +37,7 @@ enum SamplerTypeNew {
     ST_BILINEAR_CLAMPED_FILTERED,
     ST_SEMI_TRILINEAR,
     ST_MAX = ST_SEMI_TRILINEAR
-};
+};   // SamplerTypeNew
 
 
 class TextureReadBaseNew
@@ -70,7 +71,6 @@ protected:
     static BindFunction m_all_bind_functions[];
     std::vector<BindFunction> m_bind_functions;
     static GLuint m_all_texture_types[];
-
 };   // TextureReadBaseNew
 
 // ============================================================================
@@ -153,16 +153,19 @@ public:
     /** The recursive implementation.
      */
     template<int N, typename... TexIds>
-    void setTextureUnitsImpl(GLuint texid, TexIds... args)
+    void setTextureUnitsImpl(GLuint tex_id, TexIds... args)
     {
-        if (getGLSLVersion() >= 330)
+        if (CVS->getGLSLVersion() >= 330)
         {
-            setTextureSampler(m_texture_type[N], m_texture_units[N], texid,
-                              m_sampler_ids[N]);
+#ifdef GL_VERSION_3_3
+            glActiveTexture(GL_TEXTURE0 + m_texture_units[N]);
+            glBindTexture(m_texture_type[N], tex_id);
+            glBindSampler(m_texture_units[N], m_sampler_ids[N]);
+#endif
         }
         else
         {
-            m_bind_functions[N](m_texture_units[N], texid);
+            m_bind_functions[N](m_texture_units[N], tex_id);
         }
         setTextureUnitsImpl<N + 1>(args...);
     }   // setTextureUnitsImpl
@@ -228,159 +231,5 @@ public:
 
 };   // class TextureReadNew
 
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-// ============================================================================
-
-
-
-
-
-
-
-
-
-template<SamplerType...tp>
-class TextureRead
-{
-protected:
-    std::vector<GLuint> m_texture_units;
-    std::vector<GLenum> m_texture_type;
-    std::vector<GLenum> m_texture_location;
-
-public:
-    std::vector<GLuint> m_sampler_ids;
-
-    // A variadic template to assign texture names
-    // ===========================================
-private:
-    /** End of recursive variadic template AssigTextureNames. It just
-     *  checks if the number of arguments is correct.*/
-    template<unsigned N, typename...Args>
-    void assignTextureNamesImpl(GLuint)
-    {
-        static_assert(N == sizeof...(tp), "Wrong number of texture name");
-    }   // assignTextureNamesImpl
-
-    // ------------------------------------------------------------------------
-    /** Recursive implementation, peeling the texture unit and name off the
-     *  list of arguments.
-     */
-    template<unsigned N, typename...Args>
-    void assignTextureNamesImpl(GLuint program, GLuint tex_unit, 
-                                const char *name, Args...args)
-    {
-        GLuint location = glGetUniformLocation(program, name);
-        m_texture_location.push_back(location);
-        glUniform1i(location, tex_unit);
-        m_texture_units.push_back(tex_unit);
-        assignTextureNamesImpl<N + 1>(program, args...);
-    }   // assignTextureNamesImpl
-
-    // ------------------------------------------------------------------------
-protected:
-    /** The protected interface for setting sampler names - it is only called
-    *  from instances.
-    */
-    template<typename...Args>
-    void assignSamplerNames(GLuint program, Args...args)
-    {
-        CreateSamplers<tp...>::exec(m_sampler_ids, m_texture_type);
-
-        glUseProgram(program);
-        assignTextureNamesImpl<0>(program, args...);
-        glUseProgram(0);
-    }   // AssignSamplerNames
-
-
-    // Variadic template implementation of setTextureUnits
-    // ===================================================
-    /** End of recursion, just check if number of arguments is correct. */
-    template<int N>
-    void setTextureUnitsImpl()
-    {
-        static_assert(N == sizeof...(tp), "Not enough texture set");
-    }   // setTextureUnitsImpl
-
-    // ------------------------------------------------------------------------
-    /** The recursive implementation.
-     */
-    template<int N, typename... TexIds>
-    void setTextureUnitsImpl(GLuint texid, TexIds... args)
-    {
-        setTextureSampler(m_texture_type[N], m_texture_units[N], texid, 
-                          m_sampler_ids[N]);
-        setTextureUnitsImpl<N + 1>(args...);
-    }   // setTextureUnitsImpl
-
-    // ------------------------------------------------------------------------
-public:
-    /** Public implementation of setTextureUnits.
-     */
-    template<typename... TexIds>
-    void setTextureUnits(TexIds... args)
-    {
-        if (getGLSLVersion() >= 330)
-            setTextureUnitsImpl<0>(args...);
-        else
-            BindTexture<tp...>::template exec<0>(m_texture_units, args...);
-    }   // SetTextureUnits
-
-
-    // ========================================================================
-    // Variadic template implementation of setTextureHandles.
-
-    /** End of recursion, just checks at compile time if number of arguments
-     *  is correct.
-     *  \param N number of arguments. */
-    template<int N>
-    void setTextureHandlesImpl()
-    {
-        static_assert(N == sizeof...(tp), "Not enough handle set");
-    }   // setTextureHandlesImpl
-
-    // ------------------------------------------------------------------------
-    /** Recursive implementation of setTextureHandles.
-     * \param N The number of the current argument in the recursion (or the
-     *          recursion depth).
-     *  \param handle The texture handle to set.
-     */
-    template<int N, typename... HandlesId>
-    void setTextureHandlesImpl(uint64_t handle, HandlesId... args)
-    {
-        if (handle)
-            glUniformHandleui64ARB(m_texture_location[N], handle);
-        setTextureHandlesImpl<N + 1>(args...);
-    }   // setTextureHandlesImpl
-
-    // ------------------------------------------------------------------------
-public:
-    /** The protected interface.
-     *  \param ids The ids of all texture handls.
-     */
-    template<typename... HandlesId>
-    void setTextureHandles(HandlesId... ids)
-    {
-        setTextureHandlesImpl<0>(ids...);
-    }   // SetTextureHandles
-
-public:
-    // ------------------------------------------------------------------------
-    /** Destructor which frees al lsampler ids.
-     */
-    ~TextureRead()
-    {
-        for (unsigned i = 0; i < m_sampler_ids.size(); i++)
-            glDeleteSamplers(1, &m_sampler_ids[i]);
-    }   // ~TextureRead
-
-
-};   // class TextureRead
 
 #endif

From 7453853c6d87a15bf716fde87daf0006ca4a2e00 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 13:45:43 +1000
Subject: [PATCH 172/331] Fixed linux build.

---
 src/graphics/texture_read.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index b18fb4a75..f32c7ae41 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -18,7 +18,10 @@
 #ifndef HEADER_TEXTURE_READ_HPP
 #define HEADER_TEXTURE_READ_HPP
 
+#include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
+
+#include <assert.h>
 #include <functional>
 #include <vector>
 

From 824b6906c185a5c84411dee6be0a7820604c14b5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 13:59:19 +1000
Subject: [PATCH 173/331] Fixed compiler warning.

---
 src/graphics/graphics_restrictions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/graphics_restrictions.cpp b/src/graphics/graphics_restrictions.cpp
index ac6e72031..7d132eaa9 100644
--- a/src/graphics/graphics_restrictions.cpp
+++ b/src/graphics/graphics_restrictions.cpp
@@ -39,7 +39,7 @@ namespace GraphicsRestrictions
         /** The list of names used in the XML file for the graphics
          *  restriction types. They must be in the same order as the types. */
 
-        char *m_names_of_restrictions[] = {
+        const char *m_names_of_restrictions[] = {
             "UniformBufferObject",
             "GeometryShader4",
             "DrawIndirect",

From 93f24f2a745caea630018126885f06b3d1fd7933 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 8 May 2015 23:46:52 +1000
Subject: [PATCH 174/331] Removed Shaders instance out of irr-driver, and use a
 class with static members instead.

---
 src/graphics/2dutils.cpp                     |  4 +-
 src/graphics/central_settings.cpp            | 10 ++--
 src/graphics/glwrap.cpp                      |  6 +-
 src/graphics/gpuparticles.cpp                | 16 ++++--
 src/graphics/gpuparticles.hpp                |  3 +-
 src/graphics/irr_driver.cpp                  | 23 ++++----
 src/graphics/irr_driver.hpp                  | 12 +---
 src/graphics/material.cpp                    | 18 +++---
 src/graphics/mesh_tools.cpp                  | 15 +++--
 src/graphics/post_processing.cpp             | 24 ++++----
 src/graphics/render.cpp                      |  2 +-
 src/graphics/render_geometry.cpp             |  2 +-
 src/graphics/shaders.cpp                     | 58 ++++++++++++--------
 src/graphics/shaders.hpp                     | 40 +++++++++++---
 src/graphics/stk_text_billboard.cpp          |  4 +-
 src/graphics/stkmesh.cpp                     | 41 +++++++-------
 src/graphics/stkmesh.hpp                     |  3 +-
 src/graphics/stkmeshscenenode.hpp            |  4 +-
 src/graphics/water.cpp                       |  7 ++-
 src/guiengine/widgets/model_view_widget.cpp  |  5 +-
 src/guiengine/widgets/player_kart_widget.cpp |  4 +-
 src/utils/debug.cpp                          |  1 +
 22 files changed, 177 insertions(+), 125 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index ad98fd905..e2443fcc6 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -16,7 +16,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "2dutils.hpp"
-#include "central_settings.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/shaders.hpp"
 #include "glwrap.hpp"
 #include "utils/cpp2011.hpp"
 
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index ede01d4d7..719e7f4f9 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -15,11 +15,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "central_settings.hpp"
+#include "graphics/central_settings.hpp"
+
+#include "config/user_config.hpp"
 #include "modes/profile_world.hpp"
-#include "gl_headers.hpp"
-#include "glwrap.hpp"
-#include "graphics_restrictions.hpp"
+#include "graphics/gl_headers.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/graphics_restrictions.hpp"
 
 CentralVideoSettings *CVS = new CentralVideoSettings();
 
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index cff3453ff..5e3572852 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -15,11 +15,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 
-#include "config/user_config.hpp"
+
 #include "config/hardware_stats.hpp"
+#include "config/user_config.hpp"
+#include "graphics/central_settings.hpp"
+#include "graphics/shaders.hpp"
 #include "graphics/stkmesh.hpp"
 #include "utils/profiler.hpp"
 #include "utils/cpp2011.hpp"
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index ad8f753d8..f4bdc5969 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -15,15 +15,19 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/irr_driver.hpp"
-#include "graphics/glwrap.hpp"
-#include "gpuparticles.hpp"
-#include "io/file_manager.hpp"
+#include "graphics/gpuparticles.hpp"
+
 #include "config/user_config.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/particle_emitter.hpp"
+#include "graphics/shaders.hpp"
+#include "graphics/texture_read.hpp"
+#include "guiengine/engine.hpp"
+#include "io/file_manager.hpp"
+
 #include <ICameraSceneNode.h>
 #include <IParticleSystemSceneNode.h>
-#include "guiengine/engine.hpp"
-#include "graphics/particle_emitter.hpp"
 #include "../../lib/irrlicht/source/Irrlicht/os.h"
 #define COMPONENTCOUNT 8
 
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpuparticles.hpp
index f1b744964..f04464661 100644
--- a/src/graphics/gpuparticles.hpp
+++ b/src/graphics/gpuparticles.hpp
@@ -26,8 +26,7 @@
 
 namespace irr { namespace video{ class ITexture; } }
 
-
-
+using namespace irr;
 
 class ParticleSystemProxy : public scene::CParticleSystemSceneNode
 {
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 92608912a..24df1148f 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -115,7 +115,6 @@ IrrDriver::IrrDriver()
                                          /*event receiver*/ NULL,
                                          file_manager->getFileSystem());
     m_request_screenshot = false;
-    m_shaders             = NULL;
     m_rtts                = NULL;
     m_post_processing     = NULL;
     m_wind                = new Wind();
@@ -153,7 +152,7 @@ IrrDriver::~IrrDriver()
     m_device = NULL;
     m_modes.clear();
 
-    delete m_shaders;
+    Shaders::destroy();
     delete m_wind;
 }   // ~IrrDriver
 
@@ -515,7 +514,7 @@ void IrrDriver::initDevice()
     // m_glsl might be reset in rtt if an error occurs.
     if (CVS->isGLSL())
     {
-        m_shaders = new Shaders();
+        Shaders::init();
 
         m_mrt.clear();
         m_mrt.reallocate(2);
@@ -628,7 +627,7 @@ void IrrDriver::createSunInterposer()
     m_sun_interposer->getMaterial(0).Lighting = false;
     m_sun_interposer->getMaterial(0).ColorMask = video::ECP_NONE;
     m_sun_interposer->getMaterial(0).ZWriteEnable = false;
-    m_sun_interposer->getMaterial(0).MaterialType = m_shaders->getShader(ES_OBJECTPASS);
+    m_sun_interposer->getMaterial(0).MaterialType = Shaders::getShader(ES_OBJECTPASS);
 
     sphere->drop();
 }
@@ -781,7 +780,7 @@ void IrrDriver::applyResolutionSettings()
     // FIXME: this load sequence is (mostly) duplicated from main.cpp!!
     // That's just error prone
     // (we're sure to update main.cpp at some point and forget this one...)
-    m_shaders->killShaders();
+    Shaders::destroy();
     VAOManager::getInstance()->kill();
     SolidPassCmd::getInstance()->kill();
     ShadowPassCmd::getInstance()->kill();
@@ -2425,13 +2424,13 @@ void IrrDriver::applyObjectPassShader(scene::ISceneNode * const node, bool rimli
 
     const u32 mcount = node->getMaterialCount();
     u32 i;
-    const video::E_MATERIAL_TYPE ref = rimlit ? m_shaders->getShader(ES_OBJECTPASS_RIMLIT):
-                                       m_shaders->getShader(ES_OBJECTPASS_REF);
-    const video::E_MATERIAL_TYPE pass = rimlit ? m_shaders->getShader(ES_OBJECTPASS_RIMLIT):
-                                        m_shaders->getShader(ES_OBJECTPASS);
+    const video::E_MATERIAL_TYPE ref = Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT
+                                                                 : ES_OBJECTPASS_REF);
+    const video::E_MATERIAL_TYPE pass = Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT 
+                                                                  : ES_OBJECTPASS);
 
-    const video::E_MATERIAL_TYPE origref = m_shaders->getShader(ES_OBJECTPASS_REF);
-    const video::E_MATERIAL_TYPE origpass = m_shaders->getShader(ES_OBJECTPASS);
+    const video::E_MATERIAL_TYPE origref = Shaders::getShader(ES_OBJECTPASS_REF);
+    const video::E_MATERIAL_TYPE origpass = Shaders::getShader(ES_OBJECTPASS);
 
     bool viamb = false;
     scene::IMesh *mesh = NULL;
@@ -2521,7 +2520,7 @@ scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy,
 
             m_rsm_matrix_initialized = false;
 
-            ((WaterShaderProvider *) m_shaders->m_callbacks[ES_WATER])->setSunPosition(pos);
+            ((WaterShaderProvider *) Shaders::getCallback(ES_WATER) )->setSunPosition(pos);
         }
 
         return light;
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index cfe9feea0..cc9dd01e5 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -36,8 +36,8 @@
 #include <SColor.h>
 #include "IrrlichtDevice.h"
 #include "ISkinnedMesh.h"
-#include "graphics/shaders.hpp"
 #include "graphics/wind.hpp"
+#include "graphics/gl_headers.hpp"
 #include "io/file_manager.hpp"
 #include "utils/aligned_array.hpp"
 #include "utils/no_copy.hpp"
@@ -195,8 +195,7 @@ private:
     gui::IGUIFont              *m_race_font;
     /** Post-processing. */
     PostProcessing             *m_post_processing;
-    /** Shaders. */
-    Shaders              *m_shaders;
+
     /** Wind. */
     Wind                 *m_wind;
     /** RTTs. */
@@ -557,13 +556,6 @@ public:
     {
         m_suncolor = col;
     }
-    // -----------------------------------------------------------------------
-    inline video::E_MATERIAL_TYPE getShader(const ShaderType num)  {return m_shaders->getShader(num);}
-    // -----------------------------------------------------------------------
-    inline video::IShaderConstantSetCallBack* getCallback(const ShaderType num)
-    {
-        return (m_shaders == NULL ? NULL : m_shaders->m_callbacks[num]);
-    }
     // ------------------------------------------------------------------------
     GLuint getRenderTargetTexture(TypeRTT which);
     FrameBuffer& getFBO(TypeFBO which);
diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp
index bd0fcf3ca..cc6802825 100644
--- a/src/graphics/material.cpp
+++ b/src/graphics/material.cpp
@@ -723,7 +723,7 @@ void  Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
         switch (m_shader_type)
         {
         case SHADERTYPE_SOLID_UNLIT:
-            m->MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT);
+            m->MaterialType = Shaders::getShader(ES_OBJECT_UNLIT);
             m->setTexture(1, glossytex);
             return;
         case SHADERTYPE_ALPHA_TEST:
@@ -747,7 +747,7 @@ void  Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
                 video::EAS_VERTEX_COLOR);
             return;
         case SHADERTYPE_SPHERE_MAP:
-            m->MaterialType = irr_driver->getShader(ES_SPHERE_MAP);
+            m->MaterialType = Shaders::getShader(ES_SPHERE_MAP);
             m->setTexture(1, glossytex);
             return;
         case SHADERTYPE_SPLATTING:
@@ -774,7 +774,7 @@ void  Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
             m->setTexture(6, glossytex);
 
             // Material and shaders
-            m->MaterialType = irr_driver->getShader(ES_SPLATTING);
+            m->MaterialType = Shaders::getShader(ES_SPLATTING);
             return;
         case SHADERTYPE_WATER:
             m->setTexture(1, irr_driver->getTexture(FileManager::TEXTURE,
@@ -782,18 +782,18 @@ void  Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
             m->setTexture(2, irr_driver->getTexture(FileManager::TEXTURE,
                 "waternormals2.jpg"));
 
-            ((WaterShaderProvider *)irr_driver->getCallback(ES_WATER))->
+            ((WaterShaderProvider *)Shaders::getCallback(ES_WATER))->
                 setSpeed(m_water_shader_speed_1 / 100.0f, m_water_shader_speed_2 / 100.0f);
 
-            m->MaterialType = irr_driver->getShader(ES_WATER);
+            m->MaterialType = Shaders::getShader(ES_WATER);
             return;
         case SHADERTYPE_VEGETATION:
             // Only one grass speed & amplitude per map for now
-            ((GrassShaderProvider *)irr_driver->getCallback(ES_GRASS))->
+            ((GrassShaderProvider *)Shaders::getCallback(ES_GRASS))->
                 setSpeed(m_grass_speed);
-            ((GrassShaderProvider *)irr_driver->getCallback(ES_GRASS))->
+            ((GrassShaderProvider *)Shaders::getCallback(ES_GRASS))->
                 setAmplitude(m_grass_amplitude);
-            m->MaterialType = irr_driver->getShader(ES_GRASS_REF);
+            m->MaterialType = Shaders::getShader(ES_GRASS_REF);
             m->setTexture(1, glossytex);
             return;
         }
@@ -807,7 +807,7 @@ void  Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
             m->setTexture(2, tex);
 
             // Material and shaders
-            m->MaterialType = irr_driver->getShader(ES_NORMAL_MAP);
+            m->MaterialType = Shaders::getShader(ES_NORMAL_MAP);
             m->setTexture(1, glossytex);
             return;
         }
diff --git a/src/graphics/mesh_tools.cpp b/src/graphics/mesh_tools.cpp
index 0375677a5..3addc0e32 100644
--- a/src/graphics/mesh_tools.cpp
+++ b/src/graphics/mesh_tools.cpp
@@ -17,14 +17,17 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/mesh_tools.hpp"
+
 #include "graphics/central_settings.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/shaders.hpp"
+#include "modes/world.hpp"
+#include "tracks/track.hpp"
+#include "utils/log.hpp"
+
 #include <irrlicht.h>
 #include <IMesh.h>
 #include <IMeshBuffer.h>
-#include "utils/log.hpp"
-#include "graphics/irr_driver.hpp"
-#include "modes/world.hpp"
-#include "tracks/track.hpp"
 
 void MeshTools::minMax3D(scene::IMesh* mesh, Vec3 *min, Vec3 *max) {
 
@@ -328,8 +331,8 @@ bool MeshTools::isNormalMap(scene::IMeshBuffer* mb)
 {
     if (!CVS->isGLSL())
         return false;
-    return (mb->getMaterial().MaterialType == irr_driver->getShader(ES_NORMAL_MAP) &&
-        mb->getVertexType() != video::EVT_TANGENTS);
+    return (mb->getMaterial().MaterialType == Shaders::getShader(ES_NORMAL_MAP) &&
+            mb->getVertexType() != video::EVT_TANGENTS);
 }
 
 // Copied from irrlicht
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 74f8c4c72..db4212be0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -88,8 +88,8 @@ void PostProcessing::reset()
     m_center.resize(n);
     m_direction.resize(n);
 
-    MotionBlurProvider * const cb = (MotionBlurProvider *) irr_driver->
-                                                           getCallback(ES_MOTIONBLUR);
+    MotionBlurProvider * const cb = 
+        (MotionBlurProvider *) Shaders::getCallback(ES_MOTIONBLUR);
 
     for(unsigned int i=0; i<n; i++)
     {
@@ -147,8 +147,8 @@ void PostProcessing::reset()
 
 void PostProcessing::setMotionBlurCenterY(const u32 num, const float y)
 {
-    MotionBlurProvider * const cb = (MotionBlurProvider *) irr_driver->
-                                                           getCallback(ES_MOTIONBLUR);
+    MotionBlurProvider * const cb = 
+        (MotionBlurProvider *) Shaders::getCallback(ES_MOTIONBLUR);
 
     const float tex_height = m_vertices[num].v1.TCoords.Y - m_vertices[num].v0.TCoords.Y;
     m_center[num].Y = m_vertices[num].v0.TCoords.Y + y * tex_height;
@@ -174,8 +174,8 @@ void PostProcessing::giveBoost(unsigned int camera_index)
     {
         m_boost_time[camera_index] = 0.75f;
 
-        MotionBlurProvider * const cb = (MotionBlurProvider *)irr_driver->
-            getCallback(ES_MOTIONBLUR);
+        MotionBlurProvider * const cb =
+            (MotionBlurProvider *)Shaders::getCallback(ES_MOTIONBLUR);
         cb->setBoostTime(camera_index, m_boost_time[camera_index]);
     }
 }   // giveBoost
@@ -190,7 +190,7 @@ void PostProcessing::update(float dt)
         return;
 
     MotionBlurProvider* const cb =
-        (MotionBlurProvider*) irr_driver->getCallback(ES_MOTIONBLUR);
+        (MotionBlurProvider*) Shaders::getCallback(ES_MOTIONBLUR);
 
     if (cb == NULL) return;
 
@@ -518,8 +518,7 @@ void PostProcessing::renderSSAO()
 
 void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffer &out_fbo)
 {
-    MotionBlurProvider * const cb = (MotionBlurProvider *)irr_driver->
-        getCallback(ES_MOTIONBLUR);
+    MotionBlurProvider * const cb = (MotionBlurProvider *)Shaders::getCallback(ES_MOTIONBLUR);
     Camera *cam = Camera::getActiveCamera();
     unsigned camID = cam->getIndex();
 
@@ -788,10 +787,11 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
     {
         PROFILER_PUSH_CPU_MARKER("- Motion blur", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_MOTIONBLUR));
-        MotionBlurProvider * const cb = (MotionBlurProvider *)irr_driver->
-            getCallback(ES_MOTIONBLUR);
+        MotionBlurProvider * const cb = 
+            (MotionBlurProvider *)Shaders::getCallback(ES_MOTIONBLUR);
 
-        if (isRace && UserConfigParams::m_motionblur && World::getWorld() != NULL && cb->getBoostTime(Camera::getActiveCamera()->getIndex()) > 0.) // motion blur
+        if (isRace && UserConfigParams::m_motionblur && World::getWorld() &&
+            cb->getBoostTime(Camera::getActiveCamera()->getIndex()) > 0.) // motion blur
         {
             renderMotionBlur(0, *in_fbo, *out_fbo);
             std::swap(in_fbo, out_fbo);
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 24dea82de..5cc3274c1 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -84,7 +84,7 @@ void IrrDriver::renderGLSL(float dt)
     }
     if (m_mipviz)
     {
-        overridemat.Material.MaterialType = m_shaders->getShader(ES_MIPVIZ);
+        overridemat.Material.MaterialType = Shaders::getShader(ES_MIPVIZ);
         overridemat.EnableFlags |= video::EMF_MATERIAL_TYPE;
         overridemat.EnablePasses = scene::ESNRP_SOLID;
     }
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index c349f5000..7925b4bdc 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -829,7 +829,7 @@ void IrrDriver::renderTransparent()
     irr_driver->getFBO(FBO_DISPLACE).Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    DisplaceProvider * const cb = (DisplaceProvider *)irr_driver->getCallback(ES_DISPLACE);
+    DisplaceProvider * const cb = (DisplaceProvider *)Shaders::getCallback(ES_DISPLACE);
     cb->update();
 
     glEnable(GL_DEPTH_TEST);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d91add179..349e933a0 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -92,23 +92,30 @@
 
 #define SHADER_NAMES
 
+#include "graphics/shaders.hpp"
+
 #include "graphics/callbacks.hpp"
 #include "graphics/central_settings.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/gpuparticles.hpp"
-#include "graphics/shaders.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 #include "graphics/glwrap.hpp"
 #include <assert.h>
 #include <IGPUProgrammingServices.h>
 
+
+bool                               Shaders::m_has_been_initialised = false;
+video::IShaderConstantSetCallBack *Shaders::m_callbacks[ES_COUNT];
+int                                Shaders::m_shaders[ES_COUNT];
+
 using namespace video;
 
 std::vector<void(*)()> CleanTable;
 
-Shaders::Shaders()
+void Shaders::init()
 {
+    assert(!m_has_been_initialised);
     // Callbacks
     memset(m_callbacks, 0, sizeof(m_callbacks));
 
@@ -122,8 +129,25 @@ Shaders::Shaders()
         m_shaders[i] = -1;
 
     loadShaders();
-}
+    m_has_been_initialised = true;
+}   // init
 
+// ----------------------------------------------------------------------------
+/** Frees all memory used by the shader manager.
+ */
+void Shaders::destroy()
+{
+    assert(m_has_been_initialised);
+    u32 i;
+    for (i = 0; i < ES_COUNT; i++)
+    {
+        if (i == ES_GAUSSIAN3V || !m_callbacks[i]) continue;
+        delete m_callbacks[i];
+    }
+    m_has_been_initialised = false;
+}   // destroy
+
+// ----------------------------------------------------------------------------
 // Shader loading  related hook
 
 static std::string LoadHeader()
@@ -436,38 +460,26 @@ void Shaders::loadShaders()
     initParticleQuadVBO();
 }
 
+// ----------------------------------------------------------------------------
+/** C
+*/
 void Shaders::killShaders()
 {
     for (unsigned i = 0; i < CleanTable.size(); i++)
         CleanTable[i]();
-}
+}   // killShaders
 
-Shaders::~Shaders()
-{
-    u32 i;
-    for (i = 0; i < ES_COUNT; i++)
-    {
-        if (i == ES_GAUSSIAN3V || !m_callbacks[i]) continue;
-        delete m_callbacks[i];
-    }
-}
-
-E_MATERIAL_TYPE Shaders::getShader(const ShaderType num) const
-{
-    assert(num < ES_COUNT);
-
-    return (E_MATERIAL_TYPE)m_shaders[num];
-}
-
-void Shaders::check(const int num) const
+// ----------------------------------------------------------------------------
+void Shaders::check(const int num)
 {
     if (m_shaders[num] == -1)
     {
         Log::error("shaders", "Shader %s failed to load. Update your drivers, if the issue "
                    "persists, report a bug to us.", shader_names[num] + 3);
     }
-}
+}   // check
 
+// ----------------------------------------------------------------------------
 void bypassUBO(GLuint Program)
 {
     GLint VM = glGetUniformLocation(Program, "ViewMatrix");
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index d97699e89..c4aa21cdd 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -24,6 +24,8 @@
 
 #include <IMeshSceneNode.h>
 #include <IShaderConstantSetCallBack.h>
+#include <EMaterialTypes.h>
+
 
 using namespace irr;
 class ParticleSystemProxy;
@@ -824,20 +826,42 @@ static const char *shader_names[] = {
 
 class Shaders
 {
+private:
+    static bool m_has_been_initialised;
+
+    static int m_shaders[ES_COUNT];
+
+    static video::IShaderConstantSetCallBack *m_callbacks[ES_COUNT];
+
+    static void check(const int num);
+    static void loadShaders();
 public:
-    Shaders();
-    ~Shaders();
+    static void init();
+    static void destroy();
+    // ------------------------------------------------------------------------
+    /** Returns the material type of a shader. 
+     *  \param num The shader type.
+     */
+    static video::E_MATERIAL_TYPE getShader(const ShaderType num)
+    {
+        assert(m_has_been_initialised);
+        assert(num < ES_COUNT);
+        return (video::E_MATERIAL_TYPE)m_shaders[num];
+    }   // getShader
+
+    // ------------------------------------------------------------------------
+    /** Returns the callback for the specified shader type.
+     */
+    static video::IShaderConstantSetCallBack* getCallback(const ShaderType num)
+    {
+        return m_has_been_initialised ? m_callbacks[num] : NULL;
+    }   // getCallback
+    // ------------------------------------------------------------------------
 
-    video::E_MATERIAL_TYPE getShader(const ShaderType num) const;
 
-    video::IShaderConstantSetCallBack * m_callbacks[ES_COUNT];
 
-    void loadShaders();
     void killShaders();
 private:
-    void check(const int num) const;
-    
-    int m_shaders[ES_COUNT];
 };
 
 #undef ENUM
diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index 7299e108a..fd2f0bcf4 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -111,7 +111,7 @@ scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, gui::ScalableFon
             buffer = new scene::SMeshBuffer();
             buffer->getMaterial().setTexture(0, m_chars[i].m_texture);
             buffer->getMaterial().setTexture(1, getUnicolorTexture(video::SColor(0, 0, 0, 0)));
-            buffer->getMaterial().MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT);
+            buffer->getMaterial().MaterialType = Shaders::getShader(ES_OBJECT_UNLIT);
             buffers[m_chars[i].m_texture] = buffer;
         }
         else
@@ -166,7 +166,7 @@ scene::IMesh* STKTextBillboard::getTextMesh(core::stringw text, gui::ScalableFon
         map_itr->second->drop();
     }
 
-    getMaterial(0).MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT);
+    getMaterial(0).MaterialType = Shaders::getShader(ES_OBJECT_UNLIT);
 
     return Mesh;
 }
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index fd9338d33..78151771e 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -15,18 +15,21 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "graphics/stkmesh.hpp"
+
+#include "config/user_config.hpp"
 #include "central_settings.hpp"
+#include "graphics/callbacks.hpp"
+#include "graphics/camera.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/stkmesh.hpp"
+#include "graphics/shaders.hpp"
+#include "modes/world.hpp"
 #include "tracks/track.hpp"
+#include "utils/helpers.hpp"
+
 #include <ISceneManager.h>
 #include <IMaterialRenderer.h>
-#include "config/user_config.hpp"
-#include "graphics/callbacks.hpp"
-#include "utils/helpers.hpp"
-#include "graphics/camera.hpp"
-#include "modes/world.hpp"
 
 
 Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialType, video::E_VERTEX_TYPE tp,
@@ -40,7 +43,7 @@ Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialT
     default:
         return material->getShaderType();   
     case Material::SHADERTYPE_SOLID:
-        if (MaterialType == irr_driver->getShader(ES_NORMAL_MAP))
+        if (MaterialType == Shaders::getShader(ES_NORMAL_MAP))
             return Material::SHADERTYPE_NORMAL_MAP;
         else if (tp == video::EVT_2TCOORDS)
             return Material::SHADERTYPE_DETAIL_MAP;
@@ -50,7 +53,7 @@ Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialT
 
 TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE type, f32 MaterialTypeParam, Material* material)
 {
-    if (type == irr_driver->getShader(ES_DISPLACE))
+    if (type == Shaders::getShader(ES_DISPLACE))
         return TM_DISPLACEMENT;
     if (material->getShaderType() == Material::SHADERTYPE_ADDITIVE)
         return TM_ADDITIVE;
@@ -252,7 +255,7 @@ core::matrix4 computeMVP(const core::matrix4 &ModelMatrix)
 core::vector3df getWindDir()
 {
     const float time = irr_driver->getDevice()->getTimer()->getTime() / 1000.0f;
-    GrassShaderProvider *gsp = (GrassShaderProvider *)irr_driver->getCallback(ES_GRASS);
+    GrassShaderProvider *gsp = (GrassShaderProvider *)Shaders::getCallback(ES_GRASS);
     float m_speed = gsp->getSpeed();
 
     return m_speed * vector3df(1., 0., 0.) * cos(time);
@@ -260,25 +263,25 @@ core::vector3df getWindDir()
 
 bool isObject(video::E_MATERIAL_TYPE type)
 {
-    if (type == irr_driver->getShader(ES_OBJECTPASS))
+    if (type == Shaders::getShader(ES_OBJECTPASS))
         return true;
-    if (type == irr_driver->getShader(ES_OBJECTPASS_REF))
+    if (type == Shaders::getShader(ES_OBJECTPASS_REF))
         return true;
-    if (type == irr_driver->getShader(ES_OBJECTPASS_RIMLIT))
+    if (type == Shaders::getShader(ES_OBJECTPASS_RIMLIT))
         return true;
-    if (type == irr_driver->getShader(ES_NORMAL_MAP))
+    if (type == Shaders::getShader(ES_NORMAL_MAP))
         return true;
-    if (type == irr_driver->getShader(ES_SPHERE_MAP))
+    if (type == Shaders::getShader(ES_SPHERE_MAP))
         return true;
-    if (type == irr_driver->getShader(ES_SPLATTING))
+    if (type == Shaders::getShader(ES_SPLATTING))
         return true;
-    if (type == irr_driver->getShader(ES_GRASS))
+    if (type == Shaders::getShader(ES_GRASS))
         return true;
-    if (type == irr_driver->getShader(ES_GRASS_REF))
+    if (type == Shaders::getShader(ES_GRASS_REF))
         return true;
-    if (type == irr_driver->getShader(ES_DISPLACE))
+    if (type == Shaders::getShader(ES_DISPLACE))
         return true;
-    if (type == irr_driver->getShader(ES_OBJECT_UNLIT))
+    if (type == Shaders::getShader(ES_OBJECT_UNLIT))
         return true;
     if (type == video::EMT_TRANSPARENT_ALPHA_CHANNEL)
         return true;
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index b350fbb44..b0745742b 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -20,6 +20,8 @@
 #define STKMESH_H
 
 #include "graphics/irr_driver.hpp"
+#include "graphics/material.hpp"
+#include "utils/singleton.hpp"
 #include "utils/tuple.hpp"
 
 #include <IMeshSceneNode.h>
@@ -27,7 +29,6 @@
 #include "../lib/irrlicht/source/Irrlicht/CMeshSceneNode.h"
 
 #include <vector>
-#include "material.hpp"
 
 class Material;
 
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stkmeshscenenode.hpp
index a9cb78aed..8a7d54ee9 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stkmeshscenenode.hpp
@@ -19,6 +19,8 @@
 #define STKMESHSCENENODE_H
 
 #include "stkmesh.hpp"
+
+#include "graphics/shaders.hpp"
 #include "utils/ptr_vector.hpp"
 
 class STKMeshSceneNode : public irr::scene::CMeshSceneNode, public STKMeshCommon
@@ -66,7 +68,7 @@ public:
             if (!mb)
                 continue;
             if (isDisplacement)
-                mb->getMaterial().MaterialType = irr_driver->getShader(ES_DISPLACE);
+                mb->getMaterial().MaterialType = Shaders::getShader(ES_DISPLACE);
         }
     }
     virtual bool glow() const { return isGlow; }
diff --git a/src/graphics/water.cpp b/src/graphics/water.cpp
index 03f23bb35..4ee1f5c1b 100644
--- a/src/graphics/water.cpp
+++ b/src/graphics/water.cpp
@@ -38,9 +38,9 @@ WaterNode::WaterNode(scene::ISceneManager* mgr, IMesh *mesh, float height, float
 
     m_mat.Lighting = false;
 
-    if (m_mat.MaterialType != irr_driver->getShader(ES_WATER))
+    if (m_mat.MaterialType != Shaders::getShader(ES_WATER))
     {
-        m_mat.MaterialType = irr_driver->getShader(ES_WATER_SURFACE);
+        m_mat.MaterialType = Shaders::getShader(ES_WATER_SURFACE);
     } else
     {
         m_mat.BlendOperation = EBO_ADD;
@@ -68,7 +68,8 @@ void WaterNode::render()
     if (SceneManager->getSceneNodeRenderPass() != scene::ESNRP_TRANSPARENT)
         return;
 
-    WaterShaderProvider * const cb = (WaterShaderProvider *) irr_driver->getCallback(ES_WATER);
+    WaterShaderProvider * const cb = 
+        (WaterShaderProvider *) Shaders::getCallback(ES_WATER);
     cb->setSpeed(m_speed);
     cb->setHeight(m_height);
     cb->setLength(m_length);
diff --git a/src/guiengine/widgets/model_view_widget.cpp b/src/guiengine/widgets/model_view_widget.cpp
index d6ade0fde..c369dc580 100644
--- a/src/guiengine/widgets/model_view_widget.cpp
+++ b/src/guiengine/widgets/model_view_widget.cpp
@@ -22,12 +22,15 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
-#include <algorithm>
+
 #include <IAnimatedMesh.h>
 #include <IAnimatedMeshSceneNode.h>
 #include <ICameraSceneNode.h>
 #include <ILightSceneNode.h>
 #include <ISceneManager.h>
+#include <IMeshSceneNode.h>
+
+#include <algorithm>
 
 using namespace GUIEngine;
 using namespace irr::core;
diff --git a/src/guiengine/widgets/player_kart_widget.cpp b/src/guiengine/widgets/player_kart_widget.cpp
index d9d0a6115..eba20232b 100644
--- a/src/guiengine/widgets/player_kart_widget.cpp
+++ b/src/guiengine/widgets/player_kart_widget.cpp
@@ -16,10 +16,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "guiengine/widgets/player_kart_widget.hpp"
+
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/widgets/kart_stats_widget.hpp"
 #include "guiengine/widgets/model_view_widget.hpp"
-#include "guiengine/widgets/player_kart_widget.hpp"
 #include "guiengine/widgets/player_name_spinner.hpp"
 #include "input/input_device.hpp"
 #include "karts/kart_properties.hpp"
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index e552f9820..8ee17b9cc 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -22,6 +22,7 @@
 #include "graphics/camera.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/light.hpp"
+#include "graphics/shaders.hpp"
 #include "items/powerup_manager.hpp"
 #include "items/attachment.hpp"
 #include "karts/abstract_kart.hpp"

From 78f9500b1d70da70f1f3b4412d6a1c2e01bc1a5e Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sat, 9 May 2015 21:29:37 -0400
Subject: [PATCH 175/331] Work on scripting

---
 src/scriptengine/script_engine.cpp |  17 ++-
 src/scriptengine/script_engine.hpp |   7 +-
 src/scriptengine/script_gui.cpp    | 208 +++++++++++------------------
 src/scriptengine/script_gui.hpp    |   2 -
 src/scriptengine/script_kart.cpp   | 136 ++++++++++---------
 src/scriptengine/script_track.cpp  |   8 --
 src/scriptengine/script_utils.cpp  | 165 +++++++++++++++++++++++
 src/scriptengine/script_utils.hpp  |  34 +++++
 src/scriptengine/scriptvec3.cpp    |  18 ++-
 9 files changed, 375 insertions(+), 220 deletions(-)
 create mode 100644 src/scriptengine/script_utils.cpp
 create mode 100644 src/scriptengine/script_utils.hpp

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 885bd22a2..138658e36 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -24,6 +24,7 @@
 #include "scriptengine/script_engine.hpp"
 #include "scriptengine/script_gui.hpp"
 #include "scriptengine/script_track.hpp"
+#include "scriptengine/script_utils.hpp"
 #include "scriptengine/scriptstdstring.hpp"
 #include "scriptengine/scriptvec3.hpp"
 #include <string.h>
@@ -150,7 +151,7 @@ void ScriptEngine::runScript(std::string scriptName, std::function<void(asIScrip
         // Find the function for the function we want to execute.
         //This is how you call a normal function with arguments
         //asIScriptFunction *func = engine->GetModule(0)->GetFunctionByDecl("void func(arg1Type, arg2Type)");
-        func = Scripting::Track::registerScriptCallbacks(m_engine, scriptName);
+        func = registerScriptCallbacks(m_engine, scriptName);
         
         if (func == NULL)
         {
@@ -244,6 +245,16 @@ void ScriptEngine::runScript(std::string scriptName, std::function<void(asIScrip
 
 //-----------------------------------------------------------------------------
 
+asIScriptFunction* ScriptEngine::registerScriptCallbacks(asIScriptEngine *engine,
+    std::string function_name)
+{
+    asIScriptFunction *func;
+    func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
+    return func;
+}
+
+//-----------------------------------------------------------------------------
+
 void ScriptEngine::cleanupCache()
 {
     for (auto curr : m_script_cache)
@@ -265,11 +276,9 @@ void ScriptEngine::configureEngine(asIScriptEngine *engine)
     RegisterVec3(engine);      //register Vec3
 
     Scripting::Track::registerScriptFunctions(m_engine);
-
     Scripting::Kart::registerScriptFunctions(m_engine);
-
     Scripting::Physics::registerScriptFunctions(m_engine);
-
+    Scripting::Utils::registerScriptFunctions(m_engine);
     Scripting::GUI::registerScriptFunctions(m_engine);
     Scripting::GUI::registerScriptEnums(m_engine);
     
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index e1c596454..9dca59770 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -43,9 +43,6 @@ namespace Scripting
         void registerScriptFunctions(asIScriptEngine *engine);
 
         void registerScriptEnums(asIScriptEngine *engine);
-
-        asIScriptFunction*
-            registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
     }
     
     class ScriptEngine
@@ -58,7 +55,9 @@ namespace Scripting
         void runScript(std::string scriptName);
         void runScript(std::string scriptName, std::function<void(asIScriptContext*)> callback);
         void cleanupCache();
-        
+        asIScriptFunction*
+            registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
+
     private:
         asIScriptEngine *m_engine;
         std::map<std::string, asIScriptFunction*> m_script_cache;
diff --git a/src/scriptengine/script_gui.cpp b/src/scriptengine/script_gui.cpp
index 60118cd71..783351819 100644
--- a/src/scriptengine/script_gui.cpp
+++ b/src/scriptengine/script_gui.cpp
@@ -34,114 +34,64 @@
 #include <assert.h>
 #include <iostream> //debug
 
+/** \cond DOXYGEN_IGNORE */
 namespace Scripting
 {
+/** \endcond */
+
     namespace GUI
     {
-        //getter for key binding for player action enums
-        void getKeyBinding(asIScriptGeneric *gen)
+        /** \addtogroup Scripting
+        * @{
+        */
+        /** \addtogroup GUI
+        * @{
+        */
+
+        /** Get the key bound to a player action (enum GUI::PlayerAction)*/
+        std::string getKeyBinding(int Enum_value)
         {
-            int Enum_value = (int)gen->GetArgDWord(0);
             InputDevice* device = input_manager->getDeviceManager()->getLatestUsedDevice();
             DeviceConfig* config = device->getConfiguration();
             irr::core::stringw control;
             PlayerAction ScriptAction = (PlayerAction)Enum_value;
             control = config->getBindingAsString(ScriptAction);
             std::string key = std::string(irr::core::stringc(control).c_str());
-            void *key_pointer = &key;
-            gen->SetReturnObject(key_pointer);
+            return key;
         }
 
-        // Displays the message specified in displayMessage( string message ) within the script
-        void displayMessage(asIScriptGeneric *gen)
+        /** Show the specified message in a popup */
+        void displayMessage(std::string* input)
         {
-            std::string *input = (std::string*)gen->GetArgAddress(0);
             irr::core::stringw out = StringUtils::utf8_to_wide(input->c_str());
             new TutorialMessageDialog((out), true);
         }
 
-
-        void translate(asIScriptGeneric *gen)
+        /** Get translated version of string */
+        std::string translate(std::string* input)
         {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-
             irr::core::stringw out = translations->fribidize(translations->w_gettext(input->c_str()));
 
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+            return StringUtils::wide_to_utf8(out.c_str());
         }
 
-        void insertValues1(asIScriptGeneric *gen)
+        /** Translate string and insert values. e.g. GUI::translate("Hello %s !", "John") */
+        std::string translate(std::string* formatString, std::string* arg1)
         {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-
-            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-                StringUtils::utf8_to_wide(arg1->c_str()));
-
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
-        }
-
-        void insertValues2(asIScriptGeneric *gen)
-        {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-
-            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-                StringUtils::utf8_to_wide(arg1->c_str()),
-                StringUtils::utf8_to_wide(arg2->c_str()));
-
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
-        }
-
-        void insertValues3(asIScriptGeneric *gen)
-        {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-            std::string *arg3 = (std::string*)gen->GetArgAddress(3);
-
-            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(input->c_str()),
-                StringUtils::utf8_to_wide(arg1->c_str()),
-                StringUtils::utf8_to_wide(arg2->c_str()),
-                StringUtils::utf8_to_wide(arg3->c_str()));
-
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
-        }
-
-        void translateAndInsertValues1(asIScriptGeneric *gen)
-        {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-
-            irr::core::stringw out = translations->w_gettext(input->c_str());
+            irr::core::stringw out = translations->w_gettext(formatString->c_str());
 
             out = StringUtils::insertValues(out,
                 StringUtils::utf8_to_wide(arg1->c_str()));
 
             out = translations->fribidize(out);
 
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+            return StringUtils::wide_to_utf8(out.c_str());
         }
 
-        void translateAndInsertValues2(asIScriptGeneric *gen)
+        /** Translate string and insert values. e.g. GUI::translate("Hello %s !", "John") */
+        std::string translate(std::string* formatString, std::string* arg1, std::string* arg2)
         {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-
-            irr::core::stringw out = translations->w_gettext(input->c_str());
+            irr::core::stringw out = translations->w_gettext(formatString->c_str());
 
             out = StringUtils::insertValues(out,
                 StringUtils::utf8_to_wide(arg1->c_str()),
@@ -149,19 +99,14 @@ namespace Scripting
 
             out = translations->fribidize(out);
 
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+            return StringUtils::wide_to_utf8(out.c_str());
         }
 
-        void translateAndInsertValues3(asIScriptGeneric *gen)
+        /** Translate string and insert values. e.g. GUI::translate("Hello %s !", "John") */
+        std::string translate(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3)
         {
-            // Get the arguments
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            std::string *arg1 = (std::string*)gen->GetArgAddress(1);
-            std::string *arg2 = (std::string*)gen->GetArgAddress(2);
-            std::string *arg3 = (std::string*)gen->GetArgAddress(3);
-
-            irr::core::stringw out = translations->w_gettext(input->c_str());
+            irr::core::stringw out = translations->w_gettext(formatString->c_str());
 
             out = StringUtils::insertValues(out,
                 StringUtils::utf8_to_wide(arg1->c_str()),
@@ -170,70 +115,73 @@ namespace Scripting
 
             out = translations->fribidize(out);
 
-            // Return the string
-            new(gen->GetAddressOfReturnLocation()) std::string(StringUtils::wide_to_utf8(out.c_str()));
+            return StringUtils::wide_to_utf8(out.c_str());
         }
-        
-        void scriptLogInfo(asIScriptGeneric *gen)
+        /** @}*/
+        /** @}*/
+
+        // UNDOCUMENTED PROXIES : Use proxies to have different signatures, then redirect to the
+        // documented function whose name is exposed in angelscript (these proxies exist so that
+        // angelscript can properly resolve overloads, but doxygen can still generate the right docs
+        /** \cond DOXYGEN_IGNORE */
+        std::string proxy_translate(std::string* formatString)
         {
-            std::string input = *(std::string*)gen->GetArgAddress(0);
-            Log::info("Script", "%s", input.c_str());
+            return translate(formatString);
         }
 
-        void scriptLogWarning(asIScriptGeneric *gen)
+        std::string proxy_translateAndInsertValues1(std::string* formatString, std::string* arg1)
         {
-            std::string input = *(std::string*)gen->GetArgAddress(0);
-            Log::warn("Script", "%s", input.c_str());
+            return translate(formatString, arg1);
         }
 
-        void scriptLogError(asIScriptGeneric *gen)
+        std::string proxy_translateAndInsertValues2(std::string* formatString, std::string* arg1, std::string* arg2)
         {
-            std::string input = *(std::string*)gen->GetArgAddress(0);
-            Log::error("Script", "%s", input.c_str());
+            return translate(formatString, arg1, arg2);
         }
 
+        std::string proxy_translateAndInsertValues3(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3)
+        {
+            return translate(formatString, arg1, arg2, arg3);
+        }
+        /** \endcond */
+
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r; // of type asERetCodes
             engine->SetDefaultNamespace("GUI");
-            r = engine->RegisterGlobalFunction("void displayMessage(string &in)", asFUNCTION(displayMessage), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string getKeyBinding(int input)", asFUNCTION(getKeyBinding), asCALL_GENERIC); assert(r >= 0);
-
-            r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(translate), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in)", asFUNCTION(translateAndInsertValues1), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues2), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(translateAndInsertValues3), asCALL_GENERIC); assert(r >= 0);
-            
-            engine->SetDefaultNamespace("Utils");
-            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(insertValues1), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(insertValues2), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(insertValues3), asCALL_GENERIC); assert(r >= 0);
-
-            r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(scriptLogInfo), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(scriptLogWarning), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void logError(const string &in)", asFUNCTION(scriptLogError), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void displayMessage(const string &in)", asFUNCTION(displayMessage), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string getKeyBinding(int input)", asFUNCTION(getKeyBinding), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in)", asFUNCTION(proxy_translate), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in)", asFUNCTION(proxy_translateAndInsertValues1), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in)", asFUNCTION(proxy_translateAndInsertValues2), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string translate(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_translateAndInsertValues3), asCALL_CDECL); assert(r >= 0);
         }
 
         void registerScriptEnums(asIScriptEngine *engine)
         {
+            // TODO: document enum in doxygen-generated scripting docs
             engine->SetDefaultNamespace("GUI");
-            engine->RegisterEnum("PA");
-            engine->RegisterEnumValue("PA", "STEER_LEFT", PA_STEER_LEFT);
-            engine->RegisterEnumValue("PA", "STEER_RIGHT", PA_STEER_RIGHT);
-            engine->RegisterEnumValue("PA", "ACCEL", PA_ACCEL);
-            engine->RegisterEnumValue("PA", "BRAKE", PA_BRAKE);
-            engine->RegisterEnumValue("PA", "NITRO", PA_NITRO);
-            engine->RegisterEnumValue("PA", "DRIFT", PA_DRIFT);
-            engine->RegisterEnumValue("PA", "RESCUE", PA_RESCUE);
-            engine->RegisterEnumValue("PA", "FIRE", PA_FIRE);
-            engine->RegisterEnumValue("PA", "LOOK_BACK", PA_LOOK_BACK);
-            engine->RegisterEnumValue("PA", "PAUSE_RACE", PA_PAUSE_RACE);
-            engine->RegisterEnumValue("PA", "MENU_UP", PA_MENU_UP);
-            engine->RegisterEnumValue("PA", "MENU_DOWN", PA_MENU_DOWN);
-            engine->RegisterEnumValue("PA", "MENU_LEFT", PA_MENU_LEFT);
-            engine->RegisterEnumValue("PA", "MENU_RIGHT", PA_MENU_RIGHT);
-            engine->RegisterEnumValue("PA", "MENU_SELECT", PA_MENU_SELECT);
-            engine->RegisterEnumValue("PA", "MENU_CANCEL", PA_MENU_CANCEL);
+            engine->RegisterEnum("PlayerAction");
+            engine->RegisterEnumValue("PlayerAction", "STEER_LEFT", PA_STEER_LEFT);
+            engine->RegisterEnumValue("PlayerAction", "STEER_RIGHT", PA_STEER_RIGHT);
+            engine->RegisterEnumValue("PlayerAction", "ACCEL", PA_ACCEL);
+            engine->RegisterEnumValue("PlayerAction", "BRAKE", PA_BRAKE);
+            engine->RegisterEnumValue("PlayerAction", "NITRO", PA_NITRO);
+            engine->RegisterEnumValue("PlayerAction", "DRIFT", PA_DRIFT);
+            engine->RegisterEnumValue("PlayerAction", "RESCUE", PA_RESCUE);
+            engine->RegisterEnumValue("PlayerAction", "FIRE", PA_FIRE);
+            engine->RegisterEnumValue("PlayerAction", "LOOK_BACK", PA_LOOK_BACK);
+            engine->RegisterEnumValue("PlayerAction", "PAUSE_RACE", PA_PAUSE_RACE);
+            engine->RegisterEnumValue("PlayerAction", "MENU_UP", PA_MENU_UP);
+            engine->RegisterEnumValue("PlayerAction", "MENU_DOWN", PA_MENU_DOWN);
+            engine->RegisterEnumValue("PlayerAction", "MENU_LEFT", PA_MENU_LEFT);
+            engine->RegisterEnumValue("PlayerAction", "MENU_RIGHT", PA_MENU_RIGHT);
+            engine->RegisterEnumValue("PlayerAction", "MENU_SELECT", PA_MENU_SELECT);
+            engine->RegisterEnumValue("PlayerAction", "MENU_CANCEL", PA_MENU_CANCEL);
         }
     }
+
+/** \cond DOXYGEN_IGNORE */
 }
+/** \endcond */
diff --git a/src/scriptengine/script_gui.hpp b/src/scriptengine/script_gui.hpp
index f5d5434f6..804abf1f8 100644
--- a/src/scriptengine/script_gui.hpp
+++ b/src/scriptengine/script_gui.hpp
@@ -29,8 +29,6 @@ namespace Scripting
     {
         //script engine functions
         void registerScriptFunctions(asIScriptEngine *engine);
-        asIScriptFunction*
-            registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
         void registerScriptEnums(asIScriptEngine *engine);
     }
 
diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index 8642fbf00..d950b2ccf 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -25,99 +25,105 @@
 //debug
 #include <iostream>
 
-
+/** \cond DOXYGEN_IGNORE */
 namespace Scripting
 {
+/** \endcond */
 
     namespace Kart
     {
-        //Squashes the specified kart, specified time
-        void squashKart(asIScriptGeneric *gen)
+        /** \addtogroup Scripting
+          * @{
+          */
+        /** \addtogroup Kart
+        * @{
+        */
+
+        /** Squashes the specified kart, for the specified time */
+        void squash(int idKart, float time)
         {
-            int id = (int)gen->GetArgDWord(0);
-            float time = gen->GetArgFloat(1);
-            AbstractKart* kart = World::getWorld()->getKart(id);
+            AbstractKart* kart = World::getWorld()->getKart(idKart);
             kart->setSquash(time, 0.5);  //0.5 * max speed is new max for squashed duration
         }
-        //Teleports the kart to the specified Vec3 location
-        void teleportKart(asIScriptGeneric *gen)
+
+        /** Teleports the kart to the specified Vec3 location */
+        void teleport(int idKart, Vec3* position)
         {
-            int id = (int)gen->GetArgDWord(0);
-            Vec3 *position = (Vec3*)gen->GetArgAddress(1);
+            // TODO: must we delete "position" ?
 
-            float x = position->getX();
-            float y = position->getY();
-            float z = position->getZ();
-
-            AbstractKart* kart = World::getWorld()->getKart(id);
-            kart->setXYZ(btVector3(x, y, z));
+            AbstractKart* kart = World::getWorld()->getKart(idKart);
+            kart->setXYZ(*position);
             unsigned int index = World::getWorld()->getRescuePositionIndex(kart);
             btTransform s = World::getWorld()->getRescueTransform(index);
             const btVector3 &xyz = s.getOrigin();
             s.setRotation(btQuaternion(btVector3(0.0f, 1.0f, 0.0f), 0.0f));
             World::getWorld()->moveKartTo(kart, s);
         }
-        //Attempts to project kart to the given 2D location, to the position
-        //with height 0, at a 45 degree angle.
-        void jumpKartTo(asIScriptGeneric *gen)
-        {
-            //attempts to project kart to target destination
-            //at present, assumes both initial and target location are
-            //on the same horizontal plane (z=k plane) and projects
-            //at a 45 degree angle.
-            int id = (int)gen->GetArgDWord(0);
 
-            float x = gen->GetArgFloat(1);
-            float y = gen->GetArgFloat(2);
-            //float velocity = gen->GetArgFloat(3);
-            //angle = pi/4 so t = v/(root 2 * g)
-            //d = t * v/root 2 so d = v^2/(2g) => v = root(2dg)
-            //component in x = component in y = root (dg)
-            AbstractKart* kart = World::getWorld()->getKart(id);
-            Vec3 pos = kart->getXYZ();
-            float dx = x - pos[0];
-            float dy = y - pos[2]; //blender uses xyz, bullet xzy
-            float d = (sqrtf(dx*dx + dy*dy));
-            float normalized_dx = dx / d;
-            float normalized_dy = dy / d;
-            float g = 9.81f;
-            float velocity = sqrtf(d * g);
-            
-            kart->setVelocity(btVector3(velocity * normalized_dx, velocity, velocity * normalized_dy));
+        /** Attempts to project kart to the given 2D location, to the position
+          * with height 0, at a 45 degree angle.
+          */
+        // TODO: not sure what this function is for
+        //void jumpTo(asIScriptGeneric *gen)
+        //{
+        //    //attempts to project kart to target destination
+        //    //at present, assumes both initial and target location are
+        //    //on the same horizontal plane (z=k plane) and projects
+        //    //at a 45 degree angle.
+        //    int id = (int)gen->GetArgDWord(0);
+        //
+        //    float x = gen->GetArgFloat(1);
+        //    float y = gen->GetArgFloat(2);
+        //    //float velocity = gen->GetArgFloat(3);
+        //    //angle = pi/4 so t = v/(root 2 * g)
+        //    //d = t * v/root 2 so d = v^2/(2g) => v = root(2dg)
+        //    //component in x = component in y = root (dg)
+        //    AbstractKart* kart = World::getWorld()->getKart(id);
+        //    Vec3 pos = kart->getXYZ();
+        //    float dx = x - pos[0];
+        //    float dy = y - pos[2]; //blender uses xyz, bullet xzy
+        //    float d = (sqrtf(dx*dx + dy*dy));
+        //    float normalized_dx = dx / d;
+        //    float normalized_dy = dy / d;
+        //    float g = 9.81f;
+        //    float velocity = sqrtf(d * g);
+        //    
+        //    kart->setVelocity(btVector3(velocity * normalized_dx, velocity, velocity * normalized_dy));
+        //}
+        
+        /** Returns the location of the corresponding kart. */
+        Vec3 getLocation(int idKart)
+        {
+            AbstractKart* kart = World::getWorld()->getKart(idKart);
+            return kart->getXYZ();
         }
-        //Bind kart location
-        void getKartLocation(asIScriptGeneric *gen)
+
+        /** Sets the kart's velocity to the specified value. */
+        void setVelocity(int idKart, Vec3* position)
         {
-            int id = (int)gen->GetArgDWord(0);
-
-            AbstractKart* kart = World::getWorld()->getKart(id);
-            Vec3 kart_loc = kart->getXYZ();
-            void *pointer = &kart_loc;
-
-            gen->SetReturnObject(pointer);
-        }
-        //Bind setter for velocity
-        void setVelocity(asIScriptGeneric *gen)
-        {
-            int id = (int)gen->GetArgDWord(0);
-            Vec3 *position = (Vec3*)gen->GetArgAddress(1);
-
             float x = position->getX();
             float y = position->getY();
             float z = position->getZ();
 
-            AbstractKart* kart = World::getWorld()->getKart(id);
+            AbstractKart* kart = World::getWorld()->getKart(idKart);
             kart->setVelocity(btVector3(x, y, z));
         }
+
+        /** @}*/
+        /** @}*/
+
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
-            engine->SetDefaultNamespace("Karts");
-            r = engine->RegisterGlobalFunction("void squashKart(int id, float time)", asFUNCTION(squashKart), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void teleportKart(int id, Vec3 &in)", asFUNCTION(teleportKart), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void setVelocity(int id, Vec3 &in)", asFUNCTION(setVelocity), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void jumpKartTo(int id, float x, float y)", asFUNCTION(jumpKartTo), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("Vec3 getKartLocation(int id)", asFUNCTION(getKartLocation), asCALL_GENERIC); assert(r >= 0);
+            engine->SetDefaultNamespace("Kart");
+            r = engine->RegisterGlobalFunction("void squash(int id, float time)", asFUNCTION(squash), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void teleport(int id, const Vec3 &in)", asFUNCTION(teleport), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void setVelocity(int id, const Vec3 &in)", asFUNCTION(setVelocity), asCALL_CDECL); assert(r >= 0);
+            //r = engine->RegisterGlobalFunction("void jumpTo(int id, float x, float y)", asFUNCTION(jumpTo), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("Vec3 getLocation(int id)", asFUNCTION(getLocation), asCALL_CDECL); assert(r >= 0);
         }
     }
+
+/** \cond DOXYGEN_IGNORE */
 }
+/** \endcond */
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 7cfb2602b..fce2a3dfa 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -38,14 +38,6 @@ namespace Scripting
 
     namespace Track
     {
-        //register callbacks
-        // TODO: move this out of Track namespace, it's not specific to tracks
-        asIScriptFunction* registerScriptCallbacks(asIScriptEngine *engine, std::string function_name)
-        {
-            asIScriptFunction *func;
-            func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
-            return func;
-        }
         /*
         void disableAnimation(std::string *name, void *memory)
         {
diff --git a/src/scriptengine/script_utils.cpp b/src/scriptengine/script_utils.cpp
new file mode 100644
index 000000000..fcb19efad
--- /dev/null
+++ b/src/scriptengine/script_utils.cpp
@@ -0,0 +1,165 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "script_track.hpp"
+
+#include "animations/three_d_animation.hpp"
+#include "input/device_manager.hpp"
+#include "input/input_device.hpp"
+#include "input/input_manager.hpp"
+#include "modes/world.hpp"
+#include "states_screens/dialogs/tutorial_message_dialog.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
+#include "tracks/track_object_manager.hpp"
+
+#include <angelscript.h>
+#include "scriptarray.hpp"
+
+#include <assert.h>
+#include <iostream> //debug
+
+/** \cond DOXYGEN_IGNORE */
+namespace Scripting
+{
+    /** \endcond */
+
+    namespace Utils
+    {
+        /** \addtogroup Scripting
+        * @{
+        */
+        /** \addtogroup Utils
+        * @{
+        */
+        // TODO: build these variations with variadic templates?
+
+        /** Replaces placeholders with values. Note, in angelscript, omit the trailing number.
+          * e.g. Utils::insertValues("Hello %s !", "world");
+          */
+        std::string insertValues(std::string* formatString, std::string* arg1)
+        {
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(formatString->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()));
+
+            return StringUtils::wide_to_utf8(out.c_str());
+        }
+
+        /** Replaces placeholders with values. Note, in angelscript, omit the trailing number.
+        * e.g. Utils::insertValues("Hello %s %s !", "John", "Doe");
+        */
+        std::string insertValues(std::string* formatString, std::string* arg1, std::string* arg2)
+        {
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(formatString->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()));
+
+            return StringUtils::wide_to_utf8(out.c_str());
+        }
+
+        /** Replaces placeholders with values. Note, in angelscript, omit the trailing number.
+          * e.g. Utils::insertValues("Hello %s %s %s !", "Mr", "John", "Doe");
+          */
+        std::string insertValues(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3)
+        {
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(formatString->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()),
+                StringUtils::utf8_to_wide(arg3->c_str()));
+
+            return StringUtils::wide_to_utf8(out.c_str());
+        }
+
+        /** Replaces placeholders with values. Note, in angelscript, omit the trailing number.
+          * e.g. Utils::insertValues("%s %s %s %s !", "Hello", "Mr", "John", "Doe");
+          */
+        std::string insertValues(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3, std::string* arg4)
+        {
+            irr::core::stringw out = StringUtils::insertValues(StringUtils::utf8_to_wide(formatString->c_str()),
+                StringUtils::utf8_to_wide(arg1->c_str()),
+                StringUtils::utf8_to_wide(arg2->c_str()),
+                StringUtils::utf8_to_wide(arg3->c_str()),
+                StringUtils::utf8_to_wide(arg4->c_str()));
+
+            return StringUtils::wide_to_utf8(out.c_str());
+        }
+
+        /** Log to the console */
+        void logInfo(std::string* log)
+        {
+            Log::info("Script", "%s", log->c_str());
+        }
+
+        /** Log warning to the console */
+        void logWarning(std::string* log)
+        {
+            Log::warn("Script", "%s", log->c_str());
+        }
+
+        /** Log error to the console */
+        void logError(std::string* log)
+        {
+            Log::error("Script", "%s", log->c_str());
+        }
+        /** @}*/
+        /** @}*/
+
+        // UNDOCUMENTED PROXIES : Use proxies to have different signatures, then redirect to the
+        // documented function whose name is exposed in angelscript (these proxies exist so that
+        // angelscript can properly resolve overloads, but doxygen can still generate the right docs
+        /** \cond DOXYGEN_IGNORE */
+        std::string proxy_insertValues1(std::string* formatString, std::string* arg1)
+        {
+            return insertValues(formatString, arg1);
+        }
+        std::string proxy_insertValues2(std::string* formatString, std::string* arg1, std::string* arg2)
+        {
+            return insertValues(formatString, arg1, arg2);
+        }
+        std::string proxy_insertValues3(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3)
+        {
+            return insertValues(formatString, arg1, arg2, arg3);
+        }
+        std::string proxy_insertValues4(std::string* formatString, std::string* arg1, std::string* arg2,
+            std::string* arg3, std::string* arg4)
+        {
+            return insertValues(formatString, arg1, arg2, arg3, arg4);
+        }
+        /** \endcond */
+
+        void registerScriptFunctions(asIScriptEngine *engine)
+        {
+            int r; // of type asERetCodes
+            engine->SetDefaultNamespace("Utils");
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in)", asFUNCTION(proxy_insertValues1), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues2), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues3), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues4), asCALL_CDECL); assert(r >= 0);
+
+            r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(logInfo), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(logWarning), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void logError(const string &in)", asFUNCTION(logError), asCALL_CDECL); assert(r >= 0);
+        }
+    }
+
+/** \cond DOXYGEN_IGNORE */
+}
+/** \endcond */
diff --git a/src/scriptengine/script_utils.hpp b/src/scriptengine/script_utils.hpp
new file mode 100644
index 000000000..8920d8d36
--- /dev/null
+++ b/src/scriptengine/script_utils.hpp
@@ -0,0 +1,34 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SCRIPT_UTILS_HPP
+#define HEADER_SCRIPT_UTILS_HPP
+
+#include <angelscript.h>
+
+#include <string>
+
+namespace Scripting
+{
+    namespace Utils
+    {
+        void registerScriptFunctions(asIScriptEngine *engine);
+    }
+
+}
+#endif
diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index 0f7bc9306..1be851d6f 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -27,40 +27,44 @@
 
 namespace Scripting
 {
-
-
     void Constructor(void *memory)
     {
         // Initialize the pre-allocated memory by calling the
         // object constructor with the placement-new operator
         new(memory)Vec3();
     }
+
     void Destructor(void *memory)
     {
         // Uninitialize the memory by calling the object destructor
         ((Vec3*)memory)->~Vec3();
     }
-    void ConstructVector3FromFloats(float a, float b, float c, void *memory){
+
+    void ConstructVector3FromFloats(float a, float b, float c, void *memory)
+    {
         //Constructor using 3 floats
         new (memory)(Vec3)(Vec3(a, b, c));
     }
+
     //Print for debugging purposes
     void printVec3(asIScriptGeneric *gen)
     {
         Vec3 *script_vec3 = (Vec3*)gen->GetArgObject(0);
         std::cout << script_vec3->getX() << "," << script_vec3->getY() << "," << script_vec3->getZ() << std::endl;
     }
+
     void RegisterVec3(asIScriptEngine *engine)
     {
         int r;
-        r = engine->RegisterObjectType("Vec3", sizeof(Vec3), asOBJ_VALUE); assert(r >= 0);
+        r = engine->RegisterObjectType("Vec3", sizeof(Vec3), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert(r >= 0);
         // Register the behaviours
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(Constructor), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(Destructor), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectMethod("Vec3", "Vec3 &opAssign(const Vec3 &in)", asMETHODPR(Vec3, operator =, (const Vec3&), Vec3&), asCALL_THISCALL); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f(float, float, float)", asFUNCTION(ConstructVector3FromFloats), asCALL_CDECL_OBJLAST); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("void printVec3(Vec3 a)", asFUNCTION(printVec3), asCALL_GENERIC); assert(r >= 0);
-
-        
+        r = engine->RegisterGlobalFunction("void printVec3(Vec3 a)", asFUNCTION(printVec3), asCALL_GENERIC); assert(r >= 0);   
+        r = engine->RegisterObjectMethod("Vec3", "float &getX()", asMETHOD(Vec3, getX), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float &getY()", asMETHOD(Vec3, getY), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float &getZ()", asMETHOD(Vec3, getZ), asCALL_THISCALL); assert(r >= 0);
     }
 }

From 400f9c612be7939da74b6b90a9e5db95beb974ef Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 11 May 2015 08:09:09 +1000
Subject: [PATCH 176/331] Moved SpecularIBLGenerator-shader into IBL.cpp, and
 ColoredLine shader into Shaders. Fixed codying style of IBL somewhat.

---
 src/graphics/IBL.cpp           | 210 +++++++++++++++++++++------------
 src/graphics/IBL.hpp           |   9 +-
 src/graphics/glwrap.cpp        |   9 +-
 src/graphics/render.cpp        |  18 +--
 src/graphics/render_skybox.cpp |   2 +-
 src/graphics/shaders.cpp       |  52 ++++----
 src/graphics/shaders.hpp       |  47 ++++----
 7 files changed, 197 insertions(+), 150 deletions(-)

diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 20e4e0956..3f37d068a 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -22,6 +22,26 @@
 #include <set>
 #include "central_settings.hpp"
 
+
+class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4,
+                                           float >,
+                             public TextureReadNew<ST_TRILINEAR_CUBEMAP>
+{
+public:
+    GLuint m_tu_samples;
+    SpecularIBLGenerator()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                      GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
+        assignUniforms("PermutationMatrix", "ViewportSize");
+        m_tu_samples = 1;
+        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
+        assignTextureUnit(m_tu_samples, "samples");
+    }
+
+};   // SpecularIBLGenerator
+
+// ============================================================================
 static void getXYZ(GLenum face, float i, float j, float &x, float &y, float &z)
 {
     switch (face)
@@ -61,9 +81,10 @@ static void getXYZ(GLenum face, float i, float j, float &x, float &y, float &z)
     float norm = sqrt(x * x + y * y + z * z);
     x /= norm, y /= norm, z /= norm;
     return;
-}
+}   // getXYZ
 
 
+// ----------------------------------------------------------------------------
 static void getYml(GLenum face, size_t edge_size,
     float *Y00,
     float *Y1minus1, float *Y10, float *Y11,
@@ -107,18 +128,18 @@ static void getYml(GLenum face, size_t edge_size,
 }
 
 
-static void projectSH(Color *CubemapFace[6], size_t edge_size,
-    float *Y00[],
-    float *Y1minus1[], float *Y10[], float *Y11[],
-    float *Y2minus2[], float *Y2minus1[], float * Y20[], float *Y21[], float *Y22[],
-    float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff
-    )
+// ----------------------------------------------------------------------------
+static void projectSH(Color *cubemap_face[6], size_t edge_size, float *Y00[],
+                      float *Y1minus1[], float *Y10[], float *Y11[],
+                      float *Y2minus2[], float *Y2minus1[], float * Y20[],
+                      float *Y21[], float *Y22[], float *blue_sh_coeff,
+                      float *green_sh_coeff, float *red_sh_coeff)
 {
     for (unsigned i = 0; i < 9; i++)
     {
-        blueSHCoeff[i] = 0;
-        greenSHCoeff[i] = 0;
-        redSHCoeff[i] = 0;
+        blue_sh_coeff[i] = 0;
+        green_sh_coeff[i] = 0;
+        red_sh_coeff[i] = 0;
     }
 
     float wh = float(edge_size * edge_size);
@@ -127,7 +148,9 @@ static void projectSH(Color *CubemapFace[6], size_t edge_size,
     float g0 = 0., g1 = 0., g2 = 0., g3 = 0., g4 = 0., g5 = 0., g6 = 0., g7 = 0., g8 = 0.;
     for (unsigned face = 0; face < 6; face++)
     {
-#pragma omp parallel for reduction(+ : b0, b1, b2, b3, b4, b5, b6, b7, b8, r0, r1, r2, r3, r4, r5, r6, r7, r8, g0, g1, g2, g3, g4, g5, g6, g7, g8)
+#pragma omp parallel for reduction(+ : b0, b1, b2, b3, b4, b5, b6, b7, b8, \
+                                       r0, r1, r2, r3, r4, r5, r6, r7, r8, \
+                                       g0, g1, g2, g3, g4, g5, g6, g7, g8)
         for (int i = 0; i < int(edge_size); i++)
         {
             for (unsigned j = 0; j < edge_size; j++)
@@ -143,9 +166,9 @@ static void projectSH(Color *CubemapFace[6], size_t edge_size,
                 // Constant obtained by projecting unprojected ref values
                 float solidangle = 2.75f / (wh * pow(d, 1.5f));
                 // pow(., 2.2) to convert from srgb
-                float b = CubemapFace[face][edge_size * i + j].Blue;
-                float g = CubemapFace[face][edge_size * i + j].Green;
-                float r = CubemapFace[face][edge_size * i + j].Red;
+                float b = cubemap_face[face][edge_size * i + j].Blue;
+                float g = cubemap_face[face][edge_size * i + j].Green;
+                float r = cubemap_face[face][edge_size * i + j].Red;
 
                 b0 += b * Y00[face][idx] * solidangle;
                 b1 += b * Y1minus1[face][idx] * solidangle;
@@ -181,38 +204,46 @@ static void projectSH(Color *CubemapFace[6], size_t edge_size,
         }
     }
 
-    blueSHCoeff[0] = b0;
-    blueSHCoeff[1] = b1;
-    blueSHCoeff[2] = b2;
-    blueSHCoeff[3] = b3;
-    blueSHCoeff[4] = b4;
-    blueSHCoeff[5] = b5;
-    blueSHCoeff[6] = b6;
-    blueSHCoeff[7] = b7;
-    blueSHCoeff[8] = b8;
+    blue_sh_coeff[0] = b0;
+    blue_sh_coeff[1] = b1;
+    blue_sh_coeff[2] = b2;
+    blue_sh_coeff[3] = b3;
+    blue_sh_coeff[4] = b4;
+    blue_sh_coeff[5] = b5;
+    blue_sh_coeff[6] = b6;
+    blue_sh_coeff[7] = b7;
+    blue_sh_coeff[8] = b8;
 
-    redSHCoeff[0] = r0;
-    redSHCoeff[1] = r1;
-    redSHCoeff[2] = r2;
-    redSHCoeff[3] = r3;
-    redSHCoeff[4] = r4;
-    redSHCoeff[5] = r5;
-    redSHCoeff[6] = r6;
-    redSHCoeff[7] = r7;
-    redSHCoeff[8] = r8;
+    red_sh_coeff[0] = r0;
+    red_sh_coeff[1] = r1;
+    red_sh_coeff[2] = r2;
+    red_sh_coeff[3] = r3;
+    red_sh_coeff[4] = r4;
+    red_sh_coeff[5] = r5;
+    red_sh_coeff[6] = r6;
+    red_sh_coeff[7] = r7;
+    red_sh_coeff[8] = r8;
 
-    greenSHCoeff[0] = g0;
-    greenSHCoeff[1] = g1;
-    greenSHCoeff[2] = g2;
-    greenSHCoeff[3] = g3;
-    greenSHCoeff[4] = g4;
-    greenSHCoeff[5] = g5;
-    greenSHCoeff[6] = g6;
-    greenSHCoeff[7] = g7;
-    greenSHCoeff[8] = g8;
-}
+    green_sh_coeff[0] = g0;
+    green_sh_coeff[1] = g1;
+    green_sh_coeff[2] = g2;
+    green_sh_coeff[3] = g3;
+    green_sh_coeff[4] = g4;
+    green_sh_coeff[5] = g5;
+    green_sh_coeff[6] = g6;
+    green_sh_coeff[7] = g7;
+    green_sh_coeff[8] = g8;
+}   // projectSH
 
-void SphericalHarmonics(Color *CubemapFace[6], size_t edge_size, float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff)
+// ----------------------------------------------------------------------------
+/** Generate the 9 first SH coefficients for each color channel
+ *  using the cubemap provided by CubemapFace.
+ *  \param textures sequence of 6 square textures.
+ *  \param row/columns count of textures.
+ */
+void generateSphericalHarmonics(Color *cubemap_face[6], size_t edge_size,
+                                float *blue_sh_coeff, float *green_sh_coeff,
+                                float *red_sh_coeff)
 {
     float *Y00[6];
     float *Y1minus1[6];
@@ -236,15 +267,14 @@ void SphericalHarmonics(Color *CubemapFace[6], size_t edge_size, float *blueSHCo
         Y21[face] = new float[edge_size * edge_size];
         Y22[face] = new float[edge_size * edge_size];
 
-        getYml(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, edge_size, Y00[face], Y1minus1[face], Y10[face], Y11[face], Y2minus2[face], Y2minus1[face], Y20[face], Y21[face], Y22[face]);
+        getYml(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, edge_size, Y00[face],
+               Y1minus1[face], Y10[face], Y11[face], Y2minus2[face],
+               Y2minus1[face], Y20[face], Y21[face], Y22[face]);
     }
 
-    projectSH(CubemapFace, edge_size,
-        Y00,
-        Y1minus1, Y10, Y11,
-        Y2minus2, Y2minus1, Y20, Y21, Y22,
-        blueSHCoeff, greenSHCoeff, redSHCoeff
-        );
+    projectSH(cubemap_face, edge_size, Y00, Y1minus1, Y10, Y11, Y2minus2,
+              Y2minus1, Y20, Y21, Y22, blue_sh_coeff, green_sh_coeff,
+              red_sh_coeff);
 
     for (unsigned face = 0; face < 6; face++)
     {
@@ -258,38 +288,49 @@ void SphericalHarmonics(Color *CubemapFace[6], size_t edge_size, float *blueSHCo
         delete[] Y21[face];
         delete[] Y22[face];
     }
-}
+}   // generateSphericalHarmonics
 
+// ----------------------------------------------------------------------------
 // From http://http.developer.nvidia.com/GPUGems3/gpugems3_ch20.html
 /** Returns the index-th pair from Hammersley set of pseudo random set.
     Hammersley set is a uniform distribution between 0 and 1 for 2 components.
     We use the natural indexation on the set to avoid storing the whole set.
     \param index of the pair
     \param size of the set. */
-std::pair<float, float> HammersleySequence(int index, int samples)
+std::pair<float, float> getHammersleySequence(int index, int samples)
 {
     float InvertedBinaryRepresentation = 0.;
     for (size_t i = 0; i < 32; i++)
     {
-        InvertedBinaryRepresentation += ((index >> i) & 0x1) * powf(.5, (float) (i + 1.));
+        InvertedBinaryRepresentation += ((index >> i) & 0x1) 
+                                      * powf(.5, (float) (i + 1.));
     }
-    return std::make_pair(float(index) / float(samples), InvertedBinaryRepresentation);
-}
+    return std::make_pair(float(index) / float(samples),
+                          InvertedBinaryRepresentation);
+}   // HammersleySequence
 
 
-/** Returns a pseudo random (theta, phi) generated from a probability density function modeled after Phong function.
-    \param a pseudo random float pair from a uniform density function between 0 and 1.
-    \param exponent from the Phong formula. */
-std::pair<float, float> ImportanceSamplingPhong(std::pair<float, float> Seeds, float exponent)
+// ----------------------------------------------------------------------------
+/** Returns a pseudo random (theta, phi) generated from a probability density
+ *  function modeled after Phong function.
+ *  \param a pseudo random float pair from a uniform density function between 
+ *         0 and 1.
+ *   \param exponent from the Phong formula.
+ */
+std::pair<float, float> getImportanceSamplingPhong(std::pair<float, float> Seeds,
+                                                float exponent)
 {
-    return std::make_pair(acosf(powf(Seeds.first, 1.f / (exponent + 1.f))), 2.f * 3.14f * Seeds.second);
-}
+    return std::make_pair(acosf(powf(Seeds.first, 1.f / (exponent + 1.f))),
+                         2.f * 3.14f * Seeds.second);
+}   // getImportanceSamplingPhong
 
-static
-core::matrix4 getPermutationMatrix(size_t indexX, float valX, size_t indexY, float valY, size_t indexZ, float valZ)
+// ----------------------------------------------------------------------------
+static core::matrix4 getPermutationMatrix(size_t indexX, float valX, 
+                                          size_t indexY, float valY, 
+                                          size_t indexZ, float valZ)
 {
-    core::matrix4 resultMat;
-    float *M = resultMat.pointer();
+    core::matrix4 result_mat;
+    float *M = result_mat.pointer();
     memset(M, 0, 16 * sizeof(float));
     assert(indexX < 4);
     assert(indexY < 4);
@@ -297,9 +338,10 @@ core::matrix4 getPermutationMatrix(size_t indexX, float valX, size_t indexY, flo
     M[indexX] = valX;
     M[4 + indexY] = valY;
     M[8 + indexZ] = valZ;
-    return resultMat;
-}
+    return result_mat;
+}   // getPermutationMatrix
 
+// ----------------------------------------------------------------------------
 GLuint generateSpecularCubemap(GLuint probe)
 {
     GLuint cubemap_texture;
@@ -308,7 +350,10 @@ GLuint generateSpecularCubemap(GLuint probe)
     glBindTexture(GL_TEXTURE_CUBE_MAP, cubemap_texture);
     size_t cubemap_size = 256;
     for (int i = 0; i < 6; i++)
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA16F, cubemap_size, cubemap_size, 0, GL_BGRA, GL_FLOAT, 0);
+    {
+        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGBA16F,
+                     cubemap_size, cubemap_size, 0, GL_BGRA, GL_FLOAT, 0);
+    }
     glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
 
     if (!CVS->isDefferedEnabled())
@@ -320,7 +365,7 @@ GLuint generateSpecularCubemap(GLuint probe)
     glViewport(0, 0, cubemap_size, cubemap_size);
     GLenum bufs[] = { GL_COLOR_ATTACHMENT0 };
     glDrawBuffers(1, bufs);
-    UtilShader::SpecularIBLGenerator::getInstance()->use();
+    SpecularIBLGenerator::getInstance()->use();
 
     glDisable(GL_BLEND);
     glDisable(GL_DEPTH_TEST);
@@ -337,7 +382,8 @@ GLuint generateSpecularCubemap(GLuint probe)
 
     for (unsigned level = 0; level < 8; level++)
     {
-        // Blinn Phong can be approximated by Phong with 4x the specular coefficient
+        // Blinn Phong can be approximated by Phong with 4x the specular
+        // coefficient
         // See http://seblagarde.wordpress.com/2012/03/29/relationship-between-phong-and-blinn-lighting-model/
         // NOTE : Removed because it makes too sharp reflexion
         float roughness = (8 - level) * pow(2.f, 10.f) / 8.f;
@@ -346,17 +392,21 @@ GLuint generateSpecularCubemap(GLuint probe)
         float *tmp = new float[2048];
         for (unsigned i = 0; i < 1024; i++)
         {
-            std::pair<float, float> sample = ImportanceSamplingPhong(HammersleySequence(i, 1024), roughness);
+            std::pair<float, float> sample = 
+                getImportanceSamplingPhong(getHammersleySequence(i, 1024),
+                                        roughness);
             tmp[2 * i] = sample.first;
             tmp[2 * i + 1] = sample.second;
         }
 
         glBindVertexArray(0);
-        glActiveTexture(GL_TEXTURE0 + UtilShader::SpecularIBLGenerator::getInstance()->TU_Samples);
+        glActiveTexture(GL_TEXTURE0 + 
+                        SpecularIBLGenerator::getInstance()->m_tu_samples);
         GLuint sampleTex, sampleBuffer;
         glGenBuffers(1, &sampleBuffer);
         glBindBuffer(GL_TEXTURE_BUFFER, sampleBuffer);
-        glBufferData(GL_TEXTURE_BUFFER, 2048 * sizeof(float), tmp, GL_STATIC_DRAW);
+        glBufferData(GL_TEXTURE_BUFFER, 2048 * sizeof(float), tmp, 
+                     GL_STATIC_DRAW);
         glGenTextures(1, &sampleTex);
         glBindTexture(GL_TEXTURE_BUFFER, sampleTex);
         glTexBuffer(GL_TEXTURE_BUFFER, GL_RG32F, sampleBuffer);
@@ -365,16 +415,20 @@ GLuint generateSpecularCubemap(GLuint probe)
         for (unsigned face = 0; face < 6; face++)
         {
 
-            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, cubemap_texture, level);
+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
+                                   GL_TEXTURE_CUBE_MAP_POSITIVE_X + face,
+                                   cubemap_texture, level);
             GLuint status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
             assert(status == GL_FRAMEBUFFER_COMPLETE);
 
-            UtilShader::SpecularIBLGenerator::getInstance()->setTextureUnits(probe);
-            UtilShader::SpecularIBLGenerator::getInstance()->setUniforms(M[face], viewportSize);
+            SpecularIBLGenerator::getInstance()->setTextureUnits(probe);
+            SpecularIBLGenerator::getInstance()->setUniforms(M[face],
+                                                             viewportSize);
 
             glDrawArrays(GL_TRIANGLES, 0, 3);
         }
-        glActiveTexture(GL_TEXTURE0 + UtilShader::SpecularIBLGenerator::getInstance()->TU_Samples);
+        glActiveTexture(  GL_TEXTURE0
+                        + SpecularIBLGenerator::getInstance()->m_tu_samples);
         glBindBuffer(GL_TEXTURE_BUFFER, 0);
         glBindTexture(GL_TEXTURE_BUFFER, 0);
 
@@ -385,4 +439,4 @@ GLuint generateSpecularCubemap(GLuint probe)
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glDeleteFramebuffers(1, &fbo);
     return cubemap_texture;
-}
+}   // generateSpecularCubemap
diff --git a/src/graphics/IBL.hpp b/src/graphics/IBL.hpp
index f9461dd7e..783e4a8a0 100644
--- a/src/graphics/IBL.hpp
+++ b/src/graphics/IBL.hpp
@@ -27,12 +27,9 @@ struct Color
     float Blue;
 };
 
-/** Generate the 9 first SH coefficients for each color channel
-using the cubemap provided by CubemapFace.
-*  \param textures sequence of 6 square textures.
-*  \param row/columns count of textures.
-*/
-void SphericalHarmonics(Color *CubemapFace[6], size_t edge_size, float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff);
+void generateSphericalHarmonics(Color *CubemapFace[6], size_t edge_size,
+                                float *blue_sh_coeff, float *green_sh_coeff,
+                                float *red_sh_coeff);
 
 GLuint generateSpecularCubemap(GLuint probe);
 #endif
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 5e3572852..6ad76bc72 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -295,12 +295,13 @@ void draw3DLine(const core::vector3df& start,
         end.X, end.Y, end.Z
     };
 
-    glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
-    glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
+    Shaders::ColoredLine *line = Shaders::ColoredLine::getInstance();
+    line->bindVertexArray();
+    line->bindBuffer();
     glBufferSubData(GL_ARRAY_BUFFER, 0, 6 * sizeof(float), vertex);
 
-    UtilShader::ColoredLine::getInstance()->use();
-    UtilShader::ColoredLine::getInstance()->setUniforms(color);
+    line->use();
+    line->setUniforms(color);
     glDrawArrays(GL_LINES, 0, 2);
 
     glGetError();
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 5cc3274c1..7f86bb48e 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -192,10 +192,11 @@ void IrrDriver::renderGLSL(float dt)
         // Render bounding boxes
         if (irr_driver->getBoundingBoxesViz())
         {
-            UtilShader::ColoredLine::getInstance()->use();
-            glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
-            glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
-            UtilShader::ColoredLine::getInstance()->setUniforms(SColor(255, 255, 0, 0));
+            Shaders::ColoredLine *line = Shaders::ColoredLine::getInstance();
+            line->use();
+            line->bindVertexArray();
+            line->bindBuffer();
+            line->setUniforms(SColor(255, 255, 0, 0));
             const float *tmp = BoundingBoxes.data();
             for (unsigned int i = 0; i < BoundingBoxes.size(); i += 1024 * 6)
             {
@@ -221,12 +222,13 @@ void IrrDriver::renderGLSL(float dt)
                 const std::map<video::SColor, std::vector<float> >& lines = debug_drawer->getLines();
                 std::map<video::SColor, std::vector<float> >::const_iterator it;
 
-                UtilShader::ColoredLine::getInstance()->use();
-                glBindVertexArray(UtilShader::ColoredLine::getInstance()->vao);
-                glBindBuffer(GL_ARRAY_BUFFER, UtilShader::ColoredLine::getInstance()->vbo);
+                Shaders::ColoredLine *line = Shaders::ColoredLine::getInstance();
+                line->use();
+                line->bindVertexArray();
+                line->bindBuffer();
                 for (it = lines.begin(); it != lines.end(); it++)
                 {
-                    UtilShader::ColoredLine::getInstance()->setUniforms(it->first);
+                    line->setUniforms(it->first);
                     const std::vector<float> &vertex = it->second;
                     const float *tmp = vertex.data();
                     for (unsigned int i = 0; i < vertex.size(); i += 1024 * 6)
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index b722f6a65..53e43c713 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -373,7 +373,7 @@ void IrrDriver::generateDiffuseCoefficients()
         }
     }
 
-    SphericalHarmonics(FloatTexCube, sh_w, blueSHCoeff, greenSHCoeff, redSHCoeff);
+    generateSphericalHarmonics(FloatTexCube, sh_w, blueSHCoeff, greenSHCoeff, redSHCoeff);
 
     for (unsigned i = 0; i < 6; i++)
     {
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 349e933a0..d0318f41a 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -225,6 +225,26 @@ GLuint LoadShader(const char * file, unsigned type)
 
 
 
+Shaders::ColoredLine::ColoredLine()
+{
+    loadProgram(OBJECT, GL_VERTEX_SHADER,   "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "coloredquad.frag");
+
+    assignUniforms("color");
+
+    glGenVertexArrays(1, &m_vao);
+    glBindVertexArray(m_vao);
+    glGenBuffers(1, &m_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 6 * 1024 * sizeof(float), 0, GL_DYNAMIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+    glBindVertexArray(0);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+}   // Shaders::ColoredLine
+
+
+
 GLuint quad_vbo, tri_vbo;
 
 GLuint SharedObject::FullScreenQuadVAO = 0;
@@ -508,24 +528,6 @@ void bypassUBO(GLuint Program)
 
 namespace UtilShader
 {
-    ColoredLine::ColoredLine()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "coloredquad.frag");
-
-        assignUniforms("color");
-
-        glGenVertexArrays(1, &vao);
-        glBindVertexArray(vao);
-        glGenBuffers(1, &vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, vbo);
-        glBufferData(GL_ARRAY_BUFFER, 6 * 1024 * sizeof(float), 0, GL_DYNAMIC_DRAW);
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        glBindVertexArray(0);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-    }
 }
 
 
@@ -539,20 +541,6 @@ unsigned getGLSLVersion()
     return CVS->getGLSLVersion();
 }
 
-namespace UtilShader
-{
-    SpecularIBLGenerator::SpecularIBLGenerator()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
-        assignUniforms("PermutationMatrix", "ViewportSize");
-        TU_Samples = 1;
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
-        assignTextureUnit(TU_Samples, "samples");
-    }
-}
-
 namespace MeshShader
 {
     // Solid Normal and depth pass shaders
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index c4aa21cdd..5cb2d458a 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -40,25 +40,6 @@ public:
     static GLuint UIVAO;
 };
 
-namespace UtilShader
-{
-class ColoredLine : public Shader<ColoredLine, video::SColor>
-{
-public:
-    GLuint vao, vbo;
-
-    ColoredLine();
-};
-
-class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4, float >,
-                             public TextureReadNew<ST_TRILINEAR_CUBEMAP>
-{
-public:
-    GLuint TU_Samples;
-    SpecularIBLGenerator();
-};
-}
-
 
 namespace MeshShader
 {
@@ -861,8 +842,32 @@ public:
 
 
     void killShaders();
-private:
-};
+
+    // ========================================================================
+    /** Shader to draw a colored line.
+     */
+    class ColoredLine : public Shader<ColoredLine, video::SColor>
+    {
+    private:
+        GLuint m_vao, m_vbo;
+    public:
+        ColoredLine();
+
+        // --------------------------------------------------------------------
+        /** Bind the vertex array of this shader. */
+        void bindVertexArray()
+        {
+            glBindVertexArray(m_vao);
+        }   // bindVertexArray
+        // --------------------------------------------------------------------
+        /** Binds the vbo of this shader. */
+        void bindBuffer()
+        {
+            glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
+        }   // bindBuffer
+    };   // class ColoredLine
+
+};   // class Shaders
 
 #undef ENUM
 #undef STR

From f3f30a80571b3de58b5e5880c21fc9c68fe10c10 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 11 May 2015 09:14:43 +1000
Subject: [PATCH 177/331] Moved GrassPass1Shader into render_geometry; fixed up
 coding style somewhat.

---
 src/graphics/render_geometry.cpp | 488 +++++++++++++++++++++----------
 src/graphics/shaders.cpp         |  10 -
 src/graphics/shaders.hpp         |   6 -
 3 files changed, 336 insertions(+), 168 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 7925b4bdc..ed5f433b2 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -89,19 +89,23 @@ struct DefaultMaterial
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatDefault List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_SOLID;
+    static const enum Material::ShaderType MaterialType
+                                               = Material::SHADERTYPE_SOLID;
     static const enum InstanceType Instance = InstanceTypeDualTex;
     static const STK::Tuple<size_t> FirstPassTextures;
     static const STK::Tuple<size_t, size_t> SecondPassTextures;
     static const STK::Tuple<> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // struct DefaultMaterial
 
-const STK::Tuple<size_t> DefaultMaterial::FirstPassTextures = STK::Tuple<size_t>(1);
-const STK::Tuple<size_t, size_t> DefaultMaterial::SecondPassTextures = STK::Tuple<size_t, size_t>(0, 1);
+const STK::Tuple<size_t> DefaultMaterial::FirstPassTextures
+    = STK::Tuple<size_t>(1);
+const STK::Tuple<size_t, size_t> DefaultMaterial::SecondPassTextures
+    = STK::Tuple<size_t, size_t>(0, 1);
 const STK::Tuple<> DefaultMaterial::ShadowTextures;
 const STK::Tuple<size_t> DefaultMaterial::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct AlphaRef
 {
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
@@ -121,13 +125,17 @@ struct AlphaRef
     static const STK::Tuple<size_t, size_t> SecondPassTextures;
     static const STK::Tuple<size_t> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // struct AlphaRef
 
-const STK::Tuple<size_t, size_t> AlphaRef::FirstPassTextures = STK::Tuple<size_t, size_t>(0, 1);
-const STK::Tuple<size_t, size_t> AlphaRef::SecondPassTextures = STK::Tuple<size_t, size_t>(0, 1);
+// ----------------------------------------------------------------------------
+const STK::Tuple<size_t, size_t> AlphaRef::FirstPassTextures
+    = STK::Tuple<size_t, size_t>(0, 1);
+const STK::Tuple<size_t, size_t> AlphaRef::SecondPassTextures 
+    = STK::Tuple<size_t, size_t>(0, 1);
 const STK::Tuple<size_t> AlphaRef::ShadowTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> AlphaRef::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct SphereMap
 {
     typedef MeshShader::InstancedObjectPass1Shader InstancedFirstPassShader;
@@ -141,19 +149,22 @@ struct SphereMap
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatSphereMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_SPHERE_MAP;
+    static const enum Material::ShaderType MaterialType 
+                                          = Material::SHADERTYPE_SPHERE_MAP;
     static const enum InstanceType Instance = InstanceTypeDualTex;
     static const STK::Tuple<size_t> FirstPassTextures;
     static const STK::Tuple<size_t> SecondPassTextures;
     static const STK::Tuple<> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // struct SphereMap
 
+// ----------------------------------------------------------------------------
 const STK::Tuple<size_t> SphereMap::FirstPassTextures = STK::Tuple<size_t>(1);
 const STK::Tuple<size_t> SphereMap::SecondPassTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<> SphereMap::ShadowTextures;
 const STK::Tuple<size_t> SphereMap::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct UnlitMat
 {
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
@@ -167,19 +178,44 @@ struct UnlitMat
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatUnlit List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_SOLID_UNLIT;
+    static const enum Material::ShaderType MaterialType =
+                                           Material::SHADERTYPE_SOLID_UNLIT;
     static const enum InstanceType Instance = InstanceTypeDualTex;
     static const STK::Tuple<size_t, size_t> FirstPassTextures;
     static const STK::Tuple<size_t> SecondPassTextures;
     static const STK::Tuple<size_t> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // struct UnlitMat
 
-const STK::Tuple<size_t, size_t> UnlitMat::FirstPassTextures = STK::Tuple<size_t, size_t>(0, 1);
+// ----------------------------------------------------------------------------
+const STK::Tuple<size_t, size_t> UnlitMat::FirstPassTextures
+    = STK::Tuple<size_t, size_t>(0, 1);
 const STK::Tuple<size_t> UnlitMat::SecondPassTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> UnlitMat::ShadowTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> UnlitMat::RSMTextures = STK::Tuple<size_t>(0);
 
+// ============================================================================
+class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4,
+                                       core::matrix4, core::vector3df>,
+                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    GrassPass1Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "grass_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
+        assignSamplerNames(m_program,
+                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // GrassPass1Shader
+
+};   // class GrassPass1Shader
+
+
+// ----------------------------------------------------------------------------
 struct GrassMat
 {
     typedef MeshShader::InstancedGrassPass1Shader InstancedFirstPassShader;
@@ -187,25 +223,30 @@ struct GrassMat
     typedef MeshShader::InstancedGrassShadowShader InstancedShadowPassShader;
     typedef MeshShader::InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatGrass InstancedList;
-    typedef MeshShader::GrassPass1Shader FirstPassShader;
+    typedef GrassPass1Shader FirstPassShader;
     typedef MeshShader::GrassPass2Shader SecondPassShader;
     typedef MeshShader::GrassShadowShader ShadowPassShader;
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatGrass List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_VEGETATION;
+    static const enum Material::ShaderType MaterialType 
+        = Material::SHADERTYPE_VEGETATION;
     static const enum InstanceType Instance = InstanceTypeDualTex;
     static const STK::Tuple<size_t, size_t> FirstPassTextures;
     static const STK::Tuple<size_t, size_t> SecondPassTextures;
     static const STK::Tuple<size_t> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // GrassMat
 
-const STK::Tuple<size_t, size_t> GrassMat::FirstPassTextures = STK::Tuple<size_t, size_t>(0, 1);
-const STK::Tuple<size_t, size_t> GrassMat::SecondPassTextures = STK::Tuple<size_t, size_t>(0, 1);
+// ----------------------------------------------------------------------------
+const STK::Tuple<size_t, size_t> GrassMat::FirstPassTextures 
+    = STK::Tuple<size_t, size_t>(0, 1);
+const STK::Tuple<size_t, size_t> GrassMat::SecondPassTextures 
+    = STK::Tuple<size_t, size_t>(0, 1);
 const STK::Tuple<size_t> GrassMat::ShadowTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> GrassMat::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct NormalMat
 {
     typedef MeshShader::InstancedNormalMapShader InstancedFirstPassShader;
@@ -219,19 +260,24 @@ struct NormalMat
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatNormalMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_TANGENTS;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_NORMAL_MAP;
+    static const enum Material::ShaderType MaterialType
+                                          = Material::SHADERTYPE_NORMAL_MAP;
     static const enum InstanceType Instance = InstanceTypeThreeTex;
     static const STK::Tuple<size_t, size_t> FirstPassTextures;
     static const STK::Tuple<size_t, size_t> SecondPassTextures;
     static const STK::Tuple<> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // NormalMat
 
-const STK::Tuple<size_t, size_t> NormalMat::FirstPassTextures = STK::Tuple<size_t, size_t>(2, 1);
-const STK::Tuple<size_t, size_t> NormalMat::SecondPassTextures = STK::Tuple<size_t, size_t>(0, 1);
+// ----------------------------------------------------------------------------
+const STK::Tuple<size_t, size_t> NormalMat::FirstPassTextures
+    = STK::Tuple<size_t, size_t>(2, 1);
+const STK::Tuple<size_t, size_t> NormalMat::SecondPassTextures 
+    = STK::Tuple<size_t, size_t>(0, 1);
 const STK::Tuple<> NormalMat::ShadowTextures;
 const STK::Tuple<size_t> NormalMat::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct DetailMat
 {
     typedef MeshShader::InstancedObjectPass1Shader InstancedFirstPassShader;
@@ -245,19 +291,23 @@ struct DetailMat
     typedef MeshShader::RSMShader RSMShader;
     typedef ListMatDetails List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_2TCOORDS;
-    static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_DETAIL_MAP;
+    static const enum Material::ShaderType MaterialType
+                                          = Material::SHADERTYPE_DETAIL_MAP;
     static const enum InstanceType Instance = InstanceTypeThreeTex;
     static const STK::Tuple<size_t> FirstPassTextures;
     static const STK::Tuple<size_t, size_t, size_t> SecondPassTextures;
     static const STK::Tuple<> ShadowTextures;
     static const STK::Tuple<size_t> RSMTextures;
-};
+};   // DetailMat
 
+// ----------------------------------------------------------------------------
 const STK::Tuple<size_t> DetailMat::FirstPassTextures = STK::Tuple<size_t>(1);
-const STK::Tuple<size_t, size_t, size_t> DetailMat::SecondPassTextures = STK::Tuple<size_t, size_t, size_t>(0, 2, 1);
+const STK::Tuple<size_t, size_t, size_t> DetailMat::SecondPassTextures
+    = STK::Tuple<size_t, size_t, size_t>(0, 2, 1);
 const STK::Tuple<> DetailMat::ShadowTextures;
 const STK::Tuple<size_t> DetailMat::RSMTextures = STK::Tuple<size_t>(0);
 
+// ----------------------------------------------------------------------------
 struct SplattingMat
 {
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
@@ -270,12 +320,20 @@ struct SplattingMat
     static const STK::Tuple<size_t, size_t, size_t, size_t, size_t> SecondPassTextures;
     static const STK::Tuple<> ShadowTextures;
     static const STK::Tuple<size_t, size_t, size_t, size_t, size_t> RSMTextures;
-};
+};   // SplattingMat
+
+// ----------------------------------------------------------------------------
 
 const STK::Tuple<size_t> SplattingMat::FirstPassTextures = STK::Tuple<size_t>(6);
-const STK::Tuple<size_t, size_t, size_t, size_t, size_t> SplattingMat::SecondPassTextures = STK::Tuple<size_t, size_t, size_t, size_t, size_t>(1, 2, 3, 4, 5);
+const STK::Tuple<size_t, size_t, size_t, size_t, size_t> 
+          SplattingMat::SecondPassTextures 
+              = STK::Tuple<size_t, size_t, size_t, size_t, size_t>(1, 2, 3, 4, 5);
 const STK::Tuple<> SplattingMat::ShadowTextures;
-const STK::Tuple<size_t, size_t, size_t, size_t, size_t> SplattingMat::RSMTextures = STK::Tuple<size_t, size_t, size_t, size_t, size_t>(1, 2, 3, 4, 5);
+const STK::Tuple<size_t, size_t, size_t, size_t, size_t> SplattingMat::RSMTextures
+    = STK::Tuple<size_t, size_t, size_t, size_t, size_t>(1, 2, 3, 4, 5);
+
+// ============================================================================
+
 
 namespace RenderGeometry
 {
@@ -289,41 +347,48 @@ namespace RenderGeometry
             m_id = id;
             m_premul_alpha = premul_alpha;
         }
-    };
+    };   // struct TexUnit
 
+    // ------------------------------------------------------------------------
     template <typename T>
     std::vector<TexUnit> TexUnits(T curr) // required on older clang versions
     {
         std::vector<TexUnit> v;
         v.push_back(curr);
         return v;
-    }
+    }   // TexUnits
 
+    // ------------------------------------------------------------------------
+    // required on older clang versions
     template <typename T, typename... R>
-    std::vector<TexUnit> TexUnits(T curr, R... rest) // required on older clang versions
+    std::vector<TexUnit> TexUnits(T curr, R... rest)
     {
         std::vector<TexUnit> v;
         v.push_back(curr);
         VTexUnits(v, rest...);
         return v;
-    }
+    }   // TexUnits
 
+    // ------------------------------------------------------------------------
+    // required on older clang versions
     template <typename T, typename... R>
-    void VTexUnits(std::vector<TexUnit>& v, T curr, R... rest) // required on older clang versions
+    void VTexUnits(std::vector<TexUnit>& v, T curr, R... rest)
     {
         v.push_back(curr);
         VTexUnits(v, rest...);
-    }
-
+    }   // VTexUnits
+    // ------------------------------------------------------------------------
     template <typename T>
     void VTexUnits(std::vector<TexUnit>& v, T curr)
     {
         v.push_back(curr);
-    }
-}
+    }   // VTexUnits
+}   // namespace RenderGeometry
+
 using namespace RenderGeometry;
 
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...uniforms>
 void draw(const T *Shader, const GLMesh *mesh, uniforms... Args)
 {
@@ -333,8 +398,12 @@ void draw(const T *Shader, const GLMesh *mesh, uniforms... Args)
     size_t count = mesh->IndexCount;
 
     Shader->setUniforms(Args...);
-    glDrawElementsBaseVertex(ptype, (int)count, itype, (GLvoid *)mesh->vaoOffset, (int)mesh->vaoBaseVertex);
-}
+    glDrawElementsBaseVertex(ptype, (int)count, itype,
+                             (GLvoid *)mesh->vaoOffset,
+                             (int)mesh->vaoBaseVertex);
+}   // draw
+
+// ----------------------------------------------------------------------------
 
 template<int...List>
 struct custom_unroll_args;
@@ -346,9 +415,10 @@ struct custom_unroll_args<>
     static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         draw<T>(Shader, STK::tuple_get<0>(t), args...);
-    }
-};
+    }   // exec
+};   // custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<int N, int...List>
 struct custom_unroll_args<N, List...>
 {
@@ -356,62 +426,76 @@ struct custom_unroll_args<N, List...>
     static void exec(const T *Shader, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         custom_unroll_args<List...>::template exec<T>(Shader, t, STK::tuple_get<N>(t), args...);
-    }
-};
+    }   // exec
+};   // custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<typename T, int N>
 struct TexExpander_impl
 {
     template<typename...TupleArgs, typename... Args>
-    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
+    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle,
+                          Args... args)
     {
         size_t idx = STK::tuple_get<sizeof...(TupleArgs) - N>(TexSwizzle);
-        TexExpander_impl<T, N - 1>::template ExpandTex(mesh, TexSwizzle, args..., getTextureGLuint(mesh.textures[idx]));
-    }
-};
+        TexExpander_impl<T, N - 1>::template
+            ExpandTex(mesh, TexSwizzle, 
+                      args..., getTextureGLuint(mesh.textures[idx]));
+    }   // ExpandTex
+};   // TexExpander_impl
 
+// ----------------------------------------------------------------------------
 template<typename T>
 struct TexExpander_impl<T, 0>
 {
     template<typename...TupleArgs, typename... Args>
-    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
+    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle,
+                          Args... args)
     {
         T::getInstance()->setTextureUnits(args...);
-    }
-};
+    }   // ExpandTex
+};   // TexExpander_impl
 
+// ----------------------------------------------------------------------------
 template<typename T>
 struct TexExpander
 {
     template<typename...TupleArgs, typename... Args>
-    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
+    static void ExpandTex(GLMesh &mesh, const STK::Tuple<TupleArgs...> &TexSwizzle,
+                          Args... args)
     {
-        TexExpander_impl<T, sizeof...(TupleArgs)>::ExpandTex(mesh, TexSwizzle, args...);
-    }
-};
-
+        TexExpander_impl<T, sizeof...(TupleArgs)>::ExpandTex(mesh, TexSwizzle,
+                                                             args...);
+    }   // ExpandTex
+};   // TexExpander
 
+// ----------------------------------------------------------------------------
 template<typename T, int N>
 struct HandleExpander_impl
 {
     template<typename...TupleArgs, typename... Args>
-    static void Expand(uint64_t *TextureHandles, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
+    static void Expand(uint64_t *TextureHandles, 
+                       const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
     {
         size_t idx = STK::tuple_get<sizeof...(TupleArgs)-N>(TexSwizzle);
-        HandleExpander_impl<T, N - 1>::template Expand(TextureHandles, TexSwizzle, args..., TextureHandles[idx]);
-    }
-};
+        HandleExpander_impl<T, N - 1>::template 
+            Expand(TextureHandles, TexSwizzle, args..., TextureHandles[idx]);
+    }   // Expand
+};   // HandleExpander_impl
 
+// ----------------------------------------------------------------------------
 template<typename T>
 struct HandleExpander_impl<T, 0>
 {
     template<typename...TupleArgs, typename... Args>
-    static void Expand(uint64_t *TextureHandles, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
+    static void Expand(uint64_t *TextureHandles,
+                       const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
     {
         T::getInstance()->setTextureHandles(args...);
-    }
-};
+    }   // Expand
+};   // HandleExpander_impl
 
+// ----------------------------------------------------------------------------
 template<typename T>
 struct HandleExpander
 {
@@ -419,9 +503,10 @@ struct HandleExpander
     static void Expand(uint64_t *TextureHandles, const STK::Tuple<TupleArgs...> &TexSwizzle, Args... args)
     {
         HandleExpander_impl<T, sizeof...(TupleArgs)>::Expand(TextureHandles, TexSwizzle, args...);
-    }
-};
+    }   // Expand
+};   // HandleExpander
 
+// ----------------------------------------------------------------------------
 template<typename T, int ...List>
 void renderMeshes1stPass()
 {
@@ -450,8 +535,9 @@ void renderMeshes1stPass()
             TexExpander<typename T::FirstPassShader>::template ExpandTex(mesh, T::FirstPassTextures);
         custom_unroll_args<List...>::template exec(T::FirstPassShader::getInstance(), meshes.at(i));
     }
-}
+}   // renderMeshes1stPass
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void renderInstancedMeshes1stPass(Args...args)
 {
@@ -475,8 +561,9 @@ void renderInstancedMeshes1stPass(Args...args)
         T::InstancedFirstPassShader::getInstance()->setUniforms(args...);
         glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) * sizeof(DrawElementsIndirectCommand)));
     }
-}
+}   // renderInstancedMeshes1stPass
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void multidraw1stPass(Args...args)
 {
@@ -490,10 +577,11 @@ void multidraw1stPass(Args...args)
             (int)SolidPassCmd::getInstance()->Size[T::MaterialType],
             sizeof(DrawElementsIndirectCommand));
     }
-}
+}   // multidraw1stPass
 
 static core::vector3df windDir;
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderSolidFirstPass()
 {
     windDir = getWindDir();
@@ -539,8 +627,9 @@ void IrrDriver::renderSolidFirstPass()
             renderInstancedMeshes1stPass<NormalMat>();
         }
     }
-}
+}   // renderSolidFirstPass
 
+// ----------------------------------------------------------------------------
 template<typename T, int...List>
 void renderMeshes2ndPass( const std::vector<uint64_t> &Prefilled_Handle,
     const std::vector<GLuint> &Prefilled_Tex)
@@ -558,52 +647,71 @@ void renderMeshes2ndPass( const std::vector<uint64_t> &Prefilled_Handle,
         if (mesh.VAOType != T::VertexType)
         {
 #ifdef DEBUG
-            Log::error("Materials", "Wrong vertex Type associed to pass 2 (hint texture : %s)", mesh.textures[0]->getName().getPath().c_str());
+            Log::error("Materials", "Wrong vertex Type associed to pass 2 "
+                                    "(hint texture : %s)", 
+                       mesh.textures[0]->getName().getPath().c_str());
 #endif
             continue;
         }
 
         if (CVS->isAZDOEnabled())
-            HandleExpander<typename T::SecondPassShader>::template Expand(mesh.TextureHandles, T::SecondPassTextures, Prefilled_Handle[0], Prefilled_Handle[1], Prefilled_Handle[2]);
+            HandleExpander<typename T::SecondPassShader>::template 
+                Expand(mesh.TextureHandles, T::SecondPassTextures, 
+                       Prefilled_Handle[0], Prefilled_Handle[1],
+                       Prefilled_Handle[2]);
         else
-            TexExpander<typename T::SecondPassShader>::template ExpandTex(mesh, T::SecondPassTextures, Prefilled_Tex[0], Prefilled_Tex[1], Prefilled_Tex[2]);
-        custom_unroll_args<List...>::template exec(T::SecondPassShader::getInstance(), meshes.at(i));
+            TexExpander<typename T::SecondPassShader>::template 
+                ExpandTex(mesh, T::SecondPassTextures, Prefilled_Tex[0], 
+                          Prefilled_Tex[1], Prefilled_Tex[2]);
+        custom_unroll_args<List...>::template 
+            exec(T::SecondPassShader::getInstance(), meshes.at(i));
     }
-}
+}   // renderMeshes2ndPass
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void renderInstancedMeshes2ndPass(const std::vector<GLuint> &Prefilled_tex, Args...args)
 {
     std::vector<GLMesh *> &meshes = T::InstancedList::getInstance()->SolidPass;
     T::InstancedSecondPassShader::getInstance()->use();
-    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType,
+                                                                T::Instance));
     for (unsigned i = 0; i < meshes.size(); i++)
     {
         GLMesh *mesh = meshes[i];
-        TexExpander<typename T::InstancedSecondPassShader>::template ExpandTex(*mesh, T::SecondPassTextures, Prefilled_tex[0], Prefilled_tex[1], Prefilled_tex[2]);
+        TexExpander<typename T::InstancedSecondPassShader>::template
+            ExpandTex(*mesh, T::SecondPassTextures, Prefilled_tex[0],
+                      Prefilled_tex[1], Prefilled_tex[2]);
         T::InstancedSecondPassShader::getInstance()->setUniforms(args...);
-        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) * sizeof(DrawElementsIndirectCommand)));
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, 
+           (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i)
+           * sizeof(DrawElementsIndirectCommand)));
     }
-}
-
+}   // renderInstancedMeshes2ndPass
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void multidraw2ndPass(const std::vector<uint64_t> &Handles, Args... args)
 {
     T::InstancedSecondPassShader::getInstance()->use();
-    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType,
+                                                                T::Instance));
     uint64_t nulltex[10] = {};
     if (SolidPassCmd::getInstance()->Size[T::MaterialType])
     {
-        HandleExpander<typename T::InstancedSecondPassShader>::template Expand(nulltex, T::SecondPassTextures, Handles[0], Handles[1], Handles[2]);
+        HandleExpander<typename T::InstancedSecondPassShader>::template
+            Expand(nulltex, T::SecondPassTextures, Handles[0], Handles[1],
+                   Handles[2]);
         T::InstancedSecondPassShader::getInstance()->setUniforms(args...);
         glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
-            (const void*)(SolidPassCmd::getInstance()->Offset[T::MaterialType] * sizeof(DrawElementsIndirectCommand)),
+            (const void*)(SolidPassCmd::getInstance()->Offset[T::MaterialType] 
+             * sizeof(DrawElementsIndirectCommand)),
             (int)SolidPassCmd::getInstance()->Size[T::MaterialType],
             (int)sizeof(DrawElementsIndirectCommand));
     }
-}
+}   // multidraw2ndPass
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderSolidSecondPass()
 {
     irr_driver->setPhase(SOLID_LIT_PASS);
@@ -614,25 +722,30 @@ void IrrDriver::renderSolidSecondPass()
 
     if (CVS->isAZDOEnabled())
     {
-        DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
+        DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE),
+                          MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
         if (!glIsTextureHandleResidentARB(DiffuseHandle))
             glMakeTextureHandleResidentARB(DiffuseHandle);
 
-        SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
+        SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR),
+                           MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
         if (!glIsTextureHandleResidentARB(SpecularHandle))
             glMakeTextureHandleResidentARB(SpecularHandle);
 
-        SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
+        SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R),
+                        MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
         if (!glIsTextureHandleResidentARB(SSAOHandle))
             glMakeTextureHandleResidentARB(SSAOHandle);
 
-        DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[3]);
+        DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(),
+                     MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[3]);
         if (!glIsTextureHandleResidentARB(DepthHandle))
             glMakeTextureHandleResidentARB(DepthHandle);
     }
 
     if (CVS->supportsIndirectInstancingRendering())
-        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, SolidPassCmd::getInstance()->drawindirectcmd);
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER,
+                    SolidPassCmd::getInstance()->drawindirectcmd);
 
     {
         ScopedGPUTimer Timer(getGPUTimer(Q_SOLID_PASS2));
@@ -642,7 +755,10 @@ void IrrDriver::renderSolidSecondPass()
         for (unsigned i = 0; i < ImmediateDrawList::getInstance()->size(); i++)
             ImmediateDrawList::getInstance()->at(i)->render();
 
-        std::vector<GLuint> DiffSpecSSAOTex = createVector<GLuint>(m_rtts->getRenderTarget(RTT_DIFFUSE), m_rtts->getRenderTarget(RTT_SPECULAR), m_rtts->getRenderTarget(RTT_HALF1_R));
+        std::vector<GLuint> DiffSpecSSAOTex = 
+            createVector<GLuint>(m_rtts->getRenderTarget(RTT_DIFFUSE), 
+                                 m_rtts->getRenderTarget(RTT_SPECULAR),
+                                 m_rtts->getRenderTarget(RTT_HALF1_R));
 
         renderMeshes2ndPass<DefaultMaterial, 3, 1>(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
         renderMeshes2ndPass<AlphaRef, 3, 1 >(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle), DiffSpecSSAOTex);
@@ -665,14 +781,19 @@ void IrrDriver::renderSolidSecondPass()
             // template does not work with template due to extra depth texture
             {
                 GrassMat::InstancedSecondPassShader::getInstance()->use();
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(GrassMat::VertexType, GrassMat::Instance));
+                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(GrassMat::VertexType,
+                                                                           GrassMat::Instance));
                 uint64_t nulltex[10] = {};
                 if (SolidPassCmd::getInstance()->Size[GrassMat::MaterialType])
                 {
-                    HandleExpander<GrassMat::InstancedSecondPassShader>::Expand(nulltex, GrassMat::SecondPassTextures, DiffuseHandle, SpecularHandle, SSAOHandle, DepthHandle);
-                    GrassMat::InstancedSecondPassShader::getInstance()->setUniforms(windDir, irr_driver->getSunDirection());
+                    HandleExpander<GrassMat::InstancedSecondPassShader>
+                         ::Expand(nulltex, GrassMat::SecondPassTextures, DiffuseHandle,
+                                  SpecularHandle, SSAOHandle, DepthHandle);
+                    GrassMat::InstancedSecondPassShader::getInstance()->setUniforms(windDir,
+                                                             irr_driver->getSunDirection());
                     glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
-                        (const void*)(SolidPassCmd::getInstance()->Offset[GrassMat::MaterialType] * sizeof(DrawElementsIndirectCommand)),
+                        (const void*)(SolidPassCmd::getInstance()->Offset[GrassMat::MaterialType]
+                        * sizeof(DrawElementsIndirectCommand)),
                         (int)SolidPassCmd::getInstance()->Size[GrassMat::MaterialType],
                         (int)sizeof(DrawElementsIndirectCommand));
                 }
@@ -691,19 +812,27 @@ void IrrDriver::renderSolidSecondPass()
             {
                 std::vector<GLMesh *> &meshes = GrassMat::InstancedList::getInstance()->SolidPass;
                 GrassMat::InstancedSecondPassShader::getInstance()->use();
-                glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(GrassMat::VertexType, GrassMat::Instance));
+                glBindVertexArray(VAOManager::getInstance()
+                                  ->getInstanceVAO(GrassMat::VertexType, GrassMat::Instance));
                 for (unsigned i = 0; i < meshes.size(); i++)
                 {
                     GLMesh *mesh = meshes[i];
-                    TexExpander<GrassMat::InstancedSecondPassShader>::ExpandTex(*mesh, GrassMat::SecondPassTextures, DiffSpecSSAOTex[0], DiffSpecSSAOTex[1], DiffSpecSSAOTex[2], irr_driver->getDepthStencilTexture());
-                    GrassMat::InstancedSecondPassShader::getInstance()->setUniforms(windDir, irr_driver->getSunDirection());
-                    glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[GrassMat::MaterialType] + i) * sizeof(DrawElementsIndirectCommand)));
+                    TexExpander<GrassMat::InstancedSecondPassShader>
+                        ::ExpandTex(*mesh, GrassMat::SecondPassTextures, DiffSpecSSAOTex[0],
+                                    DiffSpecSSAOTex[1], DiffSpecSSAOTex[2],
+                                    irr_driver->getDepthStencilTexture());
+                    GrassMat::InstancedSecondPassShader::getInstance()
+                            ->setUniforms(windDir, irr_driver->getSunDirection());
+                    glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+                          (const void*)((SolidPassCmd::getInstance()->Offset[GrassMat::MaterialType] + i)
+                               * sizeof(DrawElementsIndirectCommand)));
                 }
             }
         }
     }
-}
+}   // renderSolidSecondPass
 
+// ----------------------------------------------------------------------------
 template<typename T>
 static void renderInstancedMeshNormals()
 {
@@ -713,10 +842,13 @@ static void renderInstancedMeshNormals()
     for (unsigned i = 0; i < meshes.size(); i++)
     {
         MeshShader::NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
-        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) * sizeof(DrawElementsIndirectCommand)));
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, 
+             (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) 
+             * sizeof(DrawElementsIndirectCommand)));
     }
-}
+}   // renderInstancedMeshNormals
 
+// ----------------------------------------------------------------------------
 template<typename T>
 static void renderMultiMeshNormals()
 {
@@ -730,8 +862,9 @@ static void renderMultiMeshNormals()
             (int)SolidPassCmd::getInstance()->Size[T::MaterialType],
             (int)sizeof(DrawElementsIndirectCommand));
     }
-}
+}   // renderMultiMeshNormals
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderNormalsVisualisation()
 {
     if (CVS->isAZDOEnabled()) {
@@ -751,10 +884,13 @@ void IrrDriver::renderNormalsVisualisation()
         renderInstancedMeshNormals<DetailMat>();
         renderInstancedMeshNormals<NormalMat>();
     }
-}
+}   // renderNormalsVisualisation
 
-template<typename Shader, enum video::E_VERTEX_TYPE VertexType, int...List, typename... TupleType>
-void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits, std::vector<STK::Tuple<TupleType...> > *meshes)
+// ----------------------------------------------------------------------------
+template<typename Shader, enum video::E_VERTEX_TYPE VertexType, int...List, 
+         typename... TupleType>
+void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits, 
+                          std::vector<STK::Tuple<TupleType...> > *meshes)
 {
     Shader::getInstance()->use();
     if (CVS->isARBBaseInstanceUsable())
@@ -767,7 +903,9 @@ void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits,
         if (mesh.VAOType != VertexType)
         {
 #ifdef DEBUG
-            Log::error("Materials", "Wrong vertex Type associed to pass 2 (hint texture : %s)", mesh.textures[0]->getName().getPath().c_str());
+            Log::error("Materials", "Wrong vertex Type associed to pass 2 "
+                                    "(hint texture : %s)",
+                       mesh.textures[0]->getName().getPath().c_str());
 #endif
             continue;
         }
@@ -778,10 +916,11 @@ void renderTransparenPass(const std::vector<RenderGeometry::TexUnit> &TexUnits,
             Shader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
         custom_unroll_args<List...>::template exec(Shader::getInstance(), meshes->at(i));
     }
-}
+}   // renderTransparenPass
 
 static video::ITexture *displaceTex = 0;
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderTransparent()
 {
     glEnable(GL_DEPTH_TEST);
@@ -801,20 +940,27 @@ void IrrDriver::renderTransparent()
     if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            RenderGeometry::TexUnit(0, true)), ListBlendTransparentFog::getInstance());
+        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD,
+                             8, 7, 6, 5, 4, 3, 2, 1>(
+                             TexUnits(RenderGeometry::TexUnit(0, true)),
+                              ListBlendTransparentFog::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(TexUnits(
-            RenderGeometry::TexUnit(0, true)), ListAdditiveTransparentFog::getInstance());
+        renderTransparenPass<MeshShader::TransparentFogShader, 
+                             video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(
+                             TexUnits(RenderGeometry::TexUnit(0, true)), 
+                                       ListAdditiveTransparentFog::getInstance());
     }
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            RenderGeometry::TexUnit(0, true)), ListBlendTransparent::getInstance());
+        renderTransparenPass<MeshShader::TransparentShader,
+                             video::EVT_STANDARD, 2, 1>(
+                                  TexUnits(RenderGeometry::TexUnit(0, true)),
+                                           ListBlendTransparent::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(TexUnits(
-            RenderGeometry::TexUnit(0, true)), ListAdditiveTransparent::getInstance());
+        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(
+                             TexUnits(RenderGeometry::TexUnit(0, true)),
+                                      ListAdditiveTransparent::getInstance());
     }
 
     for (unsigned i = 0; i < BillBoardList::getInstance()->size(); i++)
@@ -829,7 +975,8 @@ void IrrDriver::renderTransparent()
     irr_driver->getFBO(FBO_DISPLACE).Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    DisplaceProvider * const cb = (DisplaceProvider *)Shaders::getCallback(ES_DISPLACE);
+    DisplaceProvider * const cb =
+        (DisplaceProvider *)Shaders::getCallback(ES_DISPLACE);
     cb->update();
 
     glEnable(GL_DEPTH_TEST);
@@ -847,10 +994,12 @@ void IrrDriver::renderTransparent()
     irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
-        const GLMesh &mesh = *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
+        const GLMesh &mesh =
+            *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
         if (!CVS->isARBBaseInstanceUsable())
             glBindVertexArray(mesh.vao);
-        const core::matrix4 &AbsoluteTransformation = STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
+        const core::matrix4 &AbsoluteTransformation
+            = STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
         if (mesh.VAOType != video::EVT_2TCOORDS)
         {
 #ifdef DEBUG
@@ -874,10 +1023,12 @@ void IrrDriver::renderTransparent()
         displaceTex = irr_driver->getTexture(FileManager::TEXTURE, "displace.png");
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
-        const GLMesh &mesh = *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
+        const GLMesh &mesh = 
+            *(STK::tuple_get<0>(ListDisplacement::getInstance()->at(i)));
         if (!CVS->isARBBaseInstanceUsable())
             glBindVertexArray(mesh.vao);
-        const core::matrix4 &AbsoluteTransformation = STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
+        const core::matrix4 &AbsoluteTransformation =
+            STK::tuple_get<1>(ListDisplacement::getInstance()->at(i));
         if (mesh.VAOType != video::EVT_2TCOORDS)
             continue;
 
@@ -895,16 +1046,20 @@ void IrrDriver::renderTransparent()
             core::vector2df(cb->getDirX(), cb->getDirY()),
             core::vector2df(cb->getDir2X(), cb->getDir2Y()));
 
-        glDrawElementsBaseVertex(ptype, (int)count, itype, (GLvoid *)mesh.vaoOffset, (int)mesh.vaoBaseVertex);
+        glDrawElementsBaseVertex(ptype, (int)count, itype, (GLvoid *)mesh.vaoOffset,
+                                 (int)mesh.vaoBaseVertex);
     }
 
     irr_driver->getFBO(FBO_COLORS).Bind();
     glStencilFunc(GL_EQUAL, 1, 0xFF);
-    m_post_processing->renderPassThrough(m_rtts->getRenderTarget(RTT_DISPLACE), irr_driver->getFBO(FBO_COLORS).getWidth(), irr_driver->getFBO(FBO_COLORS).getHeight());
+    m_post_processing->renderPassThrough(m_rtts->getRenderTarget(RTT_DISPLACE),
+                                         irr_driver->getFBO(FBO_COLORS).getWidth(), 
+                                         irr_driver->getFBO(FBO_COLORS).getHeight());
     glDisable(GL_STENCIL_TEST);
 
-}
+}   // renderTransparent
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...uniforms>
 void drawShadow(const T *Shader, unsigned cascade, const GLMesh *mesh, uniforms... Args)
 {
@@ -914,9 +1069,11 @@ void drawShadow(const T *Shader, unsigned cascade, const GLMesh *mesh, uniforms.
     size_t count = mesh->IndexCount;
 
     Shader->setUniforms(cascade, Args...);
-    glDrawElementsBaseVertex(ptype, (int)count, itype, (GLvoid *)mesh->vaoOffset, (int)mesh->vaoBaseVertex);
-}
+    glDrawElementsBaseVertex(ptype, (int)count, itype,
+                             (GLvoid *)mesh->vaoOffset, (int)mesh->vaoBaseVertex);
+}   // drawShadow
 
+// ----------------------------------------------------------------------------
 template<int...List>
 struct shadow_custom_unroll_args;
 
@@ -927,9 +1084,10 @@ struct shadow_custom_unroll_args<>
     static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         drawShadow<T>(Shader, cascade, STK::tuple_get<0>(t), args...);
-    }
-};
+    }   // exec
+};   // shadow_custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<int N, int...List>
 struct shadow_custom_unroll_args<N, List...>
 {
@@ -937,9 +1095,10 @@ struct shadow_custom_unroll_args<N, List...>
     static void exec(const T *Shader, unsigned cascade, const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         shadow_custom_unroll_args<List...>::template exec<T>(Shader, cascade, t, STK::tuple_get<N>(t), args...);
-    }
-};
+    }   // exec
+};   // shadow_custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<typename T, int...List>
 void renderShadow(unsigned cascade)
 {
@@ -957,41 +1116,51 @@ void renderShadow(unsigned cascade)
         else
             TexExpander<typename T::ShadowPassShader>::template ExpandTex(*mesh, T::ShadowTextures);
         shadow_custom_unroll_args<List...>::template exec<typename T::ShadowPassShader>(T::ShadowPassShader::getInstance(), cascade, t.at(i));
-    }
-}
+    }   // for i
+}   // renderShadow
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void renderInstancedShadow(unsigned cascade, Args ...args)
 {
     T::InstancedShadowPassShader::getInstance()->use();
-    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeShadow));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType,
+                                                          InstanceTypeShadow));
     std::vector<GLMesh *> &t = T::InstancedList::getInstance()->Shadows[cascade];
     for (unsigned i = 0; i < t.size(); i++)
     {
         GLMesh *mesh = t[i];
 
-        TexExpander<typename T::InstancedShadowPassShader>::template ExpandTex(*mesh, T::ShadowTextures);
+        TexExpander<typename T::InstancedShadowPassShader>::template 
+                                       ExpandTex(*mesh, T::ShadowTextures);
         T::InstancedShadowPassShader::getInstance()->setUniforms(cascade, args...);
         size_t tmp = ShadowPassCmd::getInstance()->Offset[cascade][T::MaterialType] + i;
-        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((tmp) * sizeof(DrawElementsIndirectCommand)));
-    }
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+                               (const void*)((tmp) 
+                               * sizeof(DrawElementsIndirectCommand)));
+    }   // for i
 
-}
+}   // renderInstancedShadow
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 static void multidrawShadow(unsigned i, Args ...args)
 {
     T::InstancedShadowPassShader::getInstance()->use();
-    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeShadow));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType,
+                                                           InstanceTypeShadow));
     if (ShadowPassCmd::getInstance()->Size[i][T::MaterialType])
     {
         T::InstancedShadowPassShader::getInstance()->setUniforms(i, args...);
         glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, 
-            (const void*)(ShadowPassCmd::getInstance()->Offset[i][T::MaterialType] * sizeof(DrawElementsIndirectCommand)),
-            (int)ShadowPassCmd::getInstance()->Size[i][T::MaterialType], sizeof(DrawElementsIndirectCommand));
+            (const void*)(ShadowPassCmd::getInstance()->Offset[i][T::MaterialType] 
+            * sizeof(DrawElementsIndirectCommand)),
+            (int)ShadowPassCmd::getInstance()->Size[i][T::MaterialType], 
+            sizeof(DrawElementsIndirectCommand));
     }
-}
+}   // multidrawShadow
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderShadows()
 {
     glDepthFunc(GL_LEQUAL);
@@ -1066,10 +1235,11 @@ void IrrDriver::renderShadows()
         glBindTexture(GL_TEXTURE_2D_ARRAY, m_rtts->getShadowFBO().getRTT()[0]);
         glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
     }
-}
+}   // renderShadows
 
 
 
+// ----------------------------------------------------------------------------
 template<int...List>
 struct rsm_custom_unroll_args;
 
@@ -1077,22 +1247,27 @@ template<>
 struct rsm_custom_unroll_args<>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const core::matrix4 &rsm_matrix, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const core::matrix4 &rsm_matrix, 
+                      const STK::Tuple<TupleTypes...> &t, Args... args)
     {
         draw<T>(T::getInstance(), STK::tuple_get<0>(t), rsm_matrix, args...);
     }
-};
+};   // rsm_custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<int N, int...List>
 struct rsm_custom_unroll_args<N, List...>
 {
     template<typename T, typename ...TupleTypes, typename ...Args>
-    static void exec(const core::matrix4 &rsm_matrix, const STK::Tuple<TupleTypes...> &t, Args... args)
+    static void exec(const core::matrix4 &rsm_matrix,
+                     const STK::Tuple<TupleTypes...> &t, Args... args)
     {
-        rsm_custom_unroll_args<List...>::template exec<T>(rsm_matrix, t, STK::tuple_get<N>(t), args...);
+        rsm_custom_unroll_args<List...>::template 
+            exec<T>(rsm_matrix, t, STK::tuple_get<N>(t), args...);
     }
-};
+};   // rsm_custom_unroll_args
 
+// ----------------------------------------------------------------------------
 template<typename T, int... Selector>
 void drawRSM(const core::matrix4 & rsm_matrix)
 {
@@ -1112,8 +1287,9 @@ void drawRSM(const core::matrix4 & rsm_matrix)
             TexExpander<typename T::RSMShader>::template ExpandTex(*mesh, T::RSMTextures);
         rsm_custom_unroll_args<Selector...>::template exec<typename T::RSMShader>(rsm_matrix, t.at(i));
     }
-}
+}   // drawRSM
 
+// ----------------------------------------------------------------------------
 template<typename T, typename...Args>
 void renderRSMShadow(Args ...args)
 {
@@ -1127,24 +1303,31 @@ void renderRSMShadow(Args ...args)
 
         TexExpander<typename T::InstancedRSMShader>::template ExpandTex(*mesh, T::RSMTextures);
         T::InstancedRSMShader::getInstance()->setUniforms(args...);
-        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, (const void*)((RSMPassCmd::getInstance()->Offset[T::MaterialType] + i)* sizeof(DrawElementsIndirectCommand)));
+        glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
+           (const void*)((RSMPassCmd::getInstance()->Offset[T::MaterialType] + i)
+           * sizeof(DrawElementsIndirectCommand)));
     }
-}
+}   // renderRSMShadow
 
+// ----------------------------------------------------------------------------
 template<typename T, typename... Args>
 void multidrawRSM(Args...args)
 {
     T::InstancedRSMShader::getInstance()->use();
-    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, InstanceTypeRSM));
+    glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType,
+                                                               InstanceTypeRSM));
     if (RSMPassCmd::getInstance()->Size[T::MaterialType])
     {
         T::InstancedRSMShader::getInstance()->setUniforms(args...);
         glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
-            (const void*)(RSMPassCmd::getInstance()->Offset[T::MaterialType] * sizeof(DrawElementsIndirectCommand)),
-            (int)RSMPassCmd::getInstance()->Size[T::MaterialType], sizeof(DrawElementsIndirectCommand));
+            (const void*)(RSMPassCmd::getInstance()->Offset[T::MaterialType] 
+               * sizeof(DrawElementsIndirectCommand)),
+            (int)RSMPassCmd::getInstance()->Size[T::MaterialType],
+            sizeof(DrawElementsIndirectCommand));
     }
-}
+}   // multidrawRSM
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderRSM()
 {
     if (m_rsm_map_available)
@@ -1161,7 +1344,8 @@ void IrrDriver::renderRSM()
     drawRSM<SplattingMat, 1>(rsm_matrix);
 
     if (CVS->supportsIndirectInstancingRendering())
-        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, RSMPassCmd::getInstance()->drawindirectcmd);
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER,
+                     RSMPassCmd::getInstance()->drawindirectcmd);
 
     if (CVS->isAZDOEnabled())
     {
@@ -1180,4 +1364,4 @@ void IrrDriver::renderRSM()
         renderRSMShadow<DetailMat>(rsm_matrix);
     }
     m_rsm_map_available = true;
-}
+}   // renderRSM
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d0318f41a..ada4dad2e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -565,16 +565,6 @@ namespace MeshShader
                                       1, "glosstex",ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    GrassPass1Shader::GrassPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "grass_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
-        assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
 
     NormalMapShader::NormalMapShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 5cb2d458a..7196789b6 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -57,12 +57,6 @@ public:
     ObjectRefPass1Shader();
 };
 
-class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4, core::matrix4, core::vector3df>,
-                         public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    GrassPass1Shader();
-};
 
 class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>,
                         public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>

From a29fa5c4a3ec7a391500357546ab0a96f4f343c4 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 10 May 2015 19:19:35 -0400
Subject: [PATCH 178/331] More work on scripting

---
 src/physics/physical_object.hpp          |  32 +-
 src/scriptengine/script_physics.cpp      |   1 +
 src/scriptengine/script_track.cpp        | 353 +++++++++++++----------
 src/scriptengine/script_utils.cpp        |  11 +
 src/tracks/track_object.hpp              |  50 +++-
 src/tracks/track_object_presentation.cpp |  19 +-
 src/tracks/track_object_presentation.hpp |   2 +
 7 files changed, 295 insertions(+), 173 deletions(-)

diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 7d4dd1158..1b7dbce87 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -185,10 +185,6 @@ public:
      *  it. */
     bool isExplodeKartObject () const { return m_explode_kart; }
     // ------------------------------------------------------------------------
-    /** Returns true if this object should cause a kart that touches it to
-     *  be flattened. */
-    bool isFlattenKartObject () const { return m_flatten_kart; }
-    // ------------------------------------------------------------------------
     /** Sets the interaction type */
     void setInteraction(std::string interaction);
     // ------------------------------------------------------------------------
@@ -197,6 +193,34 @@ public:
     // ------------------------------------------------------------------------
     /** Add body to dynamic world */
     void addBody();
+    // ------------------------------------------------------------------------
+    // Methods usable by scripts
+
+    /**
+    * \addtogroup Scripting
+    * @{
+    * \addtogroup Scripting_Track Track
+    * @{
+    * \addtogroup Scripting_PhysicalObject PhysicalObject (script binding)
+    * Type returned by trackObject.getPhysicalObject()
+    * @{
+    */
+    /** Returns true if this object should cause a kart that touches it to
+    *  be flattened. */
+    bool isFlattenKartObject() const { return m_flatten_kart; }
+    void disable(void *memory)
+    {
+        ((PhysicalObject*)(memory))->removeBody();
+    }
+
+    //enables track object passed from the script
+    void enable(void *memory)
+    {
+        ((PhysicalObject*)(memory))->addBody();
+    }
+    /** @} */
+    /** @} */
+    /** @} */
 
     LEAK_CHECK()
 };  // PhysicalObject
diff --git a/src/scriptengine/script_physics.cpp b/src/scriptengine/script_physics.cpp
index 60fc0ce68..22adb3a1c 100644
--- a/src/scriptengine/script_physics.cpp
+++ b/src/scriptengine/script_physics.cpp
@@ -29,6 +29,7 @@ namespace Scripting
     namespace Physics
     {
         //Creates an explosion animation at specified Vec3 location
+        // TODO: does this even belong in Physics?
         void createExplosion(asIScriptGeneric *gen)
         {
             //TODO: allow different types? sand etc
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index fce2a3dfa..9f7c4294a 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -29,141 +29,68 @@
 #include "tracks/track_object_manager.hpp"
 
 #include <angelscript.h>
-
 #include <assert.h>
-#include <iostream> //debug
 
+/** \cond DOXYGEN_IGNORE */
 namespace Scripting
 {
-
+    /** \endcond */
     namespace Track
     {
+        /** \addtogroup Scripting
+        * @{
+        */
+        /** \addtogroup Scripting_Track Track
+        * @{
+        */
+
         /*
         void disableAnimation(std::string *name, void *memory)
         {
-            std::string *str = name;
-            std::string type = "mesh";
-            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str, type);
-        }*/
-        //disables track object passed from the script
-        void disable(void *memory)
-        {
-            ((PhysicalObject*)(memory))->removeBody();
-        }
-        //enables track object passed from the script
-        void enable(void *memory)
-        {
-            ((PhysicalObject*)(memory))->addBody();
-        }
-        //pause an animation
-        void setPaused(bool mode, void *memory)
-        {
-            ((ThreeDAnimation*)(memory))->setPaused(mode);
-        }
-        //move objects of type TrackObjectPresentation, to the specified location
-        void movePresentation(Vec3 *new_pos, void *memory)
-        {
-            core::vector3df xyz = new_pos->toIrrVector();
-            core::vector3df hpr = core::vector3df(0, 0, 0);
-            core::vector3df scale = core::vector3df(1, 1, 1);
-            ((TrackObjectPresentation*)(memory))->move(xyz, hpr, scale, false);
-        }
-        //stop a sound
-        void stop(void *memory)
-        {
-            ((TrackObjectPresentationSound*)memory)->stopSound();
-        }
-        //play the specified sound once
-        void playOnce(void *memory)
-        {
-            ((TrackObjectPresentationSound*)memory)->triggerSound(false); //false = once
-        }
-        //play the specified sound continuously
-        void playLoop(void *memory)
-        {
-            ((TrackObjectPresentationSound*)memory)->triggerSound(true); //true = loop
-        }
-        //sets a loop for an animation (skeletal)
-        void setLoop(int start, int end, void *memory)
-        {
-            ((TrackObjectPresentationMesh*)(memory))->setLoop(start,end);
-        }
-        //sets the current frame for a skeletal animation
-        void setCurrentFrame(int frame,void *memory)
-        {
-            ((TrackObjectPresentationMesh*)(memory))->setCurrentFrame(frame);
-        }
-        //getter for current frame in a skeletal animation
-        void getCurrentFrame(void *memory)
-        {
-            ((TrackObjectPresentationMesh*)(memory))->getCurrentFrame();
-        }
-        //getter for key binding for player action enums
-        void getKeyBinding(asIScriptGeneric *gen)
-        {
-            int Enum_value = (int)gen->GetArgDWord(0);
-            InputDevice* device = input_manager->getDeviceManager()->getLatestUsedDevice();
-            DeviceConfig* config = device->getConfiguration();
-            irr::core::stringw control;
-            PlayerAction ScriptAction = (PlayerAction)Enum_value;
-            control = config->getBindingAsString(ScriptAction);
-            std::string key = std::string(irr::core::stringc(control).c_str());
-            void *key_pointer = &key;
-            gen->SetReturnObject(key_pointer);
-        }
-        //generic track object getter, Entry point of track objects into scripts
-        void getTrackObject(asIScriptGeneric *gen)
-        {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            TrackObject* t_obj = World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*str);
-            gen->SetReturnObject(t_obj);
-        }
-        //runs the script specified by the given string
-        void runScript(asIScriptGeneric *gen)
-        {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-            script_engine->runScript(*str);
-        }
-        /*TrackObject* getTrackObject(std::string *name)
-        {
-            TrackObject* t_obj = World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*name);
-            return t_obj;
+        std::string *str = name;
+        std::string type = "mesh";
+        World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str, type);
         }*/
 
-
-        // Displays the message specified in displayMessage( string message ) within the script
-        void displayMessage(asIScriptGeneric *gen)
+        /**
+          * Get a track object by ID.
+          * @return An object of type @ref Scripting_TrackObject
+          */
+        TrackObject* getTrackObject(std::string* objID)
         {
-            std::string *input = (std::string*)gen->GetArgAddress(0);
-            irr::core::stringw out = StringUtils::utf8_to_wide(input->c_str());
-            new TutorialMessageDialog((out), true);
+            return World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*objID);
         }
-        //generic disable method for track objects
+
+        // TODO: assign types for documentation
+        /** Generic disable method for track objects */
         void disableTrackObject(asIScriptGeneric *gen)
         {
             std::string *str = (std::string*)gen->GetArgAddress(0);
             World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str);
         }
-        //generic enable method for track objects
+
+        /** Generic enable method for track objects */
         void enableTrackObject(asIScriptGeneric *gen)
         {
             std::string *str = (std::string*)gen->GetArgAddress(0);
             World::getWorld()->getTrack()->getTrackObjectManager()->enable(*str);
         }
-        //disables an action trigger of specified ID
+
+        /** Disables an action trigger of specified ID */
         void disableTrigger(asIScriptGeneric *gen)
         {
             std::string *str = (std::string*)gen->GetArgAddress(0);
             World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str);
         }
-        //enables an action trigger of specified ID
+
+        /** Enables an action trigger of specified ID */
         void enableTrigger(asIScriptGeneric *gen)
         {
             std::string *str = (std::string*)gen->GetArgAddress(0);
             World::getWorld()->getTrack()->getTrackObjectManager()->enable(*str);
         }
-        //Creates a trigger at the specified location
+
+        /** Creates a trigger at the specified location */
         void createTrigger(asIScriptGeneric *gen)
         {
             std::string *script_name = (std::string*)gen->GetArgAddress(0);
@@ -182,77 +109,193 @@ namespace Scripting
             tobj->setID(*script_name);
             World::getWorld()->getTrack()->getTrackObjectManager()->insertObject(tobj);
         }
+    }
+
+    /** \cond DOXYGEN_IGNORE */
+    namespace Track
+    {
+    /** \endcond */
+
+        // ----------- TrackObjectPresentationMesh methods -----------
+        // TODO: this method is WRONG, we should in most cases move not the presentation but the entire object
+        //void movePresentation(Vec3 *new_pos, void *memory)
+        //{
+        //    core::vector3df xyz = new_pos->toIrrVector();
+        //    core::vector3df hpr = core::vector3df(0, 0, 0);
+        //    core::vector3df scale = core::vector3df(1, 1, 1);
+        //    ((TrackObjectPresentation*)(memory))->move(xyz, hpr, scale, false);
+        //}
+
+        namespace Mesh
+        {
+            /**
+            * \addtogroup Scripting_Mesh Mesh (script binding)
+            * Type returned by trackObject.getMesh()
+            * @{
+            */
+
+            /** Sets a loop for a skeletal animation */
+            // TODO: can we use a type and avoid void* ?
+            void setLoop(int start, int end /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationMesh*)(memory))->setLoop(start, end);
+            }
+
+            /** Sets the current frame for a skeletal animation */
+            void setCurrentFrame(int frame /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationMesh*)(memory))->setCurrentFrame(frame);
+            }
+
+            /** Get current frame in a skeletal animation */
+            int getCurrentFrame(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                return ((TrackObjectPresentationMesh*)(memory))->getCurrentFrame();
+            }
+            /** @} */
+        }
+
+        // ----------- Animator Object methods -----------
+
+        namespace Animator
+        {
+            /**
+            * \addtogroup Scripting_Animator Animator (script binding)
+            * Type returned by trackObject.getIPOAnimator()
+            * @{
+            */
+
+            /** Pause/resumes a curve-based animation */
+            void setPaused(bool mode /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            {
+                ((ThreeDAnimation*)(memory))->setPaused(mode);
+            }
+
+            /** @} */
+        }
+
+        // ----------- Sound Object methods -----------
+
+        namespace SoundEmitter
+        {
+            /**
+            * @addtogroup Scripting_SoundEmitter SoundEmitter (script binding)
+            * Type returned by trackObject.getSoundEmitter()
+            * @{
+            */
+
+            // TODO: adjust all signatures to type "void*" parameters if possible
+            /** Stop a sound */
+            void stop(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationSound*)memory)->stopSound();
+            }
+
+            /** Play the specified sound once */
+            void playOnce(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationSound*)memory)->triggerSound(false); //false = once
+            }
+
+            /** Play the specified sound continuously */
+            void playLoop(/** \cond DOXYGEN_IGNORE */void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationSound*)memory)->triggerSound(true); //true = loop
+            }
+            /** @} */
+        }
+
+        // ----------- ParticleEmitter Object methods -----------
+
+        namespace ParticleEmitter
+        {
+            /**
+            * @addtogroup Scripting_ParticleEmitter ParticleEmitter (script binding)
+            * Type returned by trackObject.getParticleEmitter()
+            * @{
+            */
+
+            // TODO: adjust all signatures to type "void*" parameters if possible
+            /** Stop particle emission */
+            void stop(/** \cond DOXYGEN_IGNORE */ void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationParticles*)memory)->stop();
+            }
+
+            /** Play the specified sound once */
+            void setEmissionRate(float rate /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationParticles*)memory)->setRate(rate);
+            }
+            /** @} */
+        }
+
+        /** @}*/
+        /** @}*/
 
         void registerScriptFunctions(asIScriptEngine *engine)
         {
             int r;
 
             engine->SetDefaultNamespace("Track");
-            r = engine->RegisterGlobalFunction("void disable(string &in)", asFUNCTION(disableTrackObject), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enable(string &in)", asFUNCTION(enableTrackObject), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enableTrigger(string &in)", asFUNCTION(enableTrigger), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void disableTrigger(string &in)", asFUNCTION(disableTrigger), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void createTrigger(string &in,Vec3 &in, float distance)",
+            r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void createTrigger(const string &in,Vec3 &in, float distance)",
                 asFUNCTION(createTrigger), asCALL_GENERIC); assert(r >= 0);
-
-            /*
-            //Test singleton, and various calling conventions
-            // Register the track object manager as a singleton. The script will access it through the global property
-            //r = engine->RegisterObjectType("TrackObjectManager", 0, asOBJ_REF | asOBJ_NOHANDLE); assert(r >= 0);
-            r = engine->RegisterObjectType("TrackObjectManager", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-
-            // Register the track object manager's methods
-            TrackObjectManager* track_obj_manager = World::getWorld()->getTrack()->getTrackObjectManager();
-            r = engine->RegisterGlobalProperty("TrackObjectManager track_obj_manager", track_obj_manager); assert(r >= 0);
-            //r = engine->RegisterObjectMethod("TrackObjectManager", "void disable(string name , string type)", asMETHOD(TrackObjectManager, disable), asCALL_THISCALL); assert(r >= 0);
-            //r = engine->RegisterObjectMethod("TrackObjectManager", "void disable(string &in name)", asFUNCTION(disableAnimation), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObjectManager", "void disable(string &in)", asFUNCTION(disableAnimation), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            */
-            //TrackObject
+            r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
+            
             r = engine->RegisterObjectType("TrackObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("TrackObject @getTrackObject(string &in)", asFUNCTION(getTrackObject), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
-
-
-            //PhysicalObject
             r = engine->RegisterObjectType("PhysicalObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "PhysicalObject @getPhysicalObject()", asMETHOD(TrackObject, getPhysicalObjectForScript), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("PhysicalObject", "bool isFlattener()", asMETHOD(PhysicalObject, isFlattenKartObject), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("PhysicalObject", "void disable()", asFUNCTION(disable), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("PhysicalObject", "void enable()", asFUNCTION(enable), asCALL_CDECL_OBJLAST); assert(r >= 0);
-
-
-            //Mesh or Skeletal Animation
-            r = engine->RegisterObjectType("Mesh", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "Mesh @getMesh()", asMETHOD(TrackObject, getMesh), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Mesh", "void setLoop(int start, int end)", asFUNCTION(setLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Mesh", "int getCurrentFrame()", asFUNCTION(getCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Mesh", "void setCurrentFrame(int frame)", asFUNCTION(setCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Mesh", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
-
-            //Particle Emitter
+            r = engine->RegisterObjectType("Mesh", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0); // TrackObjectPresentationMesh
             r = engine->RegisterObjectType("ParticleEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "ParticleEmitter @getParticleEmitter()", asMETHOD(TrackObject, getParticles), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("ParticleEmitter", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
-            //Sound Effect
+            // TrackObject
+            r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "SoundEmitter@ getSoundEmitter()", asMETHOD(TrackObject, getSoundEmitter), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "PhysicalObject@ getPhysics()", asMETHOD(TrackObject, getPhysics), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "Mesh@ getMesh()", asMETHOD(TrackObject, getMesh), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "ParticleEmitter@ getParticleEmitter()", asMETHOD(TrackObject, getParticleEmitter), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "Animator@ getIPOAnimator()", asMETHOD(TrackObject, getIPOAnimator), asCALL_THISCALL); assert(r >= 0);
+            // TODO: add move method
+
+            // PhysicalObject
+            r = engine->RegisterObjectMethod("PhysicalObject", "bool isFlattenKartObject()", asMETHOD(PhysicalObject, isFlattenKartObject), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("PhysicalObject", "void disable()", asMETHOD(PhysicalObject, disable), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("PhysicalObject", "void enable()", asMETHOD(PhysicalObject, enable), asCALL_THISCALL); assert(r >= 0);
+
+            // TrackObjectPresentationMesh (Mesh or Skeletal Animation)
+            r = engine->RegisterObjectMethod("Mesh", "void setLoop(int start, int end)", asFUNCTION(Mesh::setLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Mesh", "int getCurrentFrame()", asFUNCTION(Mesh::getCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Mesh", "void setCurrentFrame(int frame)", asFUNCTION(Mesh::setCurrentFrame), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            //r = engine->RegisterObjectMethod("Mesh", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
+
+            // Particle Emitter
+            r = engine->RegisterObjectMethod("ParticleEmitter", "void stop()", asFUNCTION(ParticleEmitter::stop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("ParticleEmitter", "void setEmissionRate(float)", asFUNCTION(ParticleEmitter::setEmissionRate), asCALL_CDECL_OBJLAST); assert(r >= 0);
+
+            // Sound Effect
             r = engine->RegisterObjectType("SoundEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "SoundEmitter @getSoundEmitter()", asMETHOD(TrackObject, getSound), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("SoundEmitter", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("SoundEmitter", "void stop()", asFUNCTION(stop), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("SoundEmitter", "void playOnce()", asFUNCTION(playOnce), asCALL_CDECL_OBJLAST); assert(r >= 0);
-            r = engine->RegisterObjectMethod("SoundEmitter", "void playLoop()", asFUNCTION(playLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            //r = engine->RegisterObjectMethod("SoundEmitter", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("SoundEmitter", "void stop()", asFUNCTION(SoundEmitter::stop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("SoundEmitter", "void playOnce()", asFUNCTION(SoundEmitter::playOnce), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("SoundEmitter", "void playLoop()", asFUNCTION(SoundEmitter::playLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
 
 
-            //Curve based Animation
+            // Curve based Animation
             r = engine->RegisterObjectType("Animator", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectMethod("TrackObject", "Animator @getAnimator()", asMETHOD(TrackObject, getAnimatorForScript), asCALL_THISCALL); assert(r >= 0);
             //fails due to insufficient visibility to scripts TODO : Decide whether to fix visibility or introduce wrappers
             //r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asMETHOD(ThreeDAnimation, setPaused), asCALL_THISCALL); assert(r >= 0);
-            r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asFUNCTION( setPaused ), asCALL_CDECL_OBJLAST); assert(r >= 0);
-
-            r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asFUNCTION(Animator::setPaused), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            // TODO: add method to set current frame
+            // TODO: add method to launch playback from frame X to frame Y
+            // TODO: add method to register onAnimationComplete notifications ?
         }
+
+/** \cond DOXYGEN_IGNORE */
     }
 }
+/** \endcond */
+
diff --git a/src/scriptengine/script_utils.cpp b/src/scriptengine/script_utils.cpp
index fcb19efad..ca057b936 100644
--- a/src/scriptengine/script_utils.cpp
+++ b/src/scriptengine/script_utils.cpp
@@ -101,6 +101,15 @@ namespace Scripting
             return StringUtils::wide_to_utf8(out.c_str());
         }
 
+        /** Runs the script specified by the given string */
+        // TODO: type arguments
+        void runScript(asIScriptGeneric *gen)
+        {
+            std::string *str = (std::string*)gen->GetArgAddress(0);
+            ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+            script_engine->runScript(*str);
+        }
+
         /** Log to the console */
         void logInfo(std::string* log)
         {
@@ -153,6 +162,8 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues2), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues3), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues4), asCALL_CDECL); assert(r >= 0);
+            
+            r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_GENERIC); assert(r >= 0);
 
             r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(logInfo), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(logWarning), asCALL_CDECL); assert(r >= 0);
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index edc2e4b93..db0c39ebc 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -109,7 +109,6 @@ public:
               bool isAbsoluteCoord);
 
     virtual void reset();
-    void setEnable(bool mode);
     const core::vector3df& getPosition() const;
     const core::vector3df  getAbsolutePosition() const;
     const core::vector3df& getRotation() const;
@@ -151,8 +150,6 @@ public:
     const PhysicalObject* getPhysicalObject() const { return m_physical_object; }
     // ------------------------------------------------------------------------
     PhysicalObject* getPhysicalObject() { return m_physical_object; }
-    //Due to above overload AngelScript cannot decide which function to bind
-    PhysicalObject* getPhysicalObjectForScript() { return m_physical_object; }
     // ------------------------------------------------------------------------
     const core::vector3df getInitXYZ() const { return m_init_xyz; }
     // ------------------------------------------------------------------------
@@ -165,20 +162,47 @@ public:
     // ------------------------------------------------------------------------
     template<typename T>
     const T* getPresentation() const { return dynamic_cast<T*>(m_presentation); }
-
-    //specialized getters for scripts
-    TrackObjectPresentationMesh* getMesh(){ return getPresentation<TrackObjectPresentationMesh>(); }
-
-    TrackObjectPresentationParticles* getParticles(){ return getPresentation<TrackObjectPresentationParticles>(); }
-
-    TrackObjectPresentationSound* getSound(){ return getPresentation<TrackObjectPresentationSound>(); }
-
+    // ------------------------------------------------------------------------
+    // Methods usable by scripts
+    /**
+    * \addtogroup Scripting
+    * @{
+    * \addtogroup Scripting_Track Track
+    * @{
+    * \addtogroup Scripting_TrackObject TrackObject (script binding)
+    * @{
+    */
+    /** Should only be used on mesh track objects.
+    * On the script side, the returned object is of type : @ref Scripting_Mesh
+    */
+    TrackObjectPresentationMesh* getMesh() { return getPresentation<TrackObjectPresentationMesh>(); }
+    /** Should only be used on particle emitter track objects.
+    * On the script side, the returned object is of type : @ref Scripting_ParticleEmitter
+    */
+    TrackObjectPresentationParticles* getParticleEmitter() { return getPresentation<TrackObjectPresentationParticles>(); }
+    /** Should only be used on sound emitter track objects.
+      * On the script side, the returned object is of type : @ref Scripting_SoundEmitter
+      */
+    TrackObjectPresentationSound* getSoundEmitter(){ return getPresentation<TrackObjectPresentationSound>(); }
+    // For angelscript. Needs to be named something different than getAnimator since it's overloaded.
+    /** Should only be used on TrackObjects that use curve-based animation.
+      * On the script side, the returned object is of type : @ref Scripting_Animator
+      */
+    ThreeDAnimation* getIPOAnimator() { return m_animator; }
+    // For angelscript. Needs to be named something different than getPhysicalObject since it's overloaded.
+    /** Get the physics representation of an object.
+      * On the script side, the returned object is of type : @ref Scripting_PhysicalObject
+      */
+    PhysicalObject* getPhysics() { return m_physical_object; }
+    /** Hide or show the object */
+    void setEnable(bool mode);
+    /* @} */
+    /* @} */
+    /* @} */
     // ------------------------------------------------------------------------
     ThreeDAnimation* getAnimator() { return m_animator; }
     // ------------------------------------------------------------------------
     const ThreeDAnimation* getAnimator() const { return m_animator; }
-    //Due to above overload AngelScript cannot decide which function to bind
-    ThreeDAnimation* getAnimatorForScript() { return m_animator; }
     // ------------------------------------------------------------------------
     void setPaused(bool mode){ m_animator->setPaused(mode); }
     // ------------------------------------------------------------------------
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 9780c1242..8008cc94e 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -826,7 +826,24 @@ void TrackObjectPresentationParticles::triggerParticles()
         m_emitter->setParticleType(m_emitter->getParticlesInfo());
     }
 }   // triggerParticles
-
+// ----------------------------------------------------------------------------
+void TrackObjectPresentationParticles::stop()
+{
+    if (m_emitter != NULL)
+    {
+        m_emitter->setCreationRateAbsolute(0.0f);
+        m_emitter->clearParticles();
+    }
+}
+// ----------------------------------------------------------------------------
+void TrackObjectPresentationParticles::setRate(float rate)
+{
+    if (m_emitter != NULL)
+    {
+        m_emitter->setCreationRateAbsolute(rate);
+        m_emitter->setParticleType(m_emitter->getParticlesInfo());
+    }
+}
 // ----------------------------------------------------------------------------
 TrackObjectPresentationLight::TrackObjectPresentationLight(
                                                      const XMLNode& xml_node, 
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 95a6ebaf8..cfda97efa 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -312,6 +312,8 @@ public:
 
     virtual void update(float dt) OVERRIDE;
     void triggerParticles();
+    void stop();
+    void setRate(float rate);
     // ------------------------------------------------------------------------
     /** Returns the trigger condition for this object. */
     std::string& getTriggerCondition() { return m_trigger_condition; }

From f269b44208507799aaeb993d255d26b03e153a52 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 10 May 2015 20:04:44 -0400
Subject: [PATCH 179/331] SCripting branch fix

---
 src/scriptengine/script_track.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 9f7c4294a..d1107deb8 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -238,6 +238,14 @@ namespace Scripting
             int r;
 
             engine->SetDefaultNamespace("Track");
+
+            r = engine->RegisterObjectType("TrackObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
+            r = engine->RegisterObjectType("PhysicalObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
+            r = engine->RegisterObjectType("Mesh", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0); // TrackObjectPresentationMesh
+            r = engine->RegisterObjectType("ParticleEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
+            r = engine->RegisterObjectType("SoundEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
+            r = engine->RegisterObjectType("Animator", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
+
             r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_GENERIC); assert(r >= 0);
@@ -246,11 +254,6 @@ namespace Scripting
                 asFUNCTION(createTrigger), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             
-            r = engine->RegisterObjectType("TrackObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectType("PhysicalObject", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-            r = engine->RegisterObjectType("Mesh", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0); // TrackObjectPresentationMesh
-            r = engine->RegisterObjectType("ParticleEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
-
             // TrackObject
             r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "SoundEmitter@ getSoundEmitter()", asMETHOD(TrackObject, getSoundEmitter), asCALL_THISCALL); assert(r >= 0);
@@ -276,16 +279,13 @@ namespace Scripting
             r = engine->RegisterObjectMethod("ParticleEmitter", "void setEmissionRate(float)", asFUNCTION(ParticleEmitter::setEmissionRate), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
             // Sound Effect
-            r = engine->RegisterObjectType("SoundEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
             //r = engine->RegisterObjectMethod("SoundEmitter", "void move(Vec3 &in)", asFUNCTION(movePresentation), asCALL_CDECL_OBJLAST); assert(r >= 0);
             r = engine->RegisterObjectMethod("SoundEmitter", "void stop()", asFUNCTION(SoundEmitter::stop), asCALL_CDECL_OBJLAST); assert(r >= 0);
             r = engine->RegisterObjectMethod("SoundEmitter", "void playOnce()", asFUNCTION(SoundEmitter::playOnce), asCALL_CDECL_OBJLAST); assert(r >= 0);
             r = engine->RegisterObjectMethod("SoundEmitter", "void playLoop()", asFUNCTION(SoundEmitter::playLoop), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
 
-
             // Curve based Animation
-            r = engine->RegisterObjectType("Animator", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
             //fails due to insufficient visibility to scripts TODO : Decide whether to fix visibility or introduce wrappers
             //r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asMETHOD(ThreeDAnimation, setPaused), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("Animator", "void setPaused(bool mode)", asFUNCTION(Animator::setPaused), asCALL_CDECL_OBJLAST); assert(r >= 0);

From 77bfa8460966d9f9a594de0f56b1b369bb099949 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 11 May 2015 17:07:31 +1000
Subject: [PATCH 180/331] Moved more render-geometry specific shader into
 render geometry.

---
 src/graphics/render_geometry.cpp | 301 +++++++++++++++++++++++++++----
 src/graphics/shaders.cpp         | 160 ----------------
 src/graphics/shaders.hpp         |  65 -------
 3 files changed, 268 insertions(+), 258 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index ed5f433b2..5785e4512 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -76,17 +76,190 @@ layout(location = 6) in vec3 Bitangent;
 
 */
 
+// ============================================================================
+class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>,
+                    public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedObjectPass1Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
+
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "glosstex",
+                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedObjectPass1Shader
+};   // class InstancedObjectPass1Shader
+
+// ============================================================================
+class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>,
+    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
+    ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedObjectPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedObjectPass2Shader
+};   // InstancedObjectPass2Shader
+
+// ============================================================================
+class ShadowShader : public Shader<ShadowShader, int, core::matrix4>,
+                     public TextureReadNew<>
+{
+public:
+    ShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow.vert",
+                                GL_FRAGMENT_SHADER, "shadow.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow.vert",
+                                GL_GEOMETRY_SHADER, "shadow.geom",
+                                GL_FRAGMENT_SHADER, "shadow.frag");
+        }
+        assignUniforms("layer", "ModelMatrix");
+    }   // ShadowShader
+};   // ShadowShader
+// ============================================================================
+class InstancedShadowShader : public Shader<InstancedShadowShader, int>,
+                              public TextureReadNew<>
+{
+public:
+    InstancedShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                                GL_FRAGMENT_SHADER, "shadow.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                                GL_VERTEX_SHADER, "instanciedshadow.vert",
+                                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                                GL_FRAGMENT_SHADER, "shadow.frag");
+        }
+        assignUniforms("layer");
+    }   // InstancedShadowShader
+
+};   // InstancedShadowShader
+
+// ============================================================================
+class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, 
+                               core::matrix4>,
+                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    RSMShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "rsm.vert",
+                            GL_FRAGMENT_SHADER, "rsm.frag");
+
+        assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
+        assignSamplerNames(m_program, 0, "tex",
+                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // RSMShader
+};   // RSMShader
+
+
+// ============================================================================
+class SplattingRSMShader : public Shader<SplattingRSMShader, core::matrix4,
+                                  core::matrix4>,
+                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, 
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    SplattingRSMShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "rsm.vert",
+                            GL_FRAGMENT_SHADER, "splatting_rsm.frag");
+
+        assignUniforms("RSMMatrix", "ModelMatrix");
+        assignSamplerNames(m_program,
+                           0, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           2, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           3, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // SplattingRSMShader
+
+};  // SplattingRSMShader
+
+// ============================================================================
+class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedRSMShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_rsm.vert",
+                            GL_FRAGMENT_SHADER, "instanced_rsm.frag");
+
+        assignUniforms("RSMMatrix");
+        assignSamplerNames(m_program, 0, "tex",
+                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedRSMShader
+};   // InstancedRSMShader
+
+// ============================================================================
+class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4,
+                                           core::matrix4, core::matrix4>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    ObjectRefPass1Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
+        assignSamplerNames(m_program, 
+                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // ObjectRefPass1Shader
+};  // ObjectRefPass1Shader
+
+
+// ============================================================================
 struct DefaultMaterial
 {
-    typedef MeshShader::InstancedObjectPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedObjectPass2Shader InstancedSecondPassShader;
-    typedef MeshShader::InstancedShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedObjectPass1Shader InstancedFirstPassShader;
+    typedef InstancedObjectPass2Shader InstancedSecondPassShader;
+    typedef InstancedShadowShader InstancedShadowPassShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDefault InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::ObjectPass2Shader SecondPassShader;
-    typedef MeshShader::ShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef ShadowShader ShadowPassShader;
+    typedef RSMShader RSMShader;
     typedef ListMatDefault List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType
@@ -111,12 +284,12 @@ struct AlphaRef
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedObjectRefPass2Shader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatAlphaRef InstancedList;
-    typedef MeshShader::ObjectRefPass1Shader FirstPassShader;
+    typedef ObjectRefPass1Shader FirstPassShader;
     typedef MeshShader::ObjectRefPass2Shader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef RSMShader RSMShader;
     typedef ListMatAlphaRef List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_ALPHA_TEST;
@@ -138,15 +311,15 @@ const STK::Tuple<size_t> AlphaRef::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct SphereMap
 {
-    typedef MeshShader::InstancedObjectPass1Shader InstancedFirstPassShader;
+    typedef InstancedObjectPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedSphereMapShader InstancedSecondPassShader;
-    typedef MeshShader::InstancedShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedShadowShader InstancedShadowPassShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatSphereMap InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::SphereMapShader SecondPassShader;
-    typedef MeshShader::ShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef ShadowShader ShadowPassShader;
+    typedef RSMShader RSMShader;
     typedef ListMatSphereMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType 
@@ -170,12 +343,12 @@ struct UnlitMat
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedObjectUnlitShader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatUnlit InstancedList;
-    typedef MeshShader::ObjectRefPass1Shader FirstPassShader;
+    typedef ObjectRefPass1Shader FirstPassShader;
     typedef MeshShader::ObjectUnlitShader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef RSMShader RSMShader;
     typedef ListMatUnlit List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType =
@@ -214,19 +387,81 @@ public:
 
 };   // class GrassPass1Shader
 
+// ============================================================================
+class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4,
+                                        core::vector3df>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    GrassShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow_grass.vert",
+                                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow_grass.vert",
+                                GL_GEOMETRY_SHADER, "shadow.geom",
+                                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+        assignUniforms("layer", "ModelMatrix", "windDir");
+        assignSamplerNames(m_program, 0, "tex",
+            ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // GrassShadowShader
+};   // GrassShadowShader
+
+// ============================================================================
+class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader,
+                                                 int, core::vector3df>,
+                    public TextureReadNew < ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    InstancedGrassShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
+                                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
+                                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+
+        assignSamplerNames(m_program, 0, "tex",
+                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignUniforms("layer", "windDir");
+    }   // InstancedGrassShadowShader
+};   // InstancedGrassShadowShader
+
+// ============================================================================
+
+
 
 // ----------------------------------------------------------------------------
 struct GrassMat
 {
     typedef MeshShader::InstancedGrassPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedGrassPass2Shader InstancedSecondPassShader;
-    typedef MeshShader::InstancedGrassShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedGrassShadowShader InstancedShadowPassShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatGrass InstancedList;
     typedef GrassPass1Shader FirstPassShader;
     typedef MeshShader::GrassPass2Shader SecondPassShader;
-    typedef MeshShader::GrassShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef GrassShadowShader ShadowPassShader;
+    typedef RSMShader RSMShader;
     typedef ListMatGrass List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType 
@@ -250,14 +485,14 @@ const STK::Tuple<size_t> GrassMat::RSMTextures = STK::Tuple<size_t>(0);
 struct NormalMat
 {
     typedef MeshShader::InstancedNormalMapShader InstancedFirstPassShader;
-    typedef MeshShader::InstancedObjectPass2Shader InstancedSecondPassShader;
-    typedef MeshShader::InstancedShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedObjectPass2Shader InstancedSecondPassShader;
+    typedef InstancedShadowShader InstancedShadowPassShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatNormalMap InstancedList;
     typedef MeshShader::NormalMapShader FirstPassShader;
     typedef MeshShader::ObjectPass2Shader SecondPassShader;
-    typedef MeshShader::ShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef ShadowShader ShadowPassShader;
+    typedef RSMShader RSMShader;
     typedef ListMatNormalMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_TANGENTS;
     static const enum Material::ShaderType MaterialType
@@ -280,15 +515,15 @@ const STK::Tuple<size_t> NormalMat::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct DetailMat
 {
-    typedef MeshShader::InstancedObjectPass1Shader InstancedFirstPassShader;
+    typedef InstancedObjectPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedDetailledObjectPass2Shader InstancedSecondPassShader;
-    typedef MeshShader::InstancedShadowShader InstancedShadowPassShader;
-    typedef MeshShader::InstancedRSMShader InstancedRSMShader;
+    typedef InstancedShadowShader InstancedShadowPassShader;
+    typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDetails InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::DetailledObjectPass2Shader SecondPassShader;
-    typedef MeshShader::ShadowShader ShadowPassShader;
-    typedef MeshShader::RSMShader RSMShader;
+    typedef ShadowShader ShadowPassShader;
+    typedef RSMShader RSMShader;
     typedef ListMatDetails List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_2TCOORDS;
     static const enum Material::ShaderType MaterialType
@@ -312,8 +547,8 @@ struct SplattingMat
 {
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::SplattingShader SecondPassShader;
-    typedef MeshShader::ShadowShader ShadowPassShader;
-    typedef MeshShader::SplattingRSMShader RSMShader;
+    typedef ShadowShader ShadowPassShader;
+    typedef SplattingRSMShader RSMShader;
     typedef ListMatSplatting List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_2TCOORDS;
     static const STK::Tuple<size_t> FirstPassTextures;
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index ada4dad2e..96c17471e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -554,17 +554,6 @@ namespace MeshShader
         assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    ObjectRefPass1Shader::ObjectRefPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "objectref_pass1.frag");
-        assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex",     ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "glosstex",ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
 
     NormalMapShader::NormalMapShader()
     {
@@ -577,18 +566,6 @@ namespace MeshShader
                                       0, "DiffuseForAlpha", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    InstancedObjectPass1Shader::InstancedObjectPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
-
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
     InstancedObjectRefPass1Shader::InstancedObjectRefPass1Shader()
     {
         loadProgram(OBJECT,
@@ -641,21 +618,6 @@ namespace MeshShader
                                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    InstancedObjectPass2Shader::InstancedObjectPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
-        assignUniforms();
-            assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                          1, "SpecularMap", ST_NEAREST_FILTERED,
-                                          2, "SSAO", ST_BILINEAR_FILTERED,
-                                          3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                          4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
     InstancedObjectRefPass2Shader::InstancedObjectRefPass2Shader()
     {
         loadProgram(OBJECT,
@@ -865,84 +827,7 @@ namespace MeshShader
         assignUniforms();
     }
 
-    ShadowShader::ShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow.vert",
-                GL_FRAGMENT_SHADER, "shadow.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow.vert",
-                GL_GEOMETRY_SHADER, "shadow.geom",
-                GL_FRAGMENT_SHADER, "shadow.frag");
-        }
-        assignUniforms("layer", "ModelMatrix");
-    }
 
-    RSMShader::RSMShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "rsm.vert",
-            GL_FRAGMENT_SHADER, "rsm.frag");
-
-        assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedRSMShader::InstancedRSMShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_rsm.vert",
-            GL_FRAGMENT_SHADER, "instanced_rsm.frag");
-
-        assignUniforms("RSMMatrix");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    SplattingRSMShader::SplattingRSMShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "rsm.vert",
-            GL_FRAGMENT_SHADER, "splatting_rsm.frag");
-
-        assignUniforms("RSMMatrix", "ModelMatrix");
-        assignSamplerNames(m_program, 0, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      2, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      3, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      4, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
-    }
-
-    InstancedShadowShader::InstancedShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedshadow.vert",
-                GL_FRAGMENT_SHADER, "shadow.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedshadow.vert",
-                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
-                GL_FRAGMENT_SHADER, "shadow.frag");
-        }
-        assignUniforms("layer");
-    }
 
     RefShadowShader::RefShadowShader()
     {
@@ -990,52 +875,7 @@ namespace MeshShader
         assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    GrassShadowShader::GrassShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow_grass.vert",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow_grass.vert",
-                GL_GEOMETRY_SHADER, "shadow.geom",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-        assignUniforms("layer", "ModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
 
-    InstancedGrassShadowShader::InstancedGrassShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedgrassshadow.vert",
-                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-        assignUniforms("layer", "windDir");
-    }
 
     DisplaceMaskShader::DisplaceMaskShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7196789b6..f4b8a6a61 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -50,12 +50,6 @@ public:
     ObjectPass1Shader();
 };
 
-class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4, core::matrix4, core::matrix4>,
-                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    ObjectRefPass1Shader();
-};
 
 
 class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>,
@@ -65,12 +59,6 @@ public:
     NormalMapShader();
 };
 
-class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>,
-                                   public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedObjectPass1Shader();
-};
 
 class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>,
                                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
@@ -101,13 +89,6 @@ public:
     ObjectPass2Shader();
 };
 
-class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>,
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedObjectPass2Shader();
-};
 
 class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, 
     public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
@@ -238,40 +219,7 @@ public:
     InstancedColorizeShader();
 };
 
-class ShadowShader : public Shader<ShadowShader, int, core::matrix4>, public TextureReadNew<>
-{
-public:
-    ShadowShader();
-};
 
-class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, core::matrix4>,
-                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    RSMShader();
-};
-
-class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>,
-                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedRSMShader();
-};
-
-class SplattingRSMShader : public Shader<SplattingRSMShader, core::matrix4, core::matrix4>,
-                           public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                                 ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                                 ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    SplattingRSMShader();
-};
-
-class InstancedShadowShader : public Shader<InstancedShadowShader, int>, public TextureReadNew<>
-{
-public:
-    InstancedShadowShader();
-};
 
 class RefShadowShader : public Shader<RefShadowShader, int, core::matrix4>,
                         public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
@@ -287,19 +235,6 @@ public:
     InstancedRefShadowShader();
 };
 
-class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4, core::vector3df>,
-                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    GrassShadowShader();
-};
-
-class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader, int, core::vector3df>,
-                                   public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedGrassShadowShader();
-};
 
 class DisplaceMaskShader : public Shader<DisplaceMaskShader, core::matrix4>
 {

From e337b72789ca2be928b9f242c9fcf4bba23b381c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 11 May 2015 17:17:08 +1000
Subject: [PATCH 181/331] Moved *Detailed* shader into render_geometry, renamed
 all detailled to detailed.

---
 ...t_pass2.frag => detailedobject_pass2.frag} |  0
 src/graphics/render_geometry.cpp              | 54 ++++++++++++++++++-
 src/graphics/shaders.cpp                      | 30 -----------
 src/graphics/shaders.hpp                      | 18 -------
 4 files changed, 52 insertions(+), 50 deletions(-)
 rename data/shaders/{detailledobject_pass2.frag => detailedobject_pass2.frag} (100%)

diff --git a/data/shaders/detailledobject_pass2.frag b/data/shaders/detailedobject_pass2.frag
similarity index 100%
rename from data/shaders/detailledobject_pass2.frag
rename to data/shaders/detailedobject_pass2.frag
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 5785e4512..dbb295229 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -447,6 +447,56 @@ public:
 };   // InstancedGrassShadowShader
 
 // ============================================================================
+class DetailedObjectPass2Shader : public Shader<DetailedObjectPass2Shader,
+                                                 core::matrix4>,
+                                   public TextureReadNew<ST_NEAREST_FILTERED,
+                                             ST_NEAREST_FILTERED, 
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    DetailedObjectPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "detailedobject_pass2.frag");
+        assignUniforms("ModelMatrix");
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }  // DetailedObjectPass2Shader
+};   // DetailedObjectPass2Shader
+
+// ============================================================================
+class InstancedDetailedObjectPass2Shader : public Shader<InstancedDetailedObjectPass2Shader>,
+      public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
+                            ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    InstancedDetailedObjectPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                   GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                   GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                   GL_FRAGMENT_SHADER, "instanced_detailedobject_pass2.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedDetailedObjectPass2Shader
+};   // InstancedDetailedObjectPass2Shader
+
+// ============================================================================
 
 
 
@@ -516,12 +566,12 @@ const STK::Tuple<size_t> NormalMat::RSMTextures = STK::Tuple<size_t>(0);
 struct DetailMat
 {
     typedef InstancedObjectPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedDetailledObjectPass2Shader InstancedSecondPassShader;
+    typedef InstancedDetailedObjectPass2Shader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef InstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDetails InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
-    typedef MeshShader::DetailledObjectPass2Shader SecondPassShader;
+    typedef DetailedObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef RSMShader RSMShader;
     typedef ListMatDetails List;
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 96c17471e..85377cbf1 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -633,36 +633,6 @@ namespace MeshShader
                                       4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    DetailledObjectPass2Shader::DetailledObjectPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "detailledobject_pass2.frag");
-        assignUniforms("ModelMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
-    }
-
-    InstancedDetailledObjectPass2Shader::InstancedDetailledObjectPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "instanced_detailledobject_pass2.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                     1, "SpecularMap", ST_NEAREST_FILTERED,
-                                     2, "SSAO", ST_BILINEAR_FILTERED,
-                                     3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                     4, "Detail", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                     5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
 
     ObjectUnlitShader::ObjectUnlitShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index f4b8a6a61..77d26422f 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -98,24 +98,6 @@ public:
     InstancedObjectRefPass2Shader();
 };
 
-class DetailledObjectPass2Shader : public Shader<DetailledObjectPass2Shader, core::matrix4>, 
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                         ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                         ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    DetailledObjectPass2Shader();
-};
-
-class InstancedDetailledObjectPass2Shader : public Shader<InstancedDetailledObjectPass2Shader>,
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                          ST_TRILINEAR_ANISOTROPIC_FILTERED >
-{
-public:
-    InstancedDetailledObjectPass2Shader();
-};
-
 class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, core::matrix4>,
                           public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
                                                 ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED >

From ac3984b403666475cfbee619aef34275bd5225a4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 11 May 2015 21:08:52 +1000
Subject: [PATCH 182/331] Fixed linux compilation.

---
 src/graphics/render_geometry.cpp | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index dbb295229..26f26934d 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -168,12 +168,12 @@ public:
 };   // InstancedShadowShader
 
 // ============================================================================
-class RSMShader : public Shader<RSMShader, core::matrix4, core::matrix4, 
-                               core::matrix4>,
+class CRSMShader : public Shader<CRSMShader, core::matrix4, core::matrix4, 
+                                 core::matrix4>,
                   public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
-    RSMShader()
+    CRSMShader()
     {
         loadProgram(OBJECT, GL_VERTEX_SHADER, "rsm.vert",
                             GL_FRAGMENT_SHADER, "rsm.frag");
@@ -181,8 +181,8 @@ public:
         assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
         assignSamplerNames(m_program, 0, "tex",
                            ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }   // RSMShader
-};   // RSMShader
+    }   // CRSMShader
+};   // CRSMShader
 
 
 // ============================================================================
@@ -212,11 +212,11 @@ public:
 };  // SplattingRSMShader
 
 // ============================================================================
-class InstancedRSMShader : public Shader<InstancedRSMShader, core::matrix4>,
+class CInstancedRSMShader : public Shader<CInstancedRSMShader, core::matrix4>,
                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
 {
 public:
-    InstancedRSMShader()
+    CInstancedRSMShader()
     {
         loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
                             GL_VERTEX_SHADER, "instanced_rsm.vert",
@@ -225,8 +225,8 @@ public:
         assignUniforms("RSMMatrix");
         assignSamplerNames(m_program, 0, "tex",
                            ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }   // InstancedRSMShader
-};   // InstancedRSMShader
+    }   // CInstancedRSMShader
+};   // CInstancedRSMShader
 
 // ============================================================================
 class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4,
@@ -254,12 +254,12 @@ struct DefaultMaterial
     typedef InstancedObjectPass1Shader InstancedFirstPassShader;
     typedef InstancedObjectPass2Shader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDefault InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::ObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatDefault List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType
@@ -284,12 +284,12 @@ struct AlphaRef
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedObjectRefPass2Shader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatAlphaRef InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
     typedef MeshShader::ObjectRefPass2Shader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatAlphaRef List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType = Material::SHADERTYPE_ALPHA_TEST;
@@ -314,12 +314,12 @@ struct SphereMap
     typedef InstancedObjectPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedSphereMapShader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatSphereMap InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef MeshShader::SphereMapShader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatSphereMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType 
@@ -343,12 +343,12 @@ struct UnlitMat
     typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedObjectUnlitShader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatUnlit InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
     typedef MeshShader::ObjectUnlitShader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatUnlit List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType =
@@ -506,12 +506,12 @@ struct GrassMat
     typedef MeshShader::InstancedGrassPass1Shader InstancedFirstPassShader;
     typedef MeshShader::InstancedGrassPass2Shader InstancedSecondPassShader;
     typedef InstancedGrassShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatGrass InstancedList;
     typedef GrassPass1Shader FirstPassShader;
     typedef MeshShader::GrassPass2Shader SecondPassShader;
     typedef GrassShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatGrass List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
     static const enum Material::ShaderType MaterialType 
@@ -537,12 +537,12 @@ struct NormalMat
     typedef MeshShader::InstancedNormalMapShader InstancedFirstPassShader;
     typedef InstancedObjectPass2Shader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatNormalMap InstancedList;
     typedef MeshShader::NormalMapShader FirstPassShader;
     typedef MeshShader::ObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatNormalMap List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_TANGENTS;
     static const enum Material::ShaderType MaterialType
@@ -568,12 +568,12 @@ struct DetailMat
     typedef InstancedObjectPass1Shader InstancedFirstPassShader;
     typedef InstancedDetailedObjectPass2Shader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
-    typedef InstancedRSMShader InstancedRSMShader;
+    typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDetails InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
     typedef DetailedObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
-    typedef RSMShader RSMShader;
+    typedef CRSMShader RSMShader;
     typedef ListMatDetails List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_2TCOORDS;
     static const enum Material::ShaderType MaterialType

From c48037984ddb71e33ddba507bbab57b735dd6413 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 11 May 2015 19:40:43 -0400
Subject: [PATCH 183/331] Update to latest angelscript

---
 lib/angelscript/include/angelscript.h         | 2602 ++++++------
 lib/angelscript/projects/cmake/CMakeLists.txt |  221 +-
 lib/angelscript/source/as_array.h             |  104 +-
 lib/angelscript/source/as_atomic.cpp          |   18 +-
 lib/angelscript/source/as_builder.cpp         | 1172 ++++--
 lib/angelscript/source/as_builder.h           |   33 +-
 lib/angelscript/source/as_bytecode.cpp        |   79 +-
 lib/angelscript/source/as_callfunc.cpp        |  359 +-
 lib/angelscript/source/as_callfunc.h          |   28 +-
 lib/angelscript/source/as_callfunc_arm.cpp    |  138 +-
 lib/angelscript/source/as_callfunc_arm_gcc.S  |   11 +-
 .../source/as_callfunc_arm_msvc.asm           |    4 +-
 lib/angelscript/source/as_callfunc_arm_vita.S |  480 +++
 lib/angelscript/source/as_callfunc_mips.cpp   |    6 +-
 lib/angelscript/source/as_callfunc_ppc.cpp    |    6 +-
 lib/angelscript/source/as_callfunc_ppc_64.cpp |    9 +-
 lib/angelscript/source/as_callfunc_sh4.cpp    |    6 +-
 .../source/as_callfunc_x64_gcc.cpp            |   65 +-
 .../source/as_callfunc_x64_mingw.cpp          |   42 +-
 .../source/as_callfunc_x64_msvc.cpp           |   56 +-
 lib/angelscript/source/as_callfunc_x86.cpp    |   49 +-
 lib/angelscript/source/as_callfunc_xenon.cpp  |    6 +-
 lib/angelscript/source/as_compiler.cpp        | 3701 +++++++++++------
 lib/angelscript/source/as_compiler.h          |   47 +-
 lib/angelscript/source/as_config.h            |  217 +-
 lib/angelscript/source/as_configgroup.cpp     |  103 +-
 lib/angelscript/source/as_configgroup.h       |   11 +-
 lib/angelscript/source/as_context.cpp         |  407 +-
 lib/angelscript/source/as_context.h           |   25 +-
 lib/angelscript/source/as_datatype.cpp        |  218 +-
 lib/angelscript/source/as_datatype.h          |   58 +-
 lib/angelscript/source/as_debug.h             |   15 +-
 lib/angelscript/source/as_gc.cpp              |  102 +-
 lib/angelscript/source/as_gc.h                |    5 +-
 lib/angelscript/source/as_globalproperty.cpp  |  160 +-
 lib/angelscript/source/as_memory.cpp          |   93 +-
 lib/angelscript/source/as_memory.h            |   32 +-
 lib/angelscript/source/as_module.cpp          |  599 ++-
 lib/angelscript/source/as_module.h            |   46 +-
 lib/angelscript/source/as_namespace.h         |    5 +-
 lib/angelscript/source/as_objecttype.cpp      |  417 +-
 lib/angelscript/source/as_objecttype.h        |   56 +-
 lib/angelscript/source/as_parser.cpp          |  482 ++-
 lib/angelscript/source/as_parser.h            |   10 +-
 lib/angelscript/source/as_property.h          |   19 +-
 lib/angelscript/source/as_restore.cpp         |  549 ++-
 lib/angelscript/source/as_restore.h           |    9 +-
 lib/angelscript/source/as_scriptengine.cpp    | 2574 +++++++-----
 lib/angelscript/source/as_scriptengine.h      |  183 +-
 lib/angelscript/source/as_scriptfunction.cpp  |  627 +--
 lib/angelscript/source/as_scriptfunction.h    |   45 +-
 lib/angelscript/source/as_scriptnode.h        |    5 +-
 lib/angelscript/source/as_scriptobject.cpp    |  170 +-
 lib/angelscript/source/as_scriptobject.h      |   44 +-
 lib/angelscript/source/as_string.cpp          |   57 +-
 lib/angelscript/source/as_string.h            |    9 +-
 lib/angelscript/source/as_string_util.cpp     |    2 +-
 lib/angelscript/source/as_symboltable.h       |  119 +-
 lib/angelscript/source/as_texts.h             |  196 +-
 lib/angelscript/source/as_thread.cpp          |   23 +-
 lib/angelscript/source/as_thread.h            |    2 +-
 lib/angelscript/source/as_tokendef.h          |    7 +-
 lib/angelscript/source/as_tokenizer.cpp       |    7 +-
 lib/angelscript/source/as_typeinfo.cpp        |    4 +-
 lib/angelscript/source/as_typeinfo.h          |    5 +-
 src/scriptengine/script_engine.cpp            |    2 +-
 src/scriptengine/scriptarray.cpp              |  316 +-
 src/scriptengine/scriptarray.hpp              |   60 +-
 src/scriptengine/scriptstdstring.cpp          |  221 +-
 src/scriptengine/scriptstdstring.hpp          |   19 +-
 src/scriptengine/scriptstdstring_utils.cpp    |  135 +-
 71 files changed, 11405 insertions(+), 6307 deletions(-)
 create mode 100644 lib/angelscript/source/as_callfunc_arm_vita.S

diff --git a/lib/angelscript/include/angelscript.h b/lib/angelscript/include/angelscript.h
index ff2ffe13f..7f8c63bce 100644
--- a/lib/angelscript/include/angelscript.h
+++ b/lib/angelscript/include/angelscript.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -35,8 +35,7 @@
 // The script engine interface
 //
 
-//TODO Add Build Target for Scripting Language and provide lib and include using that
-//This file will then be removed from this directory.
+
 #ifndef ANGELSCRIPT_H
 #define ANGELSCRIPT_H
 
@@ -59,8 +58,8 @@ BEGIN_AS_NAMESPACE
 
 // AngelScript version
 
-#define ANGELSCRIPT_VERSION        22801
-#define ANGELSCRIPT_VERSION_STRING "2.28.1"
+#define ANGELSCRIPT_VERSION        23000
+#define ANGELSCRIPT_VERSION_STRING "2.30.0 WIP"
 
 // Data types
 
@@ -81,253 +80,273 @@ class asILockableSharedBool;
 // Return codes
 enum asERetCodes
 {
-   asSUCCESS                              =  0,
-   asERROR                                = -1,
-   asCONTEXT_ACTIVE                       = -2,
-   asCONTEXT_NOT_FINISHED                 = -3,
-   asCONTEXT_NOT_PREPARED                 = -4,
-   asINVALID_ARG                          = -5,
-   asNO_FUNCTION                          = -6,
-   asNOT_SUPPORTED                        = -7,
-   asINVALID_NAME                         = -8,
-   asNAME_TAKEN                           = -9,
-   asINVALID_DECLARATION                  = -10,
-   asINVALID_OBJECT                       = -11,
-   asINVALID_TYPE                         = -12,
-   asALREADY_REGISTERED                   = -13,
-   asMULTIPLE_FUNCTIONS                   = -14,
-   asNO_MODULE                            = -15,
-   asNO_GLOBAL_VAR                        = -16,
-   asINVALID_CONFIGURATION                = -17,
-   asINVALID_INTERFACE                    = -18,
-   asCANT_BIND_ALL_FUNCTIONS              = -19,
-   asLOWER_ARRAY_DIMENSION_NOT_REGISTERED = -20,
-   asWRONG_CONFIG_GROUP                   = -21,
-   asCONFIG_GROUP_IS_IN_USE               = -22,
-   asILLEGAL_BEHAVIOUR_FOR_TYPE           = -23,
-   asWRONG_CALLING_CONV                   = -24,
-   asBUILD_IN_PROGRESS                    = -25,
-   asINIT_GLOBAL_VARS_FAILED              = -26,
-   asOUT_OF_MEMORY                        = -27
+	asSUCCESS                              =  0,
+	asERROR                                = -1,
+	asCONTEXT_ACTIVE                       = -2,
+	asCONTEXT_NOT_FINISHED                 = -3,
+	asCONTEXT_NOT_PREPARED                 = -4,
+	asINVALID_ARG                          = -5,
+	asNO_FUNCTION                          = -6,
+	asNOT_SUPPORTED                        = -7,
+	asINVALID_NAME                         = -8,
+	asNAME_TAKEN                           = -9,
+	asINVALID_DECLARATION                  = -10,
+	asINVALID_OBJECT                       = -11,
+	asINVALID_TYPE                         = -12,
+	asALREADY_REGISTERED                   = -13,
+	asMULTIPLE_FUNCTIONS                   = -14,
+	asNO_MODULE                            = -15,
+	asNO_GLOBAL_VAR                        = -16,
+	asINVALID_CONFIGURATION                = -17,
+	asINVALID_INTERFACE                    = -18,
+	asCANT_BIND_ALL_FUNCTIONS              = -19,
+	asLOWER_ARRAY_DIMENSION_NOT_REGISTERED = -20,
+	asWRONG_CONFIG_GROUP                   = -21,
+	asCONFIG_GROUP_IS_IN_USE               = -22,
+	asILLEGAL_BEHAVIOUR_FOR_TYPE           = -23,
+	asWRONG_CALLING_CONV                   = -24,
+	asBUILD_IN_PROGRESS                    = -25,
+	asINIT_GLOBAL_VARS_FAILED              = -26,
+	asOUT_OF_MEMORY                        = -27,
+	asMODULE_IS_IN_USE                     = -28
 };
 
 // Engine properties
 enum asEEngineProp
 {
-   asEP_ALLOW_UNSAFE_REFERENCES            = 1,
-   asEP_OPTIMIZE_BYTECODE                  = 2,
-   asEP_COPY_SCRIPT_SECTIONS               = 3,
-   asEP_MAX_STACK_SIZE                     = 4,
-   asEP_USE_CHARACTER_LITERALS             = 5,
-   asEP_ALLOW_MULTILINE_STRINGS            = 6,
-   asEP_ALLOW_IMPLICIT_HANDLE_TYPES        = 7,
-   asEP_BUILD_WITHOUT_LINE_CUES            = 8,
-   asEP_INIT_GLOBAL_VARS_AFTER_BUILD       = 9,
-   asEP_REQUIRE_ENUM_SCOPE                 = 10,
-   asEP_SCRIPT_SCANNER                     = 11,
-   asEP_INCLUDE_JIT_INSTRUCTIONS           = 12,
-   asEP_STRING_ENCODING                    = 13,
-   asEP_PROPERTY_ACCESSOR_MODE             = 14,
-   asEP_EXPAND_DEF_ARRAY_TO_TMPL           = 15,
-   asEP_AUTO_GARBAGE_COLLECT               = 16,
-   asEP_DISALLOW_GLOBAL_VARS               = 17,
-   asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT      = 18,
-   asEP_COMPILER_WARNINGS                  = 19,
-   asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE = 20,
+	asEP_ALLOW_UNSAFE_REFERENCES            = 1,
+	asEP_OPTIMIZE_BYTECODE                  = 2,
+	asEP_COPY_SCRIPT_SECTIONS               = 3,
+	asEP_MAX_STACK_SIZE                     = 4,
+	asEP_USE_CHARACTER_LITERALS             = 5,
+	asEP_ALLOW_MULTILINE_STRINGS            = 6,
+	asEP_ALLOW_IMPLICIT_HANDLE_TYPES        = 7,
+	asEP_BUILD_WITHOUT_LINE_CUES            = 8,
+	asEP_INIT_GLOBAL_VARS_AFTER_BUILD       = 9,
+	asEP_REQUIRE_ENUM_SCOPE                 = 10,
+	asEP_SCRIPT_SCANNER                     = 11,
+	asEP_INCLUDE_JIT_INSTRUCTIONS           = 12,
+	asEP_STRING_ENCODING                    = 13,
+	asEP_PROPERTY_ACCESSOR_MODE             = 14,
+	asEP_EXPAND_DEF_ARRAY_TO_TMPL           = 15,
+	asEP_AUTO_GARBAGE_COLLECT               = 16,
+	asEP_DISALLOW_GLOBAL_VARS               = 17,
+	asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT      = 18,
+	asEP_COMPILER_WARNINGS                  = 19,
+	asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE = 20,
+	asEP_ALTER_SYNTAX_NAMED_ARGS            = 21,
+	asEP_DISABLE_INTEGER_DIVISION           = 22,
+	asEP_DISALLOW_EMPTY_LIST_ELEMENTS       = 23,
+	asEP_PRIVATE_PROP_AS_PROTECTED          = 24,
 
-   asEP_LAST_PROPERTY
+	asEP_LAST_PROPERTY
 };
 
 // Calling conventions
 enum asECallConvTypes
 {
-   asCALL_CDECL             = 0,
-   asCALL_STDCALL           = 1,
-   asCALL_THISCALL_ASGLOBAL = 2,
-   asCALL_THISCALL          = 3,
-   asCALL_CDECL_OBJLAST     = 4,
-   asCALL_CDECL_OBJFIRST    = 5,
-   asCALL_GENERIC           = 6
+	asCALL_CDECL             = 0,
+	asCALL_STDCALL           = 1,
+	asCALL_THISCALL_ASGLOBAL = 2,
+	asCALL_THISCALL          = 3,
+	asCALL_CDECL_OBJLAST     = 4,
+	asCALL_CDECL_OBJFIRST    = 5,
+	asCALL_GENERIC           = 6,
+	asCALL_THISCALL_OBJLAST  = 7,
+	asCALL_THISCALL_OBJFIRST = 8
 };
 
 // Object type flags
 enum asEObjTypeFlags
 {
-   asOBJ_REF                        = 0x01,
-   asOBJ_VALUE                      = 0x02,
-   asOBJ_GC                         = 0x04,
-   asOBJ_POD                        = 0x08,
-   asOBJ_NOHANDLE                   = 0x10,
-   asOBJ_SCOPED                     = 0x20,
-   asOBJ_TEMPLATE                   = 0x40,
-   asOBJ_ASHANDLE                   = 0x80,
-   asOBJ_APP_CLASS                  = 0x100,
-   asOBJ_APP_CLASS_CONSTRUCTOR      = 0x200,
-   asOBJ_APP_CLASS_DESTRUCTOR       = 0x400,
-   asOBJ_APP_CLASS_ASSIGNMENT       = 0x800,
-   asOBJ_APP_CLASS_COPY_CONSTRUCTOR = 0x1000,
-   asOBJ_APP_CLASS_C                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR),
-   asOBJ_APP_CLASS_CD               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR),
-   asOBJ_APP_CLASS_CA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-   asOBJ_APP_CLASS_CK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_CDA              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-   asOBJ_APP_CLASS_CDK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_CAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_CDAK             = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_D                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR),
-   asOBJ_APP_CLASS_DA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-   asOBJ_APP_CLASS_DK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_DAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_A                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT),
-   asOBJ_APP_CLASS_AK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_CLASS_K                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-   asOBJ_APP_PRIMITIVE              = 0x2000,
-   asOBJ_APP_FLOAT                  = 0x4000,
-   asOBJ_APP_CLASS_ALLINTS          = 0x8000,
-   asOBJ_APP_CLASS_ALLFLOATS        = 0x10000,
-   asOBJ_NOCOUNT                    = 0x20000,
-   asOBJ_APP_CLASS_ALIGN8           = 0x40000,
-   asOBJ_MASK_VALID_FLAGS           = 0x7FFFF,
-   asOBJ_SCRIPT_OBJECT              = 0x80000,
-   asOBJ_SHARED                     = 0x100000,
-   asOBJ_NOINHERIT                  = 0x200000,
-   asOBJ_SCRIPT_FUNCTION            = 0x400000
+	asOBJ_REF                        = (1<<0),
+	asOBJ_VALUE                      = (1<<1),
+	asOBJ_GC                         = (1<<2),
+	asOBJ_POD                        = (1<<3),
+	asOBJ_NOHANDLE                   = (1<<4),
+	asOBJ_SCOPED                     = (1<<5),
+	asOBJ_TEMPLATE                   = (1<<6),
+	asOBJ_ASHANDLE                   = (1<<7),
+	asOBJ_APP_CLASS                  = (1<<8),
+	asOBJ_APP_CLASS_CONSTRUCTOR      = (1<<9),
+	asOBJ_APP_CLASS_DESTRUCTOR       = (1<<10),
+	asOBJ_APP_CLASS_ASSIGNMENT       = (1<<11),
+	asOBJ_APP_CLASS_COPY_CONSTRUCTOR = (1<<12),
+	asOBJ_APP_CLASS_C                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CD               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR),
+	asOBJ_APP_CLASS_CA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_CK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CDA              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_CDK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CDAK             = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_D                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR),
+	asOBJ_APP_CLASS_DA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_DK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_DAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_A                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_AK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_K                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_PRIMITIVE              = (1<<13),
+	asOBJ_APP_FLOAT                  = (1<<14),
+	asOBJ_APP_ARRAY                  = (1<<15),
+	asOBJ_APP_CLASS_ALLINTS          = (1<<16),
+	asOBJ_APP_CLASS_ALLFLOATS        = (1<<17),
+	asOBJ_NOCOUNT                    = (1<<18),
+	asOBJ_APP_CLASS_ALIGN8           = (1<<19),
+	asOBJ_IMPLICIT_HANDLE            = (1<<20),
+	asOBJ_MASK_VALID_FLAGS           = 0x1FFFFF,
+	// Internal flags
+	asOBJ_SCRIPT_OBJECT              = (1<<21),
+	asOBJ_SHARED                     = (1<<22),
+	asOBJ_NOINHERIT                  = (1<<23),
+	asOBJ_SCRIPT_FUNCTION            = (1<<24),
+	asOBJ_LIST_PATTERN               = (1<<25),
+	asOBJ_ENUM                       = (1<<26),
+	asOBJ_TEMPLATE_SUBTYPE           = (1<<27),
+	asOBJ_TYPEDEF                    = (1<<28),
+	asOBJ_ABSTRACT                   = (1<<29),
+	asOBJ_APP_ALIGN16                = (1<<30)
 };
 
 // Behaviours
 enum asEBehaviours
 {
-   // Value object memory management
-   asBEHAVE_CONSTRUCT,
-   asBEHAVE_LIST_CONSTRUCT,
-   asBEHAVE_DESTRUCT,
+	// Value object memory management
+	asBEHAVE_CONSTRUCT,
+	asBEHAVE_LIST_CONSTRUCT,
+	asBEHAVE_DESTRUCT,
 
-   // Reference object memory management
-   asBEHAVE_FACTORY,
-   asBEHAVE_LIST_FACTORY,
-   asBEHAVE_ADDREF,
-   asBEHAVE_RELEASE,
-   asBEHAVE_GET_WEAKREF_FLAG,
+	// Reference object memory management
+	asBEHAVE_FACTORY,
+	asBEHAVE_LIST_FACTORY,
+	asBEHAVE_ADDREF,
+	asBEHAVE_RELEASE,
+	asBEHAVE_GET_WEAKREF_FLAG,
 
-   // Object operators
-   asBEHAVE_VALUE_CAST,
-   asBEHAVE_IMPLICIT_VALUE_CAST,
-   asBEHAVE_REF_CAST,
-   asBEHAVE_IMPLICIT_REF_CAST,
-   asBEHAVE_TEMPLATE_CALLBACK,
+	// Object operators
+#ifdef AS_DEPRECATED
+	// Deprecated since 2.30.0, 2014-10-24
+	asBEHAVE_VALUE_CAST,
+	asBEHAVE_IMPLICIT_VALUE_CAST,
+	// Deprecated since 2.30.0, 2014-12-30
+	asBEHAVE_REF_CAST,
+	asBEHAVE_IMPLICIT_REF_CAST,
+#endif
+	asBEHAVE_TEMPLATE_CALLBACK,
 
-   // Garbage collection behaviours
-   asBEHAVE_FIRST_GC,
-    asBEHAVE_GETREFCOUNT = asBEHAVE_FIRST_GC,
-    asBEHAVE_SETGCFLAG,
-    asBEHAVE_GETGCFLAG,
-    asBEHAVE_ENUMREFS,
-    asBEHAVE_RELEASEREFS,
-   asBEHAVE_LAST_GC = asBEHAVE_RELEASEREFS,
+	// Garbage collection behaviours
+	asBEHAVE_FIRST_GC,
+	 asBEHAVE_GETREFCOUNT = asBEHAVE_FIRST_GC,
+	 asBEHAVE_SETGCFLAG,
+	 asBEHAVE_GETGCFLAG,
+	 asBEHAVE_ENUMREFS,
+	 asBEHAVE_RELEASEREFS,
+	asBEHAVE_LAST_GC = asBEHAVE_RELEASEREFS,
 
-   asBEHAVE_MAX
+	asBEHAVE_MAX
 };
 
 // Context states
 enum asEContextState
 {
-   asEXECUTION_FINISHED      = 0,
-   asEXECUTION_SUSPENDED     = 1,
-   asEXECUTION_ABORTED       = 2,
-   asEXECUTION_EXCEPTION     = 3,
-   asEXECUTION_PREPARED      = 4,
-   asEXECUTION_UNINITIALIZED = 5,
-   asEXECUTION_ACTIVE        = 6,
-   asEXECUTION_ERROR         = 7
+	asEXECUTION_FINISHED      = 0,
+	asEXECUTION_SUSPENDED     = 1,
+	asEXECUTION_ABORTED       = 2,
+	asEXECUTION_EXCEPTION     = 3,
+	asEXECUTION_PREPARED      = 4,
+	asEXECUTION_UNINITIALIZED = 5,
+	asEXECUTION_ACTIVE        = 6,
+	asEXECUTION_ERROR         = 7
 };
 
 // Message types
 enum asEMsgType
 {
-   asMSGTYPE_ERROR       = 0,
-   asMSGTYPE_WARNING     = 1,
-   asMSGTYPE_INFORMATION = 2
+	asMSGTYPE_ERROR       = 0,
+	asMSGTYPE_WARNING     = 1,
+	asMSGTYPE_INFORMATION = 2
 };
 
 // Garbage collector flags
 enum asEGCFlags
 {
-   asGC_FULL_CYCLE      = 1,
-   asGC_ONE_STEP        = 2,
-   asGC_DESTROY_GARBAGE = 4,
-   asGC_DETECT_GARBAGE  = 8
+	asGC_FULL_CYCLE      = 1,
+	asGC_ONE_STEP        = 2,
+	asGC_DESTROY_GARBAGE = 4,
+	asGC_DETECT_GARBAGE  = 8
 };
 
 // Token classes
 enum asETokenClass
 {
-   asTC_UNKNOWN    = 0,
-   asTC_KEYWORD    = 1,
-   asTC_VALUE      = 2,
-   asTC_IDENTIFIER = 3,
-   asTC_COMMENT    = 4,
-   asTC_WHITESPACE = 5
+	asTC_UNKNOWN    = 0,
+	asTC_KEYWORD    = 1,
+	asTC_VALUE      = 2,
+	asTC_IDENTIFIER = 3,
+	asTC_COMMENT    = 4,
+	asTC_WHITESPACE = 5
 };
 
 // Type id flags
 enum asETypeIdFlags
 {
-   asTYPEID_VOID           = 0,
-   asTYPEID_BOOL           = 1,
-   asTYPEID_INT8           = 2,
-   asTYPEID_INT16          = 3,
-   asTYPEID_INT32          = 4,
-   asTYPEID_INT64          = 5,
-   asTYPEID_UINT8          = 6,
-   asTYPEID_UINT16         = 7,
-   asTYPEID_UINT32         = 8,
-   asTYPEID_UINT64         = 9,
-   asTYPEID_FLOAT          = 10,
-   asTYPEID_DOUBLE         = 11,
-   asTYPEID_OBJHANDLE      = 0x40000000,
-   asTYPEID_HANDLETOCONST  = 0x20000000,
-   asTYPEID_MASK_OBJECT    = 0x1C000000,
-   asTYPEID_APPOBJECT      = 0x04000000,
-   asTYPEID_SCRIPTOBJECT   = 0x08000000,
-   asTYPEID_TEMPLATE       = 0x10000000,
-   asTYPEID_MASK_SEQNBR    = 0x03FFFFFF
+	asTYPEID_VOID           = 0,
+	asTYPEID_BOOL           = 1,
+	asTYPEID_INT8           = 2,
+	asTYPEID_INT16          = 3,
+	asTYPEID_INT32          = 4,
+	asTYPEID_INT64          = 5,
+	asTYPEID_UINT8          = 6,
+	asTYPEID_UINT16         = 7,
+	asTYPEID_UINT32         = 8,
+	asTYPEID_UINT64         = 9,
+	asTYPEID_FLOAT          = 10,
+	asTYPEID_DOUBLE         = 11,
+	asTYPEID_OBJHANDLE      = 0x40000000,
+	asTYPEID_HANDLETOCONST  = 0x20000000,
+	asTYPEID_MASK_OBJECT    = 0x1C000000,
+	asTYPEID_APPOBJECT      = 0x04000000,
+	asTYPEID_SCRIPTOBJECT   = 0x08000000,
+	asTYPEID_TEMPLATE       = 0x10000000,
+	asTYPEID_MASK_SEQNBR    = 0x03FFFFFF
 };
 
 // Type modifiers
 enum asETypeModifiers
 {
-   asTM_NONE     = 0,
-   asTM_INREF    = 1,
-   asTM_OUTREF   = 2,
-   asTM_INOUTREF = 3,
-   asTM_CONST    = 4
+	asTM_NONE     = 0,
+	asTM_INREF    = 1,
+	asTM_OUTREF   = 2,
+	asTM_INOUTREF = 3,
+	asTM_CONST    = 4
 };
 
 // GetModule flags
 enum asEGMFlags
 {
-   asGM_ONLY_IF_EXISTS       = 0,
-   asGM_CREATE_IF_NOT_EXISTS = 1,
-   asGM_ALWAYS_CREATE        = 2
+	asGM_ONLY_IF_EXISTS       = 0,
+	asGM_CREATE_IF_NOT_EXISTS = 1,
+	asGM_ALWAYS_CREATE        = 2
 };
 
 // Compile flags
 enum asECompileFlags
 {
-   asCOMP_ADD_TO_MODULE = 1
+	asCOMP_ADD_TO_MODULE = 1
 };
 
 // Function types
 enum asEFuncType
 {
-   asFUNC_DUMMY     =-1,
-   asFUNC_SYSTEM    = 0,
-   asFUNC_SCRIPT    = 1,
-   asFUNC_INTERFACE = 2,
-   asFUNC_VIRTUAL   = 3,
-   asFUNC_FUNCDEF   = 4,
-   asFUNC_IMPORTED  = 5,
-   asFUNC_DELEGATE  = 6
+	asFUNC_DUMMY     =-1,
+	asFUNC_SYSTEM    = 0,
+	asFUNC_SCRIPT    = 1,
+	asFUNC_INTERFACE = 2,
+	asFUNC_VIRTUAL   = 3,
+	asFUNC_FUNCDEF   = 4,
+	asFUNC_IMPORTED  = 5,
+	asFUNC_DELEGATE  = 6
 };
 
 //
@@ -341,12 +360,12 @@ typedef unsigned char  asBYTE;
 typedef unsigned short asWORD;
 typedef unsigned int   asUINT;
 #if (defined(_MSC_VER) && _MSC_VER <= 1200) || defined(__S3E__)
-   // size_t is not really correct, since it only guaranteed to be large enough to hold the segment size.
-   // For example, on 16bit systems the size_t may be 16bits only even if pointers are 32bit. But nobody
-   // is likely to use MSVC6 to compile for 16bit systems anymore, so this should be ok.
-   typedef size_t          asPWORD;
+	// size_t is not really correct, since it only guaranteed to be large enough to hold the segment size.
+	// For example, on 16bit systems the size_t may be 16bits only even if pointers are 32bit. But nobody
+	// is likely to use MSVC6 to compile for 16bit systems anymore, so this should be ok.
+	typedef size_t	       asPWORD;
 #else
-   typedef uintptr_t      asPWORD;
+	typedef uintptr_t      asPWORD;
 #endif
 #ifdef __LP64__
     typedef unsigned int  asDWORD;
@@ -354,7 +373,7 @@ typedef unsigned int   asUINT;
     typedef long asINT64;
 #else
     typedef unsigned long asDWORD;
-  #if defined(__GNUC__) || defined(__MWERKS__)
+  #if defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_CC) || defined(__psp2__)
     typedef uint64_t asQWORD;
     typedef int64_t asINT64;
   #else
@@ -365,9 +384,9 @@ typedef unsigned int   asUINT;
 
 // Is the target a 64bit system?
 #if defined(__LP64__) || defined(__amd64__) || defined(__x86_64__) || defined(_M_X64)
-   #ifndef AS_64BIT_PTR
-      #define AS_64BIT_PTR
-   #endif
+	#ifndef AS_64BIT_PTR
+		#define AS_64BIT_PTR
+	#endif
 #endif
 
 typedef void (*asFUNCTION_t)();
@@ -379,6 +398,20 @@ typedef void (*asCLEANMODULEFUNC_t)(asIScriptModule *);
 typedef void (*asCLEANCONTEXTFUNC_t)(asIScriptContext *);
 typedef void (*asCLEANFUNCTIONFUNC_t)(asIScriptFunction *);
 typedef void (*asCLEANOBJECTTYPEFUNC_t)(asIObjectType *);
+typedef void (*asCLEANSCRIPTOBJECTFUNC_t)(asIScriptObject *);
+typedef asIScriptContext *(*asREQUESTCONTEXTFUNC_t)(asIScriptEngine *, void *);
+typedef void (*asRETURNCONTEXTFUNC_t)(asIScriptEngine *, asIScriptContext *, void *);
+
+// Check if the compiler can use C++11 features
+#if !defined(_MSC_VER) || _MSC_VER >= 1700   // MSVC 2012
+#if !defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)  // gnuc 4.7
+#if !(defined(__GNUC__) && defined(__cplusplus) && __cplusplus < 201103L) // g++ -std=c++11
+#if !defined(__SUNPRO_CC)
+#define AS_CAN_USE_CPP11 1
+#endif
+#endif
+#endif
+#endif
 
 // This macro does basically the same thing as offsetof defined in stddef.h, but
 // GNUC should not complain about the usage as I'm not using 0 as the base pointer.
@@ -402,29 +435,29 @@ typedef void (asCUnknownClass::*asMETHOD_t)();
 
 struct asSFuncPtr
 {
-   asSFuncPtr(asBYTE f = 0)
-   {
-      for( size_t n = 0; n < sizeof(ptr.dummy); n++ )
-         ptr.dummy[n] = 0;
-      flag = f;
-   }
+	asSFuncPtr(asBYTE f = 0)
+	{
+		for( size_t n = 0; n < sizeof(ptr.dummy); n++ )
+			ptr.dummy[n] = 0;
+		flag = f;
+	}
 
-   void CopyMethodPtr(const void *mthdPtr, size_t size)
-   {
-      for( size_t n = 0; n < size; n++ )
-         ptr.dummy[n] = reinterpret_cast<const char *>(mthdPtr)[n];
-   }
+	void CopyMethodPtr(const void *mthdPtr, size_t size)
+	{
+		for( size_t n = 0; n < size; n++ )
+			ptr.dummy[n] = reinterpret_cast<const char *>(mthdPtr)[n];
+	}
 
-   union
-   {
-      // The largest known method point is 20 bytes (MSVC 64bit),
-      // but with 8byte alignment this becomes 24 bytes. So we need
-      // to be able to store at least that much.
-      char dummy[25]; 
-      struct {asMETHOD_t   mthd; char dummy[25-sizeof(asMETHOD_t)];} m;
-      struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
-   } ptr;
-   asBYTE flag; // 1 = generic, 2 = global func, 3 = method
+	union
+	{
+		// The largest known method point is 20 bytes (MSVC 64bit),
+		// but with 8byte alignment this becomes 24 bytes. So we need
+		// to be able to store at least that much.
+		char dummy[25];
+		struct {asMETHOD_t   mthd; char dummy[25-sizeof(asMETHOD_t)];} m;
+		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
+	} ptr;
+	asBYTE flag; // 1 = generic, 2 = global func, 3 = method
 };
 
 #if defined(__BORLANDC__)
@@ -453,30 +486,30 @@ template <typename T>
 
 struct asSFuncPtr
 {
-   asSFuncPtr(asBYTE f)
-   {
-      for( int n = 0; n < sizeof(ptr.dummy); n++ )
-         ptr.dummy[n] = 0;
-      flag = f;
-   }
+	asSFuncPtr(asBYTE f)
+	{
+		for( int n = 0; n < sizeof(ptr.dummy); n++ )
+			ptr.dummy[n] = 0;
+		flag = f;
+	}
 
-   union
-   {
-      char dummy[25]; // largest known class method pointer
-      struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
-   } ptr;
-   asBYTE flag; // 1 = generic, 2 = global func
+	union
+	{
+		char dummy[25]; // largest known class method pointer
+		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
+	} ptr;
+	asBYTE flag; // 1 = generic, 2 = global func
 };
 
 #endif
 
 struct asSMessageInfo
 {
-   const char *section;
-   int         row;
-   int         col;
-   asEMsgType  type;
-   const char *message;
+	const char *section;
+	int         row;
+	int         col;
+	asEMsgType  type;
+	const char *message;
 };
 
 
@@ -496,7 +529,7 @@ struct asSMessageInfo
   #else // statically linked library
     #define AS_API
   #endif
-#elif defined(__GNUC__) 
+#elif defined(__GNUC__)
   #if defined(ANGELSCRIPT_EXPORT)
     #define AS_API __attribute__((visibility ("default")))
   #else
@@ -509,538 +542,625 @@ struct asSMessageInfo
 #ifndef ANGELSCRIPT_DLL_MANUAL_IMPORT
 extern "C"
 {
-   // Engine
-   AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version);
-   AS_API const char      *asGetLibraryVersion();
-   AS_API const char      *asGetLibraryOptions();
+	// Engine
+	AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version);
+	AS_API const char      *asGetLibraryVersion();
+	AS_API const char      *asGetLibraryOptions();
 
-   // Context
-   AS_API asIScriptContext *asGetActiveContext();
+	// Context
+	AS_API asIScriptContext *asGetActiveContext();
 
-   // Thread support
-   AS_API int               asPrepareMultithread(asIThreadManager *externalMgr = 0);
-   AS_API void              asUnprepareMultithread();
-   AS_API asIThreadManager *asGetThreadManager();
-   AS_API void              asAcquireExclusiveLock();
-   AS_API void              asReleaseExclusiveLock();
-   AS_API void              asAcquireSharedLock();
-   AS_API void              asReleaseSharedLock();
-   AS_API int               asAtomicInc(int &value);
-   AS_API int               asAtomicDec(int &value);
-   AS_API int               asThreadCleanup();
+	// Thread support
+	AS_API int               asPrepareMultithread(asIThreadManager *externalMgr = 0);
+	AS_API void              asUnprepareMultithread();
+	AS_API asIThreadManager *asGetThreadManager();
+	AS_API void              asAcquireExclusiveLock();
+	AS_API void              asReleaseExclusiveLock();
+	AS_API void              asAcquireSharedLock();
+	AS_API void              asReleaseSharedLock();
+	AS_API int               asAtomicInc(int &value);
+	AS_API int               asAtomicDec(int &value);
+	AS_API int               asThreadCleanup();
 
-   // Memory management
-   AS_API int asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
-   AS_API int asResetGlobalMemoryFunctions();
+	// Memory management
+	AS_API int   asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
+	AS_API int   asResetGlobalMemoryFunctions();
+	AS_API void *asAllocMem(size_t size);
+	AS_API void  asFreeMem(void *mem);
 
-   // Auxiliary
-   AS_API asILockableSharedBool *asCreateLockableSharedBool();
+	// Auxiliary
+	AS_API asILockableSharedBool *asCreateLockableSharedBool();
 }
 #endif // ANGELSCRIPT_DLL_MANUAL_IMPORT
 
+// Determine traits of a type for registration of value types
+// Relies on C++11 features so it can not be used with non-compliant compilers
+#ifdef AS_CAN_USE_CPP11
+
+END_AS_NAMESPACE
+#include <type_traits>
+BEGIN_AS_NAMESPACE
+
+template<typename T>
+asUINT asGetTypeTraits()
+{
+#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS)
+	// MSVC & XCode/Clang
+	// C++11 compliant code
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::is_trivially_default_constructible<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::is_trivially_copy_assignable<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::is_trivially_copy_constructible<T>::value;
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
+	// gnuc 4.8+
+	// gnuc is using a mix of C++11 standard and pre-standard templates
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
+#else
+	// Not fully C++11 compliant. The has_trivial checks were used while the standard was still
+	// being elaborated, but were then removed in favor of the above is_trivially checks
+	// http://stackoverflow.com/questions/12702103/writing-code-that-works-when-has-trivial-destructor-is-defined-instead-of-is
+	// https://github.com/mozart/mozart2/issues/51
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::has_trivial_destructor<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
+#endif
+	bool isFloat     = std::is_floating_point<T>::value;
+	bool isPrimitive = std::is_integral<T>::value || std::is_pointer<T>::value || std::is_enum<T>::value;
+	bool isClass     = std::is_class<T>::value;
+	bool isArray     = std::is_array<T>::value;
+
+	if( isFloat )
+		return asOBJ_APP_FLOAT;
+	if( isPrimitive )
+		return asOBJ_APP_PRIMITIVE;
+
+	if( isClass )
+	{
+		asDWORD flags = asOBJ_APP_CLASS;
+		if( hasConstructor )
+			flags |= asOBJ_APP_CLASS_CONSTRUCTOR;
+		if( hasDestructor )
+			flags |= asOBJ_APP_CLASS_DESTRUCTOR;
+		if( hasAssignmentOperator )
+			flags |= asOBJ_APP_CLASS_ASSIGNMENT;
+		if( hasCopyConstructor )
+			flags |= asOBJ_APP_CLASS_COPY_CONSTRUCTOR;
+		return flags;
+	}
+
+	if( isArray )
+		return asOBJ_APP_ARRAY;
+
+	// Unknown type traits
+	return 0;
+}
+
+#endif // c++11
+
 // Interface declarations
 
 class asIScriptEngine
 {
 public:
-   // Memory management
-   virtual int AddRef() const = 0;
-   virtual int Release() const = 0;
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
+	virtual int ShutDownAndRelease() = 0;
 
-   // Engine properties
-   virtual int     SetEngineProperty(asEEngineProp property, asPWORD value) = 0;
-   virtual asPWORD GetEngineProperty(asEEngineProp property) const = 0;
+	// Engine properties
+	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value) = 0;
+	virtual asPWORD GetEngineProperty(asEEngineProp property) const = 0;
 
-   // Compiler messages
-   virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv) = 0;
-   virtual int ClearMessageCallback() = 0;
-   virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message) = 0;
+	// Compiler messages
+	virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv) = 0;
+	virtual int ClearMessageCallback() = 0;
+	virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message) = 0;
 
-   // JIT Compiler
-   virtual int SetJITCompiler(asIJITCompiler *compiler) = 0;
-   virtual asIJITCompiler *GetJITCompiler() const = 0;
+	// JIT Compiler
+	virtual int SetJITCompiler(asIJITCompiler *compiler) = 0;
+	virtual asIJITCompiler *GetJITCompiler() const = 0;
 
-   // Global functions
-   virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0) = 0;
-   virtual asUINT             GetGlobalFunctionCount() const = 0;
-   virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const = 0;
-   virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const = 0;
+	// Global functions
+	virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0) = 0;
+	virtual asUINT             GetGlobalFunctionCount() const = 0;
+	virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const = 0;
 
-   // Global properties
-   virtual int    RegisterGlobalProperty(const char *declaration, void *pointer) = 0;
-   virtual asUINT GetGlobalPropertyCount() const = 0;
-   virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const = 0;
-   virtual int    GetGlobalPropertyIndexByName(const char *name) const = 0;
-   virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const = 0;
+	// Global properties
+	virtual int    RegisterGlobalProperty(const char *declaration, void *pointer) = 0;
+	virtual asUINT GetGlobalPropertyCount() const = 0;
+	virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const = 0;
+	virtual int    GetGlobalPropertyIndexByName(const char *name) const = 0;
+	virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const = 0;
 
-   // Object types
-   virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags) = 0;
-   virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset) = 0;
-   virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv) = 0;
-   virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0) = 0;
-   virtual int            RegisterInterface(const char *name) = 0;
-   virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration) = 0;
-   virtual asUINT         GetObjectTypeCount() const = 0;
-   virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const = 0;
-   virtual asIObjectType *GetObjectTypeByName(const char *name) const = 0;
+	// Object types
+	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags) = 0;
+	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset) = 0;
+	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0) = 0;
+	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0) = 0;
+	virtual int            RegisterInterface(const char *name) = 0;
+	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration) = 0;
+	virtual asUINT         GetObjectTypeCount() const = 0;
+	virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const = 0;
+	virtual asIObjectType *GetObjectTypeByName(const char *name) const = 0;
+	virtual asIObjectType *GetObjectTypeByDecl(const char *decl) const = 0;
 
-   // String factory
-   virtual int RegisterStringFactory(const char *datatype, const asSFuncPtr &factoryFunc, asDWORD callConv, void *objForThiscall = 0) = 0;
-   virtual int GetStringFactoryReturnTypeId() const = 0;
+	// String factory
+	virtual int RegisterStringFactory(const char *datatype, const asSFuncPtr &factoryFunc, asDWORD callConv, void *objForThiscall = 0) = 0;
+	virtual int GetStringFactoryReturnTypeId(asDWORD *flags = 0) const = 0;
 
-   // Default array type
-   virtual int RegisterDefaultArrayType(const char *type) = 0;
-   virtual int GetDefaultArrayTypeId() const = 0;
+	// Default array type
+	virtual int RegisterDefaultArrayType(const char *type) = 0;
+	virtual int GetDefaultArrayTypeId() const = 0;
 
-   // Enums
-   virtual int         RegisterEnum(const char *type) = 0;
-   virtual int         RegisterEnumValue(const char *type, const char *name, int value) = 0;
-   virtual asUINT      GetEnumCount() const = 0;
-   virtual const char *GetEnumByIndex(asUINT index, int *enumTypeId, const char **nameSpace = 0, const char **configGroup = 0, asDWORD *accessMask = 0) const = 0;
-   virtual int         GetEnumValueCount(int enumTypeId) const = 0;
-   virtual const char *GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
+	// Enums
+	virtual int         RegisterEnum(const char *type) = 0;
+	virtual int         RegisterEnumValue(const char *type, const char *name, int value) = 0;
+	virtual asUINT      GetEnumCount() const = 0;
+	virtual const char *GetEnumByIndex(asUINT index, int *enumTypeId, const char **nameSpace = 0, const char **configGroup = 0, asDWORD *accessMask = 0) const = 0;
+	virtual int         GetEnumValueCount(int enumTypeId) const = 0;
+	virtual const char *GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
 
-   // Funcdefs
-   virtual int                RegisterFuncdef(const char *decl) = 0;
-   virtual asUINT             GetFuncdefCount() const = 0;
-   virtual asIScriptFunction *GetFuncdefByIndex(asUINT index) const = 0;
+	// Funcdefs
+	virtual int                RegisterFuncdef(const char *decl) = 0;
+	virtual asUINT             GetFuncdefCount() const = 0;
+	virtual asIScriptFunction *GetFuncdefByIndex(asUINT index) const = 0;
 
-   // Typedefs
-   virtual int         RegisterTypedef(const char *type, const char *decl) = 0;
-   virtual asUINT      GetTypedefCount() const = 0;
-   virtual const char *GetTypedefByIndex(asUINT index, int *typeId, const char **nameSpace = 0, const char **configGroup = 0, asDWORD *accessMask = 0) const = 0;
+	// Typedefs
+	virtual int         RegisterTypedef(const char *type, const char *decl) = 0;
+	virtual asUINT      GetTypedefCount() const = 0;
+	virtual const char *GetTypedefByIndex(asUINT index, int *typeId, const char **nameSpace = 0, const char **configGroup = 0, asDWORD *accessMask = 0) const = 0;
 
-   // Configuration groups
-   virtual int         BeginConfigGroup(const char *groupName) = 0;
-   virtual int         EndConfigGroup() = 0;
-   virtual int         RemoveConfigGroup(const char *groupName) = 0;
-   virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask) = 0;
-   virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
-   virtual const char *GetDefaultNamespace() const = 0;
+	// Configuration groups
+	virtual int         BeginConfigGroup(const char *groupName) = 0;
+	virtual int         EndConfigGroup() = 0;
+	virtual int         RemoveConfigGroup(const char *groupName) = 0;
+	virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask) = 0;
+	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
+	virtual const char *GetDefaultNamespace() const = 0;
 
-   // Script modules
-   virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag = asGM_ONLY_IF_EXISTS) = 0;
-   virtual int              DiscardModule(const char *module) = 0;
-   virtual asUINT           GetModuleCount() const = 0;
-   virtual asIScriptModule *GetModuleByIndex(asUINT index) const = 0;
+	// Script modules
+	virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag = asGM_ONLY_IF_EXISTS) = 0;
+	virtual int              DiscardModule(const char *module) = 0;
+	virtual asUINT           GetModuleCount() const = 0;
+	virtual asIScriptModule *GetModuleByIndex(asUINT index) const = 0;
 
-   // Script functions
-   virtual asIScriptFunction *GetFunctionById(int funcId) const = 0;
-   virtual asIScriptFunction *GetFuncDefFromTypeId(int typeId) const = 0;
+	// Script functions
+	virtual asIScriptFunction *GetFunctionById(int funcId) const = 0;
+	virtual asIScriptFunction *GetFuncDefFromTypeId(int typeId) const = 0;
 
-   // Type identification
-   virtual asIObjectType *GetObjectTypeById(int typeId) const = 0;
-   virtual int            GetTypeIdByDecl(const char *decl) const = 0;
-   virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const = 0;
-   virtual int            GetSizeOfPrimitiveType(int typeId) const = 0;
+	// Type identification
+	virtual asIObjectType *GetObjectTypeById(int typeId) const = 0;
+	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
+	virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const = 0;
+	virtual int            GetSizeOfPrimitiveType(int typeId) const = 0;
 
-   // Script execution
-   virtual asIScriptContext      *CreateContext() = 0;
+	// Script execution
+	virtual asIScriptContext      *CreateContext() = 0;
+	virtual void                  *CreateScriptObject(const asIObjectType *type) = 0;
+	virtual void                  *CreateScriptObjectCopy(void *obj, const asIObjectType *type) = 0;
+	virtual void                  *CreateUninitializedScriptObject(const asIObjectType *type) = 0;
+	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj) = 0;
+	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type) = 0;
+	virtual void                   ReleaseScriptObject(void *obj, const asIObjectType *type) = 0;
+	virtual void                   AddRefScriptObject(void *obj, const asIObjectType *type) = 0;
+	virtual int                    RefCastObject(void *obj, asIObjectType *fromType, asIObjectType *toType, void **newPtr, bool useOnlyImplicitCast = false) = 0;
 #ifdef AS_DEPRECATED
-   // Deprecated since 2.27.0, 2013-07-18
-   virtual void                  *CreateScriptObject(int typeId) = 0;
-   virtual void                  *CreateScriptObjectCopy(void *obj, int typeId) = 0;
-   virtual void                  *CreateUninitializedScriptObject(int typeId) = 0;
-   virtual void                   AssignScriptObject(void *dstObj, void *srcObj, int typeId) = 0;
-   virtual void                   ReleaseScriptObject(void *obj, int typeId) = 0;
-   virtual void                   AddRefScriptObject(void *obj, int typeId) = 0;
+	// Deprecated since 2.30.0, 2014-11-04
+	virtual bool                   IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const = 0;
 #endif
-   virtual void                  *CreateScriptObject(const asIObjectType *type) = 0;
-   virtual void                  *CreateScriptObjectCopy(void *obj, const asIObjectType *type) = 0;
-   virtual void                  *CreateUninitializedScriptObject(const asIObjectType *type) = 0;
-   virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj) = 0;
-   virtual void                   AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type) = 0;
-   virtual void                   ReleaseScriptObject(void *obj, const asIObjectType *type) = 0;
-   virtual void                   AddRefScriptObject(void *obj, const asIObjectType *type) = 0;
-   virtual bool                   IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const = 0;
-   virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asIObjectType *type) const = 0;
+	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asIObjectType *type) const = 0;
 
-   // String interpretation
-   virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, int *tokenLength = 0) const = 0;
+	// Context pooling
+	virtual asIScriptContext      *RequestContext() = 0;
+	virtual void                   ReturnContext(asIScriptContext *ctx) = 0;
+	virtual int                    SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0) = 0;
 
-   // Garbage collection
-   virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE) = 0;
-   virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed = 0, asUINT *totalDetected = 0, asUINT *newObjects = 0, asUINT *totalNewDestroyed = 0) const = 0;
-   virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asIObjectType *type) = 0;
-   virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr = 0, void **obj = 0, asIObjectType **type = 0) = 0;
-   virtual void GCEnumCallback(void *reference) = 0;
+	// String interpretation
+	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const = 0;
 
-   // User data
-   virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-   virtual void *GetUserData(asPWORD type = 0) const = 0;
-   virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type = 0) = 0;
-   virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback) = 0;
-   virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback) = 0;
-   virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback) = 0;
-   virtual void  SetObjectTypeUserDataCleanupCallback(asCLEANOBJECTTYPEFUNC_t callback, asPWORD type = 0) = 0;
+	// Garbage collection
+	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1) = 0;
+	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed = 0, asUINT *totalDetected = 0, asUINT *newObjects = 0, asUINT *totalNewDestroyed = 0) const = 0;
+	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asIObjectType *type) = 0;
+	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr = 0, void **obj = 0, asIObjectType **type = 0) = 0;
+	virtual void GCEnumCallback(void *reference) = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetObjectTypeUserDataCleanupCallback(asCLEANOBJECTTYPEFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type = 0) = 0;
 
 protected:
-   virtual ~asIScriptEngine() {}
+	virtual ~asIScriptEngine() {}
 };
 
 class asIThreadManager
 {
 protected:
-   virtual ~asIThreadManager() {}
+	virtual ~asIThreadManager() {}
 };
 
 class asIScriptModule
 {
 public:
-   virtual asIScriptEngine *GetEngine() const = 0;
-   virtual void             SetName(const char *name) = 0;
-   virtual const char      *GetName() const = 0;
-   virtual void             Discard() = 0;
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual void             SetName(const char *name) = 0;
+	virtual const char      *GetName() const = 0;
+	virtual void             Discard() = 0;
 
-   // Compilation
-   virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength = 0, int lineOffset = 0) = 0;
-   virtual int         Build() = 0;
-   virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asIScriptFunction **outFunc) = 0;
-   virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset) = 0;
-   virtual asDWORD     SetAccessMask(asDWORD accessMask) = 0;
-   virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
-   virtual const char *GetDefaultNamespace() const = 0;
+	// Compilation
+	virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength = 0, int lineOffset = 0) = 0;
+	virtual int         Build() = 0;
+	virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asIScriptFunction **outFunc) = 0;
+	virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset) = 0;
+	virtual asDWORD     SetAccessMask(asDWORD accessMask) = 0;
+	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
+	virtual const char *GetDefaultNamespace() const = 0;
 
-   // Functions
-   virtual asUINT             GetFunctionCount() const = 0;
-   virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const = 0;
-   virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const = 0;
-   virtual asIScriptFunction *GetFunctionByName(const char *name) const = 0;
-   virtual int                RemoveFunction(asIScriptFunction *func) = 0;
+	// Functions
+	virtual asUINT             GetFunctionCount() const = 0;
+	virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const = 0;
+	virtual asIScriptFunction *GetFunctionByName(const char *name) const = 0;
+	virtual int                RemoveFunction(asIScriptFunction *func) = 0;
 
-   // Global variables
-   virtual int         ResetGlobalVars(asIScriptContext *ctx = 0) = 0;
-   virtual asUINT      GetGlobalVarCount() const = 0;
-   virtual int         GetGlobalVarIndexByName(const char *name) const = 0;
-   virtual int         GetGlobalVarIndexByDecl(const char *decl) const = 0;
-   virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace = false) const = 0;
-   virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0) const = 0;
-   virtual void       *GetAddressOfGlobalVar(asUINT index) = 0;
-   virtual int         RemoveGlobalVar(asUINT index) = 0;
+	// Global variables
+	virtual int         ResetGlobalVars(asIScriptContext *ctx = 0) = 0;
+	virtual asUINT      GetGlobalVarCount() const = 0;
+	virtual int         GetGlobalVarIndexByName(const char *name) const = 0;
+	virtual int         GetGlobalVarIndexByDecl(const char *decl) const = 0;
+	virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace = false) const = 0;
+	virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0) const = 0;
+	virtual void       *GetAddressOfGlobalVar(asUINT index) = 0;
+	virtual int         RemoveGlobalVar(asUINT index) = 0;
 
-   // Type identification
-   virtual asUINT         GetObjectTypeCount() const = 0;
-   virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const = 0;
-   virtual asIObjectType *GetObjectTypeByName(const char *name) const = 0;
-   virtual int            GetTypeIdByDecl(const char *decl) const = 0;
+	// Type identification
+	virtual asUINT         GetObjectTypeCount() const = 0;
+	virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const = 0;
+	virtual asIObjectType *GetObjectTypeByName(const char *name) const = 0;
+	virtual asIObjectType *GetObjectTypeByDecl(const char *decl) const = 0;
+	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
 
-   // Enums
-   virtual asUINT      GetEnumCount() const = 0;
-   virtual const char *GetEnumByIndex(asUINT index, int *enumTypeId, const char **nameSpace = 0) const = 0;
-   virtual int         GetEnumValueCount(int enumTypeId) const = 0;
-   virtual const char *GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
+	// Enums
+	virtual asUINT      GetEnumCount() const = 0;
+	virtual const char *GetEnumByIndex(asUINT index, int *enumTypeId, const char **nameSpace = 0) const = 0;
+	virtual int         GetEnumValueCount(int enumTypeId) const = 0;
+	virtual const char *GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
 
-   // Typedefs
-   virtual asUINT      GetTypedefCount() const = 0;
-   virtual const char *GetTypedefByIndex(asUINT index, int *typeId, const char **nameSpace = 0) const = 0;
+	// Typedefs
+	virtual asUINT      GetTypedefCount() const = 0;
+	virtual const char *GetTypedefByIndex(asUINT index, int *typeId, const char **nameSpace = 0) const = 0;
 
-   // Dynamic binding between modules
-   virtual asUINT      GetImportedFunctionCount() const = 0;
-   virtual int         GetImportedFunctionIndexByDecl(const char *decl) const = 0;
-   virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const = 0;
-   virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const = 0;
-   virtual int         BindImportedFunction(asUINT importIndex, asIScriptFunction *func) = 0;
-   virtual int         UnbindImportedFunction(asUINT importIndex) = 0;
-   virtual int         BindAllImportedFunctions() = 0;
-   virtual int         UnbindAllImportedFunctions() = 0;
+	// Dynamic binding between modules
+	virtual asUINT      GetImportedFunctionCount() const = 0;
+	virtual int         GetImportedFunctionIndexByDecl(const char *decl) const = 0;
+	virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const = 0;
+	virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const = 0;
+	virtual int         BindImportedFunction(asUINT importIndex, asIScriptFunction *func) = 0;
+	virtual int         UnbindImportedFunction(asUINT importIndex) = 0;
+	virtual int         BindAllImportedFunctions() = 0;
+	virtual int         UnbindAllImportedFunctions() = 0;
 
-   // Bytecode saving and loading
-   virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo = false) const = 0;
-   virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped = 0) = 0;
+	// Byte code saving and loading
+	virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo = false) const = 0;
+	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped = 0) = 0;
 
-   // User data
-   virtual void *SetUserData(void *data) = 0;
-   virtual void *GetUserData() const = 0;
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
 
 protected:
-   virtual ~asIScriptModule() {}
+	virtual ~asIScriptModule() {}
 };
 
 class asIScriptContext
 {
 public:
-   // Memory management
-   virtual int AddRef() const = 0;
-   virtual int Release() const = 0;
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
 
-   // Miscellaneous
-   virtual asIScriptEngine *GetEngine() const = 0;
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
 
-   // Execution
-   virtual int             Prepare(asIScriptFunction *func) = 0;
-   virtual int             Unprepare() = 0;
-   virtual int             Execute() = 0;
-   virtual int             Abort() = 0;
-   virtual int             Suspend() = 0;
-   virtual asEContextState GetState() const = 0;
-   virtual int             PushState() = 0;
-   virtual int             PopState() = 0;
-   virtual bool            IsNested(asUINT *nestCount = 0) const = 0;
+	// Execution
+	virtual int             Prepare(asIScriptFunction *func) = 0;
+	virtual int             Unprepare() = 0;
+	virtual int             Execute() = 0;
+	virtual int             Abort() = 0;
+	virtual int             Suspend() = 0;
+	virtual asEContextState GetState() const = 0;
+	virtual int             PushState() = 0;
+	virtual int             PopState() = 0;
+	virtual bool            IsNested(asUINT *nestCount = 0) const = 0;
 
-   // Object pointer for calling class methods
-   virtual int   SetObject(void *obj) = 0;
+	// Object pointer for calling class methods
+	virtual int   SetObject(void *obj) = 0;
 
-   // Arguments
-   virtual int   SetArgByte(asUINT arg, asBYTE value) = 0;
-   virtual int   SetArgWord(asUINT arg, asWORD value) = 0;
-   virtual int   SetArgDWord(asUINT arg, asDWORD value) = 0;
-   virtual int   SetArgQWord(asUINT arg, asQWORD value) = 0;
-   virtual int   SetArgFloat(asUINT arg, float value) = 0;
-   virtual int   SetArgDouble(asUINT arg, double value) = 0;
-   virtual int   SetArgAddress(asUINT arg, void *addr) = 0;
-   virtual int   SetArgObject(asUINT arg, void *obj) = 0;
-   virtual void *GetAddressOfArg(asUINT arg) = 0;
+	// Arguments
+	virtual int   SetArgByte(asUINT arg, asBYTE value) = 0;
+	virtual int   SetArgWord(asUINT arg, asWORD value) = 0;
+	virtual int   SetArgDWord(asUINT arg, asDWORD value) = 0;
+	virtual int   SetArgQWord(asUINT arg, asQWORD value) = 0;
+	virtual int   SetArgFloat(asUINT arg, float value) = 0;
+	virtual int   SetArgDouble(asUINT arg, double value) = 0;
+	virtual int   SetArgAddress(asUINT arg, void *addr) = 0;
+	virtual int   SetArgObject(asUINT arg, void *obj) = 0;
+	virtual int   SetArgVarType(asUINT arg, void *ptr, int typeId) = 0;
+	virtual void *GetAddressOfArg(asUINT arg) = 0;
 
-   // Return value
-   virtual asBYTE  GetReturnByte() = 0;
-   virtual asWORD  GetReturnWord() = 0;
-   virtual asDWORD GetReturnDWord() = 0;
-   virtual asQWORD GetReturnQWord() = 0;
-   virtual float   GetReturnFloat() = 0;
-   virtual double  GetReturnDouble() = 0;
-   virtual void   *GetReturnAddress() = 0;
-   virtual void   *GetReturnObject() = 0;
-   virtual void   *GetAddressOfReturnValue() = 0;
+	// Return value
+	virtual asBYTE  GetReturnByte() = 0;
+	virtual asWORD  GetReturnWord() = 0;
+	virtual asDWORD GetReturnDWord() = 0;
+	virtual asQWORD GetReturnQWord() = 0;
+	virtual float   GetReturnFloat() = 0;
+	virtual double  GetReturnDouble() = 0;
+	virtual void   *GetReturnAddress() = 0;
+	virtual void   *GetReturnObject() = 0;
+	virtual void   *GetAddressOfReturnValue() = 0;
 
-   // Exception handling
-   virtual int                SetException(const char *string) = 0;
-   virtual int                GetExceptionLineNumber(int *column = 0, const char **sectionName = 0) = 0;
-   virtual asIScriptFunction *GetExceptionFunction() = 0;
-   virtual const char *       GetExceptionString() = 0;
-   virtual int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
-   virtual void               ClearExceptionCallback() = 0;
+	// Exception handling
+	virtual int                SetException(const char *string) = 0;
+	virtual int                GetExceptionLineNumber(int *column = 0, const char **sectionName = 0) = 0;
+	virtual asIScriptFunction *GetExceptionFunction() = 0;
+	virtual const char *       GetExceptionString() = 0;
+	virtual int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
+	virtual void               ClearExceptionCallback() = 0;
 
-   // Debugging
-   virtual int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
-   virtual void               ClearLineCallback() = 0;
-   virtual asUINT             GetCallstackSize() const = 0;
-   virtual asIScriptFunction *GetFunction(asUINT stackLevel = 0) = 0;
-   virtual int                GetLineNumber(asUINT stackLevel = 0, int *column = 0, const char **sectionName = 0) = 0;
-   virtual int                GetVarCount(asUINT stackLevel = 0) = 0;
-   virtual const char        *GetVarName(asUINT varIndex, asUINT stackLevel = 0) = 0;
-   virtual const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel = 0, bool includeNamespace = false) = 0;
-   virtual int                GetVarTypeId(asUINT varIndex, asUINT stackLevel = 0) = 0;
-   virtual void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel = 0) = 0;
-   virtual bool               IsVarInScope(asUINT varIndex, asUINT stackLevel = 0) = 0;
-   virtual int                GetThisTypeId(asUINT stackLevel = 0) = 0;
-   virtual void              *GetThisPointer(asUINT stackLevel = 0) = 0;
-   virtual asIScriptFunction *GetSystemFunction() = 0;
+	// Debugging
+	virtual int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
+	virtual void               ClearLineCallback() = 0;
+	virtual asUINT             GetCallstackSize() const = 0;
+	virtual asIScriptFunction *GetFunction(asUINT stackLevel = 0) = 0;
+	virtual int                GetLineNumber(asUINT stackLevel = 0, int *column = 0, const char **sectionName = 0) = 0;
+	virtual int                GetVarCount(asUINT stackLevel = 0) = 0;
+	virtual const char        *GetVarName(asUINT varIndex, asUINT stackLevel = 0) = 0;
+	virtual const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel = 0, bool includeNamespace = false) = 0;
+	virtual int                GetVarTypeId(asUINT varIndex, asUINT stackLevel = 0) = 0;
+	virtual void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel = 0) = 0;
+	virtual bool               IsVarInScope(asUINT varIndex, asUINT stackLevel = 0) = 0;
+	virtual int                GetThisTypeId(asUINT stackLevel = 0) = 0;
+	virtual void              *GetThisPointer(asUINT stackLevel = 0) = 0;
+	virtual asIScriptFunction *GetSystemFunction() = 0;
 
-   // User data
-   virtual void *SetUserData(void *data) = 0;
-   virtual void *GetUserData() const = 0;
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
 
 protected:
-   virtual ~asIScriptContext() {}
+	virtual ~asIScriptContext() {}
 };
 
 class asIScriptGeneric
 {
 public:
-   // Miscellaneous
-   virtual asIScriptEngine   *GetEngine() const = 0;
-   virtual asIScriptFunction *GetFunction() const = 0;
+	// Miscellaneous
+	virtual asIScriptEngine   *GetEngine() const = 0;
+	virtual asIScriptFunction *GetFunction() const = 0;
 
-   // Object
-   virtual void   *GetObject() = 0;
-   virtual int     GetObjectTypeId() const = 0;
+	// Object
+	virtual void   *GetObject() = 0;
+	virtual int     GetObjectTypeId() const = 0;
 
-   // Arguments
-   virtual int     GetArgCount() const = 0;
-   virtual int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const = 0;
-   virtual asBYTE  GetArgByte(asUINT arg) = 0;
-   virtual asWORD  GetArgWord(asUINT arg) = 0;
-   virtual asDWORD GetArgDWord(asUINT arg) = 0;
-   virtual asQWORD GetArgQWord(asUINT arg) = 0;
-   virtual float   GetArgFloat(asUINT arg) = 0;
-   virtual double  GetArgDouble(asUINT arg) = 0;
-   virtual void   *GetArgAddress(asUINT arg) = 0;
-   virtual void   *GetArgObject(asUINT arg) = 0;
-   virtual void   *GetAddressOfArg(asUINT arg) = 0;
+	// Arguments
+	virtual int     GetArgCount() const = 0;
+	virtual int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const = 0;
+	virtual asBYTE  GetArgByte(asUINT arg) = 0;
+	virtual asWORD  GetArgWord(asUINT arg) = 0;
+	virtual asDWORD GetArgDWord(asUINT arg) = 0;
+	virtual asQWORD GetArgQWord(asUINT arg) = 0;
+	virtual float   GetArgFloat(asUINT arg) = 0;
+	virtual double  GetArgDouble(asUINT arg) = 0;
+	virtual void   *GetArgAddress(asUINT arg) = 0;
+	virtual void   *GetArgObject(asUINT arg) = 0;
+	virtual void   *GetAddressOfArg(asUINT arg) = 0;
 
-   // Return value
-   virtual int     GetReturnTypeId(asDWORD *flags = 0) const = 0;
-   virtual int     SetReturnByte(asBYTE val) = 0;
-   virtual int     SetReturnWord(asWORD val) = 0;
-   virtual int     SetReturnDWord(asDWORD val) = 0;
-   virtual int     SetReturnQWord(asQWORD val) = 0;
-   virtual int     SetReturnFloat(float val) = 0;
-   virtual int     SetReturnDouble(double val) = 0;
-   virtual int     SetReturnAddress(void *addr) = 0;
-   virtual int     SetReturnObject(void *obj) = 0;
-   virtual void   *GetAddressOfReturnLocation() = 0;
+	// Return value
+	virtual int     GetReturnTypeId(asDWORD *flags = 0) const = 0;
+	virtual int     SetReturnByte(asBYTE val) = 0;
+	virtual int     SetReturnWord(asWORD val) = 0;
+	virtual int     SetReturnDWord(asDWORD val) = 0;
+	virtual int     SetReturnQWord(asQWORD val) = 0;
+	virtual int     SetReturnFloat(float val) = 0;
+	virtual int     SetReturnDouble(double val) = 0;
+	virtual int     SetReturnAddress(void *addr) = 0;
+	virtual int     SetReturnObject(void *obj) = 0;
+	virtual void   *GetAddressOfReturnLocation() = 0;
 
 protected:
-   virtual ~asIScriptGeneric() {}
+	virtual ~asIScriptGeneric() {}
 };
 
 class asIScriptObject
 {
 public:
-   // Memory management
-   virtual int AddRef() const = 0;
-   virtual int Release() const = 0;
+	// Memory management
+	virtual int                    AddRef() const = 0;
+	virtual int                    Release() const = 0;
+	virtual asILockableSharedBool *GetWeakRefFlag() const = 0;
 
-   // Type info
-   virtual int            GetTypeId() const = 0;
-   virtual asIObjectType *GetObjectType() const = 0;
+	// Type info
+	virtual int            GetTypeId() const = 0;
+	virtual asIObjectType *GetObjectType() const = 0;
 
-   // Class properties
-   virtual asUINT      GetPropertyCount() const = 0;
-   virtual int         GetPropertyTypeId(asUINT prop) const = 0;
-   virtual const char *GetPropertyName(asUINT prop) const = 0;
-   virtual void       *GetAddressOfProperty(asUINT prop) = 0;
+	// Class properties
+	virtual asUINT      GetPropertyCount() const = 0;
+	virtual int         GetPropertyTypeId(asUINT prop) const = 0;
+	virtual const char *GetPropertyName(asUINT prop) const = 0;
+	virtual void       *GetAddressOfProperty(asUINT prop) = 0;
 
-   virtual asIScriptEngine *GetEngine() const = 0;
-   virtual int              CopyFrom(asIScriptObject *other) = 0;
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual int              CopyFrom(asIScriptObject *other) = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
 
 protected:
-   virtual ~asIScriptObject() {}
+	virtual ~asIScriptObject() {}
 };
 
 class asIObjectType
 {
 public:
-   virtual asIScriptEngine *GetEngine() const = 0;
-   virtual const char      *GetConfigGroup() const = 0;
-   virtual asDWORD          GetAccessMask() const = 0;
-   virtual asIScriptModule *GetModule() const = 0;
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual const char      *GetConfigGroup() const = 0;
+	virtual asDWORD          GetAccessMask() const = 0;
+	virtual asIScriptModule *GetModule() const = 0;
 
-   // Memory management
-   virtual int AddRef() const = 0;
-   virtual int Release() const = 0;
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
 
-   // Type info
-   virtual const char      *GetName() const = 0;
-   virtual   const char      *GetNamespace() const = 0;
-   virtual asIObjectType   *GetBaseType() const = 0;
-   virtual bool             DerivesFrom(const asIObjectType *objType) const = 0;
-   virtual asDWORD          GetFlags() const = 0;
-   virtual asUINT           GetSize() const = 0;
-   virtual int              GetTypeId() const = 0;
-   virtual int              GetSubTypeId(asUINT subTypeIndex = 0) const = 0;
-   virtual asIObjectType   *GetSubType(asUINT subTypeIndex = 0) const = 0;
-   virtual asUINT           GetSubTypeCount() const = 0;
+	// Type info
+	virtual const char      *GetName() const = 0;
+	virtual	const char      *GetNamespace() const = 0;
+	virtual asIObjectType   *GetBaseType() const = 0;
+	virtual bool             DerivesFrom(const asIObjectType *objType) const = 0;
+	virtual asDWORD          GetFlags() const = 0;
+	virtual asUINT           GetSize() const = 0;
+	virtual int              GetTypeId() const = 0;
+	virtual int              GetSubTypeId(asUINT subTypeIndex = 0) const = 0;
+	virtual asIObjectType   *GetSubType(asUINT subTypeIndex = 0) const = 0;
+	virtual asUINT           GetSubTypeCount() const = 0;
 
-   // Interfaces
-   virtual asUINT           GetInterfaceCount() const = 0;
-   virtual asIObjectType   *GetInterface(asUINT index) const = 0;
-   virtual bool             Implements(const asIObjectType *objType) const = 0;
+	// Interfaces
+	virtual asUINT           GetInterfaceCount() const = 0;
+	virtual asIObjectType   *GetInterface(asUINT index) const = 0;
+	virtual bool             Implements(const asIObjectType *objType) const = 0;
 
-   // Factories
-   virtual asUINT             GetFactoryCount() const = 0;
-   virtual asIScriptFunction *GetFactoryByIndex(asUINT index) const = 0;
-   virtual asIScriptFunction *GetFactoryByDecl(const char *decl) const = 0;
+	// Factories
+	virtual asUINT             GetFactoryCount() const = 0;
+	virtual asIScriptFunction *GetFactoryByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetFactoryByDecl(const char *decl) const = 0;
 
-   // Methods
-   virtual asUINT             GetMethodCount() const = 0;
-   virtual asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual = true) const = 0;
-   virtual asIScriptFunction *GetMethodByName(const char *name, bool getVirtual = true) const = 0;
-   virtual asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual = true) const = 0;
+	// Methods
+	virtual asUINT             GetMethodCount() const = 0;
+	virtual asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual = true) const = 0;
+	virtual asIScriptFunction *GetMethodByName(const char *name, bool getVirtual = true) const = 0;
+	virtual asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual = true) const = 0;
 
-   // Properties
-   virtual asUINT      GetPropertyCount() const = 0;
-   virtual int         GetProperty(asUINT index, const char **name, int *typeId = 0, bool *isPrivate = 0, int *offset = 0, bool *isReference = 0, asDWORD *accessMask = 0) const = 0;
-   virtual const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const = 0;
+	// Properties
+	virtual asUINT      GetPropertyCount() const = 0;
+	virtual int         GetProperty(asUINT index, const char **name, int *typeId = 0, bool *isPrivate = 0, bool *isProtected = 0, int *offset = 0, bool *isReference = 0, asDWORD *accessMask = 0) const = 0;
+	virtual const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const = 0;
 
-   // Behaviours
-   virtual asUINT             GetBehaviourCount() const = 0;
-   virtual asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const = 0;
+	// Behaviours
+	virtual asUINT             GetBehaviourCount() const = 0;
+	virtual asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const = 0;
 
-   // User data
-   virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-   virtual void *GetUserData(asPWORD type = 0) const = 0;
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
 
 protected:
-   virtual ~asIObjectType() {}
+	virtual ~asIObjectType() {}
 };
 
 class asIScriptFunction
 {
 public:
-   virtual asIScriptEngine *GetEngine() const = 0;
+	virtual asIScriptEngine *GetEngine() const = 0;
 
-   // Memory management
-   virtual int              AddRef() const = 0;
-   virtual int              Release() const = 0;
+	// Memory management
+	virtual int              AddRef() const = 0;
+	virtual int              Release() const = 0;
 
-   // Miscellaneous
-   virtual int              GetId() const = 0;
-   virtual asEFuncType      GetFuncType() const = 0;
-   virtual const char      *GetModuleName() const = 0;
-   virtual asIScriptModule *GetModule() const = 0;
-   virtual const char      *GetScriptSectionName() const = 0;
-   virtual const char      *GetConfigGroup() const = 0;
-   virtual asDWORD          GetAccessMask() const = 0;
+	// Miscellaneous
+	virtual int              GetId() const = 0;
+	virtual asEFuncType      GetFuncType() const = 0;
+	virtual const char      *GetModuleName() const = 0;
+	virtual asIScriptModule *GetModule() const = 0;
+	virtual const char      *GetScriptSectionName() const = 0;
+	virtual const char      *GetConfigGroup() const = 0;
+	virtual asDWORD          GetAccessMask() const = 0;
 
-   // Function signature
-   virtual asIObjectType   *GetObjectType() const = 0;
-   virtual const char      *GetObjectName() const = 0;
-   virtual const char      *GetName() const = 0;
-   virtual const char      *GetNamespace() const = 0;
-   virtual const char      *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false) const = 0;
-   virtual bool             IsReadOnly() const = 0;
-   virtual bool             IsPrivate() const = 0;
-   virtual bool             IsFinal() const = 0;
-   virtual bool             IsOverride() const = 0;
-   virtual bool             IsShared() const = 0;
-   virtual asUINT           GetParamCount() const = 0;
-   virtual int              GetParamTypeId(asUINT index, asDWORD *flags = 0) const = 0;
-   virtual int              GetReturnTypeId(asDWORD *flags = 0) const = 0;
+	// Function signature
+	virtual asIObjectType   *GetObjectType() const = 0;
+	virtual const char      *GetObjectName() const = 0;
+	virtual const char      *GetName() const = 0;
+	virtual const char      *GetNamespace() const = 0;
+	virtual const char      *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const = 0;
+	virtual bool             IsReadOnly() const = 0;
+	virtual bool             IsPrivate() const = 0;
+	virtual bool             IsProtected() const = 0;
+	virtual bool             IsFinal() const = 0;
+	virtual bool             IsOverride() const = 0;
+	virtual bool             IsShared() const = 0;
+	virtual asUINT           GetParamCount() const = 0;
+	virtual int              GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const = 0;
+#ifdef AS_DEPRECATED
+	// Deprecated since 2.29.0, 2014-04-06
+	virtual int              GetParamTypeId(asUINT index, asDWORD *flags = 0) const = 0;
+#endif
+	virtual int              GetReturnTypeId(asDWORD *flags = 0) const = 0;
 
-   // Type id for function pointers 
-   virtual int              GetTypeId() const = 0;
-   virtual bool             IsCompatibleWithTypeId(int typeId) const = 0;
+	// Type id for function pointers
+	virtual int              GetTypeId() const = 0;
+	virtual bool             IsCompatibleWithTypeId(int typeId) const = 0;
 
-   // Delegates
-   virtual void              *GetDelegateObject() const = 0;
-   virtual asIObjectType     *GetDelegateObjectType() const = 0;
-   virtual asIScriptFunction *GetDelegateFunction() const = 0;
+	// Delegates
+	virtual void              *GetDelegateObject() const = 0;
+	virtual asIObjectType     *GetDelegateObjectType() const = 0;
+	virtual asIScriptFunction *GetDelegateFunction() const = 0;
 
-   // Debug information
-   virtual asUINT           GetVarCount() const = 0;
-   virtual int              GetVar(asUINT index, const char **name, int *typeId = 0) const = 0;
-   virtual const char      *GetVarDecl(asUINT index, bool includeNamespace = false) const = 0;
-   virtual int              FindNextLineWithCode(int line) const = 0;
+	// Debug information
+	virtual asUINT           GetVarCount() const = 0;
+	virtual int              GetVar(asUINT index, const char **name, int *typeId = 0) const = 0;
+	virtual const char      *GetVarDecl(asUINT index, bool includeNamespace = false) const = 0;
+	virtual int              FindNextLineWithCode(int line) const = 0;
 
-   // For JIT compilation
-   virtual asDWORD         *GetByteCode(asUINT *length = 0) = 0;
+	// For JIT compilation
+	virtual asDWORD         *GetByteCode(asUINT *length = 0) = 0;
 
-   // User data
-   virtual void            *SetUserData(void *userData) = 0;
-   virtual void            *GetUserData() const = 0;
+	// User data
+	virtual void            *SetUserData(void *userData, asPWORD type = 0) = 0;
+	virtual void            *GetUserData(asPWORD type = 0) const = 0;
 
 protected:
-   virtual ~asIScriptFunction() {};
+	virtual ~asIScriptFunction() {};
 };
 
 class asIBinaryStream
 {
 public:
-   virtual void Read(void *ptr, asUINT size) = 0;
-   virtual void Write(const void *ptr, asUINT size) = 0;
+	virtual void Read(void *ptr, asUINT size) = 0;
+	virtual void Write(const void *ptr, asUINT size) = 0;
 
 public:
-   virtual ~asIBinaryStream() {}
+	virtual ~asIBinaryStream() {}
 };
 
 class asILockableSharedBool
 {
 public:
-   // Memory management
-   virtual int AddRef() const = 0;
-   virtual int Release() const = 0;
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
 
-   // Value
-   virtual bool Get() const = 0;
-   virtual void Set(bool val) = 0;
-   
-   // Thread management
-   virtual void Lock() const = 0;
-   virtual void Unlock() const = 0;
+	// Value
+	virtual bool Get() const = 0;
+	virtual void Set(bool val) = 0;
+
+	// Thread management
+	virtual void Lock() const = 0;
+	virtual void Unlock() const = 0;
 
 protected:
-   virtual ~asILockableSharedBool() {}
+	virtual ~asILockableSharedBool() {}
 };
 
 //-----------------------------------------------------------------
@@ -1051,30 +1171,30 @@ protected:
 template <class T>
 inline asSFuncPtr asFunctionPtr(T func)
 {
-   // Mark this as a global function
-   asSFuncPtr p(2);
+	// Mark this as a global function
+	asSFuncPtr p(2);
 
 #ifdef AS_64BIT_PTR
-   // The size_t cast is to avoid a compiler warning with asFUNCTION(0) 
-   // on 64bit, as 0 is interpreted as a 32bit int value
-   p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(size_t(func));
+	// The size_t cast is to avoid a compiler warning with asFUNCTION(0)
+	// on 64bit, as 0 is interpreted as a 32bit int value
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(size_t(func));
 #else
-   // MSVC6 doesn't like the size_t cast above so I
-   // solved this with a separate code for 32bit.
-   p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
+	// MSVC6 doesn't like the size_t cast above so I
+	// solved this with a separate code for 32bit.
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
 #endif
 
-   return p;
+	return p;
 }
 
 // Specialization for functions using the generic calling convention
 template<>
 inline asSFuncPtr asFunctionPtr<asGENFUNC_t>(asGENFUNC_t func)
 {
-   // Mark this as a generic function
-   asSFuncPtr p(1);
-   p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
-   return p;
+	// Mark this as a generic function
+	asSFuncPtr p(1);
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
+	return p;
 }
 
 #ifndef AS_NO_CLASS_METHODS
@@ -1090,31 +1210,31 @@ const int SINGLE_PTR_SIZE = sizeof(asSIMPLEMETHOD_t);
 template <int N>
 struct asSMethodPtr
 {
-   template<class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // This version of the function should never be executed, nor compiled,
-      // as it would mean that the size of the method pointer cannot be determined.
+	template<class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// This version of the function should never be executed, nor compiled,
+		// as it would mean that the size of the method pointer cannot be determined.
 
-      int ERROR_UnsupportedMethodPtr[N-100];
+		int ERROR_UnsupportedMethodPtr[N-100];
 
-      asSFuncPtr p(0);
-      return p;
-   }
+		asSFuncPtr p(0);
+		return p;
+	}
 };
 
 // Template specialization
 template <>
 struct asSMethodPtr<SINGLE_PTR_SIZE>
 {
-   template<class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // Mark this as a class method
-      asSFuncPtr p(3);
-      p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE);
-      return p;
-   }
+	template<class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE);
+		return p;
+	}
 };
 
 #if defined(_MSC_VER) && !defined(__MWERKS__)
@@ -1123,84 +1243,84 @@ struct asSMethodPtr<SINGLE_PTR_SIZE>
 template <>
 struct asSMethodPtr<SINGLE_PTR_SIZE+1*sizeof(int)>
 {
-   template <class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // Mark this as a class method
-      asSFuncPtr p(3);
-      p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+sizeof(int));
-      return p;
-   }
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+sizeof(int));
+		return p;
+	}
 };
 
 template <>
 struct asSMethodPtr<SINGLE_PTR_SIZE+2*sizeof(int)>
 {
-   template <class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // On 32bit platforms with is where a class with virtual inheritance falls.
-      // On 64bit platforms we can also fall here if 8byte data alignments is used.
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// On 32bit platforms with is where a class with virtual inheritance falls.
+		// On 64bit platforms we can also fall here if 8byte data alignments is used.
 
-      // Mark this as a class method
-      asSFuncPtr p(3);
-      p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+2*sizeof(int));
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+2*sizeof(int));
 
-      // Microsoft has a terrible optimization on class methods with virtual inheritance.
-      // They are hardcoding an important offset, which is not coming in the method pointer.
+		// Microsoft has a terrible optimization on class methods with virtual inheritance.
+		// They are hardcoding an important offset, which is not coming in the method pointer.
 
 #if defined(_MSC_VER) && !defined(AS_64BIT_PTR)
-         // Method pointers for virtual inheritance is not supported,
-         // as it requires the location of the vbase table, which is 
-         // only available to the C++ compiler, but not in the method
-         // pointer. 
+			// Method pointers for virtual inheritance is not supported,
+			// as it requires the location of the vbase table, which is
+			// only available to the C++ compiler, but not in the method
+			// pointer.
 
-         // You can get around this by forward declaring the class and
-         // storing the sizeof its method pointer in a constant. Example:
+			// You can get around this by forward declaring the class and
+			// storing the sizeof its method pointer in a constant. Example:
 
-         // class ClassWithVirtualInheritance;
-         // const int ClassWithVirtualInheritance_workaround = sizeof(void ClassWithVirtualInheritance::*());
+			// class ClassWithVirtualInheritance;
+			// const int ClassWithVirtualInheritance_workaround = sizeof(void ClassWithVirtualInheritance::*());
 
-         // This will force the compiler to use the unknown type
-         // for the class, which falls under the next case
+			// This will force the compiler to use the unknown type
+			// for the class, which falls under the next case
 
 
-         // Copy the virtual table index to the 4th dword so that AngelScript
-         // can properly detect and deny the use of methods with virtual inheritance.
-         *(reinterpret_cast<asDWORD*>(&p)+3) = *(reinterpret_cast<asDWORD*>(&p)+2);
+			// Copy the virtual table index to the 4th dword so that AngelScript
+			// can properly detect and deny the use of methods with virtual inheritance.
+			*(reinterpret_cast<asDWORD*>(&p)+3) = *(reinterpret_cast<asDWORD*>(&p)+2);
 #endif
 
-      return p;
-   }
+		return p;
+	}
 };
 
 template <>
 struct asSMethodPtr<SINGLE_PTR_SIZE+3*sizeof(int)>
 {
-   template <class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // Mark this as a class method
-      asSFuncPtr p(3);
-      p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+3*sizeof(int));
-      return p;
-   }
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+3*sizeof(int));
+		return p;
+	}
 };
 
 template <>
 struct asSMethodPtr<SINGLE_PTR_SIZE+4*sizeof(int)>
 {
-   template <class M>
-   static asSFuncPtr Convert(M Mthd)
-   {
-      // On 64bit platforms with 8byte data alignment
-      // the unknown class method pointers will come here.
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// On 64bit platforms with 8byte data alignment
+		// the unknown class method pointers will come here.
 
-      // Mark this as a class method
-      asSFuncPtr p(3);
-      p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+4*sizeof(int));
-      return p;
-   }
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+4*sizeof(int));
+		return p;
+	}
 };
 
 #endif
@@ -1212,14 +1332,14 @@ struct asSMethodPtr<SINGLE_PTR_SIZE+4*sizeof(int)>
 
 struct asSVMRegisters
 {
-   asDWORD          *programPointer;     // points to current bytecode instruction
-   asDWORD          *stackFramePointer;  // function stack frame
-   asDWORD          *stackPointer;       // top of stack (grows downward)
-   asQWORD           valueRegister;      // temp register for primitives
-   void             *objectRegister;     // temp register for objects and handles
-   asIObjectType    *objectType;         // type of object held in object register
-   bool              doProcessSuspend;   // whether or not the JIT should break out when it encounters a suspend instruction
-   asIScriptContext *ctx;                // the active context
+	asDWORD          *programPointer;     // points to current bytecode instruction
+	asDWORD          *stackFramePointer;  // function stack frame
+	asDWORD          *stackPointer;       // top of stack (grows downward)
+	asQWORD           valueRegister;      // temp register for primitives
+	void             *objectRegister;     // temp register for objects and handles
+	asIObjectType    *objectType;         // type of object held in object register
+	bool              doProcessSuspend;   // whether or not the JIT should break out when it encounters a suspend instruction
+	asIScriptContext *ctx;                // the active context
 };
 
 typedef void (*asJITFunction)(asSVMRegisters *registers, asPWORD jitArg);
@@ -1227,303 +1347,303 @@ typedef void (*asJITFunction)(asSVMRegisters *registers, asPWORD jitArg);
 class asIJITCompiler
 {
 public:
-   virtual int  CompileFunction(asIScriptFunction *function, asJITFunction *output) = 0;
-   virtual void ReleaseJITFunction(asJITFunction func) = 0;
+	virtual int  CompileFunction(asIScriptFunction *function, asJITFunction *output) = 0;
+	virtual void ReleaseJITFunction(asJITFunction func) = 0;
 public:
-   virtual ~asIJITCompiler() {}
+	virtual ~asIJITCompiler() {}
 };
 
 // Byte code instructions
 enum asEBCInstr
 {
-   asBC_PopPtr         = 0,
-   asBC_PshGPtr      = 1,
-   asBC_PshC4         = 2,
-   asBC_PshV4         = 3,
-   asBC_PSF         = 4,
-   asBC_SwapPtr      = 5,
-   asBC_NOT         = 6,
-   asBC_PshG4         = 7,
-   asBC_LdGRdR4      = 8,
-   asBC_CALL         = 9,
-   asBC_RET         = 10,
-   asBC_JMP         = 11,
-   asBC_JZ            = 12,
-   asBC_JNZ         = 13,
-   asBC_JS            = 14,
-   asBC_JNS         = 15,
-   asBC_JP            = 16,
-   asBC_JNP         = 17,
-   asBC_TZ            = 18,
-   asBC_TNZ         = 19,
-   asBC_TS            = 20,
-   asBC_TNS         = 21,
-   asBC_TP            = 22,
-   asBC_TNP         = 23,
-   asBC_NEGi         = 24,
-   asBC_NEGf         = 25,
-   asBC_NEGd         = 26,
-   asBC_INCi16         = 27,
-   asBC_INCi8         = 28,
-   asBC_DECi16         = 29,
-   asBC_DECi8         = 30,
-   asBC_INCi         = 31,
-   asBC_DECi         = 32,
-   asBC_INCf         = 33,
-   asBC_DECf         = 34,
-   asBC_INCd         = 35,
-   asBC_DECd         = 36,
-   asBC_IncVi         = 37,
-   asBC_DecVi         = 38,
-   asBC_BNOT         = 39,
-   asBC_BAND         = 40,
-   asBC_BOR         = 41,
-   asBC_BXOR         = 42,
-   asBC_BSLL         = 43,
-   asBC_BSRL         = 44,
-   asBC_BSRA         = 45,
-   asBC_COPY         = 46,
-   asBC_PshC8         = 47,
-   asBC_PshVPtr      = 48,
-   asBC_RDSPtr         = 49,
-   asBC_CMPd         = 50,
-   asBC_CMPu         = 51,
-   asBC_CMPf         = 52,
-   asBC_CMPi         = 53,
-   asBC_CMPIi         = 54,
-   asBC_CMPIf         = 55,
-   asBC_CMPIu         = 56,
-   asBC_JMPP         = 57,
-   asBC_PopRPtr      = 58,
-   asBC_PshRPtr      = 59,
-   asBC_STR         = 60,
-   asBC_CALLSYS      = 61,
-   asBC_CALLBND      = 62,
-   asBC_SUSPEND      = 63,
-   asBC_ALLOC         = 64,
-   asBC_FREE         = 65,
-   asBC_LOADOBJ      = 66,
-   asBC_STOREOBJ      = 67,
-   asBC_GETOBJ         = 68,
-   asBC_REFCPY         = 69,
-   asBC_CHKREF         = 70,
-   asBC_GETOBJREF      = 71,
-   asBC_GETREF         = 72,
-   asBC_PshNull      = 73,
-   asBC_ClrVPtr      = 74,
-   asBC_OBJTYPE      = 75,
-   asBC_TYPEID         = 76,
-   asBC_SetV4         = 77,
-   asBC_SetV8         = 78,
-   asBC_ADDSi         = 79,
-   asBC_CpyVtoV4      = 80,
-   asBC_CpyVtoV8      = 81,
-   asBC_CpyVtoR4      = 82,
-   asBC_CpyVtoR8      = 83,
-   asBC_CpyVtoG4      = 84,
-   asBC_CpyRtoV4      = 85,
-   asBC_CpyRtoV8      = 86,
-   asBC_CpyGtoV4      = 87,
-   asBC_WRTV1         = 88,
-   asBC_WRTV2         = 89,
-   asBC_WRTV4         = 90,
-   asBC_WRTV8         = 91,
-   asBC_RDR1         = 92,
-   asBC_RDR2         = 93,
-   asBC_RDR4         = 94,
-   asBC_RDR8         = 95,
-   asBC_LDG         = 96,
-   asBC_LDV         = 97,
-   asBC_PGA         = 98,
-   asBC_CmpPtr         = 99,
-   asBC_VAR         = 100,
-   asBC_iTOf         = 101,
-   asBC_fTOi         = 102,
-   asBC_uTOf         = 103,
-   asBC_fTOu         = 104,
-   asBC_sbTOi         = 105,
-   asBC_swTOi         = 106,
-   asBC_ubTOi         = 107,
-   asBC_uwTOi         = 108,
-   asBC_dTOi         = 109,
-   asBC_dTOu         = 110,
-   asBC_dTOf         = 111,
-   asBC_iTOd         = 112,
-   asBC_uTOd         = 113,
-   asBC_fTOd         = 114,
-   asBC_ADDi         = 115,
-   asBC_SUBi         = 116,
-   asBC_MULi         = 117,
-   asBC_DIVi         = 118,
-   asBC_MODi         = 119,
-   asBC_ADDf         = 120,
-   asBC_SUBf         = 121,
-   asBC_MULf         = 122,
-   asBC_DIVf         = 123,
-   asBC_MODf         = 124,
-   asBC_ADDd         = 125,
-   asBC_SUBd         = 126,
-   asBC_MULd         = 127,
-   asBC_DIVd         = 128,
-   asBC_MODd         = 129,
-   asBC_ADDIi         = 130,
-   asBC_SUBIi         = 131,
-   asBC_MULIi         = 132,
-   asBC_ADDIf         = 133,
-   asBC_SUBIf         = 134,
-   asBC_MULIf         = 135,
-   asBC_SetG4         = 136,
-   asBC_ChkRefS      = 137,
-   asBC_ChkNullV      = 138,
-   asBC_CALLINTF      = 139,
-   asBC_iTOb         = 140,
-   asBC_iTOw         = 141,
-   asBC_SetV1         = 142,
-   asBC_SetV2         = 143,
-   asBC_Cast         = 144,
-   asBC_i64TOi         = 145,
-   asBC_uTOi64         = 146,
-   asBC_iTOi64         = 147,
-   asBC_fTOi64         = 148,
-   asBC_dTOi64         = 149,
-   asBC_fTOu64         = 150,
-   asBC_dTOu64         = 151,
-   asBC_i64TOf         = 152,
-   asBC_u64TOf         = 153,
-   asBC_i64TOd         = 154,
-   asBC_u64TOd         = 155,
-   asBC_NEGi64         = 156,
-   asBC_INCi64         = 157,
-   asBC_DECi64         = 158,
-   asBC_BNOT64         = 159,
-   asBC_ADDi64         = 160,
-   asBC_SUBi64         = 161,
-   asBC_MULi64         = 162,
-   asBC_DIVi64         = 163,
-   asBC_MODi64         = 164,
-   asBC_BAND64         = 165,
-   asBC_BOR64         = 166,
-   asBC_BXOR64         = 167,
-   asBC_BSLL64         = 168,
-   asBC_BSRL64         = 169,
-   asBC_BSRA64         = 170,
-   asBC_CMPi64         = 171,
-   asBC_CMPu64         = 172,
-   asBC_ChkNullS      = 173,
-   asBC_ClrHi         = 174,
-   asBC_JitEntry      = 175,
-   asBC_CallPtr      = 176,
-   asBC_FuncPtr      = 177,
-   asBC_LoadThisR      = 178,
-   asBC_PshV8         = 179,
-   asBC_DIVu         = 180,
-   asBC_MODu         = 181,
-   asBC_DIVu64         = 182,
-   asBC_MODu64         = 183,
-   asBC_LoadRObjR      = 184,
-   asBC_LoadVObjR      = 185,
-   asBC_RefCpyV      = 186,
-   asBC_JLowZ         = 187,
-   asBC_JLowNZ         = 188,
-   asBC_AllocMem      = 189,
-   asBC_SetListSize   = 190,
-   asBC_PshListElmnt   = 191,
-   asBC_SetListType   = 192,
-   asBC_POWi         = 193,
-   asBC_POWu         = 194,
-   asBC_POWf         = 195,
-   asBC_POWd         = 196,
-   asBC_POWdi         = 197,
-   asBC_POWi64         = 198,
-   asBC_POWu64         = 199,
+	asBC_PopPtr			= 0,
+	asBC_PshGPtr		= 1,
+	asBC_PshC4			= 2,
+	asBC_PshV4			= 3,
+	asBC_PSF			= 4,
+	asBC_SwapPtr		= 5,
+	asBC_NOT			= 6,
+	asBC_PshG4			= 7,
+	asBC_LdGRdR4		= 8,
+	asBC_CALL			= 9,
+	asBC_RET			= 10,
+	asBC_JMP			= 11,
+	asBC_JZ				= 12,
+	asBC_JNZ			= 13,
+	asBC_JS				= 14,
+	asBC_JNS			= 15,
+	asBC_JP				= 16,
+	asBC_JNP			= 17,
+	asBC_TZ				= 18,
+	asBC_TNZ			= 19,
+	asBC_TS				= 20,
+	asBC_TNS			= 21,
+	asBC_TP				= 22,
+	asBC_TNP			= 23,
+	asBC_NEGi			= 24,
+	asBC_NEGf			= 25,
+	asBC_NEGd			= 26,
+	asBC_INCi16			= 27,
+	asBC_INCi8			= 28,
+	asBC_DECi16			= 29,
+	asBC_DECi8			= 30,
+	asBC_INCi			= 31,
+	asBC_DECi			= 32,
+	asBC_INCf			= 33,
+	asBC_DECf			= 34,
+	asBC_INCd			= 35,
+	asBC_DECd			= 36,
+	asBC_IncVi			= 37,
+	asBC_DecVi			= 38,
+	asBC_BNOT			= 39,
+	asBC_BAND			= 40,
+	asBC_BOR			= 41,
+	asBC_BXOR			= 42,
+	asBC_BSLL			= 43,
+	asBC_BSRL			= 44,
+	asBC_BSRA			= 45,
+	asBC_COPY			= 46,
+	asBC_PshC8			= 47,
+	asBC_PshVPtr		= 48,
+	asBC_RDSPtr			= 49,
+	asBC_CMPd			= 50,
+	asBC_CMPu			= 51,
+	asBC_CMPf			= 52,
+	asBC_CMPi			= 53,
+	asBC_CMPIi			= 54,
+	asBC_CMPIf			= 55,
+	asBC_CMPIu			= 56,
+	asBC_JMPP			= 57,
+	asBC_PopRPtr		= 58,
+	asBC_PshRPtr		= 59,
+	asBC_STR			= 60,
+	asBC_CALLSYS		= 61,
+	asBC_CALLBND		= 62,
+	asBC_SUSPEND		= 63,
+	asBC_ALLOC			= 64,
+	asBC_FREE			= 65,
+	asBC_LOADOBJ		= 66,
+	asBC_STOREOBJ		= 67,
+	asBC_GETOBJ			= 68,
+	asBC_REFCPY			= 69,
+	asBC_CHKREF			= 70,
+	asBC_GETOBJREF		= 71,
+	asBC_GETREF			= 72,
+	asBC_PshNull		= 73,
+	asBC_ClrVPtr		= 74,
+	asBC_OBJTYPE		= 75,
+	asBC_TYPEID			= 76,
+	asBC_SetV4			= 77,
+	asBC_SetV8			= 78,
+	asBC_ADDSi			= 79,
+	asBC_CpyVtoV4		= 80,
+	asBC_CpyVtoV8		= 81,
+	asBC_CpyVtoR4		= 82,
+	asBC_CpyVtoR8		= 83,
+	asBC_CpyVtoG4		= 84,
+	asBC_CpyRtoV4		= 85,
+	asBC_CpyRtoV8		= 86,
+	asBC_CpyGtoV4		= 87,
+	asBC_WRTV1			= 88,
+	asBC_WRTV2			= 89,
+	asBC_WRTV4			= 90,
+	asBC_WRTV8			= 91,
+	asBC_RDR1			= 92,
+	asBC_RDR2			= 93,
+	asBC_RDR4			= 94,
+	asBC_RDR8			= 95,
+	asBC_LDG			= 96,
+	asBC_LDV			= 97,
+	asBC_PGA			= 98,
+	asBC_CmpPtr			= 99,
+	asBC_VAR			= 100,
+	asBC_iTOf			= 101,
+	asBC_fTOi			= 102,
+	asBC_uTOf			= 103,
+	asBC_fTOu			= 104,
+	asBC_sbTOi			= 105,
+	asBC_swTOi			= 106,
+	asBC_ubTOi			= 107,
+	asBC_uwTOi			= 108,
+	asBC_dTOi			= 109,
+	asBC_dTOu			= 110,
+	asBC_dTOf			= 111,
+	asBC_iTOd			= 112,
+	asBC_uTOd			= 113,
+	asBC_fTOd			= 114,
+	asBC_ADDi			= 115,
+	asBC_SUBi			= 116,
+	asBC_MULi			= 117,
+	asBC_DIVi			= 118,
+	asBC_MODi			= 119,
+	asBC_ADDf			= 120,
+	asBC_SUBf			= 121,
+	asBC_MULf			= 122,
+	asBC_DIVf			= 123,
+	asBC_MODf			= 124,
+	asBC_ADDd			= 125,
+	asBC_SUBd			= 126,
+	asBC_MULd			= 127,
+	asBC_DIVd			= 128,
+	asBC_MODd			= 129,
+	asBC_ADDIi			= 130,
+	asBC_SUBIi			= 131,
+	asBC_MULIi			= 132,
+	asBC_ADDIf			= 133,
+	asBC_SUBIf			= 134,
+	asBC_MULIf			= 135,
+	asBC_SetG4			= 136,
+	asBC_ChkRefS		= 137,
+	asBC_ChkNullV		= 138,
+	asBC_CALLINTF		= 139,
+	asBC_iTOb			= 140,
+	asBC_iTOw			= 141,
+	asBC_SetV1			= 142,
+	asBC_SetV2			= 143,
+	asBC_Cast			= 144,
+	asBC_i64TOi			= 145,
+	asBC_uTOi64			= 146,
+	asBC_iTOi64			= 147,
+	asBC_fTOi64			= 148,
+	asBC_dTOi64			= 149,
+	asBC_fTOu64			= 150,
+	asBC_dTOu64			= 151,
+	asBC_i64TOf			= 152,
+	asBC_u64TOf			= 153,
+	asBC_i64TOd			= 154,
+	asBC_u64TOd			= 155,
+	asBC_NEGi64			= 156,
+	asBC_INCi64			= 157,
+	asBC_DECi64			= 158,
+	asBC_BNOT64			= 159,
+	asBC_ADDi64			= 160,
+	asBC_SUBi64			= 161,
+	asBC_MULi64			= 162,
+	asBC_DIVi64			= 163,
+	asBC_MODi64			= 164,
+	asBC_BAND64			= 165,
+	asBC_BOR64			= 166,
+	asBC_BXOR64			= 167,
+	asBC_BSLL64			= 168,
+	asBC_BSRL64			= 169,
+	asBC_BSRA64			= 170,
+	asBC_CMPi64			= 171,
+	asBC_CMPu64			= 172,
+	asBC_ChkNullS		= 173,
+	asBC_ClrHi			= 174,
+	asBC_JitEntry		= 175,
+	asBC_CallPtr		= 176,
+	asBC_FuncPtr		= 177,
+	asBC_LoadThisR		= 178,
+	asBC_PshV8			= 179,
+	asBC_DIVu			= 180,
+	asBC_MODu			= 181,
+	asBC_DIVu64			= 182,
+	asBC_MODu64			= 183,
+	asBC_LoadRObjR		= 184,
+	asBC_LoadVObjR		= 185,
+	asBC_RefCpyV		= 186,
+	asBC_JLowZ			= 187,
+	asBC_JLowNZ			= 188,
+	asBC_AllocMem		= 189,
+	asBC_SetListSize	= 190,
+	asBC_PshListElmnt	= 191,
+	asBC_SetListType	= 192,
+	asBC_POWi			= 193,
+	asBC_POWu			= 194,
+	asBC_POWf			= 195,
+	asBC_POWd			= 196,
+	asBC_POWdi			= 197,
+	asBC_POWi64			= 198,
+	asBC_POWu64			= 199,
 
-   asBC_MAXBYTECODE   = 200,
+	asBC_MAXBYTECODE	= 200,
 
-   // Temporary tokens. Can't be output to the final program
-   asBC_VarDecl      = 251,
-   asBC_Block         = 252,
-   asBC_ObjInfo      = 253,
-   asBC_LINE         = 254,
-   asBC_LABEL         = 255
+	// Temporary tokens. Can't be output to the final program
+	asBC_VarDecl		= 251,
+	asBC_Block			= 252,
+	asBC_ObjInfo		= 253,
+	asBC_LINE			= 254,
+	asBC_LABEL			= 255
 };
 
 // Instruction types
 enum asEBCType
 {
-   asBCTYPE_INFO         = 0,
-   asBCTYPE_NO_ARG       = 1,
-   asBCTYPE_W_ARG        = 2,
-   asBCTYPE_wW_ARG       = 3,
-   asBCTYPE_DW_ARG       = 4,
-   asBCTYPE_rW_DW_ARG    = 5,
-   asBCTYPE_QW_ARG       = 6,
-   asBCTYPE_DW_DW_ARG    = 7,
-   asBCTYPE_wW_rW_rW_ARG = 8,
-   asBCTYPE_wW_QW_ARG    = 9,
-   asBCTYPE_wW_rW_ARG    = 10,
-   asBCTYPE_rW_ARG       = 11,
-   asBCTYPE_wW_DW_ARG    = 12,
-   asBCTYPE_wW_rW_DW_ARG = 13,
-   asBCTYPE_rW_rW_ARG    = 14,
-   asBCTYPE_wW_W_ARG     = 15,
-   asBCTYPE_QW_DW_ARG    = 16,
-   asBCTYPE_rW_QW_ARG    = 17,
-   asBCTYPE_W_DW_ARG     = 18,
-   asBCTYPE_rW_W_DW_ARG  = 19,
-   asBCTYPE_rW_DW_DW_ARG = 20
+	asBCTYPE_INFO         = 0,
+	asBCTYPE_NO_ARG       = 1,
+	asBCTYPE_W_ARG        = 2,
+	asBCTYPE_wW_ARG       = 3,
+	asBCTYPE_DW_ARG       = 4,
+	asBCTYPE_rW_DW_ARG    = 5,
+	asBCTYPE_QW_ARG       = 6,
+	asBCTYPE_DW_DW_ARG    = 7,
+	asBCTYPE_wW_rW_rW_ARG = 8,
+	asBCTYPE_wW_QW_ARG    = 9,
+	asBCTYPE_wW_rW_ARG    = 10,
+	asBCTYPE_rW_ARG       = 11,
+	asBCTYPE_wW_DW_ARG    = 12,
+	asBCTYPE_wW_rW_DW_ARG = 13,
+	asBCTYPE_rW_rW_ARG    = 14,
+	asBCTYPE_wW_W_ARG     = 15,
+	asBCTYPE_QW_DW_ARG    = 16,
+	asBCTYPE_rW_QW_ARG    = 17,
+	asBCTYPE_W_DW_ARG     = 18,
+	asBCTYPE_rW_W_DW_ARG  = 19,
+	asBCTYPE_rW_DW_DW_ARG = 20
 };
 
 // Instruction type sizes
 const int asBCTypeSize[21] =
 {
-   0, // asBCTYPE_INFO
-   1, // asBCTYPE_NO_ARG
-   1, // asBCTYPE_W_ARG
-   1, // asBCTYPE_wW_ARG
-   2, // asBCTYPE_DW_ARG
-   2, // asBCTYPE_rW_DW_ARG
-   3, // asBCTYPE_QW_ARG
-   3, // asBCTYPE_DW_DW_ARG
-   2, // asBCTYPE_wW_rW_rW_ARG
-   3, // asBCTYPE_wW_QW_ARG
-   2, // asBCTYPE_wW_rW_ARG
-   1, // asBCTYPE_rW_ARG
-   2, // asBCTYPE_wW_DW_ARG
-   3, // asBCTYPE_wW_rW_DW_ARG
-   2, // asBCTYPE_rW_rW_ARG
-   2, // asBCTYPE_wW_W_ARG
-   4, // asBCTYPE_QW_DW_ARG
-   3, // asBCTYPE_rW_QW_ARG
-   2, // asBCTYPE_W_DW_ARG
-   3, // asBCTYPE_rW_W_DW_ARG
-   3  // asBCTYPE_rW_DW_DW_ARG
+	0, // asBCTYPE_INFO
+	1, // asBCTYPE_NO_ARG
+	1, // asBCTYPE_W_ARG
+	1, // asBCTYPE_wW_ARG
+	2, // asBCTYPE_DW_ARG
+	2, // asBCTYPE_rW_DW_ARG
+	3, // asBCTYPE_QW_ARG
+	3, // asBCTYPE_DW_DW_ARG
+	2, // asBCTYPE_wW_rW_rW_ARG
+	3, // asBCTYPE_wW_QW_ARG
+	2, // asBCTYPE_wW_rW_ARG
+	1, // asBCTYPE_rW_ARG
+	2, // asBCTYPE_wW_DW_ARG
+	3, // asBCTYPE_wW_rW_DW_ARG
+	2, // asBCTYPE_rW_rW_ARG
+	2, // asBCTYPE_wW_W_ARG
+	4, // asBCTYPE_QW_DW_ARG
+	3, // asBCTYPE_rW_QW_ARG
+	2, // asBCTYPE_W_DW_ARG
+	3, // asBCTYPE_rW_W_DW_ARG
+	3  // asBCTYPE_rW_DW_DW_ARG
 };
 
 // Instruction info
 struct asSBCInfo
 {
-   asEBCInstr  bc;
-   asEBCType   type;
-   int         stackInc;
-   const char *name;
+	asEBCInstr  bc;
+	asEBCType   type;
+	int         stackInc;
+	const char *name;
 };
 
 #ifndef AS_64BIT_PTR
-   #define asBCTYPE_PTR_ARG    asBCTYPE_DW_ARG
-   #define asBCTYPE_PTR_DW_ARG asBCTYPE_DW_DW_ARG
-   #define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_DW_ARG
-   #define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_DW_ARG
-   #ifndef AS_PTR_SIZE
-      #define AS_PTR_SIZE 1
-   #endif
+	#define asBCTYPE_PTR_ARG    asBCTYPE_DW_ARG
+	#define asBCTYPE_PTR_DW_ARG asBCTYPE_DW_DW_ARG
+	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_DW_ARG
+	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_DW_ARG
+	#ifndef AS_PTR_SIZE
+		#define AS_PTR_SIZE 1
+	#endif
 #else
-   #define asBCTYPE_PTR_ARG    asBCTYPE_QW_ARG
-   #define asBCTYPE_PTR_DW_ARG asBCTYPE_QW_DW_ARG
-   #define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_QW_ARG
-   #define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_QW_ARG
-   #ifndef AS_PTR_SIZE
-      #define AS_PTR_SIZE 2
-   #endif
+	#define asBCTYPE_PTR_ARG    asBCTYPE_QW_ARG
+	#define asBCTYPE_PTR_DW_ARG asBCTYPE_QW_DW_ARG
+	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_QW_ARG
+	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_QW_ARG
+	#ifndef AS_PTR_SIZE
+		#define AS_PTR_SIZE 2
+	#endif
 #endif
 
 #define asBCINFO(b,t,s) {asBC_##b, asBCTYPE_##t, s, #b}
@@ -1531,264 +1651,264 @@ struct asSBCInfo
 
 const asSBCInfo asBCInfo[256] =
 {
-   asBCINFO(PopPtr,   NO_ARG,         -AS_PTR_SIZE),
-   asBCINFO(PshGPtr,   PTR_ARG,      AS_PTR_SIZE),
-   asBCINFO(PshC4,      DW_ARG,         1),
-   asBCINFO(PshV4,      rW_ARG,         1),
-   asBCINFO(PSF,      rW_ARG,         AS_PTR_SIZE),
-   asBCINFO(SwapPtr,   NO_ARG,         0),
-   asBCINFO(NOT,      rW_ARG,         0),
-   asBCINFO(PshG4,      PTR_ARG,      1),
-   asBCINFO(LdGRdR4,   wW_PTR_ARG,      0),
-   asBCINFO(CALL,      DW_ARG,         0xFFFF),
-   asBCINFO(RET,      W_ARG,         0xFFFF),
-   asBCINFO(JMP,      DW_ARG,         0),
-   asBCINFO(JZ,      DW_ARG,         0),
-   asBCINFO(JNZ,      DW_ARG,         0),
-   asBCINFO(JS,      DW_ARG,         0),
-   asBCINFO(JNS,      DW_ARG,         0),
-   asBCINFO(JP,      DW_ARG,         0),
-   asBCINFO(JNP,      DW_ARG,         0),
-   asBCINFO(TZ,      NO_ARG,         0),
-   asBCINFO(TNZ,      NO_ARG,         0),
-   asBCINFO(TS,      NO_ARG,         0),
-   asBCINFO(TNS,      NO_ARG,         0),
-   asBCINFO(TP,      NO_ARG,         0),
-   asBCINFO(TNP,      NO_ARG,         0),
-   asBCINFO(NEGi,      rW_ARG,         0),
-   asBCINFO(NEGf,      rW_ARG,         0),
-   asBCINFO(NEGd,      rW_ARG,         0),
-   asBCINFO(INCi16,   NO_ARG,         0),
-   asBCINFO(INCi8,      NO_ARG,         0),
-   asBCINFO(DECi16,   NO_ARG,         0),
-   asBCINFO(DECi8,      NO_ARG,         0),
-   asBCINFO(INCi,      NO_ARG,         0),
-   asBCINFO(DECi,      NO_ARG,         0),
-   asBCINFO(INCf,      NO_ARG,         0),
-   asBCINFO(DECf,      NO_ARG,         0),
-   asBCINFO(INCd,      NO_ARG,         0),
-   asBCINFO(DECd,      NO_ARG,         0),
-   asBCINFO(IncVi,      rW_ARG,         0),
-   asBCINFO(DecVi,      rW_ARG,         0),
-   asBCINFO(BNOT,      rW_ARG,         0),
-   asBCINFO(BAND,      wW_rW_rW_ARG,   0),
-   asBCINFO(BOR,      wW_rW_rW_ARG,   0),
-   asBCINFO(BXOR,      wW_rW_rW_ARG,   0),
-   asBCINFO(BSLL,      wW_rW_rW_ARG,   0),
-   asBCINFO(BSRL,      wW_rW_rW_ARG,   0),
-   asBCINFO(BSRA,      wW_rW_rW_ARG,   0),
-   asBCINFO(COPY,      W_DW_ARG,      -AS_PTR_SIZE),
-   asBCINFO(PshC8,      QW_ARG,         2),
-   asBCINFO(PshVPtr,   rW_ARG,         AS_PTR_SIZE),
-   asBCINFO(RDSPtr,   NO_ARG,         0),
-   asBCINFO(CMPd,      rW_rW_ARG,      0),
-   asBCINFO(CMPu,      rW_rW_ARG,      0),
-   asBCINFO(CMPf,      rW_rW_ARG,      0),
-   asBCINFO(CMPi,      rW_rW_ARG,      0),
-   asBCINFO(CMPIi,      rW_DW_ARG,      0),
-   asBCINFO(CMPIf,      rW_DW_ARG,      0),
-   asBCINFO(CMPIu,      rW_DW_ARG,      0),
-   asBCINFO(JMPP,      rW_ARG,         0),
-   asBCINFO(PopRPtr,   NO_ARG,         -AS_PTR_SIZE),
-   asBCINFO(PshRPtr,   NO_ARG,         AS_PTR_SIZE),
-   asBCINFO(STR,      W_ARG,         1+AS_PTR_SIZE),
-   asBCINFO(CALLSYS,   DW_ARG,         0xFFFF),
-   asBCINFO(CALLBND,   DW_ARG,         0xFFFF),
-   asBCINFO(SUSPEND,   NO_ARG,         0),
-   asBCINFO(ALLOC,      PTR_DW_ARG,      0xFFFF),
-   asBCINFO(FREE,      wW_PTR_ARG,      0),
-   asBCINFO(LOADOBJ,   rW_ARG,         0),
-   asBCINFO(STOREOBJ,   wW_ARG,         0),
-   asBCINFO(GETOBJ,   W_ARG,         0),
-   asBCINFO(REFCPY,   PTR_ARG,      -AS_PTR_SIZE),
-   asBCINFO(CHKREF,   NO_ARG,         0),
-   asBCINFO(GETOBJREF,   W_ARG,         0),
-   asBCINFO(GETREF,   W_ARG,         0),
-   asBCINFO(PshNull,   NO_ARG,         AS_PTR_SIZE),
-   asBCINFO(ClrVPtr,   wW_ARG,         0),
-   asBCINFO(OBJTYPE,   PTR_ARG,      AS_PTR_SIZE),
-   asBCINFO(TYPEID,   DW_ARG,         1),
-   asBCINFO(SetV4,      wW_DW_ARG,      0),
-   asBCINFO(SetV8,      wW_QW_ARG,      0),
-   asBCINFO(ADDSi,      W_DW_ARG,      0),
-   asBCINFO(CpyVtoV4,   wW_rW_ARG,      0),
-   asBCINFO(CpyVtoV8,   wW_rW_ARG,      0),
-   asBCINFO(CpyVtoR4,   rW_ARG,         0),
-   asBCINFO(CpyVtoR8,   rW_ARG,         0),
-   asBCINFO(CpyVtoG4,   rW_PTR_ARG,      0),
-   asBCINFO(CpyRtoV4,   wW_ARG,         0),
-   asBCINFO(CpyRtoV8,   wW_ARG,         0),
-   asBCINFO(CpyGtoV4,   wW_PTR_ARG,      0),
-   asBCINFO(WRTV1,      rW_ARG,         0),
-   asBCINFO(WRTV2,      rW_ARG,         0),
-   asBCINFO(WRTV4,      rW_ARG,         0),
-   asBCINFO(WRTV8,      rW_ARG,         0),
-   asBCINFO(RDR1,      wW_ARG,         0),
-   asBCINFO(RDR2,      wW_ARG,         0),
-   asBCINFO(RDR4,      wW_ARG,         0),
-   asBCINFO(RDR8,      wW_ARG,         0),
-   asBCINFO(LDG,      PTR_ARG,      0),
-   asBCINFO(LDV,      rW_ARG,         0),
-   asBCINFO(PGA,      PTR_ARG,      AS_PTR_SIZE),
-   asBCINFO(CmpPtr,   rW_rW_ARG,      0),
-   asBCINFO(VAR,      rW_ARG,         AS_PTR_SIZE),
-   asBCINFO(iTOf,      rW_ARG,         0),
-   asBCINFO(fTOi,      rW_ARG,         0),
-   asBCINFO(uTOf,      rW_ARG,         0),
-   asBCINFO(fTOu,      rW_ARG,         0),
-   asBCINFO(sbTOi,      rW_ARG,         0),
-   asBCINFO(swTOi,      rW_ARG,         0),
-   asBCINFO(ubTOi,      rW_ARG,         0),
-   asBCINFO(uwTOi,      rW_ARG,         0),
-   asBCINFO(dTOi,      wW_rW_ARG,      0),
-   asBCINFO(dTOu,      wW_rW_ARG,      0),
-   asBCINFO(dTOf,      wW_rW_ARG,      0),
-   asBCINFO(iTOd,      wW_rW_ARG,      0),
-   asBCINFO(uTOd,      wW_rW_ARG,      0),
-   asBCINFO(fTOd,      wW_rW_ARG,      0),
-   asBCINFO(ADDi,      wW_rW_rW_ARG,   0),
-   asBCINFO(SUBi,      wW_rW_rW_ARG,   0),
-   asBCINFO(MULi,      wW_rW_rW_ARG,   0),
-   asBCINFO(DIVi,      wW_rW_rW_ARG,   0),
-   asBCINFO(MODi,      wW_rW_rW_ARG,   0),
-   asBCINFO(ADDf,      wW_rW_rW_ARG,   0),
-   asBCINFO(SUBf,      wW_rW_rW_ARG,   0),
-   asBCINFO(MULf,      wW_rW_rW_ARG,   0),
-   asBCINFO(DIVf,      wW_rW_rW_ARG,   0),
-   asBCINFO(MODf,      wW_rW_rW_ARG,   0),
-   asBCINFO(ADDd,      wW_rW_rW_ARG,   0),
-   asBCINFO(SUBd,      wW_rW_rW_ARG,   0),
-   asBCINFO(MULd,      wW_rW_rW_ARG,   0),
-   asBCINFO(DIVd,      wW_rW_rW_ARG,   0),
-   asBCINFO(MODd,      wW_rW_rW_ARG,   0),
-   asBCINFO(ADDIi,      wW_rW_DW_ARG,   0),
-   asBCINFO(SUBIi,      wW_rW_DW_ARG,   0),
-   asBCINFO(MULIi,      wW_rW_DW_ARG,   0),
-   asBCINFO(ADDIf,      wW_rW_DW_ARG,   0),
-   asBCINFO(SUBIf,      wW_rW_DW_ARG,   0),
-   asBCINFO(MULIf,      wW_rW_DW_ARG,   0),
-   asBCINFO(SetG4,      PTR_DW_ARG,      0),
-   asBCINFO(ChkRefS,   NO_ARG,         0),
-   asBCINFO(ChkNullV,   rW_ARG,         0),
-   asBCINFO(CALLINTF,   DW_ARG,         0xFFFF),
-   asBCINFO(iTOb,      rW_ARG,         0),
-   asBCINFO(iTOw,      rW_ARG,         0),
-   asBCINFO(SetV1,      wW_DW_ARG,      0),
-   asBCINFO(SetV2,      wW_DW_ARG,      0),
-   asBCINFO(Cast,      DW_ARG,         -AS_PTR_SIZE),
-   asBCINFO(i64TOi,   wW_rW_ARG,      0),
-   asBCINFO(uTOi64,   wW_rW_ARG,      0),
-   asBCINFO(iTOi64,   wW_rW_ARG,      0),
-   asBCINFO(fTOi64,   wW_rW_ARG,      0),
-   asBCINFO(dTOi64,   rW_ARG,         0),
-   asBCINFO(fTOu64,   wW_rW_ARG,      0),
-   asBCINFO(dTOu64,   rW_ARG,         0),
-   asBCINFO(i64TOf,   wW_rW_ARG,      0),
-   asBCINFO(u64TOf,   wW_rW_ARG,      0),
-   asBCINFO(i64TOd,   rW_ARG,         0),
-   asBCINFO(u64TOd,   rW_ARG,         0),
-   asBCINFO(NEGi64,   rW_ARG,         0),
-   asBCINFO(INCi64,   NO_ARG,         0),
-   asBCINFO(DECi64,   NO_ARG,         0),
-   asBCINFO(BNOT64,   rW_ARG,         0),
-   asBCINFO(ADDi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(SUBi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(MULi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(DIVi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(MODi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(BAND64,   wW_rW_rW_ARG,   0),
-   asBCINFO(BOR64,      wW_rW_rW_ARG,   0),
-   asBCINFO(BXOR64,   wW_rW_rW_ARG,   0),
-   asBCINFO(BSLL64,   wW_rW_rW_ARG,   0),
-   asBCINFO(BSRL64,   wW_rW_rW_ARG,   0),
-   asBCINFO(BSRA64,   wW_rW_rW_ARG,   0),
-   asBCINFO(CMPi64,   rW_rW_ARG,      0),
-   asBCINFO(CMPu64,   rW_rW_ARG,      0),
-   asBCINFO(ChkNullS,   W_ARG,         0),
-   asBCINFO(ClrHi,      NO_ARG,         0),
-   asBCINFO(JitEntry,   PTR_ARG,      0),
-   asBCINFO(CallPtr,   rW_ARG,         0xFFFF),
-   asBCINFO(FuncPtr,   PTR_ARG,      AS_PTR_SIZE),
-   asBCINFO(LoadThisR,   W_DW_ARG,      0),
-   asBCINFO(PshV8,      rW_ARG,         2),
-   asBCINFO(DIVu,      wW_rW_rW_ARG,   0),
-   asBCINFO(MODu,      wW_rW_rW_ARG,   0),
-   asBCINFO(DIVu64,   wW_rW_rW_ARG,   0),
-   asBCINFO(MODu64,   wW_rW_rW_ARG,   0),
-   asBCINFO(LoadRObjR,   rW_W_DW_ARG,   0),
-   asBCINFO(LoadVObjR,   rW_W_DW_ARG,   0),
-   asBCINFO(RefCpyV,   wW_PTR_ARG,      0),
-   asBCINFO(JLowZ,      DW_ARG,         0),
-   asBCINFO(JLowNZ,   DW_ARG,         0),
-   asBCINFO(AllocMem,   wW_DW_ARG,      0),
-   asBCINFO(SetListSize, rW_DW_DW_ARG,   0),
-   asBCINFO(PshListElmnt, rW_DW_ARG,   AS_PTR_SIZE),
-   asBCINFO(SetListType, rW_DW_DW_ARG,   0),
-   asBCINFO(POWi,      wW_rW_rW_ARG,   0),
-   asBCINFO(POWu,      wW_rW_rW_ARG,   0),
-   asBCINFO(POWf,      wW_rW_rW_ARG,   0),
-   asBCINFO(POWd,      wW_rW_rW_ARG,   0),
-   asBCINFO(POWdi,      wW_rW_rW_ARG,   0),
-   asBCINFO(POWi64,   wW_rW_rW_ARG,   0),
-   asBCINFO(POWu64,   wW_rW_rW_ARG,   0),
+	asBCINFO(PopPtr,	NO_ARG,			-AS_PTR_SIZE),
+	asBCINFO(PshGPtr,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(PshC4,		DW_ARG,			1),
+	asBCINFO(PshV4,		rW_ARG,			1),
+	asBCINFO(PSF,		rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(SwapPtr,	NO_ARG,			0),
+	asBCINFO(NOT,		rW_ARG,			0),
+	asBCINFO(PshG4,		PTR_ARG,		1),
+	asBCINFO(LdGRdR4,	wW_PTR_ARG,		0),
+	asBCINFO(CALL,		DW_ARG,			0xFFFF),
+	asBCINFO(RET,		W_ARG,			0xFFFF),
+	asBCINFO(JMP,		DW_ARG,			0),
+	asBCINFO(JZ,		DW_ARG,			0),
+	asBCINFO(JNZ,		DW_ARG,			0),
+	asBCINFO(JS,		DW_ARG,			0),
+	asBCINFO(JNS,		DW_ARG,			0),
+	asBCINFO(JP,		DW_ARG,			0),
+	asBCINFO(JNP,		DW_ARG,			0),
+	asBCINFO(TZ,		NO_ARG,			0),
+	asBCINFO(TNZ,		NO_ARG,			0),
+	asBCINFO(TS,		NO_ARG,			0),
+	asBCINFO(TNS,		NO_ARG,			0),
+	asBCINFO(TP,		NO_ARG,			0),
+	asBCINFO(TNP,		NO_ARG,			0),
+	asBCINFO(NEGi,		rW_ARG,			0),
+	asBCINFO(NEGf,		rW_ARG,			0),
+	asBCINFO(NEGd,		rW_ARG,			0),
+	asBCINFO(INCi16,	NO_ARG,			0),
+	asBCINFO(INCi8,		NO_ARG,			0),
+	asBCINFO(DECi16,	NO_ARG,			0),
+	asBCINFO(DECi8,		NO_ARG,			0),
+	asBCINFO(INCi,		NO_ARG,			0),
+	asBCINFO(DECi,		NO_ARG,			0),
+	asBCINFO(INCf,		NO_ARG,			0),
+	asBCINFO(DECf,		NO_ARG,			0),
+	asBCINFO(INCd,		NO_ARG,			0),
+	asBCINFO(DECd,		NO_ARG,			0),
+	asBCINFO(IncVi,		rW_ARG,			0),
+	asBCINFO(DecVi,		rW_ARG,			0),
+	asBCINFO(BNOT,		rW_ARG,			0),
+	asBCINFO(BAND,		wW_rW_rW_ARG,	0),
+	asBCINFO(BOR,		wW_rW_rW_ARG,	0),
+	asBCINFO(BXOR,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSLL,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSRL,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSRA,		wW_rW_rW_ARG,	0),
+	asBCINFO(COPY,		W_DW_ARG,		-AS_PTR_SIZE),
+	asBCINFO(PshC8,		QW_ARG,			2),
+	asBCINFO(PshVPtr,	rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(RDSPtr,	NO_ARG,			0),
+	asBCINFO(CMPd,		rW_rW_ARG,		0),
+	asBCINFO(CMPu,		rW_rW_ARG,		0),
+	asBCINFO(CMPf,		rW_rW_ARG,		0),
+	asBCINFO(CMPi,		rW_rW_ARG,		0),
+	asBCINFO(CMPIi,		rW_DW_ARG,		0),
+	asBCINFO(CMPIf,		rW_DW_ARG,		0),
+	asBCINFO(CMPIu,		rW_DW_ARG,		0),
+	asBCINFO(JMPP,		rW_ARG,			0),
+	asBCINFO(PopRPtr,	NO_ARG,			-AS_PTR_SIZE),
+	asBCINFO(PshRPtr,	NO_ARG,			AS_PTR_SIZE),
+	asBCINFO(STR,		W_ARG,			1+AS_PTR_SIZE),
+	asBCINFO(CALLSYS,	DW_ARG,			0xFFFF),
+	asBCINFO(CALLBND,	DW_ARG,			0xFFFF),
+	asBCINFO(SUSPEND,	NO_ARG,			0),
+	asBCINFO(ALLOC,		PTR_DW_ARG,		0xFFFF),
+	asBCINFO(FREE,		wW_PTR_ARG,		0),
+	asBCINFO(LOADOBJ,	rW_ARG,			0),
+	asBCINFO(STOREOBJ,	wW_ARG,			0),
+	asBCINFO(GETOBJ,	W_ARG,			0),
+	asBCINFO(REFCPY,	PTR_ARG,		-AS_PTR_SIZE),
+	asBCINFO(CHKREF,	NO_ARG,			0),
+	asBCINFO(GETOBJREF,	W_ARG,			0),
+	asBCINFO(GETREF,	W_ARG,			0),
+	asBCINFO(PshNull,	NO_ARG,			AS_PTR_SIZE),
+	asBCINFO(ClrVPtr,	wW_ARG,			0),
+	asBCINFO(OBJTYPE,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(TYPEID,	DW_ARG,			1),
+	asBCINFO(SetV4,		wW_DW_ARG,		0),
+	asBCINFO(SetV8,		wW_QW_ARG,		0),
+	asBCINFO(ADDSi,		W_DW_ARG,		0),
+	asBCINFO(CpyVtoV4,	wW_rW_ARG,		0),
+	asBCINFO(CpyVtoV8,	wW_rW_ARG,		0),
+	asBCINFO(CpyVtoR4,	rW_ARG,			0),
+	asBCINFO(CpyVtoR8,	rW_ARG,			0),
+	asBCINFO(CpyVtoG4,	rW_PTR_ARG,		0),
+	asBCINFO(CpyRtoV4,	wW_ARG,			0),
+	asBCINFO(CpyRtoV8,	wW_ARG,			0),
+	asBCINFO(CpyGtoV4,	wW_PTR_ARG,		0),
+	asBCINFO(WRTV1,		rW_ARG,			0),
+	asBCINFO(WRTV2,		rW_ARG,			0),
+	asBCINFO(WRTV4,		rW_ARG,			0),
+	asBCINFO(WRTV8,		rW_ARG,			0),
+	asBCINFO(RDR1,		wW_ARG,			0),
+	asBCINFO(RDR2,		wW_ARG,			0),
+	asBCINFO(RDR4,		wW_ARG,			0),
+	asBCINFO(RDR8,		wW_ARG,			0),
+	asBCINFO(LDG,		PTR_ARG,		0),
+	asBCINFO(LDV,		rW_ARG,			0),
+	asBCINFO(PGA,		PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(CmpPtr,	rW_rW_ARG,		0),
+	asBCINFO(VAR,		rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(iTOf,		rW_ARG,			0),
+	asBCINFO(fTOi,		rW_ARG,			0),
+	asBCINFO(uTOf,		rW_ARG,			0),
+	asBCINFO(fTOu,		rW_ARG,			0),
+	asBCINFO(sbTOi,		rW_ARG,			0),
+	asBCINFO(swTOi,		rW_ARG,			0),
+	asBCINFO(ubTOi,		rW_ARG,			0),
+	asBCINFO(uwTOi,		rW_ARG,			0),
+	asBCINFO(dTOi,		wW_rW_ARG,		0),
+	asBCINFO(dTOu,		wW_rW_ARG,		0),
+	asBCINFO(dTOf,		wW_rW_ARG,		0),
+	asBCINFO(iTOd,		wW_rW_ARG,		0),
+	asBCINFO(uTOd,		wW_rW_ARG,		0),
+	asBCINFO(fTOd,		wW_rW_ARG,		0),
+	asBCINFO(ADDi,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBi,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULi,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVi,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODi,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDf,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBf,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULf,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVf,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODf,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDd,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBd,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULd,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVd,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODd,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(SUBIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(MULIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(ADDIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(SUBIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(MULIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(SetG4,		PTR_DW_ARG,		0),
+	asBCINFO(ChkRefS,	NO_ARG,			0),
+	asBCINFO(ChkNullV,	rW_ARG,			0),
+	asBCINFO(CALLINTF,	DW_ARG,			0xFFFF),
+	asBCINFO(iTOb,		rW_ARG,			0),
+	asBCINFO(iTOw,		rW_ARG,			0),
+	asBCINFO(SetV1,		wW_DW_ARG,		0),
+	asBCINFO(SetV2,		wW_DW_ARG,		0),
+	asBCINFO(Cast,		DW_ARG,			-AS_PTR_SIZE),
+	asBCINFO(i64TOi,	wW_rW_ARG,		0),
+	asBCINFO(uTOi64,	wW_rW_ARG,		0),
+	asBCINFO(iTOi64,	wW_rW_ARG,		0),
+	asBCINFO(fTOi64,	wW_rW_ARG,		0),
+	asBCINFO(dTOi64,	rW_ARG,			0),
+	asBCINFO(fTOu64,	wW_rW_ARG,		0),
+	asBCINFO(dTOu64,	rW_ARG,			0),
+	asBCINFO(i64TOf,	wW_rW_ARG,		0),
+	asBCINFO(u64TOf,	wW_rW_ARG,		0),
+	asBCINFO(i64TOd,	rW_ARG,			0),
+	asBCINFO(u64TOd,	rW_ARG,			0),
+	asBCINFO(NEGi64,	rW_ARG,			0),
+	asBCINFO(INCi64,	NO_ARG,			0),
+	asBCINFO(DECi64,	NO_ARG,			0),
+	asBCINFO(BNOT64,	rW_ARG,			0),
+	asBCINFO(ADDi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(SUBi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MULi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(DIVi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MODi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BAND64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BOR64,		wW_rW_rW_ARG,	0),
+	asBCINFO(BXOR64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSLL64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSRL64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSRA64,	wW_rW_rW_ARG,	0),
+	asBCINFO(CMPi64,	rW_rW_ARG,		0),
+	asBCINFO(CMPu64,	rW_rW_ARG,		0),
+	asBCINFO(ChkNullS,	W_ARG,			0),
+	asBCINFO(ClrHi,		NO_ARG,			0),
+	asBCINFO(JitEntry,	PTR_ARG,		0),
+	asBCINFO(CallPtr,	rW_ARG,			0xFFFF),
+	asBCINFO(FuncPtr,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(LoadThisR,	W_DW_ARG,		0),
+	asBCINFO(PshV8,		rW_ARG,			2),
+	asBCINFO(DIVu,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODu,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVu64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MODu64,	wW_rW_rW_ARG,	0),
+	asBCINFO(LoadRObjR,	rW_W_DW_ARG,	0),
+	asBCINFO(LoadVObjR,	rW_W_DW_ARG,	0),
+	asBCINFO(RefCpyV,	wW_PTR_ARG,		0),
+	asBCINFO(JLowZ,		DW_ARG,			0),
+	asBCINFO(JLowNZ,	DW_ARG,			0),
+	asBCINFO(AllocMem,	wW_DW_ARG,		0),
+	asBCINFO(SetListSize, rW_DW_DW_ARG,	0),
+	asBCINFO(PshListElmnt, rW_DW_ARG,	AS_PTR_SIZE),
+	asBCINFO(SetListType, rW_DW_DW_ARG,	0),
+	asBCINFO(POWi,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWu,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWf,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWd,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWdi,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(POWu64,	wW_rW_rW_ARG,	0),
 
-   asBCINFO_DUMMY(200),
-   asBCINFO_DUMMY(201),
-   asBCINFO_DUMMY(202),
-   asBCINFO_DUMMY(203),
-   asBCINFO_DUMMY(204),
-   asBCINFO_DUMMY(205),
-   asBCINFO_DUMMY(206),
-   asBCINFO_DUMMY(207),
-   asBCINFO_DUMMY(208),
-   asBCINFO_DUMMY(209),
-   asBCINFO_DUMMY(210),
-   asBCINFO_DUMMY(211),
-   asBCINFO_DUMMY(212),
-   asBCINFO_DUMMY(213),
-   asBCINFO_DUMMY(214),
-   asBCINFO_DUMMY(215),
-   asBCINFO_DUMMY(216),
-   asBCINFO_DUMMY(217),
-   asBCINFO_DUMMY(218),
-   asBCINFO_DUMMY(219),
-   asBCINFO_DUMMY(220),
-   asBCINFO_DUMMY(221),
-   asBCINFO_DUMMY(222),
-   asBCINFO_DUMMY(223),
-   asBCINFO_DUMMY(224),
-   asBCINFO_DUMMY(225),
-   asBCINFO_DUMMY(226),
-   asBCINFO_DUMMY(227),
-   asBCINFO_DUMMY(228),
-   asBCINFO_DUMMY(229),
-   asBCINFO_DUMMY(230),
-   asBCINFO_DUMMY(231),
-   asBCINFO_DUMMY(232),
-   asBCINFO_DUMMY(233),
-   asBCINFO_DUMMY(234),
-   asBCINFO_DUMMY(235),
-   asBCINFO_DUMMY(236),
-   asBCINFO_DUMMY(237),
-   asBCINFO_DUMMY(238),
-   asBCINFO_DUMMY(239),
-   asBCINFO_DUMMY(240),
-   asBCINFO_DUMMY(241),
-   asBCINFO_DUMMY(242),
-   asBCINFO_DUMMY(243),
-   asBCINFO_DUMMY(244),
-   asBCINFO_DUMMY(245),
-   asBCINFO_DUMMY(246),
-   asBCINFO_DUMMY(247),
-   asBCINFO_DUMMY(248),
-   asBCINFO_DUMMY(249),
-   asBCINFO_DUMMY(250),
+	asBCINFO_DUMMY(200),
+	asBCINFO_DUMMY(201),
+	asBCINFO_DUMMY(202),
+	asBCINFO_DUMMY(203),
+	asBCINFO_DUMMY(204),
+	asBCINFO_DUMMY(205),
+	asBCINFO_DUMMY(206),
+	asBCINFO_DUMMY(207),
+	asBCINFO_DUMMY(208),
+	asBCINFO_DUMMY(209),
+	asBCINFO_DUMMY(210),
+	asBCINFO_DUMMY(211),
+	asBCINFO_DUMMY(212),
+	asBCINFO_DUMMY(213),
+	asBCINFO_DUMMY(214),
+	asBCINFO_DUMMY(215),
+	asBCINFO_DUMMY(216),
+	asBCINFO_DUMMY(217),
+	asBCINFO_DUMMY(218),
+	asBCINFO_DUMMY(219),
+	asBCINFO_DUMMY(220),
+	asBCINFO_DUMMY(221),
+	asBCINFO_DUMMY(222),
+	asBCINFO_DUMMY(223),
+	asBCINFO_DUMMY(224),
+	asBCINFO_DUMMY(225),
+	asBCINFO_DUMMY(226),
+	asBCINFO_DUMMY(227),
+	asBCINFO_DUMMY(228),
+	asBCINFO_DUMMY(229),
+	asBCINFO_DUMMY(230),
+	asBCINFO_DUMMY(231),
+	asBCINFO_DUMMY(232),
+	asBCINFO_DUMMY(233),
+	asBCINFO_DUMMY(234),
+	asBCINFO_DUMMY(235),
+	asBCINFO_DUMMY(236),
+	asBCINFO_DUMMY(237),
+	asBCINFO_DUMMY(238),
+	asBCINFO_DUMMY(239),
+	asBCINFO_DUMMY(240),
+	asBCINFO_DUMMY(241),
+	asBCINFO_DUMMY(242),
+	asBCINFO_DUMMY(243),
+	asBCINFO_DUMMY(244),
+	asBCINFO_DUMMY(245),
+	asBCINFO_DUMMY(246),
+	asBCINFO_DUMMY(247),
+	asBCINFO_DUMMY(248),
+	asBCINFO_DUMMY(249),
+	asBCINFO_DUMMY(250),
 
-   asBCINFO(VarDecl,      W_ARG,         0),
-   asBCINFO(Block,         INFO,         0),
-   asBCINFO(ObjInfo,      rW_DW_ARG,      0),
-   asBCINFO(LINE,         INFO,         0),
-   asBCINFO(LABEL,         INFO,         0)
+	asBCINFO(VarDecl,		W_ARG,			0),
+	asBCINFO(Block,			INFO,			0),
+	asBCINFO(ObjInfo,		rW_DW_ARG,		0),
+	asBCINFO(LINE,			INFO,			0),
+	asBCINFO(LABEL,			INFO,			0)
 };
 
 // Macros to access bytecode instruction arguments
diff --git a/lib/angelscript/projects/cmake/CMakeLists.txt b/lib/angelscript/projects/cmake/CMakeLists.txt
index cce6b8d2e..b3e3cea1e 100644
--- a/lib/angelscript/projects/cmake/CMakeLists.txt
+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
@@ -1,116 +1,155 @@
+cmake_minimum_required(VERSION 2.6)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 cmake_policy(SET CMP0003 NEW)
 
+project(angelscript)
+
+option(BUILD_SHARED_LIBS "Build shared library" OFF)
+
+if(APPLE)
+    option(BUILD_FRAMEWORK "Build Framework bundle for OSX" OFF)
+endif()
+
+set(ANGELSCRIPT_VERSION_MAJOR 2)
+set(ANGELSCRIPT_VERSION_MINOR 30)
+set(ANGELSCRIPT_VERSION_PATCH 0)
+set(PROJECT_VERSION ${ANGELSCRIPT_VERSION_MAJOR}.${ANGELSCRIPT_VERSION_MINOR}.${ANGELSCRIPT_VERSION_PATCH})
+
+find_package(Threads)
+
+set(ANGELSCRIPT_HEADERS
+    ../../include/angelscript.h
+    ../../source/as_array.h
+    ../../source/as_builder.h
+    ../../source/as_bytecode.h
+    ../../source/as_callfunc.h
+    ../../source/as_compiler.h
+    ../../source/as_config.h
+    ../../source/as_configgroup.h
+    ../../source/as_context.h
+    ../../source/as_criticalsection.h
+    ../../source/as_datatype.h
+    ../../source/as_debug.h
+    ../../source/as_generic.h
+    ../../source/as_map.h
+    ../../source/as_memory.h
+    ../../source/as_module.h
+    ../../source/as_objecttype.h
+    ../../source/as_outputbuffer.h
+    ../../source/as_parser.h
+    ../../source/as_property.h
+    ../../source/as_restore.h
+    ../../source/as_scriptcode.h
+    ../../source/as_scriptengine.h
+    ../../source/as_scriptfunction.h
+    ../../source/as_scriptnode.h
+    ../../source/as_scriptobject.h
+    ../../source/as_string.h
+    ../../source/as_string_util.h
+    ../../source/as_texts.h
+    ../../source/as_thread.h
+    ../../source/as_tokendef.h
+    ../../source/as_tokenizer.h
+    ../../source/as_typeinfo.h
+    ../../source/as_variablescope.h
+)
+
 set(ANGELSCRIPT_SOURCE
-        ../../source/as_atomic.cpp
-        ../../source/as_builder.cpp
-        ../../source/as_bytecode.cpp
-        ../../source/as_callfunc.cpp
-        ../../source/as_callfunc_x86.cpp
-        ../../source/as_callfunc_x64_gcc.cpp
-        ../../source/as_callfunc_x64_msvc.cpp
-        ../../source/as_callfunc_x64_mingw.cpp
-        ../../source/as_compiler.cpp
-        ../../source/as_configgroup.cpp
-        ../../source/as_context.cpp
-        ../../source/as_datatype.cpp
-        ../../source/as_gc.cpp
-        ../../source/as_generic.cpp
-        ../../source/as_globalproperty.cpp
-        ../../source/as_memory.cpp
-        ../../source/as_module.cpp
-        ../../source/as_objecttype.cpp
-        ../../source/as_outputbuffer.cpp
-        ../../source/as_parser.cpp
-        ../../source/as_restore.cpp
-        ../../source/as_scriptcode.cpp
-        ../../source/as_scriptengine.cpp
-        ../../source/as_scriptfunction.cpp
-        ../../source/as_scriptnode.cpp
-        ../../source/as_scriptobject.cpp
-        ../../source/as_string.cpp
-        ../../source/as_string_util.cpp
-        ../../source/as_thread.cpp
-        ../../source/as_tokenizer.cpp
-        ../../source/as_typeinfo.cpp
-        ../../source/as_variablescope.cpp
+    ../../source/as_atomic.cpp
+    ../../source/as_builder.cpp
+    ../../source/as_bytecode.cpp
+    ../../source/as_callfunc.cpp
+    ../../source/as_callfunc_x86.cpp
+    ../../source/as_callfunc_x64_gcc.cpp
+    ../../source/as_callfunc_x64_msvc.cpp
+    ../../source/as_callfunc_x64_mingw.cpp
+    ../../source/as_compiler.cpp
+    ../../source/as_configgroup.cpp
+    ../../source/as_context.cpp
+    ../../source/as_datatype.cpp
+    ../../source/as_gc.cpp
+    ../../source/as_generic.cpp
+    ../../source/as_globalproperty.cpp
+    ../../source/as_memory.cpp
+    ../../source/as_module.cpp
+    ../../source/as_objecttype.cpp
+    ../../source/as_outputbuffer.cpp
+    ../../source/as_parser.cpp
+    ../../source/as_restore.cpp
+    ../../source/as_scriptcode.cpp
+    ../../source/as_scriptengine.cpp
+    ../../source/as_scriptfunction.cpp
+    ../../source/as_scriptnode.cpp
+    ../../source/as_scriptobject.cpp
+    ../../source/as_string.cpp
+    ../../source/as_string_util.cpp
+    ../../source/as_thread.cpp
+    ../../source/as_tokenizer.cpp
+    ../../source/as_typeinfo.cpp
+    ../../source/as_variablescope.cpp
 )
 
 if(MSVC AND CMAKE_CL_64)
-            enable_language(ASM_MASM)
-            if(CMAKE_ASM_MASM_COMPILER_WORKS)
-                            set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_x64_msvc_asm.asm)
-            else()
-                            message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
-            endif()
+    enable_language(ASM_MASM)
+    if(CMAKE_ASM_MASM_COMPILER_WORKS)
+        set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_x64_msvc_asm.asm)
+    else()
+        message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
+    endif()
 endif()
 
 if(ANDROID)
-        enable_language(ASM)
-        if(CMAKE_ASM_COMPILER_WORKS)
-                set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
-        else()
-                message(FATAL ERROR "Android target requires a working assembler")
-        endif(CMAKE_ASM_COMPILER_WORKS)
+    enable_language(ASM)
+    if(CMAKE_ASM_COMPILER_WORKS)
+        set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
+    else()
+        message(FATAL ERROR "Android target requires a working assembler")
+    endif()
 endif()
 
-set(ANGELSCRIPT_HEADERS
-        ../../include/angelscript.h
-        ../../source/as_array.h
-        ../../source/as_builder.h
-        ../../source/as_bytecode.h
-        ../../source/as_callfunc.h
-        ../../source/as_compiler.h
-        ../../source/as_config.h
-        ../../source/as_configgroup.h
-        ../../source/as_context.h
-        ../../source/as_criticalsection.h
-        ../../source/as_datatype.h
-        ../../source/as_debug.h
-        ../../source/as_generic.h
-        ../../source/as_map.h
-        ../../source/as_memory.h
-        ../../source/as_module.h
-        ../../source/as_objecttype.h
-        ../../source/as_outputbuffer.h
-        ../../source/as_parser.h
-        ../../source/as_property.h
-        ../../source/as_restore.h
-        ../../source/as_scriptcode.h
-        ../../source/as_scriptengine.h
-        ../../source/as_scriptfunction.h
-        ../../source/as_scriptnode.h
-        ../../source/as_scriptobject.h
-        ../../source/as_string.h
-        ../../source/as_string_util.h
-        ../../source/as_texts.h
-        ../../source/as_thread.h
-        ../../source/as_tokendef.h
-        ../../source/as_tokenizer.h
-        ../../source/as_typeinfo.h
-        ../../source/as_variablescope.h
-)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 
-add_definitions("-D_CRT_SECURE_NO_WARNINGS -DANGELSCRIPT_EXPORT -D_LIB")
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)    
+endif()
+
+add_definitions(-DANGELSCRIPT_EXPORT -D_LIB)
 
 # Fix x64 issues on Linux
 if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
-        add_definitions(-fPIC)
+    add_definitions(-fPIC)
 endif()
 
-add_library(angelscript STATIC ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
+if(NOT BUILD_FRAMEWORK)
+    set(ANGELSCRIPT_LIBRARY_NAME angelscript)
+else()
+    set(ANGELSCRIPT_LIBRARY_NAME Angelscript) # OS X frameworks should have capitalized name
+    set(BUILD_SHARED_LIBS TRUE)
+endif()
 
-#set(LIBRARY_OUTPUT_PATH  ${PROJECT_SOURCE_DIR}/../../lib)
+add_library(${ANGELSCRIPT_LIBRARY_NAME} ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT})
 
-#find_package(Threads)
-#target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT})
+set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
 
-#if(MSVC)
-#        set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP")
-#endif(MSVC)
+if(BUILD_FRAMEWORK)
+    set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES
+        FRAMEWORK TRUE
+        FRAMEWORK_VERSION ${PROJECT_VERSION}
+        MACOSX_FRAMEWORK_IDENTIFIER com.angelcode.Angelscript
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
+        MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
+        XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+        PUBLIC_HEADER ../../include/angelscript.h
+    )
+endif()
 
-#set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin)
+if(MSVC)
+    set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "/MP")
+endif()
+
+set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin)
 
 
diff --git a/lib/angelscript/source/as_array.h b/lib/angelscript/source/as_array.h
index 5f47de478..e1487e48d 100644
--- a/lib/angelscript/source/as_array.h
+++ b/lib/angelscript/source/as_array.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -47,46 +47,46 @@ template <class T> class asCArray
 public:
 	asCArray();
 	asCArray(const asCArray<T> &);
-	asCArray(size_t reserve);
+	asCArray(asUINT reserve);
 	~asCArray();
 
-	void   Allocate(size_t numElements, bool keepData);
-	void   AllocateNoConstruct(size_t numElements, bool keepData);
-	size_t GetCapacity() const;
+	void   Allocate(asUINT numElements, bool keepData);
+	void   AllocateNoConstruct(asUINT numElements, bool keepData);
+	asUINT GetCapacity() const;
 
 	void PushLast(const T &element);
 	T    PopLast();
 
-	bool   SetLength(size_t numElements);
-	bool   SetLengthNoConstruct(size_t numElements);
-	size_t GetLength() const;
+	bool   SetLength(asUINT numElements);
+	bool   SetLengthNoConstruct(asUINT numElements);
+	asUINT GetLength() const;
 
-	void         Copy(const T*, size_t count);
+	void         Copy(const T*, asUINT count);
 	asCArray<T> &operator =(const asCArray<T> &);
 	void         SwapWith(asCArray<T> &other);
 
-	const T &operator [](size_t index) const;
-	T       &operator [](size_t index);
+	const T &operator [](asUINT index) const;
+	T       &operator [](asUINT index);
 	T       *AddressOf();
 	const T *AddressOf() const;
 
-	void Concatenate(const asCArray<T> &);
+	bool Concatenate(const asCArray<T> &);
 	void Concatenate(T*, unsigned int count);
 
 	bool Exists(const T &element) const;
 	int  IndexOf(const T &element) const;
-	void RemoveIndex(size_t index);          // Removes the entry without reordering the array
+	void RemoveIndex(asUINT index);          // Removes the entry without reordering the array
 	void RemoveValue(const T &element);      // Removes the value without reordering the array
-	void RemoveIndexUnordered(size_t index); // Removes the entry without keeping the order
+	void RemoveIndexUnordered(asUINT index); // Removes the entry without keeping the order
 
 	bool operator==(const asCArray<T> &) const;
 	bool operator!=(const asCArray<T> &) const;
 
 protected:
 	T      *array;
-	size_t  length;
-	size_t  maxLength;
-	char    buf[8];
+	asUINT  length;                  // 32bits is enough for all uses of this array
+	asUINT  maxLength;
+	char    buf[2*4*AS_PTR_SIZE];    // Avoid dynamically allocated memory for tiny arrays
 };
 
 // Implementation
@@ -122,7 +122,7 @@ asCArray<T>::asCArray(const asCArray<T> &copy)
 }
 
 template <class T>
-asCArray<T>::asCArray(size_t reserve)
+asCArray<T>::asCArray(asUINT reserve)
 {
 	array     = 0;
 	length    = 0;
@@ -139,13 +139,13 @@ asCArray<T>::~asCArray(void)
 }
 
 template <class T>
-size_t asCArray<T>::GetLength() const
+asUINT asCArray<T>::GetLength() const
 {
 	return length;
 }
 
 template <class T>
-const T &asCArray<T>::operator [](size_t index) const
+const T &asCArray<T>::operator [](asUINT index) const
 {
 	asASSERT(index < length);
 
@@ -153,7 +153,7 @@ const T &asCArray<T>::operator [](size_t index) const
 }
 
 template <class T>
-T &asCArray<T>::operator [](size_t index)
+T &asCArray<T>::operator [](asUINT index)
 {
 	asASSERT(index < length);
 
@@ -189,7 +189,7 @@ T asCArray<T>::PopLast()
 }
 
 template <class T>
-void asCArray<T>::Allocate(size_t numElements, bool keepData)
+void asCArray<T>::Allocate(asUINT numElements, bool keepData)
 {
 	// We have 4 situations
 	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
@@ -200,7 +200,7 @@ void asCArray<T>::Allocate(size_t numElements, bool keepData)
 	T *tmp = 0;
 	if( numElements )
 	{
-		if( sizeof(T)*numElements <= 8 )
+		if( sizeof(T)*numElements <= sizeof(buf) )
 			// Use the internal buffer
 			tmp = reinterpret_cast<T*>(buf);
 		else
@@ -217,20 +217,20 @@ void asCArray<T>::Allocate(size_t numElements, bool keepData)
 		if( array == tmp )
 		{
 			// Construct only the newly allocated elements
-			for( size_t n = length; n < numElements; n++ )
+			for( asUINT n = length; n < numElements; n++ )
 				new (&tmp[n]) T();
 		}
 		else
 		{
 			// Construct all elements
-			for( size_t n = 0; n < numElements; n++ )
+			for( asUINT n = 0; n < numElements; n++ )
 				new (&tmp[n]) T();
 		}
 	}
 
 	if( array )
 	{	
-		size_t oldLength = length;
+		asUINT oldLength = length;
 
 		if( array == tmp )
 		{
@@ -243,7 +243,7 @@ void asCArray<T>::Allocate(size_t numElements, bool keepData)
 				length = 0;
 
 			// Call the destructor for elements that are no longer used
-			for( size_t n = length; n < oldLength; n++ )
+			for( asUINT n = length; n < oldLength; n++ )
 				array[n].~T();
 		}
 		else
@@ -253,14 +253,14 @@ void asCArray<T>::Allocate(size_t numElements, bool keepData)
 				if( length > numElements )
 					length = numElements;
 
-				for( size_t n = 0; n < length; n++ )
+				for( asUINT n = 0; n < length; n++ )
 					tmp[n] = array[n];
 			}
 			else
 				length = 0;
 
 			// Call the destructor for all elements
-			for( size_t n = 0; n < oldLength; n++ )
+			for( asUINT n = 0; n < oldLength; n++ )
 				array[n].~T();
 
 			if( array != reinterpret_cast<T*>(buf) )
@@ -273,7 +273,7 @@ void asCArray<T>::Allocate(size_t numElements, bool keepData)
 }
 
 template <class T>
-void asCArray<T>::AllocateNoConstruct(size_t numElements, bool keepData)
+void asCArray<T>::AllocateNoConstruct(asUINT numElements, bool keepData)
 {
 	// We have 4 situations
 	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
@@ -284,7 +284,7 @@ void asCArray<T>::AllocateNoConstruct(size_t numElements, bool keepData)
 	T *tmp = 0;
 	if( numElements )
 	{
-		if( sizeof(T)*numElements <= 8 )
+		if( sizeof(T)*numElements <= sizeof(buf) )
 			// Use the internal buffer
 			tmp = reinterpret_cast<T*>(buf);
 		else
@@ -333,13 +333,13 @@ void asCArray<T>::AllocateNoConstruct(size_t numElements, bool keepData)
 }
 
 template <class T>
-size_t asCArray<T>::GetCapacity() const
+asUINT asCArray<T>::GetCapacity() const
 {
 	return maxLength;
 }
 
 template <class T>
-bool asCArray<T>::SetLength(size_t numElements)
+bool asCArray<T>::SetLength(asUINT numElements)
 {
 	if( numElements > maxLength )
 	{
@@ -356,7 +356,7 @@ bool asCArray<T>::SetLength(size_t numElements)
 }
 
 template <class T>
-bool asCArray<T>::SetLengthNoConstruct(size_t numElements)
+bool asCArray<T>::SetLengthNoConstruct(asUINT numElements)
 {
 	if( numElements > maxLength )
 	{
@@ -373,7 +373,7 @@ bool asCArray<T>::SetLengthNoConstruct(size_t numElements)
 }
 
 template <class T>
-void asCArray<T>::Copy(const T *data, size_t count)
+void asCArray<T>::Copy(const T *data, asUINT count)
 {
 	if( maxLength < count )
 	{
@@ -385,7 +385,7 @@ void asCArray<T>::Copy(const T *data, size_t count)
 		}
 	}
 
-	for( size_t n = 0; n < count; n++ )
+	for( asUINT n = 0; n < count; n++ )
 		array[n] = data[n];
 
 	length = count;
@@ -403,8 +403,8 @@ template <class T>
 void asCArray<T>::SwapWith(asCArray<T> &other)
 {
 	T      *tmpArray = array;
-	size_t  tmpLength = length;
-	size_t  tmpMaxLength = maxLength;
+	asUINT  tmpLength = length;
+	asUINT  tmpMaxLength = maxLength;
 	char    tmpBuf[sizeof(buf)];
 	memcpy(tmpBuf, buf, sizeof(buf));
 
@@ -430,7 +430,7 @@ bool asCArray<T>::operator ==(const asCArray<T> &other) const
 {
 	if( length != other.length ) return false;
 
-	for( size_t n = 0; n < length; n++ )
+	for( asUINT n = 0; n < length; n++ )
 		if( array[n] != other.array[n] )
 			return false;
 
@@ -443,16 +443,28 @@ bool asCArray<T>::operator !=(const asCArray<T> &other) const
 	return !(*this == other);
 }
 
+
+// Returns false if the concatenation wasn't successful due to out of memory
 template <class T>
-void asCArray<T>::Concatenate(const asCArray<T> &other)
+bool asCArray<T>::Concatenate(const asCArray<T> &other)
 {
 	if( maxLength < length + other.length )
+	{
 		Allocate(length + other.length, true);
+		if( maxLength < length + other.length )
+		{
+			// Out of memory
+			return false;
+		}
+	}
 
-	for( size_t n = 0; n < other.length; n++ )
+	for( asUINT n = 0; n < other.length; n++ )
 		array[length+n] = other.array[n];
 
 	length += other.length;
+
+	// Success
+	return true;
 }
 
 template <class T>
@@ -471,18 +483,18 @@ bool asCArray<T>::Exists(const T &e) const
 template <class T>
 int asCArray<T>::IndexOf(const T &e) const
 {
-	for( size_t n = 0; n < length; n++ )
+	for( asUINT n = 0; n < length; n++ )
 		if( array[n] == e ) return static_cast<int>(n);
 
 	return -1;
 }
 
 template <class T>
-void asCArray<T>::RemoveIndex(size_t index)
+void asCArray<T>::RemoveIndex(asUINT index)
 {
 	if( index < length )
 	{
-		for( size_t n = index; n < length-1; n++ )
+		for( asUINT n = index; n < length-1; n++ )
 			array[n] = array[n+1];
 
 		PopLast();
@@ -492,7 +504,7 @@ void asCArray<T>::RemoveIndex(size_t index)
 template <class T>
 void asCArray<T>::RemoveValue(const T &e)
 {
-	for( size_t n = 0; n < length; n++ )
+	for( asUINT n = 0; n < length; n++ )
 	{
 		if( array[n] == e )
 		{
@@ -503,7 +515,7 @@ void asCArray<T>::RemoveValue(const T &e)
 }
 
 template <class T>
-void asCArray<T>::RemoveIndexUnordered(size_t index)
+void asCArray<T>::RemoveIndexUnordered(asUINT index)
 {
 	if( index == length - 1 )
 		PopLast();
diff --git a/lib/angelscript/source/as_atomic.cpp b/lib/angelscript/source/as_atomic.cpp
index 7b635f806..e110b3fc9 100644
--- a/lib/angelscript/source/as_atomic.cpp
+++ b/lib/angelscript/source/as_atomic.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -45,21 +45,37 @@ asCAtomic::asCAtomic()
 
 asDWORD asCAtomic::get() const
 {
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
 	return value;
 }
 
 void asCAtomic::set(asDWORD val)
 {
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
 	value = val;
 }
 
 asDWORD asCAtomic::atomicInc()
 {
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
 	return asAtomicInc((int&)value);
 }
 
 asDWORD asCAtomic::atomicDec()
 {
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
 	return asAtomicDec((int&)value);
 }
 
diff --git a/lib/angelscript/source/as_builder.cpp b/lib/angelscript/source/as_builder.cpp
index 5c1cd7ca7..a7c630411 100644
--- a/lib/angelscript/source/as_builder.cpp
+++ b/lib/angelscript/source/as_builder.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -55,8 +55,8 @@ BEGIN_AS_NAMESPACE
 template<>
 void asCSymbolTable<sGlobalVariableDescription>::GetKey(const sGlobalVariableDescription *entry, asSNameSpaceNamePair &key) const
 {
-	asSNameSpace *ns = entry->property->nameSpace;
-	asCString name = entry->property->name;
+	asSNameSpace *ns = entry->ns;
+	asCString name = entry->name;
 	key = asSNameSpaceNamePair(ns, name);
 }
 
@@ -80,10 +80,10 @@ private:
 
 #endif
 
-asCBuilder::asCBuilder(asCScriptEngine *engine, asCModule *module)
+asCBuilder::asCBuilder(asCScriptEngine *_engine, asCModule *_module)
 {
-	this->engine = engine;
-	this->module = module;
+	this->engine = _engine;
+	this->module = _module;
 	silent = false;
 }
 
@@ -98,9 +98,7 @@ asCBuilder::~asCBuilder()
 		if( functions[n] )
 		{
 			if( functions[n]->node )
-			{
 				functions[n]->node->Destroy(engine);
-			}
 
 			asDELETE(functions[n],sFunctionDescription);
 		}
@@ -125,9 +123,7 @@ asCBuilder::~asCBuilder()
 	for( n = 0; n < scripts.GetLength(); n++ )
 	{
 		if( scripts[n] )
-		{
 			asDELETE(scripts[n],asCScriptCode);
-		}
 
 		scripts[n] = 0;
 	}
@@ -138,9 +134,7 @@ asCBuilder::~asCBuilder()
 		if( classDeclarations[n] )
 		{
 			if( classDeclarations[n]->node )
-			{
 				classDeclarations[n]->node->Destroy(engine);
-			}
 
 			asDELETE(classDeclarations[n],sClassDeclaration);
 			classDeclarations[n] = 0;
@@ -152,9 +146,7 @@ asCBuilder::~asCBuilder()
 		if( interfaceDeclarations[n] )
 		{
 			if( interfaceDeclarations[n]->node )
-			{
 				interfaceDeclarations[n]->node->Destroy(engine);
-			}
 
 			asDELETE(interfaceDeclarations[n],sClassDeclaration);
 			interfaceDeclarations[n] = 0;
@@ -166,9 +158,7 @@ asCBuilder::~asCBuilder()
 		if( namedTypeDeclarations[n] )
 		{
 			if( namedTypeDeclarations[n]->node )
-			{
 				namedTypeDeclarations[n]->node->Destroy(engine);
-			}
 
 			asDELETE(namedTypeDeclarations[n],sClassDeclaration);
 			namedTypeDeclarations[n] = 0;
@@ -206,7 +196,7 @@ void asCBuilder::Reset()
 {
 	numErrors = 0;
 	numWarnings = 0;
-	preMessage.isSet = false;
+	engine->preMessage.isSet = false;
 
 #ifndef AS_NO_COMPILER
 	// Clear the cache of known types
@@ -236,15 +226,83 @@ int asCBuilder::AddCode(const char *name, const char *code, int codeLength, int
 	return 0;
 }
 
+void asCBuilder::EvaluateTemplateInstances(asUINT startIdx, bool keepSilent)
+{
+	// Backup the original message stream
+	bool                       msgCallback     = engine->msgCallback;
+	asSSystemFunctionInterface msgCallbackFunc = engine->msgCallbackFunc;
+	void                      *msgCallbackObj  = engine->msgCallbackObj;
+
+	// Set the new temporary message stream
+	asCOutputBuffer outBuffer;
+	if( keepSilent )
+		engine->SetMessageCallback(asMETHOD(asCOutputBuffer, Callback), &outBuffer, asCALL_THISCALL);
+
+	// Evaluate each of the template instances that have been created since the start of the build
+	// TODO: This is not exactly correct, since another thread may have created template instances in parallel
+	for( asUINT n = startIdx; n < engine->templateInstanceTypes.GetLength(); n++ )
+	{
+		bool dontGarbageCollect = false;
+		asCObjectType *tmpl = engine->templateInstanceTypes[n];
+		asCScriptFunction *callback = engine->scriptFunctions[tmpl->beh.templateCallback];
+		if( callback && !engine->CallGlobalFunctionRetBool(tmpl, &dontGarbageCollect, callback->sysFuncIntf, callback) )
+		{
+			asCString sub = tmpl->templateSubTypes[0].Format(engine->nameSpaces[0]);
+			for( asUINT n = 1; n < tmpl->templateSubTypes.GetLength(); n++ )
+			{
+				sub += ",";
+				sub += tmpl->templateSubTypes[n].Format(engine->nameSpaces[0]);
+			}
+			asCString str;
+			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, tmpl->name.AddressOf(), sub.AddressOf());
+			WriteError(tmpl->scriptSectionIdx >= 0 ? engine->scriptSectionNames[tmpl->scriptSectionIdx]->AddressOf() : "", str, tmpl->declaredAt&0xFFFFF, (tmpl->declaredAt>>20)&0xFFF);
+		}
+		else
+		{
+			// If the callback said this template instance won't be garbage collected then remove the flag
+			if( dontGarbageCollect )
+				tmpl->flags &= ~asOBJ_GC;
+		}
+	}
+
+	// Restore message callback
+	if( keepSilent )
+	{
+		engine->msgCallback     = msgCallback;
+		engine->msgCallbackFunc = msgCallbackFunc;
+		engine->msgCallbackObj  = msgCallbackObj;
+	}
+}
+
 int asCBuilder::Build()
 {
 	Reset();
 
+	// The template callbacks must only be called after the subtypes have a known structure,
+	// otherwise the callback may think it is not possible to create the template instance, 
+	// even though it is.
+	// TODO: This flag shouldn't be set globally in the engine, as it would mean that another 
+	//       thread requesting a template instance in parallel to the compilation wouldn't 
+	//       evaluate the template instance. 
+	engine->deferValidationOfTemplateTypes = true;
+	asUINT numTempl = (asUINT)engine->templateInstanceTypes.GetLength();
+
 	ParseScripts();
 
+	// Compile the types first
 	CompileInterfaces();
-	CompileClasses();
+	CompileClasses(numTempl);
+
+	// Evaluate the template instances one last time, this time with error messages, as we know 
+	// all classes have been fully built and it is known which ones will need garbage collection.
+	EvaluateTemplateInstances(numTempl, false);
+	engine->deferValidationOfTemplateTypes = false;
+
+	// Then the global variables. Here the variables declared with auto
+	// will be resolved, so they can be accessed properly in the functions
 	CompileGlobalVariables();
+
+	// Finally the global functions and class methods
 	CompileFunctions();
 
 	// TODO: Attempt to reorder the initialization of global variables so that
@@ -341,6 +399,64 @@ int asCBuilder::ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node,
 }
 
 #ifndef AS_NO_COMPILER
+// This function will verify if the newly created function will conflict another overload due to having
+// identical function arguments that are not default args, e.g: foo(int) and foo(int, int=0)
+int asCBuilder::CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType)
+{
+	// TODO: Implement for global functions too
+	if( func->objectType == 0 || objType == 0 ) return 0;
+
+	asCArray<int> funcs;
+	GetObjectMethodDescriptions(func->name.AddressOf(), objType, funcs, false);
+	for( asUINT n = 0; n < funcs.GetLength(); n++ )
+	{
+		asCScriptFunction *func2 = engine->scriptFunctions[funcs[n]];
+		if( func == func2 )
+			continue;
+
+		if( func->IsReadOnly() != func2->IsReadOnly() )
+			continue;
+
+		bool match = true;
+		asUINT p = 0;
+		for( ; p < func->parameterTypes.GetLength() && p < func2->parameterTypes.GetLength(); p++ )
+		{
+			// Only verify until the first argument with default args
+			if( (func->defaultArgs.GetLength() > p && func->defaultArgs[p]) ||
+				(func2->defaultArgs.GetLength() > p && func2->defaultArgs[p]) )
+				break;
+
+			if( func->parameterTypes[p] != func2->parameterTypes[p] ||
+				func->inOutFlags[p] != func2->inOutFlags[p] )
+			{
+				match = false;
+				break;
+			}
+		}
+
+		if( match )
+		{
+			if( !((p >= func->parameterTypes.GetLength() && p < func2->defaultArgs.GetLength() && func2->defaultArgs[p]) ||
+				  (p >= func2->parameterTypes.GetLength() && p < func->defaultArgs.GetLength() && func->defaultArgs[p])) )
+			{
+				// The argument lists match for the full length of the shorter, but the next
+				// argument on the longer does not have a default arg so there is no conflict
+				match = false;
+			}
+		}
+
+		if( match )
+		{
+			WriteWarning(TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS, script, node);
+			WriteInfo(func->GetDeclaration(), script, node);
+			WriteInfo(func2->GetDeclaration(), script, node);
+			break;
+		}
+	}
+
+	return 0;
+}
+
 int asCBuilder::CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asCScriptFunction **outFunc)
 {
 	asASSERT(outFunc != 0);
@@ -378,13 +494,12 @@ int asCBuilder::CompileFunction(const char *sectionName, const char *code, int l
 	node = node->firstChild;
 
 	// Create the function
-	bool isConstructor, isDestructor, isPrivate, isFinal, isOverride, isShared;
+	bool isConstructor, isDestructor, isPrivate, isProtected, isFinal, isOverride, isShared;
 	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, compileFlags & asCOMP_ADD_TO_MODULE ? module : 0, asFUNC_SCRIPT);
 	if( func == 0 )
 		return asOUT_OF_MEMORY;
 
-	asCArray<asCString> parameterNames;
-	GetParsedFunctionDetails(node, scripts[0], 0, func->name, func->returnType, parameterNames, func->parameterTypes, func->inOutFlags, func->defaultArgs, func->isReadOnly, isConstructor, isDestructor, isPrivate, isFinal, isOverride, isShared, module->defaultNamespace);
+	GetParsedFunctionDetails(node, scripts[0], 0, func->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, func->defaultArgs, func->isReadOnly, isConstructor, isDestructor, isPrivate, isProtected, isFinal, isOverride, isShared, module->defaultNamespace);
 	func->id                           = engine->GetNextScriptFunctionId();
 	func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
 	int row, col;
@@ -396,7 +511,7 @@ int asCBuilder::CompileFunction(const char *sectionName, const char *code, int l
 	int r = ValidateDefaultArgs(script, node, func);
 	if( r < 0 )
 	{
-		func->Release();
+		func->ReleaseInternal();
 		return asERROR;
 	}
 
@@ -406,23 +521,23 @@ int asCBuilder::CompileFunction(const char *sectionName, const char *code, int l
 		int r = CheckNameConflict(func->name.AddressOf(), node, scripts[0], module->defaultNamespace);
 		if( r < 0 )
 		{
-			func->Orphan(module);
+			func->ReleaseInternal();
 			return asERROR;
 		}
 
 		module->globalFunctions.Put(func);
-		func->AddRef();
+		
 		module->AddScriptFunction(func);
 	}
 	else
-		engine->SetScriptFunction(func);
+		engine->AddScriptFunction(func);
 
 	// Fill in the function info for the builder too
 	node->DisconnectParent();
 	sFunctionDescription *funcDesc = asNEW(sFunctionDescription);
 	if( funcDesc == 0 )
 	{
-		func->Release();
+		func->ReleaseInternal();
 		return asOUT_OF_MEMORY;
 	}
 
@@ -431,11 +546,11 @@ int asCBuilder::CompileFunction(const char *sectionName, const char *code, int l
 	funcDesc->node              = node;
 	funcDesc->name              = func->name;
 	funcDesc->funcId            = func->id;
-	funcDesc->paramNames        = parameterNames;
+	funcDesc->paramNames        = func->parameterNames;
 	funcDesc->isExistingShared  = false;
 
 	asCCompiler compiler(engine);
-	compiler.CompileFunction(this, functions[0]->script, parameterNames, functions[0]->node, func, 0);
+	compiler.CompileFunction(this, functions[0]->script, func->parameterNames, functions[0]->node, func, 0);
 
 	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
 		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
@@ -447,11 +562,10 @@ int asCBuilder::CompileFunction(const char *sectionName, const char *code, int l
 		{
 			module->globalFunctions.Erase(module->globalFunctions.GetIndex(func));
 			module->scriptFunctions.RemoveValue(func);
-			func->Release();
-			func->Orphan(module);
+			func->ReleaseInternal();
 		}
 
-		func->Release();
+		func->ReleaseInternal();
 
 		return asERROR;
 	}
@@ -493,9 +607,7 @@ void asCBuilder::ParseScripts()
 
 		// Register the complete function definitions
 		for( n = 0; n < funcDefs.GetLength(); n++ )
-		{
 			CompleteFuncDef(funcDefs[n]);
-		}
 
 		// Register script methods found in the interfaces
 		for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
@@ -565,20 +677,20 @@ void asCBuilder::ParseScripts()
 					// As the class has another constructor we shouldn't provide the default constructor
 					if( decl->objType->beh.construct )
 					{
-						engine->scriptFunctions[decl->objType->beh.construct]->Release();
+						engine->scriptFunctions[decl->objType->beh.construct]->ReleaseInternal();
 						decl->objType->beh.construct = 0;
 						decl->objType->beh.constructors.RemoveIndex(0);
 					}
 					if( decl->objType->beh.factory )
 					{
-						engine->scriptFunctions[decl->objType->beh.factory]->Release();
+						engine->scriptFunctions[decl->objType->beh.factory]->ReleaseInternal();
 						decl->objType->beh.factory = 0;
 						decl->objType->beh.factories.RemoveIndex(0);
 					}
 					// Only remove the opAssign method if the script hasn't provided one
 					if( decl->objType->beh.copy == engine->scriptTypeBehaviours.beh.copy )
 					{
-						engine->scriptFunctions[decl->objType->beh.copy]->Release();
+						engine->scriptFunctions[decl->objType->beh.copy]->ReleaseInternal();
 						decl->objType->beh.copy = 0;
 					}
 				}
@@ -745,7 +857,7 @@ void asCBuilder::CompileFunctions()
 			// When compiling a constructor need to pass the class declaration for member initializations
 			compiler.CompileFunction(this, current->script, current->paramNames, current->node, func, classDecl);
 
-			preMessage.isSet = false;
+			engine->preMessage.isSet = false;
 		}
 		else if( current->objType && current->name == current->objType->name )
 		{
@@ -763,7 +875,7 @@ void asCBuilder::CompileFunctions()
 			// automatically if not implemented by the user.
 			compiler.CompileDefaultConstructor(this, current->script, node, func, classDecl);
 
-			preMessage.isSet = false;
+			engine->preMessage.isSet = false;
 		}
 		else
 		{
@@ -815,7 +927,7 @@ int asCBuilder::ParseTemplateDecl(const char *decl, asCString *name, asCArray<as
 	asCScriptNode *node = parser.GetScriptNode()->firstChild;
 
 	name->Assign(&decl[node->tokenPos], node->tokenLength);
-	while( (node = node->next) )
+	while( (node = node->next) != 0 )
 	{
 		asCString subtypeName;
 		subtypeName.Assign(&decl[node->tokenPos], node->tokenLength);
@@ -864,8 +976,8 @@ int asCBuilder::VerifyProperty(asCDataType *dt, const char *decl, asCString &nam
 	name.Assign(&decl[nameNode->tokenPos], nameNode->tokenLength);
 
 	// Validate that the type really can be a registered property
-	// We cannot use CanBeInstanciated, as it is allowed to register
-	// properties of type that cannot otherwise be instanciated
+	// We cannot use CanBeInstantiated, as it is allowed to register
+	// properties of type that cannot otherwise be instantiated
 	if( type.GetFuncDef() && !type.IsObjectHandle() )
 	{
 		// Function definitions must always be handles
@@ -912,32 +1024,20 @@ asCObjectProperty *asCBuilder::GetObjectProperty(asCDataType &obj, const char *p
 }
 #endif
 
-asCGlobalProperty *asCBuilder::GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp)
+bool asCBuilder::DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp, sGlobalVariableDescription **outDesc, bool *isAppProp)
 {
-	if( isCompiled )     *isCompiled     = true;
-	if( isPureConstant ) *isPureConstant = false;
-	if( isAppProp )      *isAppProp      = false;
+	if( outProp )   *outProp = 0;
+	if( outDesc )   *outDesc = 0;
+	if( isAppProp ) *isAppProp = false;
 
 	// Check application registered properties
 	asCString name(prop);
 	asCGlobalProperty *globProp = engine->registeredGlobalProps.GetFirst(ns, name);
 	if( globProp )
 	{
-		if( module )
-		{
-			// Determine if the module has access to the property
-			if( module->accessMask & globProp->accessMask )
-			{
-				if( isAppProp ) *isAppProp = true;
-				return globProp;
-			}
-		}
-		else
-		{
-			// We're not compiling a module right now, so it must be a registered global property
-			if( isAppProp ) *isAppProp = true;
-			return globProp;
-		}
+		if( isAppProp ) *isAppProp = true;
+		if( outProp )   *outProp   = globProp;
+		return true;
 	}
 
 #ifndef AS_NO_COMPILER
@@ -945,18 +1045,55 @@ asCGlobalProperty *asCBuilder::GetGlobalProperty(const char *prop, asSNameSpace
 	sGlobalVariableDescription* desc = globVariables.GetFirst(ns, prop);
 	if( desc && !desc->isEnumValue )
 	{
-		if( isCompiled )     *isCompiled     = desc->isCompiled;
-		if( isPureConstant ) *isPureConstant = desc->isPureConstant;
-		if( constantValue  ) *constantValue  = desc->constantValue;
-		return desc->property;
+		if( outProp ) *outProp = desc->property;
+		if( outDesc ) *outDesc = desc;
+		return true;
 	}
-#else
-	UNUSED_VAR(constantValue);
 #endif
 
 	// Check previously compiled global variables
 	if( module )
-		return module->scriptGlobals.GetFirst(ns, prop);
+	{
+		globProp = module->scriptGlobals.GetFirst(ns, prop);
+		if( globProp )
+		{
+			if( outProp ) *outProp = globProp;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+asCGlobalProperty *asCBuilder::GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp)
+{
+	if( isCompiled )     *isCompiled     = true;
+	if( isPureConstant ) *isPureConstant = false;
+	if( isAppProp )      *isAppProp      = false;
+	if( constantValue )  *constantValue  = 0;
+
+	asCGlobalProperty          *globProp = 0;
+	sGlobalVariableDescription *globDesc = 0;
+	if( DoesGlobalPropertyExist(prop, ns, &globProp, &globDesc, isAppProp) )
+	{
+#ifndef AS_NO_COMPILER
+		if( globDesc )
+		{
+			// The property was declared in this build call, check if it has been compiled successfully already
+			if( isCompiled )     *isCompiled     = globDesc->isCompiled;
+			if( isPureConstant ) *isPureConstant = globDesc->isPureConstant;
+			if( constantValue  ) *constantValue  = globDesc->constantValue;
+		}
+		else 
+#endif
+		if( isAppProp )
+		{
+			// Don't return the property if the module doesn't have access to it
+			if( !(module->accessMask & globProp->accessMask) )
+				globProp = 0;
+		}
+		return globProp;
+	}
 
 	return 0;
 }
@@ -982,7 +1119,10 @@ int asCBuilder::ParseFunctionDeclaration(asCObjectType *objType, const char *dec
 	// Determine scope
 	asCScriptNode *n = node->firstChild->next->next;
 	asCString scope = GetScopeFromNode(n, &source, &n);
-	func->nameSpace = engine->FindNameSpace(scope.AddressOf());
+	if( scope == "::" )
+		func->nameSpace = engine->nameSpaces[0];
+	else
+		func->nameSpace = engine->FindNameSpace(scope.AddressOf());
 	if( func->nameSpace == 0 )
 		return asINVALID_DECLARATION;
 
@@ -1024,11 +1164,13 @@ int asCBuilder::ParseFunctionDeclaration(asCObjectType *objType, const char *dec
 
 	// Preallocate memory
 	func->parameterTypes.Allocate(paramCount, false);
+	func->parameterNames.SetLength(paramCount);
 	func->inOutFlags.Allocate(paramCount, false);
 	func->defaultArgs.Allocate(paramCount, false);
 	if( paramAutoHandles ) paramAutoHandles->Allocate(paramCount, false);
 
 	n = paramList->firstChild;
+	asUINT index = 0;
 	while( n )
 	{
 		asETypeModifiers inOutFlags;
@@ -1063,8 +1205,12 @@ int asCBuilder::ParseFunctionDeclaration(asCObjectType *objType, const char *dec
 
 		// Move to next parameter
 		n = n->next->next;
-		if( n && n->nodeType == snIdentifier )
+		if( n && n->nodeType == snIdentifier ) 
+		{
+			func->parameterNames[index] = asCString(&source.code[n->tokenPos], n->tokenLength);
 			n = n->next;
+		}
+		++index;
 
 		if( n && n->nodeType == snExpression )
 		{
@@ -1214,10 +1360,8 @@ int asCBuilder::CheckNameConflict(const char *name, asCScriptNode *node, asCScri
 		return -1;
 	}
 
-	// TODO: Must verify global properties in all config groups, whether the module has access or not
 	// Check against global properties
-	asCGlobalProperty *prop = GetGlobalProperty(name, ns, 0, 0, 0, 0);
-	if( prop )
+	if( DoesGlobalPropertyExist(name, ns) )
 	{
 		if( code )
 		{
@@ -1314,6 +1458,10 @@ sMixinClass *asCBuilder::GetMixinClass(const char *name, asSNameSpace *ns)
 
 int asCBuilder::RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
 {
+	// TODO: 2.30.0: redesign: Allow funcdefs to be explicitly declared as 'shared'. In this case
+	//                         an error should be given if any of the arguments/return type is not
+	//                         shared.
+
 	// Find the name
 	asASSERT( node->firstChild->nodeType == snDataType );
 	asCScriptNode *n = node->firstChild->next->next;
@@ -1355,11 +1503,11 @@ int asCBuilder::RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNam
 
 void asCBuilder::CompleteFuncDef(sFuncDef *funcDef)
 {
-	asCArray<asCString>        parameterNames;
 	asCArray<asCString *>      defaultArgs;
 	bool                       isConstMethod;
 	bool                       isConstructor;
 	bool                       isDestructor;
+	bool                       isProtected;
 	bool                       isPrivate;
 	bool                       isOverride;
 	bool                       isFinal;
@@ -1368,7 +1516,7 @@ void asCBuilder::CompleteFuncDef(sFuncDef *funcDef)
 	asCScriptFunction *func = module->funcDefs[funcDef->idx];
 	asASSERT( func );
 
-	GetParsedFunctionDetails(funcDef->node, funcDef->script, 0, funcDef->name, func->returnType, parameterNames, func->parameterTypes, func->inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isOverride, isFinal, isShared, func->nameSpace);
+	GetParsedFunctionDetails(funcDef->node, funcDef->script, 0, funcDef->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, func->nameSpace);
 
 	// There should not be any defaultArgs, but if there are any we need to delete them to avoid leaks
 	for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
@@ -1390,14 +1538,11 @@ void asCBuilder::CompleteFuncDef(sFuncDef *funcDef)
 			// Replace our funcdef for the existing one
 			funcDef->idx = f2->id;
 			module->funcDefs[module->funcDefs.IndexOf(func)] = f2;
-			f2->AddRef();
+			f2->AddRefInternal();
 
 			engine->funcDefs.RemoveValue(func);
 
-			func->Release();
-
-			// funcdefs aren't destroyed when the refCount reaches zero so we need to manually delete them
-			asDELETE(func, asCScriptFunction);
+			func->ReleaseInternal();
 			break;
 		}
 	}
@@ -1412,14 +1557,16 @@ int asCBuilder::RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSN
 	// What data type is it?
 	asCDataType type = CreateDataTypeFromNode(node->firstChild, file, ns);
 
-	if( !type.CanBeInstanciated() )
+	if( !type.CanBeInstantiated() )
 	{
 		asCString str;
-		// TODO: Change to "'type' cannot be declared as variable"
-		str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format().AddressOf());
-
-		int r, c;
-		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
+		if( type.IsAbstractClass() )
+			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
+		else if( type.IsInterface() )
+			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
+		else
+			// TODO: Improve error message to explain why
+			str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(ns).AddressOf());
 
 		WriteError(str, file, node);
 	}
@@ -1445,12 +1592,14 @@ int asCBuilder::RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSN
 		gvar->isCompiled  = false;
 		gvar->datatype    = type;
 		gvar->isEnumValue = false;
+		gvar->ns          = ns;
 
 		// TODO: Give error message if wrong
 		asASSERT(!gvar->datatype.IsReference());
 
-		gvar->property = module->AllocateGlobalProperty(name.AddressOf(), gvar->datatype, ns);
-		gvar->index    = gvar->property->id;
+		// Allocation is done when the variable is compiled, to allow for autos
+		gvar->property = 0;
+		gvar->index    = 0;
 
 		globVariables.Put(gvar);
 
@@ -1532,24 +1681,58 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 	asCScriptNode *n = node->firstChild;
 	bool isFinal = false;
 	bool isShared = false;
+	bool isAbstract = false;
 
-	if( n->tokenType == ttIdentifier && file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) )
+	// Check the class modifiers
+	while( n->tokenType == ttIdentifier )
 	{
-		isFinal = true;
-		n = n->next;
-	}
-
-	if( n->tokenType == ttIdentifier && file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN) )
-	{
-		isShared = true;
-		n = n->next;
-
-		// Check for final again
-		if( n->tokenType == ttIdentifier && file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) )
+		if( file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) )
 		{
-			isFinal = true;
-			n = n->next;
+			if( isAbstract )
+				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
+			else
+			{
+				if( isFinal )
+				{
+					asCString msg;
+					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+					WriteWarning(msg, file, n);
+				}
+				isFinal = true;
+			}
 		}
+		else if( file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN) )
+		{
+			if( isShared )
+			{
+				asCString msg;
+				msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+				WriteWarning(msg, file, n);
+			}
+			isShared = true;
+		}
+		else if( file->TokenEquals(n->tokenPos, n->tokenLength, ABSTRACT_TOKEN) )
+		{
+			if( isFinal )
+				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
+			else
+			{
+				if( isAbstract )
+				{
+					asCString msg;
+					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+					WriteWarning(msg, file, n);
+				}
+				isAbstract = true;
+			}
+		}
+		else
+		{
+			// This is the name of the class
+			break;
+		}
+
+		n = n->next;
 	}
 
 	asCString name(&file->code[n->tokenPos], n->tokenLength);
@@ -1576,9 +1759,9 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 	// creating a new one.
 	if( isShared )
 	{
-		for( asUINT n = 0; n < engine->classTypes.GetLength(); n++ )
+		for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
 		{
-			asCObjectType *st = engine->classTypes[n];
+			asCObjectType *st = engine->sharedScriptTypes[n];
 			if( st &&
 				st->IsShared() &&
 				st->name == name &&
@@ -1589,7 +1772,7 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 				decl->isExistingShared = true;
 				decl->objType          = st;
 				module->classTypes.PushLast(st);
-				st->AddRef();
+				st->AddRefInternal();
 				return 0;
 			}
 		}
@@ -1605,7 +1788,7 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 	// is known, can the flag be cleared for those objects that truly cannot
 	// form circular references. This is important because a template
 	// callback may be called with a script class before the compilation
-	// complete, and until it is known, the callback must assume the class
+	// completes, and until it is known, the callback must assume the class
 	// is garbage collected.
 	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_GC;
 
@@ -1615,6 +1798,9 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 	if( isFinal )
 		st->flags |= asOBJ_NOINHERIT;
 
+	if( isAbstract )
+		st->flags |= asOBJ_ABSTRACT;
+
 	if( node->tokenType == ttHandle )
 		st->flags |= asOBJ_IMPLICIT_HANDLE;
 
@@ -1623,28 +1809,29 @@ int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameS
 	st->nameSpace = ns;
 	st->module    = module;
 	module->classTypes.PushLast(st);
-	engine->classTypes.PushLast(st);
-	st->AddRef();
+	if( isShared )
+	{
+		engine->sharedScriptTypes.PushLast(st);
+		st->AddRefInternal();
+	}
 	decl->objType = st;
 
 	// Use the default script class behaviours
 	st->beh = engine->scriptTypeBehaviours.beh;
 
 	// TODO: Move this to asCObjectType so that the asCRestore can reuse it
-	engine->scriptFunctions[st->beh.addref]->AddRef();
-	engine->scriptFunctions[st->beh.release]->AddRef();
-	engine->scriptFunctions[st->beh.gcEnumReferences]->AddRef();
-	engine->scriptFunctions[st->beh.gcGetFlag]->AddRef();
-	engine->scriptFunctions[st->beh.gcGetRefCount]->AddRef();
-	engine->scriptFunctions[st->beh.gcReleaseAllReferences]->AddRef();
-	engine->scriptFunctions[st->beh.gcSetFlag]->AddRef();
-	engine->scriptFunctions[st->beh.copy]->AddRef();
-	engine->scriptFunctions[st->beh.factory]->AddRef();
-	engine->scriptFunctions[st->beh.construct]->AddRef();
+	engine->scriptFunctions[st->beh.addref]->AddRefInternal();
+	engine->scriptFunctions[st->beh.release]->AddRefInternal();
+	engine->scriptFunctions[st->beh.gcEnumReferences]->AddRefInternal();
+	engine->scriptFunctions[st->beh.gcGetFlag]->AddRefInternal();
+	engine->scriptFunctions[st->beh.gcGetRefCount]->AddRefInternal();
+	engine->scriptFunctions[st->beh.gcReleaseAllReferences]->AddRefInternal();
+	engine->scriptFunctions[st->beh.gcSetFlag]->AddRefInternal();
+	engine->scriptFunctions[st->beh.copy]->AddRefInternal();
+	engine->scriptFunctions[st->beh.factory]->AddRefInternal();
+	engine->scriptFunctions[st->beh.construct]->AddRefInternal();
 	// TODO: weak: Should not do this if the class has been declared with noweak
-	engine->scriptFunctions[st->beh.getWeakRefFlag]->AddRef();
-	for( asUINT i = 1; i < st->beh.operators.GetLength(); i += 2 )
-		engine->scriptFunctions[st->beh.operators[i]]->AddRef();
+	engine->scriptFunctions[st->beh.getWeakRefFlag]->AddRefInternal();
 
 	return 0;
 }
@@ -1685,9 +1872,9 @@ int asCBuilder::RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSN
 	// creating a new one.
 	if( isShared )
 	{
-		for( asUINT n = 0; n < engine->classTypes.GetLength(); n++ )
+		for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
 		{
-			asCObjectType *st = engine->classTypes[n];
+			asCObjectType *st = engine->sharedScriptTypes[n];
 			if( st &&
 				st->IsShared() &&
 				st->name == name &&
@@ -1698,7 +1885,7 @@ int asCBuilder::RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSN
 				decl->isExistingShared = true;
 				decl->objType          = st;
 				module->classTypes.PushLast(st);
-				st->AddRef();
+				st->AddRefInternal();
 				return 0;
 			}
 		}
@@ -1714,20 +1901,24 @@ int asCBuilder::RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSN
 	if( isShared )
 		st->flags |= asOBJ_SHARED;
 
-	st->size = 0; // Cannot be instanciated
+	st->size = 0; // Cannot be instantiated
 	st->name = name;
 	st->nameSpace = ns;
+	st->module = module;
 	module->classTypes.PushLast(st);
-	engine->classTypes.PushLast(st);
-	st->AddRef();
+	if( isShared )
+	{
+		engine->sharedScriptTypes.PushLast(st);
+		st->AddRefInternal();
+	}
 	decl->objType = st;
 
 	// Use the default script class behaviours
 	st->beh.construct = 0;
 	st->beh.addref = engine->scriptTypeBehaviours.beh.addref;
-	engine->scriptFunctions[st->beh.addref]->AddRef();
+	engine->scriptFunctions[st->beh.addref]->AddRefInternal();
 	st->beh.release = engine->scriptTypeBehaviours.beh.release;
-	engine->scriptFunctions[st->beh.release]->AddRef();
+	engine->scriptFunctions[st->beh.release]->AddRefInternal();
 	st->beh.copy = 0;
 
 	return 0;
@@ -1793,7 +1984,7 @@ void asCBuilder::CompileGlobalVariables()
 			{
 				int r, c;
 				gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &r, &c);
-				asCString str = gvar->datatype.Format();
+				asCString str = gvar->datatype.Format(gvar->ns);
 				str += " " + gvar->name;
 				str.Format(TXT_COMPILING_s, str.AddressOf());
 				WriteInfo(gvar->script->name, str, r, c, true);
@@ -1841,7 +2032,7 @@ void asCBuilder::CompileGlobalVariables()
 								int row, col;
 								gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &row, &col);
 
-								asCString str = gvar->datatype.Format();
+								asCString str = gvar->datatype.Format(gvar->ns);
 								str += " " + gvar->name;
 								str.Format(TXT_COMPILING_s, str.AddressOf());
 								WriteInfo(gvar->script->name, str, row, col, true);
@@ -1875,7 +2066,7 @@ void asCBuilder::CompileGlobalVariables()
 				}
 
 				// Set the namespace that should be used for this function
-				initFunc->nameSpace = gvar->property->nameSpace;
+				initFunc->nameSpace = gvar->ns;
 
 				asCCompiler comp(engine);
 				int r = comp.CompileGlobalVariable(this, gvar->script, gvar->initializationNode, gvar, initFunc);
@@ -1913,7 +2104,7 @@ void asCBuilder::CompileGlobalVariables()
 				{
 					// Create the init function for this variable
 					initFunc->id = engine->GetNextScriptFunctionId();
-					engine->SetScriptFunction(initFunc);
+					engine->AddScriptFunction(initFunc);
 
 					// Finalize the init function for this variable
 					initFunc->returnType = asCDataType::CreatePrimitive(ttVoid, false);
@@ -1927,7 +2118,7 @@ void asCBuilder::CompileGlobalVariables()
 
 					gvar->property->SetInitFunc(initFunc);
 
-					initFunc->Release();
+					initFunc->ReleaseInternal();
 					initFunc = 0;
 				}
 				else if( initFunc )
@@ -1966,7 +2157,7 @@ void asCBuilder::CompileGlobalVariables()
 				accumWarnings += numWarnings;
 			}
 
-			preMessage.isSet = false;
+			engine->preMessage.isSet = false;
 		}
 
 		if( !compileSucceeded )
@@ -2037,7 +2228,8 @@ void asCBuilder::CompileGlobalVariables()
 
 			asDELETE(gvar, sGlobalVariableDescription);
 		}
-		it++;
+		else
+			it++;
 	}
 }
 
@@ -2082,7 +2274,7 @@ void asCBuilder::AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScript
 			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
 
 			// Check that the object type is an interface
-			if( objType && objType->size == 0 && (objType->flags & asOBJ_SCRIPT_OBJECT) )
+			if( objType && objType->IsInterface() )
 			{
 				// Only add the interface if the class doesn't already implement it
 				if( !decl->objType->Implements(objType) )
@@ -2187,12 +2379,12 @@ void asCBuilder::CompileInterfaces()
 				objType = GetObjectType(name.AddressOf(), ns);
 				if( objType ) break;
 
-				ns = GetParentNameSpace(ns);
+				ns = engine->GetParentNameSpace(ns);
 			}
 
 			// Check that the object type is an interface
 			bool ok = true;
-			if( objType && objType->size == 0 && (objType->flags & asOBJ_SCRIPT_OBJECT) )
+			if( objType && objType->IsInterface() )
 			{
 				// Check that the implemented interface is shared if the base interface is shared
 				if( intfType->IsShared() && !objType->IsShared() )
@@ -2313,14 +2505,15 @@ void asCBuilder::CompileInterfaces()
 				{
 					// Add the method
 					intfType->methods.PushLast(baseFunc->id);
-					baseFunc->AddRef();
+					baseFunc->AddRefInternal();
 				}
 			}
 		}
 	}
 }
 
-void asCBuilder::CompileClasses()
+// numTempl is the number of template instances that existed in the engine before the build begun
+void asCBuilder::CompileClasses(asUINT numTempl)
 {
 	asUINT n;
 	asCArray<sClassDeclaration*> toValidate((int)classDeclarations.GetLength());
@@ -2335,16 +2528,10 @@ void asCBuilder::CompileClasses()
 		bool multipleInheritance = false;
 		asCScriptNode *node = decl->node->firstChild;
 
-		if( decl->objType->IsShared() )
+		while( file->TokenEquals(node->tokenPos, node->tokenLength, FINAL_TOKEN) ||
+			   file->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN) ||
+			   file->TokenEquals(node->tokenPos, node->tokenLength, ABSTRACT_TOKEN) )
 		{
-			// Skip the keyword 'shared'
-			asASSERT(node->tokenType == ttIdentifier);
-			node = node->next;
-		}
-		if( decl->objType->flags & asOBJ_NOINHERIT )
-		{
-			// skip the keyword 'final'
-			asASSERT(node->tokenType == ttIdentifier);
 			node = node->next;
 		}
 
@@ -2365,6 +2552,7 @@ void asCBuilder::CompileClasses()
 			// Find the object type for the interface
 			asCObjectType *objType = 0;
 			sMixinClass *mixin = 0;
+			asSNameSpace *origNs = ns;
 			while( ns )
 			{
 				objType = GetObjectType(name.AddressOf(), ns);
@@ -2374,13 +2562,16 @@ void asCBuilder::CompileClasses()
 				if( objType || mixin )
 					break;
 
-				ns = GetParentNameSpace(ns);
+				ns = engine->GetParentNameSpace(ns);
 			}
 
 			if( objType == 0 && mixin == 0 )
 			{
 				asCString str;
-				str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE, name.AddressOf());
+				if( origNs->name == "" )
+					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, name.AddressOf());
+				else
+					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, name.AddressOf(), origNs->name.AddressOf());
 				WriteError(str, file, node);
 			}
 			else if( mixin )
@@ -2388,7 +2579,7 @@ void asCBuilder::CompileClasses()
 				AddInterfaceFromMixinToClass(decl, node, mixin);
 			}
 			else if( !(objType->flags & asOBJ_SCRIPT_OBJECT) ||
-					 objType->flags & asOBJ_NOINHERIT )
+					 (objType->flags & asOBJ_NOINHERIT) )
 			{
 				// Either the class is not a script class or interface
 				// or the class has been declared as 'final'
@@ -2452,7 +2643,7 @@ void asCBuilder::CompileClasses()
 						{
 							// Set the base class
 							decl->objType->derivedFrom = objType;
-							objType->AddRef();
+							objType->AddRefInternal();
 						}
 					}
 				}
@@ -2507,6 +2698,8 @@ void asCBuilder::CompileClasses()
 			// added to the shared class that wasn't there in the previous
 			// compilation. We do not care if something that is there in the previous
 			// declaration is not included in the new declaration though.
+
+			asASSERT( decl->objType->interfaces.GetLength() == decl->objType->interfaceVFTOffsets.GetLength() );
 		}
 
 		// Methods included from mixin classes should take precedence over inherited methods
@@ -2529,7 +2722,7 @@ void asCBuilder::CompileClasses()
 			// Copy properties from base class to derived class
 			for( asUINT p = 0; p < baseType->properties.GetLength(); p++ )
 			{
-				asCObjectProperty *prop = AddPropertyToClass(decl, baseType->properties[p]->name, baseType->properties[p]->type, baseType->properties[p]->isPrivate);
+				asCObjectProperty *prop = AddPropertyToClass(decl, baseType->properties[p]->name, baseType->properties[p]->type, baseType->properties[p]->isPrivate, baseType->properties[p]->isProtected, true);
 
 				// The properties must maintain the same offset
 				asASSERT(prop && prop->byteOffset == baseType->properties[p]->byteOffset); UNUSED_VAR(prop);
@@ -2545,28 +2738,52 @@ void asCBuilder::CompileClasses()
 				for( asUINT d = 0; d < decl->objType->methods.GetLength(); d++ )
 				{
 					derivedFunc = GetFunctionDescription(decl->objType->methods[d]);
-					if( derivedFunc->name == baseFunc->name &&
-						derivedFunc->IsSignatureExceptNameAndReturnTypeEqual(baseFunc) )
+					if( baseFunc->name == "opConv" || baseFunc->name == "opImplConv" ||
+						baseFunc->name == "opCast" || baseFunc->name == "opImplCast" )
 					{
-						if( baseFunc->returnType != derivedFunc->returnType )
+						// For the opConv and opCast methods, the return type can differ if they are different methods
+						if( derivedFunc->name == baseFunc->name &&
+							derivedFunc->IsSignatureExceptNameEqual(baseFunc) )
 						{
-							asCString msg;
-							msg.Format(TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s, baseFunc->GetDeclaration());
-							WriteError(msg, decl->script, decl->node);
-						}
+							if( baseFunc->IsFinal() )
+							{
+								asCString msg;
+								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
 
-						if( baseFunc->IsFinal() )
+							// Move the function from the methods array to the virtualFunctionTable
+							decl->objType->methods.RemoveIndex(d);
+							decl->objType->virtualFunctionTable.PushLast(derivedFunc);
+							found = true;
+							break;
+						}
+					}
+					else
+					{
+						if( derivedFunc->name == baseFunc->name &&
+							derivedFunc->IsSignatureExceptNameAndReturnTypeEqual(baseFunc) )
 						{
-							asCString msg;
-							msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
-							WriteError(msg, decl->script, decl->node);
-						}
+							if( baseFunc->returnType != derivedFunc->returnType )
+							{
+								asCString msg;
+								msg.Format(TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
 
-						// Move the function from the methods array to the virtualFunctionTable
-						decl->objType->methods.RemoveIndex(d);
-						decl->objType->virtualFunctionTable.PushLast(derivedFunc);
-						found = true;
-						break;
+							if( baseFunc->IsFinal() )
+							{
+								asCString msg;
+								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
+
+							// Move the function from the methods array to the virtualFunctionTable
+							decl->objType->methods.RemoveIndex(d);
+							decl->objType->virtualFunctionTable.PushLast(derivedFunc);
+							found = true;
+							break;
+						}
 					}
 				}
 
@@ -2574,11 +2791,13 @@ void asCBuilder::CompileClasses()
 				{
 					// Push the base class function on the virtual function table
 					decl->objType->virtualFunctionTable.PushLast(baseType->virtualFunctionTable[m]);
-					baseType->virtualFunctionTable[m]->AddRef();
+					baseType->virtualFunctionTable[m]->AddRefInternal();
+
+					CheckForConflictsDueToDefaultArgs(decl->script, decl->node, baseType->virtualFunctionTable[m], decl->objType);
 				}
 
 				decl->objType->methods.PushLast(baseType->methods[m]);
-				engine->scriptFunctions[baseType->methods[m]]->AddRef();
+				engine->scriptFunctions[baseType->methods[m]]->AddRefInternal();
 			}
 		}
 
@@ -2646,17 +2865,13 @@ void asCBuilder::CompileClasses()
 					// implemented and we error out later in the checks.
 					decl->objType->virtualFunctionTable.PushLast(realFunc);
 					if( realFunc )
-						realFunc->AddRef();
+						realFunc->AddRefInternal();
 				}
 			}
 		}
 
 		// Enumerate each of the declared properties
 		asCScriptNode *node = decl->node->firstChild->next;
-		if( decl->objType->IsShared() )
-			node = node->next;
-		if( decl->objType->flags & asOBJ_NOINHERIT )
-			node = node->next;
 
 		// Skip list of classes and interfaces
 		while( node && node->nodeType == snIdentifier )
@@ -2668,13 +2883,18 @@ void asCBuilder::CompileClasses()
 			{
 				asCScriptNode *n = node->firstChild;
 
-				// Is the property declared as private?
-				bool isPrivate = false;
+				// Is the property declared as private or protected?
+				bool isPrivate = false, isProtected = false;
 				if( n && n->tokenType == ttPrivate )
 				{
 					isPrivate = true;
 					n = n->next;
 				}
+				else if( n && n->tokenType == ttProtected )
+				{
+					isProtected = true;
+					n = n->next;
+				}
 
 				// Determine the type of the property
 				asCScriptCode *file = decl->script;
@@ -2698,7 +2918,7 @@ void asCBuilder::CompileClasses()
 					if( !decl->isExistingShared )
 					{
 						CheckNameConflictMember(decl->objType, name.AddressOf(), n, file, true);
-						AddPropertyToClass(decl, name, dt, isPrivate, file, n);
+						AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, n);
 					}
 					else
 					{
@@ -2708,6 +2928,7 @@ void asCBuilder::CompileClasses()
 						{
 							asCObjectProperty *prop = decl->objType->properties[p];
 							if( prop->isPrivate == isPrivate &&
+								prop->isProtected == isProtected &&
 								prop->name == name &&
 								prop->type.IsEqualExceptRef(dt) )
 							{
@@ -2741,6 +2962,8 @@ void asCBuilder::CompileClasses()
 
 		if( !decl->isExistingShared )
 			toValidate.PushLast(decl);
+
+		asASSERT( decl->objType->interfaces.GetLength() == decl->objType->interfaceVFTOffsets.GetLength() );
 	}
 
 	// TODO: Warn if a method overrides a base method without marking it as 'override'.
@@ -2814,14 +3037,21 @@ void asCBuilder::CompileClasses()
 				asCObjectProperty *prop = decl->objType->properties[n];
 				asCDataType dt = prop->type;
 
+				// TODO: Add this check again, once solving the issues commented below
+				/* 
 				if( dt.IsTemplate() )
 				{
+					// TODO: This must verify all sub types, not just the first one
+					// TODO: Just because the subtype is not a handle doesn't mean the template will actually instance the object
+					//       this it shouldn't automatically raise an error for this, e.g. weakref<Object> should be legal as member
+					//       of the Object class
 					asCDataType sub = dt;
 					while( sub.IsTemplate() && !sub.IsObjectHandle() )
 						sub = sub.GetSubType();
 
 					dt = sub;
 				}
+				*/
 
 				if( dt.IsObject() && !dt.IsObjectHandle() )
 				{
@@ -2882,6 +3112,8 @@ void asCBuilder::CompileClasses()
 	if( numErrors > 0 ) return;
 
 	// Verify which script classes can really form circular references, and mark only those as garbage collected.
+	// This must be done in the correct order, so that a class that contains another class isn't needlessly marked
+	// as garbage collected, just because the contained class was evaluated afterwards.
 
 	// TODO: runtime optimize: This algorithm can be further improved by checking the types that inherits from
 	//                         a base class. If the base class is not shared all the classes that derive from it
@@ -2892,92 +3124,170 @@ void asCBuilder::CompileClasses()
 	//                         existing module. However, the applications that want to use that should use a special
 	//                         build flag to not finalize the module.
 
+	asCArray<asCObjectType*> typesToValidate;
 	for( n = 0; n < classDeclarations.GetLength(); n++ )
 	{
+		// Existing shared classes won't need evaluating, nor interfaces
 		sClassDeclaration *decl = classDeclarations[n];
-
-		// Existing shared classes won't be re-evaluated
 		if( decl->isExistingShared ) continue;
+		if( decl->objType->IsInterface() ) continue;
 
-		asCObjectType *ot = decl->objType;
+		typesToValidate.PushLast(decl->objType);
+	}
+
+	asUINT numReevaluations = 0;
+	while( typesToValidate.GetLength() )
+	{
+		if( numReevaluations > typesToValidate.GetLength() )
+		{
+			// No types could be completely evaluated in the last iteration so 
+			// we consider the remaining types in the array as garbage collected
+			break;
+		}
+
+		asCObjectType *type = typesToValidate[0];
+		typesToValidate.RemoveIndex(0);
+
+		// If the type inherits from another type that is yet to be validated, then reinsert it at the end
+		if( type->derivedFrom && typesToValidate.Exists(type->derivedFrom) )
+		{
+			typesToValidate.PushLast(type);
+			numReevaluations++;
+			continue;
+		}
+
+		// If the type inherits from a known garbage collected type, then this type must also be garbage collected
+		if( type->derivedFrom && (type->derivedFrom->flags & asOBJ_GC) )
+		{
+			type->flags |= asOBJ_GC;
+			continue;
+		}
+
+		// Evaluate template instances (silently) before verifying each of the classes, since it is possible that
+		// a class will be marked as non-garbage collected, which in turn will mark the template instance that uses
+		// it as non-garbage collected, which in turn means the class that contains the array also do not have to be 
+		// garbage collected
+		EvaluateTemplateInstances(numTempl, true);
 
 		// Is there some path in which this structure is involved in circular references?
+		// If the type contains a member of a type that is yet to be validated, then reinsert it at the end
+		bool mustReevaluate = false;
 		bool gc = false;
-		for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
+		for( asUINT p = 0; p < type->properties.GetLength(); p++ )
 		{
-			asCDataType dt = ot->properties[p]->type;
+			asCDataType dt = type->properties[p]->type;
 			if( !dt.IsObject() )
 				continue;
 
-			if( dt.IsObjectHandle() )
+			if( typesToValidate.Exists(dt.GetObjectType()) )
+				mustReevaluate = true;
+			else
 			{
-				// If it is known that the handle can't be involved in a circular reference
-				// then this object doesn't need to be marked as garbage collected.
-				asCObjectType *prop = dt.GetObjectType();
-
-				if( prop->flags & asOBJ_SCRIPT_OBJECT )
+				if( dt.IsTemplate() )
 				{
-					// For script objects, treat non-final classes as if they can contain references
-					// as it is not known what derived classes might do. For final types, check all
-					// properties to determine if any of those can cause a circular reference.
-					if( prop->flags & asOBJ_NOINHERIT )
+					// Check if any of the subtypes are yet to be evaluated
+					bool skip = false;
+					for( asUINT s = 0; s < dt.GetObjectType()->GetSubTypeCount(); s++ )
 					{
-						for( asUINT sp = 0; sp < prop->properties.GetLength(); sp++ )
+						asCObjectType *t = reinterpret_cast<asCObjectType*>(dt.GetObjectType()->GetSubType(s));
+						if( typesToValidate.Exists(t) )
 						{
-							asCDataType sdt = prop->properties[sp]->type;
+							mustReevaluate = true;
+							skip = true;
+							break;
+						}
+					}
+					if( skip )
+						continue;
+				}
 
-							if( sdt.IsObject() )
+				if( dt.IsObjectHandle() )
+				{
+					// If it is known that the handle can't be involved in a circular reference
+					// then this object doesn't need to be marked as garbage collected.
+					asCObjectType *prop = dt.GetObjectType();
+
+					if( prop->flags & asOBJ_SCRIPT_OBJECT )
+					{
+						// For script objects, treat non-final classes as if they can contain references
+						// as it is not known what derived classes might do. For final types, check all
+						// properties to determine if any of those can cause a circular reference with this
+						// class.
+						if( prop->flags & asOBJ_NOINHERIT )
+						{
+							for( asUINT sp = 0; sp < prop->properties.GetLength(); sp++ )
 							{
-								if( sdt.IsObjectHandle() )
+								asCDataType sdt = prop->properties[sp]->type;
+
+								if( sdt.IsObject() )
 								{
-									// TODO: runtime optimize: If the handle is again to a final class, then we can recursively check if the circular reference can occur
-									if( sdt.GetObjectType()->flags & (asOBJ_SCRIPT_OBJECT | asOBJ_GC) )
+									if( sdt.IsObjectHandle() )
 									{
+										// TODO: runtime optimize: If the handle is again to a final class, then we can recursively check if the circular reference can occur
+										if( sdt.GetObjectType()->flags & (asOBJ_SCRIPT_OBJECT | asOBJ_GC) )
+										{
+											gc = true;
+											break;
+										}
+									}
+									else if( sdt.GetObjectType()->flags & asOBJ_GC )
+									{
+										// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
+										//                         Only if the object is of a type that can reference this type, either directly or indirectly
 										gc = true;
 										break;
 									}
 								}
-								else if( sdt.GetObjectType()->flags & asOBJ_GC )
-								{
-									// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
-									//                         Only if the object is of a type that can reference this type, either directly or indirectly
-									gc = true;
-									break;
-								}
 							}
-						}
 
-						if( gc )
+							if( gc )
+								break;
+						}
+						else
+						{
+							// Assume it is garbage collected as it is not known at compile time what might inherit from this type
+							gc = true;
 							break;
+						}
 					}
-					else
+					else if( prop->flags & asOBJ_GC )
 					{
-						// Assume it is garbage collected as it is not known at compile time what might inherit from this type
+						// If a type is not a script object, adopt its GC flag
+						// TODO: runtime optimize: Just because an application registered class is garbage collected, doesn't mean it 
+						//                         can form a circular reference with this script class. Perhaps need a flag to tell
+						//                         if the script classes that contains the type should be garbage collected or not.
 						gc = true;
 						break;
 					}
 				}
-				else if( prop->flags & asOBJ_GC )
+				else if( dt.GetObjectType()->flags & asOBJ_GC )
 				{
-					// If a type is not a script object, adopt its GC flag
+					// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
+					//                         Only if the object is of a type that can reference this type, either directly or indirectly
 					gc = true;
 					break;
 				}
 			}
-			else if( dt.GetObjectType()->flags & asOBJ_GC )
-			{
-				// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
-				//                         Only if the object is of a type that can reference this type, either directly or indirectly
-				gc = true;
-				break;
-			}
+		}
+
+		// If the class wasn't found to require garbage collection, but it 
+		// contains another type that has yet to be evaluated then it must be 
+		// re-evaluated.
+		if( !gc && mustReevaluate )
+		{
+			typesToValidate.PushLast(type);
+			numReevaluations++;
+			continue;
 		}
 
 		// Update the flag in the object type
 		if( gc )
-			ot->flags |= asOBJ_GC;
+			type->flags |= asOBJ_GC;
 		else
-			ot->flags &= ~asOBJ_GC;
+			type->flags &= ~asOBJ_GC;
+
+		// Reset the counter
+		numReevaluations = 0;
 	}
 }
 
@@ -2985,10 +3295,9 @@ void asCBuilder::IncludeMethodsFromMixins(sClassDeclaration *decl)
 {
 	asCScriptNode *node = decl->node->firstChild;
 
-	// Skip the 'final' and 'shared' keywords
-	if( decl->objType->IsShared() )
-		node = node->next;
-	if( decl->objType->flags & asOBJ_NOINHERIT )
+	// Skip the class attributes
+	while( node->nodeType == snIdentifier &&
+		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
 		node = node->next;
 
 	// Skip the name of the class
@@ -3005,7 +3314,20 @@ void asCBuilder::IncludeMethodsFromMixins(sClassDeclaration *decl)
 			continue;
 		}
 
-		sMixinClass *mixin = GetMixinClass(name.AddressOf(), ns);
+		sMixinClass *mixin = 0;
+		while( ns )
+		{
+			// Need to make sure the name is not an object type 
+			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
+			if( objType == 0 )
+				mixin = GetMixinClass(name.AddressOf(), ns);
+			
+			if( objType || mixin )
+				break;
+
+			ns = engine->GetParentNameSpace(ns);
+		}
+
 		if( mixin )
 		{
 			// Find methods from mixin declaration
@@ -3026,7 +3348,7 @@ void asCBuilder::IncludeMethodsFromMixins(sClassDeclaration *decl)
 					asCScriptNode *copy = n->CreateCopy(engine);
 
 					// Register the method, but only if it doesn't already exist in the class
-					RegisterScriptFunctionFromNode(copy, mixin->script, decl->objType, false, false, 0, false, true);
+					RegisterScriptFunctionFromNode(copy, mixin->script, decl->objType, false, false, mixin->ns, false, true);
 				}
 				else if( n->nodeType == snVirtualProperty )
 				{
@@ -3047,10 +3369,9 @@ void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
 {
 	asCScriptNode *node = decl->node->firstChild;
 
-	// Skip the 'final' and 'shared' keywords
-	if( decl->objType->IsShared() )
-		node = node->next;
-	if( decl->objType->flags & asOBJ_NOINHERIT )
+	// Skip the class attributes
+	while( node->nodeType == snIdentifier &&
+		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
 		node = node->next;
 
 	// Skip the name of the class
@@ -3067,7 +3388,20 @@ void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
 			continue;
 		}
 
-		sMixinClass *mixin = GetMixinClass(name.AddressOf(), ns);
+		sMixinClass *mixin = 0;
+		while( ns )
+		{
+			// Need to make sure the name is not an object type 
+			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
+			if( objType == 0 )
+				mixin = GetMixinClass(name.AddressOf(), ns);
+			
+			if( objType || mixin )
+				break;
+
+			ns = engine->GetParentNameSpace(ns);
+		}
+
 		if( mixin )
 		{
 			// Find properties from mixin declaration
@@ -3084,12 +3418,17 @@ void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
 				if( n->nodeType == snDeclaration )
 				{
 					asCScriptNode *n2 = n->firstChild;
-					bool isPrivate = false;
+					bool isPrivate = false, isProtected = false;
 					if( n2 && n2->tokenType == ttPrivate )
 					{
 						isPrivate = true;
 						n2 = n2->next;
 					}
+					else if( n2 && n2->tokenType == ttProtected )
+					{
+						isProtected = true;
+						n2 = n2->next;
+					}
 
 					asCScriptCode *file = mixin->script;
 					asCDataType dt = CreateDataTypeFromNode(n2, file, mixin->ns);
@@ -3128,7 +3467,7 @@ void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
 								if( r < 0 )
 									WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
 
-								AddPropertyToClass(decl, name, dt, isPrivate, file, n2);
+								AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, n2);
 							}
 							else
 							{
@@ -3138,6 +3477,7 @@ void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
 								{
 									asCObjectProperty *prop = decl->objType->properties[p];
 									if( prop->isPrivate == isPrivate &&
+										prop->isProtected == isProtected &&
 										prop->name == name &&
 										prop->type == dt )
 									{
@@ -3184,8 +3524,10 @@ int asCBuilder::CreateVirtualFunction(asCScriptFunction *func, int idx)
 	vf->id               = engine->GetNextScriptFunctionId();
 	vf->isReadOnly       = func->isReadOnly;
 	vf->objectType       = func->objectType;
+	vf->objectType->AddRefInternal();
 	vf->signatureId      = func->signatureId;
 	vf->isPrivate        = func->isPrivate;
+	vf->isProtected      = func->isProtected;
 	vf->isFinal          = func->isFinal;
 	vf->isOverride       = func->isOverride;
 	vf->vfTableIdx       = idx;
@@ -3200,19 +3542,25 @@ int asCBuilder::CreateVirtualFunction(asCScriptFunction *func, int idx)
 	return vf->id;
 }
 
-asCObjectProperty *asCBuilder::AddPropertyToClass(sClassDeclaration *decl, const asCString &name, const asCDataType &dt, bool isPrivate, asCScriptCode *file, asCScriptNode *node)
+asCObjectProperty *asCBuilder::AddPropertyToClass(sClassDeclaration *decl, const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file, asCScriptNode *node)
 {
-	// If the declaration node is not given, then
-	// this property is inherited from a base class
 	if( node )
 	{
+		asASSERT(!isInherited);
+
 		// Check if the property is allowed
-		if( !dt.CanBeInstanciated() )
+		if( !dt.CanBeInstantiated() )
 		{
 			if( file && node )
 			{
 				asCString str;
-				str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format().AddressOf());
+				if( dt.IsAbstractClass() )
+					str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->objType->nameSpace).AddressOf());
+				else if( dt.IsInterface() )
+					str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->objType->nameSpace).AddressOf());
+				else
+					// TODO: Improve error message to explain why
+					str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(decl->objType->nameSpace).AddressOf());
 				WriteError(str, file, node);
 			}
 			return 0;
@@ -3230,9 +3578,15 @@ asCObjectProperty *asCBuilder::AddPropertyToClass(sClassDeclaration *decl, const
 		sPropertyInitializer p(name, declNode, initNode, file);
 		decl->propInits.PushLast(p);
 	}
+	else
+	{
+		// If the declaration node is not given, then
+		// this property is inherited from a base class
+		asASSERT(isInherited);
+	}
 
 	// Add the property to the object type
-	return decl->objType->AddPropertyToClass(name, dt, isPrivate);
+	return decl->objType->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
 }
 
 bool asCBuilder::DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex)
@@ -3266,17 +3620,18 @@ void asCBuilder::AddDefaultConstructor(asCObjectType *objType, asCScriptCode *fi
 	asCArray<asCDataType> parameterTypes;
 	asCArray<asETypeModifiers> inOutFlags;
 	asCArray<asCString *> defaultArgs;
+	asCArray<asCString> parameterNames;
 
 	// Add the script function
 	// TODO: declaredAt should be set to where the class has been declared
-	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, inOutFlags, defaultArgs, false, objType);
+	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false, objType);
 
 	// Set it as default constructor
 	if( objType->beh.construct )
-		engine->scriptFunctions[objType->beh.construct]->Release();
+		engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
 	objType->beh.construct = funcId;
 	objType->beh.constructors[0] = funcId;
-	engine->scriptFunctions[funcId]->AddRef();
+	engine->scriptFunctions[funcId]->AddRefInternal();
 
 	// The bytecode for the default constructor will be generated
 	// only after the potential inheritance has been established
@@ -3299,16 +3654,16 @@ void asCBuilder::AddDefaultConstructor(asCObjectType *objType, asCScriptCode *fi
 	// Add a default factory as well
 	funcId = engine->GetNextScriptFunctionId();
 	if( objType->beh.factory )
-		engine->scriptFunctions[objType->beh.factory]->Release();
+		engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
 	objType->beh.factory = funcId;
 	objType->beh.factories[0] = funcId;
 	returnType = asCDataType::CreateObjectHandle(objType, false);
 	// TODO: should be the same as the constructor
-	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, inOutFlags, defaultArgs, false);
+	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false);
 	functions.PushLast(0);
 	asCCompiler compiler(engine);
 	compiler.CompileFactory(this, file, engine->scriptFunctions[funcId]);
-	engine->scriptFunctions[funcId]->AddRef();
+	engine->scriptFunctions[funcId]->AddRefInternal();
 
 	// If the object is shared, then the factory must also be marked as shared
 	if( objType->flags & asOBJ_SHARED )
@@ -3336,9 +3691,9 @@ int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSp
 	if( isShared )
 	{
 		// Look for a pre-existing shared enum with the same signature
-		for( asUINT n = 0; n < engine->classTypes.GetLength(); n++ )
+		for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
 		{
-			asCObjectType *o = engine->classTypes[n];
+			asCObjectType *o = engine->sharedScriptTypes[n];
 			if( o &&
 				o->IsShared() &&
 				(o->flags & asOBJ_ENUM) &&
@@ -3358,7 +3713,10 @@ int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSp
 		asCObjectType *st;
 
 		if( existingSharedType )
+		{
 			st = existingSharedType;
+			st->AddRefInternal();
+		}
 		else
 		{
 			st = asNEW(asCObjectType)(engine);
@@ -3371,14 +3729,15 @@ int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSp
 			st->size      = 4;
 			st->name      = name;
 			st->nameSpace = ns;
+			st->module    = module;
 		}
 		module->enumTypes.PushLast(st);
-		st->AddRef();
 
-		// TODO: cleanup: Should the enum type really be stored in the engine->classTypes?
-		//                http://www.gamedev.net/topic/616912-c-header-file-shared-with-scripts/page__gopid__4895940
-		if( !existingSharedType )
-			engine->classTypes.PushLast(st);
+		if( !existingSharedType && isShared )
+		{
+			engine->sharedScriptTypes.PushLast(st);
+			st->AddRefInternal();
+		}
 
 		// Store the location of this declaration for reference in name collisions
 		sClassDeclaration *decl = asNEW(sClassDeclaration);
@@ -3406,7 +3765,7 @@ int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSp
 				// If this is a pre-existent shared enum, then just double check
 				// that the value is already defined in the original declaration
 				bool found = false;
-				for( size_t n = 0; n < st->enumValues.GetLength(); n++ )
+				for( asUINT n = 0; n < st->enumValues.GetLength(); n++ )
 					if( st->enumValues[n]->name == name )
 					{
 						found = true;
@@ -3460,6 +3819,7 @@ int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSp
 				gvar->initializationNode = asnNode;
 				gvar->name               = name;
 				gvar->datatype           = type;
+				gvar->ns                 = ns;
 				// No need to allocate space on the global memory stack since the values are stored in the asCObjectType
 				// Set the index to a negative to allow compiler to diferentiate from ordinary global var when compiling the initialization
 				gvar->index              = -1; 
@@ -3523,11 +3883,9 @@ int asCBuilder::RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNam
 		st->name            = name;
 		st->nameSpace       = ns;
 		st->templateSubTypes.PushLast(dataType);
-
-		st->AddRef();
+		st->module          = module;
 
 		module->typeDefs.PushLast(st);
-		engine->classTypes.PushLast(st);
 
 		// Store the location of this declaration for reference in name collisions
 		sClassDeclaration *decl = asNEW(sClassDeclaration);
@@ -3547,17 +3905,22 @@ int asCBuilder::RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNam
 	return r;
 }
 
-void asCBuilder::GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace)
+void asCBuilder::GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isProtected, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace)
 {
 	node = node->firstChild;
 
-	// Is the function a private class method?
-	isPrivate = false;
+	// Is the function a private or protected class method?
+	isPrivate = false, isProtected = false;
 	if( node->tokenType == ttPrivate )
 	{
 		isPrivate = true;
 		node = node->next;
 	}
+	else if( node->tokenType == ttProtected )
+	{
+		isProtected = true;
+		node = node->next;
+	}
 
 	// Is the function shared?
 	isShared = false;
@@ -3714,7 +4077,7 @@ asCString asCBuilder::GetCleanExpressionString(asCScriptNode *node, asCScriptCod
 	asCString cleanStr;
 	for( asUINT n = 0; n < str.GetLength(); )
 	{
-		int len;
+		asUINT len = 0;
 		asETokenClass tok = engine->ParseToken(str.AddressOf() + n, str.GetLength() - n, &len);
 		if( tok != asTC_COMMENT && tok != asTC_WHITESPACE )
 		{
@@ -3742,25 +4105,26 @@ int asCBuilder::RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCod
 	bool                       isConstructor;
 	bool                       isDestructor;
 	bool                       isPrivate;
+	bool                       isProtected;
 	bool                       isShared;
 
-	asASSERT( (objType && ns == 0) || isGlobalFunction );
+	asASSERT( (objType && ns == 0) || isGlobalFunction || isMixin );
 
 	// Set the default namespace
 	if( ns == 0 )
-    {
+	{
 		if( objType )
 			ns = objType->nameSpace;
 		else
 			ns = engine->nameSpaces[0];
-    }
+	}
 
-	GetParsedFunctionDetails(node, file, objType, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isOverride, isFinal, isShared, ns);
+	GetParsedFunctionDetails(node, file, objType, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, ns);
 
-	return RegisterScriptFunction(node, file, objType, isInterface, isGlobalFunction, ns, isExistingShared, isMixin, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isOverride, isFinal, isShared);
+	return RegisterScriptFunction(node, file, objType, isInterface, isGlobalFunction, ns, isExistingShared, isMixin, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared);
 }
 
-int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isOverride, bool isFinal, bool isShared)
+int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isProtected, bool isOverride, bool isFinal, bool isShared)
 {
 	// Determine default namespace if not specified
 	if( ns == 0 )
@@ -3790,6 +4154,9 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 				if( func->name == name &&
 					func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, isConstMethod) )
 				{
+					// Add the shared function in this module too
+					module->AddScriptFunction(func);
+
 					found = true;
 					break;
 				}
@@ -3843,7 +4210,14 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 
 		// Verify that the name of the constructor/destructor is the same as the class
 		if( name != objType->name )
-			WriteError(TXT_CONSTRUCTOR_NAME_ERROR, file, node);
+		{
+			asCString str;
+			if( isDestructor )
+				str.Format(TXT_DESTRUCTOR_s_s_NAME_ERROR, objType->name.AddressOf(), name.AddressOf());
+			else
+				str.Format(TXT_METHOD_s_s_HAS_NO_RETURN_TYPE, objType->name.AddressOf(), name.AddressOf());
+			WriteError(str, file, node);
+		}
 
 		if( isDestructor )
 			name = "~" + name;
@@ -3928,29 +4302,62 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 		GetObjectMethodDescriptions(name.AddressOf(), objType, funcs, false);
 	else
 		GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-	for( asUINT n = 0; n < funcs.GetLength(); ++n )
+	if( objType && (name == "opConv" || name == "opImplConv" || name == "opCast" || name == "opImplCast") && parameterTypes.GetLength() == 0 )
 	{
-		asCScriptFunction *func = GetFunctionDescription(funcs[n]);
-		if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, objType, isConstMethod) )
+		// opConv and opCast are special methods used for type casts
+		for( asUINT n = 0; n < funcs.GetLength(); ++n )
 		{
-			if( isMixin )
+			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
+			if( func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, isConstMethod) )
 			{
-				// Clean up the memory, as the function will not be registered
-				if( node )
-					node->Destroy(engine);
-				sFunctionDescription *func = functions.PopLast();
-				asDELETE(func, sFunctionDescription);
+				// TODO: clean up: Reuse the same error handling for both opConv and normal methods
+				if( isMixin )
+				{
+					// Clean up the memory, as the function will not be registered
+					if( node )
+						node->Destroy(engine);
+					sFunctionDescription *func = functions.PopLast();
+					asDELETE(func, sFunctionDescription);
 
-				// Free the default args
-				for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-					if( defaultArgs[n] )
-						asDELETE(defaultArgs[n], asCString);
+					// Free the default args
+					for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+						if( defaultArgs[n] )
+							asDELETE(defaultArgs[n], asCString);
 
-				return 0;
+					return 0;
+				}
+
+				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+				break;
 			}
+		}
+	}
+	else
+	{
+		for( asUINT n = 0; n < funcs.GetLength(); ++n )
+		{
+			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
+			if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, objType, isConstMethod) )
+			{
+				if( isMixin )
+				{
+					// Clean up the memory, as the function will not be registered
+					if( node )
+						node->Destroy(engine);
+					sFunctionDescription *func = functions.PopLast();
+					asDELETE(func, sFunctionDescription);
 
-			WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
-			break;
+					// Free the default args
+					for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+						if( defaultArgs[n] )
+							asDELETE(defaultArgs[n], asCString);
+
+					return 0;
+				}
+
+				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+				break;
+			}
 		}
 	}
 
@@ -3967,36 +4374,36 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 
 		// TODO: clean up: This should be done by AddScriptFunction() itself
 		module->globalFunctions.Put(f);
-		f->AddRef();
 	}
 	else
 	{
 		int row = 0, col = 0;
 		if( node )
 			file->ConvertPosToRowCol(node->tokenPos, &row, &col);
-		module->AddScriptFunction(file->idx, (row&0xFFFFF)|((col&0xFFF)<<20), funcId, name, returnType, parameterTypes, inOutFlags, defaultArgs, isInterface, objType, isConstMethod, isGlobalFunction, isPrivate, isFinal, isOverride, isShared, ns);
+		module->AddScriptFunction(file->idx, (row&0xFFFFF)|((col&0xFFF)<<20), funcId, name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, isInterface, objType, isConstMethod, isGlobalFunction, isPrivate, isProtected, isFinal, isOverride, isShared, ns);
 	}
 
 	// Make sure the default args are declared correctly
 	ValidateDefaultArgs(file, node, engine->scriptFunctions[funcId]);
+	CheckForConflictsDueToDefaultArgs(file, node, engine->scriptFunctions[funcId], objType);
 
 	if( objType )
 	{
 		asASSERT( !isExistingShared );
 
-		engine->scriptFunctions[funcId]->AddRef();
+		engine->scriptFunctions[funcId]->AddRefInternal();
 		if( isConstructor )
 		{
 			int factoryId = engine->GetNextScriptFunctionId();
 			if( parameterTypes.GetLength() == 0 )
 			{
 				// Overload the default constructor
-				engine->scriptFunctions[objType->beh.construct]->Release();
+				engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
 				objType->beh.construct = funcId;
 				objType->beh.constructors[0] = funcId;
 
 				// Register the default factory as well
-				engine->scriptFunctions[objType->beh.factory]->Release();
+				engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
 				objType->beh.factory = factoryId;
 				objType->beh.factories[0] = factoryId;
 			}
@@ -4014,7 +4421,7 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 					defaultArgs[n] = asNEW(asCString)(*defaultArgs[n]);
 
 			asCDataType dt = asCDataType::CreateObjectHandle(objType, false);
-			module->AddScriptFunction(file->idx, engine->scriptFunctions[funcId]->scriptData->declaredAt, factoryId, name, dt, parameterTypes, inOutFlags, defaultArgs, false);
+			module->AddScriptFunction(file->idx, engine->scriptFunctions[funcId]->scriptData->declaredAt, factoryId, name, dt, parameterTypes, parameterNames, inOutFlags, defaultArgs, false);
 
 			// If the object is shared, then the factory must also be marked as shared
 			if( objType->flags & asOBJ_SHARED )
@@ -4026,7 +4433,7 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 			// Compile the factory immediately
 			asCCompiler compiler(engine);
 			compiler.CompileFactory(this, file, engine->scriptFunctions[factoryId]);
-			engine->scriptFunctions[factoryId]->AddRef();
+			engine->scriptFunctions[factoryId]->AddRefInternal();
 		}
 		else if( isDestructor )
 			objType->beh.destruct = funcId;
@@ -4038,9 +4445,9 @@ int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file,
 				f->parameterTypes[0].GetObjectType() == f->objectType &&
 				(f->inOutFlags[0] & asTM_INREF) )
 			{
-				engine->scriptFunctions[objType->beh.copy]->Release();
+				engine->scriptFunctions[objType->beh.copy]->ReleaseInternal();
 				objType->beh.copy = funcId;
-				f->AddRef();
+				f->AddRefInternal();
 			}
 
 			objType->methods.PushLast(funcId);
@@ -4066,14 +4473,14 @@ int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file
 	asASSERT( (objType && ns == 0) || isGlobalFunction );
 
 	if( ns == 0 )
-    {
+	{
 		if( objType )
 			ns = objType->nameSpace;
 		else
 			ns = engine->nameSpaces[0];
-    }
+	}
 
-	bool isPrivate = false;
+	bool isPrivate = false, isProtected = false;
 	asCString emulatedName;
 	asCDataType emulatedType;
 
@@ -4085,6 +4492,11 @@ int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file
 		isPrivate = true;
 		node = node->next;
 	}
+	else if( !isGlobalFunction && node->tokenType == ttProtected )
+	{
+		isProtected = true;
+		node = node->next;
+	}
 
 	emulatedType = CreateDataTypeFromNode(node, file, ns);
 	emulatedType = ModifyDataTypeFromNode(emulatedType, node->next, file, 0, 0);
@@ -4190,7 +4602,7 @@ int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file
 		if( success )
 		{
 			if( !isExistingShared )
-				RegisterScriptFunction(funcNode, file, objType, isInterface, isGlobalFunction, ns, false, false, name, returnType, paramNames, paramTypes, paramModifiers, defaultArgs, isConst, false, false, isPrivate, isOverride, isFinal, false);
+				RegisterScriptFunction(funcNode, file, objType, isInterface, isGlobalFunction, ns, false, false, name, returnType, paramNames, paramTypes, paramModifiers, defaultArgs, isConst, false, false, isPrivate, isProtected, isOverride, isFinal, false);
 			else
 			{
 				// Free the funcNode as it won't be used
@@ -4234,12 +4646,12 @@ int asCBuilder::RegisterImportedFunction(int importID, asCScriptNode *node, asCS
 	asCArray<asCDataType>      parameterTypes;
 	asCArray<asETypeModifiers> inOutFlags;
 	asCArray<asCString *>      defaultArgs;
-	bool isConstMethod, isOverride, isFinal, isConstructor, isDestructor, isPrivate, isShared;
+	bool isConstMethod, isOverride, isFinal, isConstructor, isDestructor, isPrivate, isProtected, isShared;
 
 	if( ns == 0 )
 		ns = engine->nameSpaces[0];
 
-	GetParsedFunctionDetails(node->firstChild, file, 0, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isOverride, isFinal, isShared, ns);
+	GetParsedFunctionDetails(node->firstChild, file, 0, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, ns);
 	CheckNameConflict(name.AddressOf(), node, file, ns);
 
 	// Check that the same function hasn't been registered already in the namespace
@@ -4296,7 +4708,8 @@ void asCBuilder::GetFunctionDescriptions(const char *name, asCArray<int> &funcs,
 	// TODO: optimize: Linear search: This is probably not that critial. Also bindInformation will probably be removed in near future
 	for( n = 0; n < module->bindInformations.GetLength(); n++ )
 	{
-		if( module->bindInformations[n]->importedFunctionSignature->name == name )
+		if( module->bindInformations[n]->importedFunctionSignature->name == name &&
+			module->bindInformations[n]->importedFunctionSignature->nameSpace == ns )
 			funcs.PushLast(module->bindInformations[n]->importedFunctionSignature->id);
 	}
 
@@ -4314,12 +4727,21 @@ void asCBuilder::GetFunctionDescriptions(const char *name, asCArray<int> &funcs,
 	}
 }
 
-void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope)
+void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope, asCScriptNode *errNode, asCScriptCode *script)
 {
 	if( scope != "" )
 	{
+		// If searching with a scope informed, then the node and script must also be informed for potential error reporting
+		asASSERT( errNode && script );
+
+		// If the scope contains ::identifier, then use the last identifier as the class name and the rest of is as the namespace
+		int n = scope.FindLast("::");
+		asCString className = n >= 0 ? scope.SubString(n+2) : scope;
+		asCString nsName = n >= 0 ? scope.SubString(0, n) : "";
+		asSNameSpace *ns = GetNameSpaceByString(nsName, objectType->nameSpace, errNode, script);
+
 		// Find the base class with the specified scope
-		while( objectType && objectType->name != scope )
+		while( objectType && (objectType->name != className || objectType->nameSpace != ns) )
 			objectType = objectType->derivedFrom;
 
 		// If the scope is not any of the base classes, then return no methods
@@ -4333,8 +4755,10 @@ void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *ob
 		// Only add const methods to the list
 		for( asUINT n = 0; n < objectType->methods.GetLength(); n++ )
 		{
-			if( engine->scriptFunctions[objectType->methods[n]]->name == name &&
-				engine->scriptFunctions[objectType->methods[n]]->isReadOnly )
+			asCScriptFunction *func = engine->scriptFunctions[objectType->methods[n]];
+			if( func->name == name &&
+				func->isReadOnly &&
+				(func->accessMask & module->accessMask) )
 			{
 				// When the scope is defined the returned methods should be the true methods, not the virtual method stubs
 				if( scope == "" )
@@ -4353,7 +4777,9 @@ void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *ob
 		// TODO: Prefer non-const over const
 		for( asUINT n = 0; n < objectType->methods.GetLength(); n++ )
 		{
-			if( engine->scriptFunctions[objectType->methods[n]]->name == name )
+			asCScriptFunction *func = engine->scriptFunctions[objectType->methods[n]];
+			if( func->name == name &&
+				(func->accessMask & module->accessMask) )
 			{
 				// When the scope is defined the returned methods should be the true methods, not the virtual method stubs
 				if( scope == "" )
@@ -4375,15 +4801,15 @@ void asCBuilder::WriteInfo(const asCString &scriptname, const asCString &message
 	// Need to store the pre message in a structure
 	if( pre )
 	{
-		preMessage.isSet = true;
-		preMessage.c = c;
-		preMessage.r = r;
-		preMessage.message = message;
-		preMessage.scriptname = scriptname;
+		engine->preMessage.isSet      = true;
+		engine->preMessage.c          = c;
+		engine->preMessage.r          = r;
+		engine->preMessage.message    = message;
+		engine->preMessage.scriptname = scriptname;
 	}
 	else
 	{
-		preMessage.isSet = false;
+		engine->preMessage.isSet = false;
 
 		if( !silent )
 			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_INFORMATION, message.AddressOf());
@@ -4412,10 +4838,6 @@ void asCBuilder::WriteError(const asCString &scriptname, const asCString &messag
 {
 	numErrors++;
 
-	// Need to pass the preMessage first
-	if( preMessage.isSet )
-		WriteInfo(preMessage.scriptname, preMessage.message, preMessage.r, preMessage.c, false);
-
 	if( !silent )
 		engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_ERROR, message.AddressOf());
 }
@@ -4426,15 +4848,20 @@ void asCBuilder::WriteWarning(const asCString &scriptname, const asCString &mess
 	{
 		numWarnings++;
 
-		// Need to pass the preMessage first
-		if( preMessage.isSet )
-			WriteInfo(preMessage.scriptname, preMessage.message, preMessage.r, preMessage.c, false);
-
 		if( !silent )
 			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_WARNING, message.AddressOf());
 	}
 }
 
+void asCBuilder::WriteWarning(const asCString &message, asCScriptCode *file, asCScriptNode *node)
+{
+	int r = 0, c = 0;
+	if( node && file )
+		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	WriteWarning(file ? file->name : asCString(""), message, r, c);
+}
+
 asCString asCBuilder::GetScopeFromNode(asCScriptNode *node, asCScriptCode *script, asCScriptNode **next)
 {
 	asCString scope;
@@ -4464,39 +4891,28 @@ asCString asCBuilder::GetScopeFromNode(asCScriptNode *node, asCScriptCode *scrip
 asSNameSpace *asCBuilder::GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next)
 {
 	asCString scope = GetScopeFromNode(node, script, next);
+	return GetNameSpaceByString(scope, implicitNs, node, script);
+}
+
+asSNameSpace *asCBuilder::GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script)
+{
 	asSNameSpace *ns = implicitNs;
-	if( scope == "::" )
+	if( nsName == "::" )
 		ns = engine->nameSpaces[0];
-	else if( scope != "" )
+	else if( nsName != "" )
 	{
-		ns = engine->FindNameSpace(scope.AddressOf());
+		ns = engine->FindNameSpace(nsName.AddressOf());
 		if( ns == 0 )
 		{
 			asCString msg;
-			msg.Format(TXT_NAMESPACE_s_DOESNT_EXIST, scope.AddressOf());
-			WriteError(msg, script, node);
+			msg.Format(TXT_NAMESPACE_s_DOESNT_EXIST, nsName.AddressOf());
+			WriteError(msg, script, errNode);
 		}
 	}
 
 	return ns;
 }
 
-asSNameSpace *asCBuilder::GetParentNameSpace(asSNameSpace *ns)
-{
-	if( ns == 0 ) return 0;
-	if( ns == engine->nameSpaces[0] ) return 0;
-
-	asCString scope = ns->name;
-	int pos = scope.FindLast("::");
-	if( pos >= 0 )
-	{
-		scope = scope.SubString(0, pos);
-		return engine->FindNameSpace(scope.AddressOf());
-	}
-
-	return engine->nameSpaces[0];
-}
-
 asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope, asCObjectType *currentType)
 {
 	asASSERT(node->nodeType == snDataType);
@@ -4531,13 +4947,14 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 		str.Assign(&file->code[n->tokenPos], n->tokenLength);
 
 		// Recursively search parent namespaces for matching type
+		asSNameSpace *origNs = ns;
 		while( ns && !found )
 		{
 			asCObjectType *ot = 0;
 
 			// If this is for a template type, then we must first determine if the
 			// identifier matches any of the template subtypes
-			if( currentType && (currentType->flags & asOBJ_TEMPLATE))
+			if( currentType && (currentType->flags & asOBJ_TEMPLATE) )
 			{
 				for( asUINT subtypeIndex = 0; subtypeIndex < currentType->templateSubTypes.GetLength(); subtypeIndex++)
 				{
@@ -4565,7 +4982,7 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 				// Make sure the module has access to the object type
 				if( !module || (module->accessMask & ot->accessMask) )
 				{
-					if(asOBJ_TYPEDEF == (ot->flags & asOBJ_TYPEDEF))
+					if( asOBJ_TYPEDEF == (ot->flags & asOBJ_TYPEDEF) )
 					{
 						// TODO: typedef: A typedef should be considered different from the original type (though with implicit conversions between the two)
 						// Create primitive data type based on object flags
@@ -4587,7 +5004,10 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 							{
 								n = n->next;
 
-								asCDataType subType = CreateDataTypeFromNode(n, file, implicitNamespace, false, module ? 0 : ot);
+								// When parsing function definitions for template registrations (currentType != 0) it is necessary 
+								// to pass in the current template type to the recursive call since it is this ones sub-template types
+								// that should be allowed.
+								asCDataType subType = CreateDataTypeFromNode(n, file, implicitNamespace, false, module ? 0 : (currentType ? currentType : ot));
 								subTypes.PushLast(subType);
 
 								if( subType.IsReadOnly() )
@@ -4611,8 +5031,6 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 								return asCDataType::CreatePrimitive(ttInt, false);
 							}
 
-							asASSERT( subTypes.GetLength() == ot->templateSubTypes.GetLength() );
-
 							// Check if any of the given subtypes are different from the template's declared subtypes
 							bool isDifferent = false;
 							for( subtypeIndex = 0; subtypeIndex < subTypes.GetLength(); subtypeIndex++ )
@@ -4628,14 +5046,28 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 							{
 								// This is a template instance
 								// Need to find the correct object type
-								asCObjectType *otInstance = engine->GetTemplateInstanceType(ot, subTypes);
+								asCObjectType *otInstance = engine->GetTemplateInstanceType(ot, subTypes, module);
+
+								if( otInstance && otInstance->scriptSectionIdx < 0 )
+								{
+									// If this is the first time the template instance is used, store where it was declared from
+									otInstance->scriptSectionIdx = engine->GetScriptSectionNameIndex(file->name.AddressOf());
+									int row, column;
+									file->ConvertPosToRowCol(n->tokenPos, &row, &column);
+									otInstance->declaredAt = (row&0xFFFFF)|(column<<20);
+								}
 
 								if( !otInstance )
 								{
-									asCString msg;
-									// TODO: Should name all subtypes
-									msg.Format(TXT_CANNOT_INSTANCIATE_TEMPLATE_s_WITH_s, ot->name.AddressOf(), subTypes[0].Format().AddressOf());
-									WriteError(msg, file, n);
+									asCString sub = subTypes[0].Format(ot->nameSpace);
+									for( asUINT s = 1; s < subTypes.GetLength(); s++ )
+									{
+										sub += ",";
+										sub += subTypes[s].Format(ot->nameSpace);
+									}
+									asCString str;
+									str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, ot->name.AddressOf(), sub.AddressOf());
+									WriteError(str, file, n);
 								}
 
 								ot = otInstance;
@@ -4673,20 +5105,27 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 			if( !found )
 			{
 				// Try to find it in the parent namespace
-				ns = GetParentNameSpace(ns);
+				ns = engine->GetParentNameSpace(ns);
 			}
 		}
 
 		if( !found )
 		{
 			asCString msg;
-			msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE, (const char *)str.AddressOf());
+			if( origNs->name == "" )
+				msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, str.AddressOf());
+			else
+				msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, str.AddressOf(), origNs->name.AddressOf());
 			WriteError(msg, file, n);
 
 			dt = asCDataType::CreatePrimitive(ttInt, isConst);
 			return dt;
 		}
 	}
+	else if( n->tokenType == ttAuto )
+	{
+		dt = asCDataType::CreateAuto(isConst);
+	}
 	else
 	{
 		// Create primitive data type
@@ -4699,17 +5138,23 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 	{
 		if( n->tokenType == ttOpenBracket )
 		{
-			// Make sure the sub type can be instanciated
-			if( !dt.CanBeInstanciated() )
+			// Make sure the sub type can be instantiated
+			if( !dt.CanBeInstantiated() )
 			{
 				asCString str;
-				// TODO: Change to "Array sub type cannot be 'type'"
-				str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format().AddressOf());
+				if( dt.IsAbstractClass() )
+					str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
+				else if( dt.IsInterface() )
+					str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
+				else
+					// TODO: Improve error message to explain why
+					str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(ns).AddressOf());
+
 				WriteError(str, file, n);
 			}
 
 			// Make the type an array (or multidimensional array)
-			if( dt.MakeArray(engine) < 0 )
+			if( dt.MakeArray(engine, module) < 0 )
 			{
 				WriteError(TXT_NO_DEFAULT_ARRAY_TYPE, file, n);
 				break;
@@ -4718,7 +5163,12 @@ asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCod
 		else
 		{
 			// Make the type a handle
-			if( dt.MakeHandle(true, acceptHandleForScope) < 0 )
+			if( dt.IsObjectHandle() )
+			{
+				WriteError(TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED, file, n);
+				break;
+			}
+			else if( dt.MakeHandle(true, acceptHandleForScope) < 0 )
 			{
 				WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
 				break;
diff --git a/lib/angelscript/source/as_builder.h b/lib/angelscript/source/as_builder.h
index 5b894857a..3a9851fec 100644
--- a/lib/angelscript/source/as_builder.h
+++ b/lib/angelscript/source/as_builder.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -51,6 +51,11 @@
 
 BEGIN_AS_NAMESPACE
 
+#ifdef AS_NO_COMPILER
+// Forward declare the structure, as it is part of some function signatures used even without the compiler
+struct sGlobalVariableDescription;
+#endif
+
 #ifndef AS_NO_COMPILER
 
 struct sFunctionDescription
@@ -72,6 +77,7 @@ struct sGlobalVariableDescription
 	asCString          name;
 	asCGlobalProperty *property;
 	asCDataType        datatype;
+	asSNameSpace      *ns;
 	int                index;
 	bool               isCompiled;
 	bool               isPureConstant;
@@ -160,14 +166,16 @@ protected:
 	void               WriteError(const asCString &scriptname, const asCString &msg, int r, int c);
 	void               WriteError(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
 	void               WriteWarning(const asCString &scriptname, const asCString &msg, int r, int c);
+	void               WriteWarning(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
 
+	bool               DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp = 0, sGlobalVariableDescription **outDesc = 0, bool *isAppProp = 0);
 	asCGlobalProperty *GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp);
 	int                ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func);
 	asCString          GetCleanExpressionString(asCScriptNode *n, asCScriptCode *file);
 
 	asSNameSpace      *GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next);
+	asSNameSpace      *GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script);
 	asCString          GetScopeFromNode(asCScriptNode *n, asCScriptCode *script, asCScriptNode **next = 0);
-	asSNameSpace      *GetParentNameSpace(asSNameSpace *ns);
 
 	asCObjectType     *GetObjectType(const char *type, asSNameSpace *ns);
 	asCScriptFunction *GetFuncDef(const char *type);
@@ -175,15 +183,6 @@ protected:
 	asCDataType        CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope = false, asCObjectType *currentType = 0);
 	asCDataType        ModifyDataTypeFromNode(const asCDataType &type, asCScriptNode *node, asCScriptCode *file, asETypeModifiers *inOutFlag, bool *autoHandle);
 
-	struct preMessage_t
-	{
-		bool isSet;
-		asCString message;
-		asCString scriptname;
-		int r;
-		int c;
-	} preMessage;
-
 	int numErrors;
 	int numWarnings;
 	bool silent;
@@ -195,6 +194,7 @@ protected:
 protected:
 	friend class asCCompiler;
 
+	int                CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType);
 	int                GetNamespaceAndNameFromNode(asCScriptNode *n, asCScriptCode *script, asSNameSpace *implicitNs, asSNameSpace *&outNs, asCString &outName);
 	int                RegisterMixinClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
 	sMixinClass       *GetMixinClass(const char *name, asSNameSpace *ns);
@@ -204,7 +204,7 @@ protected:
 	void               AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScriptNode *errNode, sMixinClass *mixin);
 
 	int                RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false, bool isMixin = false);
-	int                RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isOverride, bool isFinal, bool isShared);
+	int                RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isProtected, bool isOverride, bool isFinal, bool isShared);
 	int                RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false);
 	int                RegisterImportedFunction(int funcID, asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
 	int                RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
@@ -215,11 +215,11 @@ protected:
 	int                RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
 	void               CompleteFuncDef(sFuncDef *funcDef);
 	void               CompileInterfaces();
-	void               CompileClasses();
-	void               GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace);
+	void               CompileClasses(asUINT originalNumTempl);
+	void               GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isProtected, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace);
 	bool               DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex = 0);
 	void               AddDefaultConstructor(asCObjectType *objType, asCScriptCode *file);
-	asCObjectProperty *AddPropertyToClass(sClassDeclaration *c, const asCString &name, const asCDataType &type, bool isPrivate, asCScriptCode *file = 0, asCScriptNode *node = 0);
+	asCObjectProperty *AddPropertyToClass(sClassDeclaration *c, const asCString &name, const asCDataType &type, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file = 0, asCScriptNode *node = 0);
 	int                CreateVirtualFunction(asCScriptFunction *func, int idx);
 	void               ParseScripts();
 	void               RegisterTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns);
@@ -232,7 +232,8 @@ protected:
 	asCObjectProperty *GetObjectProperty(asCDataType &obj, const char *prop);
 	asCScriptFunction *GetFunctionDescription(int funcId);
 	void               GetFunctionDescriptions(const char *name, asCArray<int> &funcs, asSNameSpace *ns);
-	void               GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope = "");
+	void               GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope = "", asCScriptNode *errNode = 0, asCScriptCode *script = 0);
+	void               EvaluateTemplateInstances(asUINT startIdx, bool keepSilent);
 
 	asCArray<asCScriptCode *>                  scripts;
 	asCArray<sFunctionDescription *>           functions;
diff --git a/lib/angelscript/source/as_bytecode.cpp b/lib/angelscript/source/as_bytecode.cpp
index e0531c20a..32564f2a0 100644
--- a/lib/angelscript/source/as_bytecode.cpp
+++ b/lib/angelscript/source/as_bytecode.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -864,7 +864,6 @@ void asCByteCode::OptimizeLocally(const asCArray<int> &tempVariableOffsets)
 
 				instr = GoForward(curr);
 			}
-
 		}
 		else if( currOp == asBC_RDSPtr )
 		{
@@ -1553,6 +1552,7 @@ int asCByteCode::GetSize()
 
 void asCByteCode::AddCode(asCByteCode *bc)
 {
+	if( bc == this ) return;
 	if( bc->first )
 	{
 		if( first == 0 )
@@ -2037,7 +2037,14 @@ void asCByteCode::PostProcess()
 			DeleteInstruction(curr);
 		}
 		else
+		{
+#ifndef AS_DEBUG
+			// If the stackSize is negative, then there is a problem with the bytecode.
+			// If AS_DEBUG is turned on, this same check is done in DebugOutput.
+			asASSERT( instr->stackSize >= 0 || asBCInfo[instr->op].type == asBCTYPE_INFO );
+#endif
 			instr = instr->next;
+		}
 	}
 }
 
@@ -2079,7 +2086,9 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 	fprintf(file, "Variables: \n");
 	for( n = 0; n < func->scriptData->variables.GetLength(); n++ )
 	{
-		fprintf(file, " %.3d: %s %s\n", func->scriptData->variables[n]->stackOffset, func->scriptData->variables[n]->type.Format().AddressOf(), func->scriptData->variables[n]->name.AddressOf());
+		int idx = func->scriptData->objVariablePos.IndexOf(func->scriptData->variables[n]->stackOffset);
+		bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
+		fprintf(file, " %.3d: %s%s %s\n", func->scriptData->variables[n]->stackOffset, isOnHeap ? "(heap) " : "", func->scriptData->variables[n]->type.Format(func->nameSpace).AddressOf(), func->scriptData->variables[n]->name.AddressOf());
 	}
 	asUINT offset = 0;
 	if( func->objectType )
@@ -2099,7 +2108,11 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			}
 		}
 		if( !found )
-			fprintf(file, " %.3d: %s {noname param}\n", offset, func->parameterTypes[n].Format().AddressOf());
+		{
+			int idx = func->scriptData->objVariablePos.IndexOf(offset);
+			bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
+			fprintf(file, " %.3d: %s%s {noname param}\n", offset, isOnHeap ? "(heap) " : "", func->parameterTypes[n].Format(func->nameSpace).AddressOf());
+		}
 
 		offset -= func->parameterTypes[n].GetSizeOnStackDWords();
 	}
@@ -2115,10 +2128,20 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			}
 		}
 		if( !found )
-			fprintf(file, " %.3d: %s {noname}\n", func->scriptData->objVariablePos[n], func->scriptData->objVariableTypes[n]->name.AddressOf());
+		{
+			if( func->scriptData->objVariableTypes[n] )
+			{
+				int idx = func->scriptData->objVariablePos.IndexOf(func->scriptData->objVariablePos[n]);
+				bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
+				fprintf(file, " %.3d: %s%s {noname}\n", func->scriptData->objVariablePos[n], isOnHeap ? "(heap) " : "", func->scriptData->objVariableTypes[n]->name.AddressOf());
+			}
+			else
+				fprintf(file, " %.3d: null handle {noname}\n", func->scriptData->objVariablePos[n]);
+		}
 	}
 	fprintf(file, "\n\n");
 
+	bool invalidStackSize = false;
 	int pos = 0;
 	asUINT lineIndex = 0;
 	asCByteInstruction *instr = first;
@@ -2131,10 +2154,19 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			lineIndex += 2;
 		}
 
-		fprintf(file, "%5d ", pos);
-		pos += instr->GetSize();
+		if( instr->GetSize() > 0 )
+		{
+			fprintf(file, "%5d ", pos);
+			pos += instr->GetSize();
 
-		fprintf(file, "%3d %c ", int(instr->stackSize + func->scriptData->variableSpace), instr->marked ? '*' : ' ');
+			fprintf(file, "%3d %c ", int(instr->stackSize + func->scriptData->variableSpace), instr->marked ? '*' : ' ');
+			if( instr->stackSize < 0 )
+				invalidStackSize = true;
+		}
+		else
+		{
+			fprintf(file, "            ");
+		}
 
 		switch( asBCInfo[instr->op].type )
 		{
@@ -2182,7 +2214,10 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			switch( instr->op )
 			{
 			case asBC_OBJTYPE:
-				fprintf(file, "   %-8s 0x%x\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg));
+				{
+					asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
+					fprintf(file, "   %-8s 0x%x           (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), ot->GetName());
+				}
 				break;
 
 			case asBC_PshC4:
@@ -2229,6 +2264,16 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			break;
 
 		case asBCTYPE_QW_ARG:
+			switch( instr->op )
+			{
+			case asBC_OBJTYPE:
+				{
+					asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
+					fprintf(file, "   %-8s 0x%x          (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), ot->GetName());
+				}
+				break;
+	
+			default:
 #ifdef __GNUC__
 #ifdef _LP64
 			fprintf(file, "   %-8s 0x%lx           (i:%ld, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
@@ -2238,6 +2283,7 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 #else
 			fprintf(file, "   %-8s 0x%I64x          (i:%I64d, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
 #endif
+			}
 			break;
 
 		case asBCTYPE_wW_QW_ARG:
@@ -2257,7 +2303,8 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			if( instr->op == asBC_ALLOC )
 			{
 				asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
-				fprintf(file, "   %-8s 0x%x, %d             (type:%s)\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1), ot->GetName());
+				asCScriptFunction *func = engine->scriptFunctions[instr->wArg[0]];
+				fprintf(file, "   %-8s 0x%x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1), ot->GetName(), func ? func->GetDeclaration() : "{no func}");
 			}
 			else
 				fprintf(file, "   %-8s %u, %d\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1));
@@ -2271,14 +2318,15 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 			if( instr->op == asBC_ALLOC )
 			{
 				asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
+				asCScriptFunction *func = engine->scriptFunctions[instr->wArg[0]];
 #ifdef __GNUC__
 #ifdef AS_64BIT_PTR
-				fprintf(file, "   %-8s 0x%lx, %d             (type:%s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName());
+				fprintf(file, "   %-8s 0x%lx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), func ? func->GetDeclaration() : "{no func}");
 #else
-				fprintf(file, "   %-8s 0x%llx, %d             (type:%s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName());
+				fprintf(file, "   %-8s 0x%llx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), func ? func->GetDeclaration() : "{no func}");
 #endif
 #else
-				fprintf(file, "   %-8s 0x%I64x, %d             (type:%s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName());
+				fprintf(file, "   %-8s 0x%I64x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), func ? func->GetDeclaration() : "{no func}");
 #endif
 			}
 			else
@@ -2333,6 +2381,11 @@ void asCByteCode::DebugOutput(const char *name, asCScriptEngine *engine, asCScri
 	}
 
 	fclose(file);
+
+	// If the stackSize is negative then there is something wrong with the 
+	// bytecode, i.e. there is a bug in the compiler or in the optimizer. We 
+	// only check this here to have the bytecode available on file for verification
+	asASSERT( !invalidStackSize );
 }
 #endif
 
diff --git a/lib/angelscript/source/as_callfunc.cpp b/lib/angelscript/source/as_callfunc.cpp
index 597f5ec96..723ba1c28 100644
--- a/lib/angelscript/source/as_callfunc.cpp
+++ b/lib/angelscript/source/as_callfunc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -45,6 +45,14 @@
 
 BEGIN_AS_NAMESPACE
 
+// ref: Member Function Pointers and the Fastest Possible C++ Delegates
+//      describes the structure of class method pointers for most compilers
+//      http://www.codeproject.com/Articles/7150/Member-Function-Pointers-and-the-Fastest-Possible
+
+// ref: The code comments for ItaniumCXXABI::EmitLoadOfMemberFunctionPointer in the LLVM compiler
+//      describes the structure for class method pointers on Itanium and arm64 ABI
+//      http://clang.llvm.org/doxygen/CodeGen_2ItaniumCXXABI_8cpp_source.html#l00937
+
 int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *objForThiscall, asSSystemFunctionInterface *internal)
 {
 	memset(internal, 0, sizeof(asSSystemFunctionInterface));
@@ -57,9 +65,9 @@ int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv,
 	{
 		if( ptr.flag == 1 && callConv != asCALL_GENERIC )
 			return asWRONG_CALLING_CONV;
-		else if( ptr.flag == 2 && (callConv == asCALL_GENERIC || callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL) )
+		else if( ptr.flag == 2 && (callConv == asCALL_GENERIC || callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
 			return asWRONG_CALLING_CONV;
-		else if( ptr.flag == 3 && !(callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL) )
+		else if( ptr.flag == 3 && !(callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
 			return asWRONG_CALLING_CONV;
 	}
 
@@ -90,20 +98,44 @@ int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv,
 	if( isMethod )
 	{
 #ifndef AS_NO_CLASS_METHODS
-		if( base == asCALL_THISCALL )
+		if( base == asCALL_THISCALL || base == asCALL_THISCALL_OBJFIRST || base == asCALL_THISCALL_OBJLAST )
 		{
-			internal->callConv = ICC_THISCALL;
+			internalCallConv thisCallConv;
+			if( base == asCALL_THISCALL )
+			{
+				if( callConv != asCALL_THISCALL_ASGLOBAL && objForThiscall )
+					return asINVALID_ARG;
+
+				thisCallConv = ICC_THISCALL;
+			}
+			else
+			{
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+				return asNOT_SUPPORTED;
+#else
+				if( objForThiscall == 0 )
+					return asINVALID_ARG;
+
+				internal->objForThiscall = objForThiscall;
+				if( base == asCALL_THISCALL_OBJFIRST )
+					thisCallConv = ICC_THISCALL_OBJFIRST;
+				else //if( base == asCALL_THISCALL_OBJLAST )
+					thisCallConv = ICC_THISCALL_OBJLAST;
+#endif
+			}
+
+			internal->callConv = thisCallConv;
 #ifdef GNU_STYLE_VIRTUAL_METHOD
 			if( (size_t(ptr.ptr.f.func) & 1) )
-				internal->callConv = ICC_VIRTUAL_THISCALL;
+				internal->callConv = (internalCallConv)(thisCallConv + 2);
 #endif
 			internal->baseOffset = ( int )MULTI_BASE_OFFSET(ptr);
-#if defined(AS_ARM) && defined(__GNUC__)
+#if defined(AS_ARM) && (defined(__GNUC__) || defined(AS_PSVITA))
 			// As the least significant bit in func is used to switch to THUMB mode
 			// on ARM processors, the LSB in the __delta variable is used instead of
 			// the one in __pfn on ARM processors.
 			if( (size_t(internal->baseOffset) & 1) )
-				internal->callConv = ICC_VIRTUAL_THISCALL;
+				internal->callConv = (internalCallConv)(thisCallConv + 2);
 #endif
 
 #ifdef HAVE_VIRTUAL_BASE_OFFSET
@@ -135,6 +167,49 @@ int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInter
 	// Calculate the size needed for the parameters
 	internal->paramSize = func->GetSpaceNeededForArguments();
 
+	// Prepare the clean up instructions for the function arguments
+	internal->cleanArgs.SetLength(0);
+	int offset = 0;
+	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		asCDataType &dt = func->parameterTypes[n];
+
+		if( dt.IsObject() && !dt.IsReference() )
+		{
+			asSTypeBehaviour *beh = &dt.GetObjectType()->beh;
+			if( dt.GetObjectType()->flags & asOBJ_REF )
+			{
+				asASSERT( (dt.GetObjectType()->flags & asOBJ_NOCOUNT) || beh->release );
+				if( beh->release )
+				{
+					asSSystemFunctionInterface::SClean clean;
+					clean.op  = 0; // call release
+					clean.ot  = dt.GetObjectType();
+					clean.off = short(offset);
+					internal->cleanArgs.PushLast(clean);
+				}
+			}
+			else
+			{
+				asSSystemFunctionInterface::SClean clean;
+				clean.op  = 1; // call free
+				clean.ot  = dt.GetObjectType();
+				clean.off = short(offset);
+
+				// Call the destructor then free the memory
+				if( beh->destruct )
+					clean.op = 2; // call destruct, then free
+
+				internal->cleanArgs.PushLast(clean);
+			}
+		}
+
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
+			offset += AS_PTR_SIZE;
+		else
+			offset += dt.GetSizeOnStackDWords();
+	}
+
 	return 0;
 }
 
@@ -142,11 +217,14 @@ int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInter
 int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine)
 {
 #ifdef AS_MAX_PORTABILITY
+	UNUSED_VAR(func);
+	UNUSED_VAR(internal);
+	UNUSED_VAR(engine);
+
 	// This should never happen, as when AS_MAX_PORTABILITY is on, all functions 
 	// are asCALL_GENERIC, which are prepared by PrepareSystemFunctionGeneric
 	asASSERT(false);
-#endif
-
+#else
 	// References are always returned as primitive data
 	if( func->returnType.IsReference() || func->returnType.IsObjectHandle() )
 	{
@@ -162,7 +240,7 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 		// Only value types can be returned by value
 		asASSERT( objType & asOBJ_VALUE );
 
-		if( !(objType & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT)) )
+		if( !(objType & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
 		{
 			// If the return is by value then we need to know the true type
 			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
@@ -172,6 +250,13 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
 			engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
 		}
+		else if( objType & asOBJ_APP_ARRAY )
+		{
+			// Array types are always returned in memory
+			internal->hostReturnInMemory = true;
+			internal->hostReturnSize     = sizeof(void*)/4;
+			internal->hostReturnFloat = false;
+		}
 		else if( objType & asOBJ_APP_CLASS )
 		{
 			internal->hostReturnFloat = false;
@@ -203,7 +288,13 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 
 #ifdef THISCALL_RETURN_SIMPLE_IN_MEMORY
 				if((internal->callConv == ICC_THISCALL ||
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
 					internal->callConv == ICC_VIRTUAL_THISCALL) &&
+#else
+					internal->callConv == ICC_VIRTUAL_THISCALL ||
+					internal->callConv == ICC_THISCALL_OBJFIRST ||
+					internal->callConv == ICC_THISCALL_OBJLAST) &&
+#endif
 					func->returnType.GetSizeInMemoryDWords() >= THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
 				{
 					internal->hostReturnInMemory = true;
@@ -242,7 +333,7 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
 
 				asCString str;
-				str.Format(TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL, func->returnType.Format().AddressOf());
+				str.Format(TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL, func->returnType.Format(func->nameSpace).AddressOf());
 				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
 				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
 			}
@@ -313,7 +404,7 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 			internal->takesObjByVal = true;
 
 			// Can't pass objects by value unless the application type is informed
-			if( !(func->parameterTypes[n].GetObjectType()->flags & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT)) )
+			if( !(func->parameterTypes[n].GetObjectType()->flags & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
 			{
 				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
 	
@@ -350,29 +441,70 @@ int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *i
 		}
 	}
 
-	// Verify if the function has any registered autohandles
-	internal->hasAutoHandles = false;
-	for( n = 0; n < internal->paramAutoHandles.GetLength(); n++ )
+	// Prepare the clean up instructions for the function arguments
+	internal->cleanArgs.SetLength(0);
+	int offset = 0;
+	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
 	{
-		if( internal->paramAutoHandles[n] )
-		{
-			internal->hasAutoHandles = true;
-			break;
-		}
-	}
+		asCDataType &dt = func->parameterTypes[n];
 
+#if defined(COMPLEX_OBJS_PASSED_BY_REF) || defined(AS_LARGE_OBJS_PASSED_BY_REF)
+		bool needFree = false;
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+		if( dt.GetObjectType() && dt.GetObjectType()->flags & COMPLEX_MASK ) needFree = true;
+#endif
+#ifdef AS_LARGE_OBJS_PASSED_BY_REF
+		if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ) needFree = true;
+#endif
+		if( needFree &&
+			dt.IsObject() &&
+			!dt.IsObjectHandle() && 
+			!dt.IsReference() )
+		{
+			asSSystemFunctionInterface::SClean clean;
+			clean.op  = 1; // call free
+			clean.ot  = dt.GetObjectType();
+			clean.off = short(offset);
+
+#ifndef AS_CALLEE_DESTROY_OBJ_BY_VAL
+			// If the called function doesn't destroy objects passed by value we must do so here
+			asSTypeBehaviour *beh = &dt.GetObjectType()->beh;
+			if( beh->destruct )
+				clean.op = 2; // call destruct, then free
+#endif
+
+			internal->cleanArgs.PushLast(clean);
+		}
+#endif
+
+		if( n < internal->paramAutoHandles.GetLength() && internal->paramAutoHandles[n] )
+		{
+			asSSystemFunctionInterface::SClean clean;
+			clean.op  = 0; // call release
+			clean.ot  = dt.GetObjectType();
+			clean.off = short(offset);
+			internal->cleanArgs.PushLast(clean);
+		}
+
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
+			offset += AS_PTR_SIZE;
+		else
+			offset += dt.GetSizeOnStackDWords();
+	}
+#endif // !defined(AS_MAX_PORTABILITY)
 	return 0;
 }
 
 #ifdef AS_MAX_PORTABILITY
 
-int CallSystemFunction(int id, asCContext *context, void *objectPointer)
+int CallSystemFunction(int id, asCContext *context)
 {
 	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = engine->scriptFunctions[id]->sysFuncIntf;
+	asCScriptFunction *func = engine->scriptFunctions[id];
+	asSSystemFunctionInterface *sysFunc = func->sysFuncIntf;
 	int callConv = sysFunc->callConv;
 	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
-		return context->CallGeneric(id, objectPointer);
+		return context->CallGeneric(func);
 
 	context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
 
@@ -396,15 +528,15 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 // args       - This is the function arguments, which are packed as in AngelScript
 // retPointer - This points to a the memory buffer where the return object is to be placed, if the function returns the value in memory rather than in registers
 // retQW2     - This output parameter should be used if the function returns a value larger than 64bits in registers
+// secondObj  - This is the object pointer that the proxy method should invoke its method on when the call convention is THISCALL_OBJFIRST/LAST
 //
 // Return value:
 //
 // The function should return the value that is returned in registers. 
-//
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2);
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2, void *secondObj);
 
 
-int CallSystemFunction(int id, asCContext *context, void *objectPointer)
+int CallSystemFunction(int id, asCContext *context)
 {
 	asCScriptEngine            *engine  = context->m_engine;
 	asCScriptFunction          *descr   = engine->scriptFunctions[id];
@@ -412,26 +544,24 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 
 	int callConv = sysFunc->callConv;
 	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
-		return context->CallGeneric(id, objectPointer);
+		return context->CallGeneric(descr);
 
 	asQWORD  retQW             = 0;
 	asQWORD  retQW2            = 0;
 	asDWORD *args              = context->m_regs.stackPointer;
 	void    *retPointer        = 0;
-	void    *obj               = 0;
 	int      popSize           = sysFunc->paramSize;
 
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+	void    *obj               = 0;
+	void    *secondObj         = 0;
+
 	if( callConv >= ICC_THISCALL )
 	{
 		if( sysFunc->objForThiscall )
 		{
 			// This class method is being called as if it is a global function
 			obj = sysFunc->objForThiscall;
-			asASSERT( objectPointer == 0 );
-		}
-		else if( objectPointer )
-		{
-			obj = objectPointer;
 		}
 		else
 		{
@@ -447,7 +577,7 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 			}
 
 			// Add the base offset for multiple inheritance
-#if defined(__GNUC__) && defined(AS_ARM)
+#if (defined(__GNUC__) && defined(AS_ARM)) || defined(AS_PSVITA)
 			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
 			// and the whole offset is thus shifted one bit left to keep the original
 			// offset resolution
@@ -460,7 +590,73 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 			args += AS_PTR_SIZE;
 		}
 	}
-	
+#else
+	// TODO: clean-up: CallSystemFunctionNative should have two arguments for object pointers
+	//                 objForThiscall is the object pointer that should be used for the thiscall
+	//                 objForArg is the object pointer that should be passed as argument when using OBJFIRST or OBJLAST
+
+	// Used to save two object pointers with THISCALL_OBJLAST or THISCALL_OBJFIRST
+	void *obj               = 0;
+	void *secondObj         = 0;
+
+	if( callConv >= ICC_THISCALL )
+	{
+		bool continueCheck = true;  // True if need check objectPointer or context stack for object
+		int continueCheckIndex = 0; // Index into objectsPtrs to save the object if continueCheck
+
+		if( callConv >= ICC_THISCALL_OBJLAST )
+		{
+			asASSERT( sysFunc->objForThiscall != 0 );
+			// This class method is being called as object method (sysFunc->objForThiscall must be set).
+			obj = sysFunc->objForThiscall;
+			continueCheckIndex = 1;
+		}
+		else if( sysFunc->objForThiscall )
+		{
+			// This class method is being called as if it is a global function
+			obj = sysFunc->objForThiscall;
+			continueCheck = false;
+		}
+
+		if( continueCheck )
+		{
+			void *tempPtr = 0;
+
+			// The object pointer should be popped from the context stack
+			popSize += AS_PTR_SIZE;
+
+			// Check for null pointer
+			tempPtr = (void*)*(asPWORD*)(args);
+			if( tempPtr == 0 )
+			{
+				context->SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return 0;
+			}
+
+			// Add the base offset for multiple inheritance
+#if (defined(__GNUC__) && defined(AS_ARM)) || defined(AS_PSVITA)
+			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
+			// and the whole offset is thus shifted one bit left to keep the original
+			// offset resolution
+			tempPtr = (void*)(asPWORD(tempPtr) + (sysFunc->baseOffset>>1));
+#else
+			tempPtr = (void*)(asPWORD(tempPtr) + sysFunc->baseOffset);
+#endif
+
+			// Skip the object pointer
+			args += AS_PTR_SIZE;
+
+			if( continueCheckIndex )
+				secondObj = tempPtr;
+			else
+			{
+				asASSERT( obj == 0 );
+				obj = tempPtr;
+			}
+		}
+	}
+#endif // AS_NO_THISCALL_FUNCTOR_METHOD
+
 	if( descr->DoesReturnOnStack() )
 	{
 		// Get the address of the location for the return value from the stack
@@ -479,8 +675,9 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 	}
 
 	context->m_callingSystemFunction = descr;
+	bool cppException = false;
 #ifdef AS_NO_EXCEPTIONS
-	retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2);
+	retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
 #else
 	// This try/catch block is to catch potential exception that may 
 	// be thrown by the registered function. The implementation of the
@@ -489,10 +686,12 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 	// executed in case of an exception.
 	try
 	{
-		retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2);
+		retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
 	}
 	catch(...)
 	{
+		cppException = true;
+
 		// Convert the exception to a script exception so the VM can 
 		// properly report the error to the application and then clean up
 		context->SetException(TXT_EXCEPTION_CAUGHT);
@@ -500,51 +699,6 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 #endif
 	context->m_callingSystemFunction = 0;
 
-#if defined(COMPLEX_OBJS_PASSED_BY_REF) || defined(AS_LARGE_OBJS_PASSED_BY_REF)
-	if( sysFunc->takesObjByVal )
-	{
-		// Need to free the complex objects passed by value, but that the 
-		// calling convention implicitly passes by reference behind the scene as the 
-		// calling function is the owner of that memory.
-
-		// args is pointing to the first real argument as used in CallSystemFunctionNative,
-		// i.e. hidden arguments such as the object pointer and return address have already 
-		// been skipped.
-
-		int spos = 0;
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			bool needFree = false;
-			asCDataType &dt = descr->parameterTypes[n];
-#ifdef COMPLEX_OBJS_PASSED_BY_REF				
-			if( dt.GetObjectType() && dt.GetObjectType()->flags & COMPLEX_MASK ) needFree = true;
-#endif
-#ifdef AS_LARGE_OBJS_PASSED_BY_REF
-			if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ) needFree = true;
-#endif
-			if( needFree &&
-				dt.IsObject() &&
-				!dt.IsObjectHandle() && 
-				!dt.IsReference() )
-			{
-				void *obj = (void*)*(asPWORD*)&args[spos];
-				spos += AS_PTR_SIZE;
-
-#ifndef AS_CALLEE_DESTROY_OBJ_BY_VAL
-				// If the called function doesn't destroy objects passed by value we must do so here
-				asSTypeBehaviour *beh = &dt.GetObjectType()->beh;
-				if( beh->destruct )
-					engine->CallObjectMethod(obj, beh->destruct);
-#endif
-
-				engine->CallFree(obj);
-			}
-			else
-				spos += dt.GetSizeOnStackDWords();
-		}
-	}
-#endif
-
 	// Store the returned value in our stack
 	if( descr->returnType.IsObject() && !descr->returnType.IsReference() )
 	{
@@ -595,7 +749,7 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 				}
 			}
 
-			if( context->m_status == asEXECUTION_EXCEPTION )
+			if( context->m_status == asEXECUTION_EXCEPTION && !cppException )
 			{
 				// If the function raised a script exception it really shouldn't have 
 				// initialized the object. However, as it is a soft exception there is 
@@ -663,27 +817,36 @@ int CallSystemFunction(int id, asCContext *context, void *objectPointer)
 			context->m_regs.valueRegister = retQW;
 	}
 
-	// Release autohandles in the arguments
-	if( sysFunc->hasAutoHandles )
+	// Clean up arguments
+	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
+	if( cleanCount )
 	{
 		args = context->m_regs.stackPointer;
-		if( callConv >= ICC_THISCALL && !objectPointer )
+		if( callConv >= ICC_THISCALL )
 			args += AS_PTR_SIZE;
 
-		int spos = 0;
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
+		for( asUINT n = 0; n < cleanCount; n++, clean++ )
 		{
-			if( sysFunc->paramAutoHandles[n] && *(asPWORD*)&args[spos] != 0 )
+			void **addr = (void**)&args[clean->off];
+			if( clean->op == 0 )
 			{
-				// Call the release method on the type
-				engine->CallObjectMethod((void*)*(asPWORD*)&args[spos], descr->parameterTypes[n].GetObjectType()->beh.release);
-				*(asPWORD*)&args[spos] = 0;
+				if( *addr != 0 )
+				{
+					engine->CallObjectMethod(*addr, clean->ot->beh.release);
+					*addr = 0;
+				}
 			}
+			else 
+			{
+				asASSERT( clean->op == 1 || clean->op == 2 );
+				asASSERT( *addr );
 
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-				spos += AS_PTR_SIZE;
-			else
-				spos += descr->parameterTypes[n].GetSizeOnStackDWords();
+				if( clean->op == 2 )
+					engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
+				
+				engine->CallFree(*addr);
+			}
 		}
 	}
 
diff --git a/lib/angelscript/source/as_callfunc.h b/lib/angelscript/source/as_callfunc.h
index f15ecdbdc..dde7f72d7 100644
--- a/lib/angelscript/source/as_callfunc.h
+++ b/lib/angelscript/source/as_callfunc.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -46,6 +46,7 @@ BEGIN_AS_NAMESPACE
 class asCContext;
 class asCScriptEngine;
 class asCScriptFunction;
+class asCObjectType;
 struct asSSystemFunctionInterface;
 
 int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *objForThiscall, asSSystemFunctionInterface *internal);
@@ -54,7 +55,7 @@ int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInter
 
 int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
 
-int CallSystemFunction(int id, asCContext *context, void *objectPointer);
+int CallSystemFunction(int id, asCContext *context);
 
 inline asPWORD FuncPtrToUInt(asFUNCTION_t func)
 {
@@ -83,7 +84,15 @@ enum internalCallConv
 	ICC_CDECL_OBJFIRST,
 	ICC_CDECL_OBJFIRST_RETURNINMEM,
 	ICC_GENERIC_METHOD,
-	ICC_GENERIC_METHOD_RETURNINMEM // never used
+	ICC_GENERIC_METHOD_RETURNINMEM, // never used
+	ICC_THISCALL_OBJLAST,
+	ICC_THISCALL_OBJLAST_RETURNINMEM,
+	ICC_VIRTUAL_THISCALL_OBJLAST,
+	ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM,
+	ICC_THISCALL_OBJFIRST,
+	ICC_THISCALL_OBJFIRST_RETURNINMEM,
+	ICC_VIRTUAL_THISCALL_OBJFIRST,
+	ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM
 };
 
 struct asSSystemFunctionInterface
@@ -97,11 +106,18 @@ struct asSSystemFunctionInterface
 	int                  hostReturnSize;
 	int                  paramSize;
 	bool                 takesObjByVal;
-	asCArray<bool>       paramAutoHandles;
+	asCArray<bool>       paramAutoHandles; // TODO: Should be able to remove this array. Perhaps the flags can be stored together with the inOutFlags in asCScriptFunction?
 	bool                 returnAutoHandle;
-	bool                 hasAutoHandles;
 	void                *objForThiscall;
 
+	struct SClean
+	{
+		asCObjectType *ot; // argument type for clean up
+		short op;          // clean up operation: 0 = release, 1 = free, 2 = destruct then free
+		short off;         // argument offset on the stack
+	};
+	asCArray<SClean>     cleanArgs;
+
 	asSSystemFunctionInterface() {}
 
 	asSSystemFunctionInterface(const asSSystemFunctionInterface &in)
@@ -122,8 +138,8 @@ struct asSSystemFunctionInterface
 		takesObjByVal      = in.takesObjByVal;
 		paramAutoHandles   = in.paramAutoHandles;
 		returnAutoHandle   = in.returnAutoHandle;
-		hasAutoHandles     = in.hasAutoHandles;
 		objForThiscall     = in.objForThiscall;
+		cleanArgs          = in.cleanArgs;
 		return *this;
 	}
 };
diff --git a/lib/angelscript/source/as_callfunc_arm.cpp b/lib/angelscript/source/as_callfunc_arm.cpp
index 51e550c33..a5d20355e 100644
--- a/lib/angelscript/source/as_callfunc_arm.cpp
+++ b/lib/angelscript/source/as_callfunc_arm.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -37,6 +37,8 @@
 // Written by Fredrik Ehnbom in June 2009, based on as_callfunc_x86.cpp
 //
 // The code was complemented to support Linux with ARM by Carlos Luna in December, 2012.
+//
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
 
 
 // This code has to conform to both AAPCS and the modified ABI for iOS
@@ -71,7 +73,7 @@ extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD
 extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
 extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
 {
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
@@ -87,33 +89,45 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// The return is made in memory
 		callConv++;
 	}
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+
 
 	asDWORD paramBuffer[64+2];
 	// Android & Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
 	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
 	//                         doesn't have to be done for functions that don't have any 64bit types
 #if !defined(AS_ANDROID) && !defined(AS_LINUX)
-	if( sysFunc->takesObjByVal )
+	// In cases of thiscall methods, the callstack is configured as a standard thiscall
+	// adding the secondObject as first or last element in callstack
+	if( sysFunc->takesObjByVal || isThisCallMethod )
 #endif
 	{
 #if defined(AS_ANDROID) || defined(AS_LINUX)
 		// mask is used as a toggler to skip uneven registers.
 		int mask = 1;
 
-		// Check for object pointer as first argument
-		switch( callConv )
+		if( isThisCallMethod )
 		{
-			case ICC_THISCALL:
-			case ICC_CDECL_OBJFIRST:
-			case ICC_VIRTUAL_THISCALL:
-			case ICC_THISCALL_RETURNINMEM:
-			case ICC_CDECL_OBJFIRST_RETURNINMEM:
-			case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-				mask = 0;
-				break;
-			default:
-				break;
+			mask = 0;
 		}
+		else
+		{
+			// Check for object pointer as first argument
+			switch( callConv )
+			{
+				case ICC_THISCALL:
+				case ICC_CDECL_OBJFIRST:
+				case ICC_VIRTUAL_THISCALL:
+				case ICC_THISCALL_RETURNINMEM:
+				case ICC_CDECL_OBJFIRST_RETURNINMEM:
+				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+					mask = 0;
+					break;
+				default:
+					break;
+			}
+		}
+
 		// Check for hidden address in case of return by value
 		if( sysFunc->hostReturnInMemory )
 			mask = !mask;
@@ -122,6 +136,14 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		int spos = 0;
 		int dpos = 2;
 
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+		{
+			// Add the object pointer as the first parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
 		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
 		{
 			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
@@ -177,6 +199,15 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
 			}
 		}
+
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+		{
+			// Add the object pointer as the last parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
 		// Keep a free location at the beginning
 		args = &paramBuffer[2];
 	}
@@ -193,9 +224,13 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		break;
 	case ICC_THISCALL:  // fall through
 	case ICC_CDECL_OBJFIRST:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
 		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
 		break;
 	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
 #ifdef __GNUC__
 		// On GNUC the address where the return value will be placed should be put in R0
 		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
@@ -208,11 +243,15 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
 		break;
 	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
 		// Get virtual function table from the object pointer
 		vftable = *(asFUNCTION_t**)obj;
 		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
 		break;
 	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
 		// Get virtual function table from the object pointer
 		vftable = *(asFUNCTION_t**)obj;
 #ifdef __GNUC__
@@ -255,7 +294,7 @@ extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD
 extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
 extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
 {
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
@@ -307,6 +346,8 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		callConv++;
 	}
 
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+
 	// Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
 	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
 	//                         doesn't have to be done for functions that don't have any 64bit types
@@ -314,19 +355,26 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// mask is used as a toggler to skip uneven registers.
 		int mask = 1;
 
-		// Check for object pointer as first argument
-		switch( callConv )
+		if( isThisCallMethod )
 		{
-			case ICC_THISCALL:
-			case ICC_CDECL_OBJFIRST:
-			case ICC_VIRTUAL_THISCALL:
-			case ICC_THISCALL_RETURNINMEM:
-			case ICC_CDECL_OBJFIRST_RETURNINMEM:
-			case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-				mask = 0;
-				break;
-			default:
-				break;
+			mask = 0;
+		}
+		else
+		{
+			// Check for object pointer as first argument
+			switch( callConv )
+			{
+				case ICC_THISCALL:
+				case ICC_CDECL_OBJFIRST:
+				case ICC_VIRTUAL_THISCALL:
+				case ICC_THISCALL_RETURNINMEM:
+				case ICC_CDECL_OBJFIRST_RETURNINMEM:
+				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+					mask = 0;
+					break;
+				default:
+					break;
+			}
 		}
 		// Check for hidden address in case of return by value
 		if( sysFunc->hostReturnInMemory )
@@ -336,10 +384,19 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		int spos = 0;
 		int dpos = 2;
 
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+		{
+			// Add the object pointer as the first parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
 		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
 		{
 			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+				!(descr->parameterTypes[n].GetObjectType()->flags & asOBJ_APP_ARRAY) )
 			{
 #ifdef COMPLEX_OBJS_PASSED_BY_REF
 				if( descr->parameterTypes[n].GetObjectType()->flags & COMPLEX_MASK )
@@ -501,6 +558,21 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 			}// else...
 		}// Loop
 
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+		{
+			if (paramSize < 4)
+			{
+				paramBuffer[dpos++] = (asDWORD)secondObject;
+				paramSize++;
+			}
+			else
+			{
+				paramBuffer[stackPos++] = (asDWORD)secondObject;
+				stackSize++;
+			}
+		}
+
 		// Keep a free location at the beginning
 		args = &paramBuffer[2];
 	}
@@ -519,9 +591,13 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		break;
 	case ICC_THISCALL:  // fall through
 	case ICC_CDECL_OBJFIRST:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
 		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
 		break;
 	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
 		// On GNUC the address where the return value will be placed should be put in R0
 		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
 		break;
@@ -529,11 +605,15 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
 		break;
 	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
 		// Get virtual function table from the object pointer
 		vftable = *(asFUNCTION_t**)obj;
 		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
 		break;
 	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
 		// Get virtual function table from the object pointer
 		vftable = *(asFUNCTION_t**)obj;
 		// On GNUC the address where the return value will be placed should be put in R0
diff --git a/lib/angelscript/source/as_callfunc_arm_gcc.S b/lib/angelscript/source/as_callfunc_arm_gcc.S
index 126e0b480..38299d453 100644
--- a/lib/angelscript/source/as_callfunc_arm_gcc.S
+++ b/lib/angelscript/source/as_callfunc_arm_gcc.S
@@ -1,6 +1,6 @@
 /*
   AngelCode Scripting Library
-  Copyright (c) 2003-2013 Andreas Jonsson
+  Copyright (c) 2003-2014 Andreas Jonsson
 
   This software is provided 'as-is', without any express or implied
   warranty. In no event will the authors be held liable for any
@@ -488,6 +488,7 @@ armFuncR0ObjLast:
     strge   r7, [r6, #8]
 
     str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #0
 
     movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
     add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
@@ -687,6 +688,12 @@ nomoreargsarmFuncR0R1:
 
     pop {r4-r8, r10, r11, pc}
 
+#endif /* hard float abi */
+
+#if defined(__linux__) && defined(__ELF__)
+/* ref: http://hardened.gentoo.org/gnu-stack.xml */
+.section .note.GNU-stack,"",%progbits
 #endif
 
-#endif
+#endif /* arm */
+
diff --git a/lib/angelscript/source/as_callfunc_arm_msvc.asm b/lib/angelscript/source/as_callfunc_arm_msvc.asm
index 05bcddfbb..7ddf99758 100644
--- a/lib/angelscript/source/as_callfunc_arm_msvc.asm
+++ b/lib/angelscript/source/as_callfunc_arm_msvc.asm
@@ -1,6 +1,6 @@
 ;
 ;  AngelCode Scripting Library
-;  Copyright (c) 2003-2013 Andreas Jonsson
+;  Copyright (c) 2003-2014 Andreas Jonsson
 ;
 ;  This software is provided 'as-is', without any express or implied
 ;  warranty. In no event will the authors be held liable for any
@@ -29,7 +29,7 @@
 ;
 
 
-; Assembly routines for the ARM call convention
+; Assembly routines for the ARM call convention used for Windows CE
 ; Written by Fredrik Ehnbom in June 2009
 
 ; MSVC currently doesn't support inline assembly for the ARM platform
diff --git a/lib/angelscript/source/as_callfunc_arm_vita.S b/lib/angelscript/source/as_callfunc_arm_vita.S
new file mode 100644
index 000000000..3281f46f5
--- /dev/null
+++ b/lib/angelscript/source/as_callfunc_arm_vita.S
@@ -0,0 +1,480 @@
+/*
+  AngelCode Scripting Library
+  Copyright (c) 2003-2013 Andreas Jonsson
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any
+  damages arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any
+  purpose, including commercial applications, and to alter it and
+  redistribute it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you
+     must not claim that you wrote the original software. If you use
+     this software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  2. Altered source versions must be plainly marked as such, and
+     must not be misrepresented as being the original software.
+
+  3. This notice may not be removed or altered from any source
+     distribution.
+
+  The original version of this library can be located at:
+  http://www.angelcode.com/angelscript/
+
+  Andreas Jonsson
+  andreas@angelcode.com
+*/
+
+/*
+   Assembly routines for the Playstation Vita SNC call convention.
+
+   This code was adapted from as_callfunc_arm_gcc (ARM, Linux hard float) by Brandon Bare on October 2014.
+*/
+
+#ifdef __psp2__
+
+.syntax unified
+.cpu cortex-a9
+.fpu neon
+
+.section .text.armCallFunc
+.balign 2
+.thumb
+.thumb_func
+
+.align 2
+
+.global armFunc
+.global armFuncR0
+.global armFuncR0R1
+.global armFuncObjLast
+.global armFuncR0ObjLast
+
+.type armFunc, %function
+.type armFuncR0, %function
+.type armFuncR0R1, %function
+.type armFuncObjLast, %function
+.type armFuncR0ObjLast, %function
+
+/* --------------------------------------------------------------------------------------------*/
+armFunc:
+	.fnstart
+
+    push    {r4-r8, r10, r11, lr}   /* sp must be 8-byte alignment for ABI compliance, so the pushed registers must be even */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    /* Load float and double args into d0-d7 and s0-s15 */
+    add       r10, r6, #272 /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov       r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargs
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+
+	it ge
+    ldrge   r0, [r6]
+    cmp     r7, #8
+
+	it ge
+    ldrge   r1, [r6, #4]
+    cmp     r7, #12
+
+	it ge
+    ldrge   r2, [r6, #8]
+    cmp     r7, #16
+
+	it ge
+    ldrge   r3, [r6, #12]
+
+stackargs:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargs
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargsloop:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargsloop
+    mov     sp, r12
+
+nomoreargs:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64 r10, {d0-d7}   /* Copy contents of registers d0-d7 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+	.fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncObjLast:
+	.fnstart
+
+    push {r4-r8, r10, r11, lr}  /* We´re storing r11 just to keep the stack aligned to an 8 byte boundary */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3          /* objlast. might get overwritten */
+    mov     r5, #0          /* This will hold an offset of #4 only if objlast couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncObjLast
+
+    mov     r5, r3          /* store objlast in r5 temporarily */
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+
+	it ge
+    ldrge   r0, [r6]
+    cmp     r7, #8
+
+	it ge
+    ldrge   r1, [r6,#4]
+
+	it lt
+    movlt   r1, r5
+    cmp     r7, #12
+
+	it ge
+    ldrge   r2, [r6,#8]
+
+	it lt
+    movlt   r2, r5
+    cmp     r7, #16
+
+	it ge
+    ldrge   r3, [r6,#12]
+
+	ittt lt
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncObjLast    /* If objlast got placed into a register, go to stackargsFuncObjLast */
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #4                  /* Set r5 with an offset of #4, so objlast can be loaded into the stack */
+
+stackargsFuncObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncObjLast:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop   {r4-r8, r10,r11, pc}
+
+	.fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0ObjLast:
+	.fnstart
+
+    push    {r4-r8, r10, r11, lr}
+
+    ldr     r5, [sp,#32]   /* objlast to temp reg */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3      /* r0 explicitly set */
+    mov     r1, r5      /* objlast.  might get overwritten */
+    mov     r5, #0      /* This will hold an offset of #4 or #8 if objlast or one arg couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncR0ObjLast
+
+    mov     r5, r1          /* store objlast in r5 temporarily */
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+
+	it ge
+    ldrge   r1, [r6]
+    cmp     r7, #8
+
+	it ge
+    ldrge   r2, [r6,#4]
+
+	it lt
+    movlt   r2, r5
+    cmp     r7, #12
+
+	it ge
+    ldrge   r3, [r6,#8]
+
+	ittt lt
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncR0ObjLast  /* If objlast got placed into a register, go to stackargsFuncR0ObjLast */
+
+    cmp     r7, #16                 /* Else if we have one last arg set the offset accordingly and store the arg in the array */
+
+	itt ge
+    ldrge   r7, [r6, #12]
+    strge   r7, [r6, #8]
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+	mov     r5, #0
+
+	it ge
+    movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
+    add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
+
+stackargsFuncR0ObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0ObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0ObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0ObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncR0ObjLast:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+	.fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0:
+	.fnstart
+
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 only if the last arg that should have been placed into an "r" reg needs to go to the stack */
+    mov     r0, r3  /* r0 explicitly set */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+
+	it ge
+    ldrge   r1, [r6]
+    cmp     r7, #8
+
+	it ge
+    ldrge   r2, [r6, #4]
+    cmp     r7, #12
+
+	it ge
+    ldrge   r3, [r6, #8]
+    cmp     r7, #16
+
+	it ge
+    movge   r11, #4         /* If there is still one arg to be placed, set the offset in r11 to #4 */
+
+stackargsarmFuncR0:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0
+    mov     sp, r12
+
+nomoreargsarmFuncR0:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+	.fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0R1:
+	.fnstart
+
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 or #8 only if the last arg (or last 2 args) that should have been placed into "r" regs need to go to the stack */
+
+    mov     r0, r3          /* r0 explicitly set */
+    ldr     r1, [sp, #32]   /* r1 explicitly set too */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r2-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0R1
+
+    /* Load the first 2 arguments into r2-r3 */
+    cmp     r7, #4
+
+	it ge
+    ldrge   r2, [r6]
+    cmp     r7, #8
+
+	it ge
+    ldrge   r3, [r6, #4]
+    cmp     r7, #12
+
+	it ge
+    movge   r11, #4         /* If there is a third arg to be placed, set the offset in r11 to #4 */
+
+    cmp     r7, #16
+
+	it ge
+    movge   r11, #8         /* If there is a fourth arg to be placed, set the offset in r11 to #8 */
+
+	itt lt
+    ldrlt   r7, [r6, #8]    /* Else copy the third arg to the correct place in the array */
+    strlt   r7, [r6, #12]
+
+stackargsarmFuncR0R1:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4 or #8) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0R1
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4 or #8) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0R1:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0R1
+    mov     sp, r12
+
+nomoreargsarmFuncR0R1:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+	.fnend
+
+#endif
\ No newline at end of file
diff --git a/lib/angelscript/source/as_callfunc_mips.cpp b/lib/angelscript/source/as_callfunc_mips.cpp
index 8020847f0..2dc8e0078 100644
--- a/lib/angelscript/source/as_callfunc_mips.cpp
+++ b/lib/angelscript/source/as_callfunc_mips.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -221,12 +221,14 @@ asQWORD GetReturnedDouble()
 	return d;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
 {
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
 	int callConv = sysFunc->callConv;
 
+	// TODO: Mips does not yet support THISCALL_OBJFIRST/LAST
+
 	asQWORD retQW = 0;
 
 	void    *func              = (void*)sysFunc->func;
diff --git a/lib/angelscript/source/as_callfunc_ppc.cpp b/lib/angelscript/source/as_callfunc_ppc.cpp
index fff759c16..32a73f8f8 100644
--- a/lib/angelscript/source/as_callfunc_ppc.cpp
+++ b/lib/angelscript/source/as_callfunc_ppc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -482,8 +482,10 @@ static asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD* pArg
 	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
 {
+	// TODO: PPC does not yet support THISCALL_OBJFIRST/LAST
+
 	// use a working array of types, we'll configure the final one in stackArgs
 	asBYTE argsType[2*AS_PPC_MAX_ARGS + 1 + 1 + 1];
 	memset( argsType, 0, sizeof(argsType));
diff --git a/lib/angelscript/source/as_callfunc_ppc_64.cpp b/lib/angelscript/source/as_callfunc_ppc_64.cpp
index 141a6d495..a2c62f2b9 100644
--- a/lib/angelscript/source/as_callfunc_ppc_64.cpp
+++ b/lib/angelscript/source/as_callfunc_ppc_64.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -547,8 +547,10 @@ inline bool IsVariableArgument( asCDataType type )
 	return (type.GetTokenType() == ttQuestion) ? true : false;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
 {
+	// TODO: PPC 64 does not yet support THISCALL_OBJFIRST/LAST
+
 	// use a working array of types, we'll configure the final one in stackArgs
 	asBYTE argsType[AS_PPC_MAX_ARGS + 1 + 1 + 1];
 	memset( argsType, 0, sizeof(argsType));
@@ -663,7 +665,8 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 
 		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
 		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+				!(descr->parameterTypes[n].GetObjectType()->flags & asOBJ_APP_ARRAY) )
 			{
 #ifdef COMPLEX_OBJS_PASSED_BY_REF
 				if( descr->parameterTypes[n].GetObjectType()->flags & COMPLEX_MASK )
diff --git a/lib/angelscript/source/as_callfunc_sh4.cpp b/lib/angelscript/source/as_callfunc_sh4.cpp
index e22a3dd54..2fb4ff68f 100644
--- a/lib/angelscript/source/as_callfunc_sh4.cpp
+++ b/lib/angelscript/source/as_callfunc_sh4.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -270,8 +270,10 @@ asQWORD GetReturnedDouble()
 	return d;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
 {
+	// TODO: SH4 does not yet support THISCALL_OBJFIRST/LAST
+
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
 	int callConv = sysFunc->callConv;
diff --git a/lib/angelscript/source/as_callfunc_x64_gcc.cpp b/lib/angelscript/source/as_callfunc_x64_gcc.cpp
index 056ac1f2e..5e497dec8 100644
--- a/lib/angelscript/source/as_callfunc_x64_gcc.cpp
+++ b/lib/angelscript/source/as_callfunc_x64_gcc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -34,8 +34,14 @@
  * Author: Ionut "gargltk" Leonte <ileonte@bitdefender.com>
  *
  * Initial author: niteice
+ *
+ * Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
  */
 
+// Useful references for the System V AMD64 ABI:
+// http://eli.thegreenplace.net/2011/09/06/stack-frame-layout-on-x86-64/
+// http://math-atlas.sourceforge.net/devel/assembly/abi_sysV_amd64.pdf
+ 
 #include "as_config.h"
 
 #ifndef AS_MAX_PORTABILITY
@@ -73,6 +79,8 @@ static asQWORD __attribute__((noinline)) X64_CallFunction(const asQWORD *args, i
 
 	// Backup stack pointer in R15 that is guaranteed to maintain its value over function calls
 		"  movq %%rsp, %%r15 \n"
+	// Make sure the stack unwind logic knows we've backed up the stack pointer in register r15
+		" .cfi_def_cfa_register r15 \n"
 
 	// Skip the first 128 bytes on the stack frame, called "red zone",  
 	// that might be used by the compiler to store temporary values
@@ -124,6 +132,8 @@ static asQWORD __attribute__((noinline)) X64_CallFunction(const asQWORD *args, i
 
 	// Restore stack pointer
 		"  mov %%r15, %%rsp \n"
+	// Inform the stack unwind logic that the stack pointer has been restored
+		" .cfi_def_cfa_register rsp \n"
 
 	// Put return value in retQW1 and retQW2, using either RAX:RDX or XMM0:XMM1 depending on type of return value
 		"  movl %5, %%ecx \n"
@@ -152,7 +162,7 @@ static inline bool IsVariableArgument( asCDataType type )
 	return ( type.GetTokenType() == ttQuestion ) ? true : false;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2, void *secondObject)
 {
 	asCScriptEngine            *engine             = context->m_engine;
 	asSSystemFunctionInterface *sysFunc            = descr->sysFuncIntf;
@@ -172,8 +182,17 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		callConv++;
 	}
 
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
 	// Determine the real function pointer in case of virtual method
 	if ( obj && ( callConv == ICC_VIRTUAL_THISCALL || callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ) ) 
+#else
+	if ( obj && ( callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+#endif
 	{
 		vftable = *((funcptr_t**)obj);
 		func = vftable[FuncPtrToUInt(asFUNCTION_t(func)) >> 3];
@@ -195,6 +214,11 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 
 			break;
 		}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+		case ICC_THISCALL_OBJLAST:
+		case ICC_VIRTUAL_THISCALL_OBJLAST:
+			param_post = 2;
+#endif
 		case ICC_THISCALL:
 		case ICC_VIRTUAL_THISCALL:
 		case ICC_CDECL_OBJFIRST: 
@@ -206,6 +230,11 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 
 			break;
 		}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+		case ICC_THISCALL_OBJLAST_RETURNINMEM:
+		case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
+			param_post = 2;
+#endif
 		case ICC_THISCALL_RETURNINMEM:
 		case ICC_VIRTUAL_THISCALL_RETURNINMEM:
 		case ICC_CDECL_OBJFIRST_RETURNINMEM: 
@@ -219,7 +248,33 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 
 			break;
 		}
-		case ICC_CDECL_OBJLAST: 
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+		case ICC_THISCALL_OBJFIRST:
+		case ICC_VIRTUAL_THISCALL_OBJFIRST:
+		{
+			paramBuffer[0] = (asPWORD)obj;
+			paramBuffer[1] = (asPWORD)secondObject;
+			argsType[0] = x64INTARG;
+			argsType[1] = x64INTARG;
+
+			argIndex = 2;
+			break;
+		}
+		case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+		case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+		{
+			paramBuffer[0] = (asPWORD)retPointer;
+			paramBuffer[1] = (asPWORD)obj;
+			paramBuffer[2] = (asPWORD)secondObject;
+			argsType[0] = x64INTARG;
+			argsType[1] = x64INTARG;
+			argsType[2] = x64INTARG;
+
+			argIndex = 3;
+			break;
+		}
+#endif
+		case ICC_CDECL_OBJLAST:
 			param_post = 1;
 			break;
 		case ICC_CDECL_OBJLAST_RETURNINMEM: 
@@ -337,7 +392,11 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 	// For the CDECL_OBJ_LAST calling convention we need to add the object pointer as the last argument
 	if( param_post )
 	{
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
 		paramBuffer[argIndex] = (asPWORD)obj;
+#else
+		paramBuffer[argIndex] = (asPWORD)(param_post > 1 ? secondObject : obj);
+#endif
 		argsType[argIndex] = x64INTARG;
 		argIndex++;
 	}
diff --git a/lib/angelscript/source/as_callfunc_x64_mingw.cpp b/lib/angelscript/source/as_callfunc_x64_mingw.cpp
index 4b5cb54d3..35e775fe9 100644
--- a/lib/angelscript/source/as_callfunc_x64_mingw.cpp
+++ b/lib/angelscript/source/as_callfunc_x64_mingw.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -31,6 +31,8 @@
 //
 // This code was adapted from as_callfunc_x64_msvc by _Vicious_ on August 20th, 2011.
 //
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
+//
 
 #include <stdio.h>
 
@@ -165,7 +167,7 @@ static asQWORD GetReturnedDouble()
 	return ret;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
 {
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
@@ -189,10 +191,16 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		allArgBuffer[paramSize++] = (asQWORD)retPointer;
 	}
 
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
 	if( callConv == ICC_THISCALL ||
 		callConv == ICC_THISCALL_RETURNINMEM ||
 		callConv == ICC_VIRTUAL_THISCALL ||
 		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+#else
+	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
+	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
+		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+#endif
 	{
 		// Add the object pointer as the first parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
@@ -204,8 +212,28 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// Add the object pointer as the first parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
 	}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+	else if( callConv == ICC_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+#endif
+
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
 	if( callConv == ICC_VIRTUAL_THISCALL ||
 		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+#else
+	if( callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+#endif
 	{
 		// Get the true function pointer from the virtual function table
 		vftable = *(void***)obj;
@@ -287,6 +315,16 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// Add the object pointer as the last parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
 	}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+	else if( callConv == ICC_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+#endif
 
 	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
 
diff --git a/lib/angelscript/source/as_callfunc_x64_msvc.cpp b/lib/angelscript/source/as_callfunc_x64_msvc.cpp
index bddd3f7c8..84b96c2dd 100644
--- a/lib/angelscript/source/as_callfunc_x64_msvc.cpp
+++ b/lib/angelscript/source/as_callfunc_x64_msvc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -28,6 +28,9 @@
    andreas@angelcode.com
 */
 
+//
+// Added support for thiscall methods by Jordi Oliveras Rovira in April, 2014.
+//
 
 #include <stdio.h>
 
@@ -48,7 +51,7 @@ extern "C" asQWORD CallX64(const asQWORD *args, const asQWORD *floatArgs, int pa
 extern "C" asDWORD GetReturnedFloat();
 extern "C" asQWORD GetReturnedDouble();
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
 {
 	asCScriptEngine *engine = context->m_engine;
 	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
@@ -62,10 +65,10 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 	asQWORD  floatArgBuffer[4];
 
 	int callConv = sysFunc->callConv;
-	if( callConv == ICC_THISCALL ||
-		callConv == ICC_THISCALL_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL || 
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+
+	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
+	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
+		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
 	{
 		// Add the object pointer as the first parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
@@ -86,9 +89,21 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// Add the object pointer as the first parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
 	}
+	else if( callConv == ICC_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
 
 	if( callConv == ICC_VIRTUAL_THISCALL ||
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
 	{
 		// Get the true function pointer from the virtual function table
 		vftable = *(void***)obj;
@@ -100,10 +115,11 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 	asUINT spos = 0;
 	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
 	{
-		if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+		asCDataType &dt = descr->parameterTypes[n];
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
 		{
-			if( descr->parameterTypes[n].GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
-				(descr->parameterTypes[n].GetObjectType()->flags & COMPLEX_MASK) )
+			if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
+				(dt.GetObjectType()->flags & COMPLEX_MASK) )
 			{
 				allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
 				spos += AS_PTR_SIZE;
@@ -112,18 +128,18 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 			else
 			{
 				// Copy the object's memory to the buffer
-				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), dt.GetSizeInMemoryBytes());
 
 				// Delete the original memory
 				engine->CallFree(*(char**)(args+spos));
 				spos += AS_PTR_SIZE;
-				asUINT dwords = descr->parameterTypes[n].GetSizeInMemoryDWords();
+				asUINT dwords = dt.GetSizeInMemoryDWords();
 				asUINT qwords = (dwords >> 1) + (dwords & 1);
 				dpos      += qwords;
 				paramSize += qwords;
 			}
 		}
-		else if( descr->parameterTypes[n].GetTokenType() == ttQuestion )
+		else if( dt.GetTokenType() == ttQuestion )
 		{
 			// Copy the reference and the type id
 			allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
@@ -134,14 +150,14 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		else
 		{
 			// Copy the value directly
-			asUINT dwords = descr->parameterTypes[n].GetSizeOnStackDWords();
+			asUINT dwords = dt.GetSizeOnStackDWords();
 			if( dwords > 1 )
 			{
 				allArgBuffer[dpos] = *(asQWORD*)&args[spos];
 
 				// Double arguments are moved to a separate buffer in order to be placed in the XMM registers,
 				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && descr->parameterTypes[n].IsDoubleType() )
+				if( paramSize < 4 && dt.IsDoubleType() )
 					floatArgBuffer[dpos] = *(asQWORD*)&args[spos];
 
 				dpos++;
@@ -153,7 +169,7 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 
 				// Float arguments are moved to a separate buffer in order to be placed in the XMM registers,
 				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && descr->parameterTypes[n].IsFloatType() )
+				if( paramSize < 4 && dt.IsFloatType() )
 					floatArgBuffer[dpos] = args[spos];
 				
 				dpos++;
@@ -170,6 +186,14 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		// Add the object pointer as the last parameter
 		allArgBuffer[paramSize++] = (asQWORD)obj;
 	}
+	else if( callConv == ICC_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
 
 	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
 
diff --git a/lib/angelscript/source/as_callfunc_x86.cpp b/lib/angelscript/source/as_callfunc_x86.cpp
index 3c551cfcf..21c5f40df 100644
--- a/lib/angelscript/source/as_callfunc_x86.cpp
+++ b/lib/angelscript/source/as_callfunc_x86.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -34,6 +34,8 @@
 //
 // These functions handle the actual calling of system functions
 //
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
+//
 
 
 
@@ -87,7 +89,7 @@ asQWORD CallThisCallFunctionRetByRef(const void *, const asDWORD *, int, asFUNCT
 asDWORD GetReturnedFloat();
 asQWORD GetReturnedDouble();
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
 {
 	asCScriptEngine            *engine    = context->m_engine;
 	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;
@@ -95,13 +97,30 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 	asQWORD retQW = 0;
 
 	// Prepare the parameters
-	int paramSize = sysFunc->paramSize;
 	asDWORD paramBuffer[64];
-	if( sysFunc->takesObjByVal )
+	int callConv = sysFunc->callConv;
+
+	// Changed because need check for ICC_THISCALL_OBJFIRST or
+	// ICC_THISCALL_OBJLAST if sysFunc->takesObjByVal (avoid copy code)
+	// Check if is THISCALL_OBJ* calling convention (in this case needs to add secondObject pointer into stack).
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+	int paramSize = isThisCallMethod || sysFunc->takesObjByVal ? 0 : sysFunc->paramSize;
+
+	int dpos = 1;
+
+	if( isThisCallMethod && 
+		(callConv >= ICC_THISCALL_OBJFIRST &&
+		 callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+	{
+		// Add the object pointer as the first parameter
+		paramBuffer[dpos++] = (asDWORD)secondObject;
+		paramSize++;
+	}
+
+	if( sysFunc->takesObjByVal || isThisCallMethod )
 	{
-		paramSize = 0;
 		int spos = 0;
-		int dpos = 1;
+
 		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
 		{
 			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
@@ -146,9 +165,17 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		args = &paramBuffer[1];
 	}
 
+	if( isThisCallMethod && 
+		(callConv >= ICC_THISCALL_OBJLAST &&
+		 callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+	{
+		// Add the object pointer as the last parameter
+		paramBuffer[dpos++] = (asDWORD)secondObject;
+		paramSize++;
+	}
+
 	// Make the actual call
 	asFUNCTION_t func = sysFunc->func;
-	int callConv = sysFunc->callConv;
 	if( sysFunc->hostReturnInMemory )
 		callConv++;
 
@@ -176,14 +203,20 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		break;
 
 	case ICC_THISCALL:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
 		retQW = CallThisCallFunction(obj, args, paramSize<<2, func);
 		break;
 
 	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
 		retQW = CallThisCallFunctionRetByRef(obj, args, paramSize<<2, func, retPointer);
 		break;
 
 	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
 		{
 			// Get virtual function table from the object pointer
 			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
@@ -192,6 +225,8 @@ asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr,
 		break;
 
 	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
 		{
 			// Get virtual function table from the object pointer
 			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
diff --git a/lib/angelscript/source/as_callfunc_xenon.cpp b/lib/angelscript/source/as_callfunc_xenon.cpp
index c4f0394f3..34228216c 100644
--- a/lib/angelscript/source/as_callfunc_xenon.cpp
+++ b/lib/angelscript/source/as_callfunc_xenon.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -498,8 +498,10 @@ inline bool IsVariableArgument( asCDataType type )
 	return (type.GetTokenType() == ttQuestion) ? true : false;
 }
 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/)
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
 {
+	// TODO: Xenon does not yet support THISCALL_OBJFIRST/LAST
+
 	asCScriptEngine            *engine    = context->m_engine;
 	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;	
 	int                         callConv  = sysFunc->callConv;
diff --git a/lib/angelscript/source/as_compiler.cpp b/lib/angelscript/source/as_compiler.cpp
index 8df4c83c3..62b67315d 100644
--- a/lib/angelscript/source/as_compiler.cpp
+++ b/lib/angelscript/source/as_compiler.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -194,7 +194,7 @@ int asCCompiler::CompileFactory(asCBuilder *builder, asCScriptCode *script, asCS
 		}
 	}
 
-	// Allocate the class and instanciate it with the constructor
+	// Allocate the class and instantiate it with the constructor
 	int varOffset = AllocateVariable(dt, true);
 
 	outFunc->scriptData->variableSpace = AS_PTR_SIZE;
@@ -340,12 +340,12 @@ int asCCompiler::SetupParametersAndReturnVariable(asCArray<asCString> &parameter
 	}
 
 	// Is the return type allowed?
-	if( (!returnType.CanBeInstanciated() && returnType != asCDataType::CreatePrimitive(ttVoid, false)) ||
-		(returnType.IsReference() && !returnType.CanBeInstanciated()) )
+	if( returnType != asCDataType::CreatePrimitive(ttVoid, false) &&
+		!returnType.CanBeInstantiated() )
 	{
 		// TODO: Hasn't this been validated by the builder already?
 		asCString str;
-		str.Format(TXT_RETURN_CANT_BE_s, returnType.Format().AddressOf());
+		str.Format(TXT_RETURN_CANT_BE_s, returnType.Format(outFunc->nameSpace).AddressOf());
 		Error(str, func);
 	}
 
@@ -367,10 +367,10 @@ int asCCompiler::SetupParametersAndReturnVariable(asCArray<asCString> &parameter
 
 		// Is the data type allowed?
 		// TODO: Hasn't this been validated by the builder already?
-		if( (type.IsReference() && inoutFlag != asTM_INOUTREF && !type.CanBeInstanciated()) ||
-			(!type.IsReference() && !type.CanBeInstanciated()) )
+		if( (type.IsReference() && inoutFlag != asTM_INOUTREF && !type.CanBeInstantiated()) ||
+			(!type.IsReference() && !type.CanBeInstantiated()) )
 		{
-			asCString parm = type.Format();
+			asCString parm = type.Format(outFunc->nameSpace);
 			if( inoutFlag == asTM_INREF )
 				parm += "in";
 			else if( inoutFlag == asTM_OUTREF )
@@ -502,6 +502,7 @@ void asCCompiler::CompileMemberInitialization(asCByteCode *byteCode, bool onlyDe
 			asQWORD constantValue;
 			asCByteCode bc(engine);
 			CompileInitialization(initNode, &bc, prop->type, declNode, prop->byteOffset, &constantValue, 2);
+			bc.OptimizeLocally(tempVariableOffsets);
 			byteCode->AddCode(&bc);
 
 			script = origScript;
@@ -608,22 +609,6 @@ int asCCompiler::CompileFunction(asCBuilder *builder, asCScriptCode *script, asC
 				CompileMemberInitialization(&byteCode, false);
 			}
 		}
-
-		// Increase the reference for the object pointer, so that it is guaranteed to live during the entire call
-		if( !m_isConstructor && !outFunc->returnType.IsReference() )
-		{
-			// TODO: runtime optimize: If the function is trivial, i.e. doesn't access any outside functions,
-			//                         then this is not necessary. If I implement this, then the function needs
-			//                         to set a flag so the exception handler doesn't try to release the handle.
-			// It is not necessary to do this for constructors, as they have no outside references that can be released anyway
-			// It is not necessary to do this for methods that return references, as the caller is guaranteed to hold a reference to the object
-			asCByteCode tmpBC(engine);
-			tmpBC.InstrSHORT(asBC_PSF, 0);
-			tmpBC.Instr(asBC_RDSPtr);
-			tmpBC.Call(asBC_CALLSYS, outFunc->objectType->beh.addref, AS_PTR_SIZE);
-			tmpBC.OptimizeLocally(tempVariableOffsets);
-			byteCode.AddCode(&tmpBC);
-		}
 	}
 
 	// Add the code for the statement block
@@ -666,10 +651,6 @@ int asCCompiler::CompileFunction(asCBuilder *builder, asCScriptCode *script, asC
 		// Do not deallocate parameters
 	}
 
-	// Release the object pointer again
-	if( outFunc->objectType && !m_isConstructor && !outFunc->returnType.IsReference() )
-		byteCode.InstrW_PTR(asBC_FREE, 0, outFunc->objectType);
-
 	// Check if the number of labels in the functions isn't too many to be handled
 	if( nextLabel >= (1<<15) )
 		Error(TXT_TOO_MANY_JUMP_LABELS, func);
@@ -808,7 +789,7 @@ int asCCompiler::CallCopyConstructor(asCDataType &type, int offset, bool isObjec
 	return -1;
 }
 
-int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem, bool derefDest)
+int asCCompiler::CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem, bool derefDest)
 {
 	if( !type.IsObject() || type.IsObjectHandle() )
 		return 0;
@@ -820,7 +801,7 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 
 		int func = 0;
 		asSTypeBehaviour *beh = type.GetBehaviour();
-		if( beh ) 
+		if( beh )
 		{
 			func = beh->factory;
 
@@ -847,7 +828,7 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 			if( f->parameterTypes.GetLength() )
 			{
 				// Add the default values for arguments not explicitly supplied
-				CompileDefaultArgs(node, args, f);
+				CompileDefaultAndNamedArgs(node, args, func, type.GetObjectType());
 
 				PrepareFunctionCall(func, &ctx.bc, args);
 
@@ -927,7 +908,7 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 		asSTypeBehaviour *beh = type.GetBehaviour();
 
 		int func = 0;
-		if( beh ) 
+		if( beh )
 		{
 			func = beh->construct;
 
@@ -955,7 +936,7 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 			if( f && f->parameterTypes.GetLength() )
 			{
 				// Add the default values for arguments not explicitly supplied
-				CompileDefaultArgs(node, args, f);
+				CompileDefaultAndNamedArgs(node, args, func, type.GetObjectType());
 
 				PrepareFunctionCall(func, &ctx.bc, args);
 
@@ -1001,7 +982,7 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 						bc->AddCode(&ctx.bc);
 					}
 				}
-				else 
+				else
 				{
 					asASSERT( false );
 				}
@@ -1019,7 +1000,31 @@ int asCCompiler::CallDefaultConstructor(asCDataType &type, int offset, bool isOb
 					bc->InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateObject(outFunc->objectType, false)));
 				}
 
-				bc->Alloc(asBC_ALLOC, type.GetObjectType(), func, AS_PTR_SIZE);
+				if( (type.GetObjectType()->flags & asOBJ_TEMPLATE) )
+				{
+					asCScriptFunction *descr = engine->scriptFunctions[func];
+					asASSERT( descr->funcType == asFUNC_SCRIPT );
+
+					// Find the id of the real constructor and not the generated stub
+					asUINT id = 0;
+					asDWORD *funcBc = descr->scriptData->byteCode.AddressOf();
+					while( funcBc )
+					{
+						if( (*(asBYTE*)funcBc) == asBC_CALLSYS )
+						{
+							id = asBC_INTARG(funcBc);
+							break;
+						}
+						funcBc += asBCTypeSize[asBCInfo[*(asBYTE*)funcBc].type];
+					}
+
+					asASSERT( id );
+
+					bc->InstrPTR(asBC_OBJTYPE, type.GetObjectType());
+					bc->Alloc(asBC_ALLOC, type.GetObjectType(), id, AS_PTR_SIZE + AS_PTR_SIZE);
+				}
+				else
+					bc->Alloc(asBC_ALLOC, type.GetObjectType(), func, AS_PTR_SIZE);
 			}
 
 			// Cleanup
@@ -1052,6 +1057,10 @@ void asCCompiler::CallDestructor(asCDataType &type, int offset, bool isObjectOnH
 		// Call destructor for the data type
 		if( type.IsObject() )
 		{
+			// The null pointer doesn't need to be destroyed
+			if( type.IsNullHandle() )
+				return;
+
 			// Nothing is done for list pattern types, as this is taken care of by the CompileInitList method
 			if( type.GetObjectType()->flags & asOBJ_LIST_PATTERN )
 				return;
@@ -1106,6 +1115,13 @@ void asCCompiler::CompileStatementBlock(asCScriptNode *block, bool ownVariableSc
 	asCScriptNode *node = block->firstChild;
 	while( node )
 	{
+#ifdef AS_DEBUG
+		// Keep the current line in a variable so it will be easier
+		// to determine where in a script an assert is occurring.
+		int currentLine = 0;
+		script->ConvertPosToRowCol(node->tokenPos, &currentLine, 0);
+#endif
+
 		if( !hasUnreachableCode && (*hasReturn || isFinished) )
 		{
 			// Empty statements don't count
@@ -1188,10 +1204,20 @@ int asCCompiler::CompileGlobalVariable(asCBuilder *builder, asCScriptCode *scrip
 		node = parser.GetScriptNode();
 	}
 
+	asSExprContext compiledCtx(engine);
+	bool preCompiled = false;
+	if( gvar->datatype.IsAuto() )
+		preCompiled = CompileAutoType(gvar->datatype, compiledCtx, node, gvar->declaredAtNode);
+	if( gvar->property == 0 )
+	{
+		gvar->property = builder->module->AllocateGlobalProperty(gvar->name.AddressOf(), gvar->datatype, gvar->ns);
+		gvar->index = gvar->property->id;
+	}
+
 	// Compile the expression
 	asSExprContext ctx(engine);
-	asQWORD constantValue;
-	if( CompileInitialization(node, &ctx.bc, gvar->datatype, gvar->declaredAtNode, gvar->index, &constantValue, 1) )
+	asQWORD constantValue = 0;
+	if( CompileInitialization(node, &ctx.bc, gvar->datatype, gvar->declaredAtNode, gvar->index, &constantValue, 1, preCompiled ? &compiledCtx : 0) )
 	{
 		// Should the variable be marked as pure constant?
 		if( gvar->datatype.IsPrimitive() && gvar->datatype.IsReadOnly() )
@@ -1263,8 +1289,8 @@ void asCCompiler::DetermineSingleFunc(asSExprContext *ctx, asCScriptNode *node)
 	if( pos >= 0 )
 	{
 		asCString nsName = ctx->methodName.SubString(0, pos+2);
-		
-		// Cut off the :: 
+
+		// Cut off the ::
 		if( nsName.GetLength() > 2 )
 			nsName.SetLength(nsName.GetLength()-2);
 
@@ -1300,7 +1326,7 @@ void asCCompiler::DetermineSingleFunc(asSExprContext *ctx, asCScriptNode *node)
 		asCString msg;
 		msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, builder->GetFunctionDescription(funcs[0])->GetDeclaration());
 		Error(msg, node);
-		
+
 		// Fall through so the compiler can continue anyway
 	}
 
@@ -1312,7 +1338,79 @@ void asCCompiler::DetermineSingleFunc(asSExprContext *ctx, asCScriptNode *node)
 	ctx->methodName = "";
 }
 
-void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, asCScriptNode *node, bool isFunction, int refType, bool isMakingCopy)
+void asCCompiler::CompileInitAsCopy(asCDataType &dt, int offset, asCByteCode *bc, asSExprContext *arg, asCScriptNode *node, bool derefDestination)
+{
+	asASSERT( dt.GetObjectType() );
+
+	bool isObjectOnHeap = derefDestination ? false : IsVariableOnHeap(offset);
+
+	// Use copy constructor if available.
+	if( dt.GetObjectType()->beh.copyconstruct )
+	{
+		PrepareForAssignment(&dt, arg, node, true);
+		int r = CallCopyConstructor(dt, offset, isObjectOnHeap, bc, arg, node, 0, derefDestination);
+		if( r < 0 && tempVariables.Exists(offset) )
+			Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+	}
+	else
+	{
+		// TODO: 2.28.1: Need to reserve variables, as the default constructor may need
+		//               to allocate temporary variables to compute default args
+
+		// Allocate and construct the temporary object before whatever is already in the bytecode
+		asCByteCode tmpBC(engine);
+		int r = CallDefaultConstructor(dt, offset, isObjectOnHeap, &tmpBC, node, 0, derefDestination);
+		if( r < 0 )
+		{
+			if( tempVariables.Exists(offset) )
+				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+			return;
+		}
+
+		tmpBC.AddCode(bc);
+		bc->AddCode(&tmpBC);
+
+		// Assign the evaluated expression to the temporary variable
+		PrepareForAssignment(&dt, arg, node, true);
+		bc->AddCode(&arg->bc);
+
+		// Call the opAssign method to assign the value to the temporary object
+		dt.MakeReference(isObjectOnHeap);
+		asCTypeInfo type;
+		type.Set(dt);
+		type.isTemporary = true;
+		type.stackOffset = (short)offset;
+
+		if( dt.IsObjectHandle() )
+			type.isExplicitHandle = true;
+
+		bc->InstrSHORT(asBC_PSF, (short)offset);
+		if( derefDestination )
+			bc->Instr(asBC_RDSPtr);
+
+		r = PerformAssignment(&type, &arg->type, bc, node);
+		if( r < 0 )
+		{
+			if( tempVariables.Exists(offset) )
+				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+			return;
+		}
+
+		// Pop the reference that was pushed on the stack if the result is an object
+		if( type.dataType.IsObject() )
+			bc->Instr(asBC_PopPtr);
+
+		// If the assignment operator returned an object by value it will
+		// be in a temporary variable which we need to destroy now
+		if( type.isTemporary && type.stackOffset != (short)offset )
+			ReleaseTemporaryVariable(type.stackOffset, bc);
+
+		// Release the original value too in case it is a temporary
+		ReleaseTemporaryVariable(arg->type, bc);
+	}
+}
+
+int asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, asCScriptNode *node, bool isFunction, int refType, bool isMakingCopy)
 {
 	asCDataType param = *paramType;
 	if( paramType->GetTokenType() == ttQuestion )
@@ -1324,9 +1422,13 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 		param = ctx->type.dataType;
 		param.MakeHandle(ctx->type.isExplicitHandle || ctx->type.IsNullConstant());
 
+		// Treat the void expression like a null handle when working with var types
+		if( ctx->type.IsVoidExpression() )
+			param = asCDataType::CreateNullHandle();
+
 		// If value assign is disabled for reference types, then make
 		// sure to always pass the handle to ? parameters
-		if( builder->engine->ep.disallowValueAssignForRefType && 
+		if( builder->engine->ep.disallowValueAssignForRefType &&
 			ctx->type.dataType.GetObjectType() && (ctx->type.dataType.GetObjectType()->flags & asOBJ_REF) && !(ctx->type.dataType.GetObjectType()->flags & asOBJ_SCOPED) )
 		{
 			param.MakeHandle(true);
@@ -1365,10 +1467,10 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 				ctx->bc.AddCode(&tmpBC);
 			}
 
-			// If the reference is const, then it is not necessary to make a copy if the value already is a variable
-			// Even if the same variable is passed in another argument as non-const then there is no problem
-			if( dt.IsPrimitive() || dt.IsNullHandle() )
+			if( dt.IsPrimitive() )
 			{
+				// If the reference is const, then it is not necessary to make a copy if the value already is a variable
+				// Even if the same variable is passed in another argument as non-const then there is no problem
 				IsVariableInitialized(&ctx->type, node);
 
 				if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
@@ -1380,82 +1482,99 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 				PushVariableOnStack(ctx, true);
 				ctx->type.dataType.MakeReadOnly(param.IsReadOnly());
 			}
+			else if( ctx->type.dataType.IsNullHandle() )
+			{
+				// Need to initialize a local temporary variable to
+				// represent the null handle when passed as reference
+				asASSERT( ctx->bc.GetLastInstr() == asBC_PshNull );
+				ctx->bc.Instr(asBC_PopPtr);
+
+				dt.MakeHandle(true);
+				offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+				// Push the reference to the variable on the stack
+				ctx->bc.InstrWORD(asBC_PSF, (short)offset);
+
+				ctx->type.SetVariable(dt, offset, true);
+			}
 			else
 			{
 				IsVariableInitialized(&ctx->type, node);
 
 				if( !isMakingCopy )
 				{
-					ImplicitConversion(ctx, param, node, asIC_IMPLICIT_CONV, true);
-
-					if( !ctx->type.dataType.IsEqualExceptRef(param) )
+					// Even though the parameter expects a reference, it is only meant to be
+					// used as input value and doesn't have to refer to the actual object, so it
+					// is OK to do an implicit conversion.
+					ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true);
+					if( !ctx->type.dataType.IsEqualExceptRefAndConst(param) )
 					{
 						asCString str;
-						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format().AddressOf(), param.Format().AddressOf());
+						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), param.Format(outFunc->nameSpace).AddressOf());
 						Error(str, node);
 
 						ctx->type.Set(param);
+						return -1;
+					}
+
+					// The compiler must guarantee that the object stays alive during the execution
+					// of the function, and it must also guarantee that the value isn't modified by
+					// the function.
+
+					// If the argument is a temporary local variable then it is safe to be passed to
+					// the function as it is, since the local variable will stay alive, and since it
+					// is temporary there is no side effect if the function modifies it.
+
+					// If the parameter is read-only and therefor guaranteed not to be modified by the
+					// function, then it is enough that the variable is local to guarantee the lifetime.
+					if( !ctx->type.isTemporary && !(param.IsReadOnly() && ctx->type.isVariable) )
+					{
+						if( (ctx->type.dataType.GetObjectType()->flags & asOBJ_REF) && param.IsReadOnly() && !(ctx->type.dataType.GetObjectType()->flags & asOBJ_SCOPED) )
+						{
+							// If the object is a reference type (except scoped reference types), and the
+							// parameter is a const reference, then it is not necessary to make a copy of the
+							// object. The compiler just needs to hold a handle to guarantee the lifetime.
+
+							// Allocate a handle variable
+							dt.MakeHandle(true);
+							offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+							// Copy the handle
+							Dereference(ctx, true);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+							ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetObjectType());
+							ctx->bc.Instr(asBC_PopPtr);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+
+							// The type should be set to the param type instead of dt to guarantee
+							// that the expression keeps the correct type for variable ? args. Otherwise
+							// MoveArgsToStack will use the wrong bytecode to move the arg to the stack
+							ctx->type.SetVariable(param, offset, true);
+						}
+						else
+						{
+							// Allocate and initialize a temporary local object
+							offset = AllocateVariableNotIn(dt, true, false, ctx);
+							CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
+
+							// Push the object pointer on the stack
+							ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+							if( dt.IsObject() && !dt.IsObjectHandle() )
+								ctx->bc.Instr(asBC_RDSPtr);
+
+							// Set the resulting type
+							ctx->type.Set(dt);
+							ctx->type.isTemporary = true;
+							ctx->type.stackOffset = short(offset);
+							if( dt.IsObjectHandle() )
+								ctx->type.isExplicitHandle = true;
+							ctx->type.dataType.MakeReference(false);
+							if( paramType->IsReadOnly() )
+								ctx->type.dataType.MakeReadOnly(true);
+						}
 					}
 				}
-
-				// If the argument already is a temporary
-				// variable we don't need to allocate another
-
-				// If the parameter is read-only and the object already is a local
-				// variable then it is not necessary to make a copy either
-				if( !ctx->type.isTemporary && !(param.IsReadOnly() && ctx->type.isVariable) && !isMakingCopy )
-				{
-					// TODO: 2.28.1: Need to reserve variables, as the default constructor may need 
-					//               to allocate temporary variables to compute default args
-					// Make sure the variable is not used in the expression
-					offset = AllocateVariableNotIn(dt, true, false, ctx);
-
-					// TODO: copy: Use copy constructor if available. See PrepareTemporaryObject()
-
-					// Allocate and construct the temporary object
-					asCByteCode tmpBC(engine);
-
-					CallDefaultConstructor(dt, offset, IsVariableOnHeap(offset), &tmpBC, node);
-
-					// Insert the code before the expression code
-					tmpBC.AddCode(&ctx->bc);
-					ctx->bc.AddCode(&tmpBC);
-
-					// Assign the evaluated expression to the temporary variable
-					PrepareForAssignment(&dt, ctx, node, true);
-
-					dt.MakeReference(IsVariableOnHeap(offset));
-					asCTypeInfo type;
-					type.Set(dt);
-					type.isTemporary = true;
-					type.stackOffset = (short)offset;
-
-					if( dt.IsObjectHandle() )
-						type.isExplicitHandle = true;
-
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-
-					PerformAssignment(&type, &ctx->type, &ctx->bc, node);
-
-					ctx->bc.Instr(asBC_PopPtr);
-
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-					ctx->type.Set(dt);
-					ctx->type.isTemporary = true;
-					ctx->type.stackOffset = offset;
-					if( dt.IsObjectHandle() )
-						ctx->type.isExplicitHandle = true;
-					ctx->type.dataType.MakeReference(false);
-
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-					if( dt.IsObject() && !dt.IsObjectHandle() )
-						ctx->bc.Instr(asBC_RDSPtr);
-
-					if( paramType->IsReadOnly() )
-						ctx->type.dataType.MakeReadOnly(true);
-				}
-				else if( isMakingCopy )
+				else
 				{
 					// We must guarantee that the address to the value is on the stack
 					if( ctx->type.dataType.IsObject() &&
@@ -1490,7 +1609,7 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 			}
 			else
 			{
-				// TODO: 2.28.1: Need to reserve variables, as the default constructor may need 
+				// TODO: 2.28.1: Need to reserve variables, as the default constructor may need
 				//               to allocate temporary variables to compute default args
 
 				// Allocate and construct the temporary object
@@ -1501,7 +1620,7 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 				tmpBC.AddCode(&ctx->bc);
 				ctx->bc.AddCode(&tmpBC);
 
-				dt.MakeReference((!dt.IsObject() || dt.IsObjectHandle()));
+				dt.MakeReference(!dt.IsObject() || dt.IsObjectHandle());
 				asCTypeInfo type;
 				type.Set(dt);
 				type.isTemporary = true;
@@ -1537,9 +1656,24 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 			// Literal constants cannot be passed to inout ref arguments
 			if( !ctx->type.isVariable && ctx->type.isConstant )
 			{
-				Error(TXT_NOT_VALID_REFERENCE, node);
+				// Unless unsafe references are turned on and the reference is const
+				if( param.IsReadOnly() && engine->ep.allowUnsafeReferences )
+				{
+					// Since the parameter is a const & make a copy.
+					ConvertToTempVariable(ctx);
+					ctx->type.dataType.MakeReadOnly(true);
+				}
+				else
+				{
+					Error(TXT_NOT_VALID_REFERENCE, node);
+					return -1;
+				}
 			}
 
+			// Perform implicit ref cast if necessary, but don't allow the implicit conversion to create new objects
+			if( ctx->type.dataType.IsObject() && ctx->type.dataType.GetObjectType() != dt.GetObjectType() )
+				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true, false);
+
 			// Only objects that support object handles
 			// can be guaranteed to be safe. Local variables are
 			// already safe, so there is no need to add an extra
@@ -1573,9 +1707,7 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 
 				// Release previous temporary variable stored in the context (if any)
 				if( ctx->type.isTemporary )
-				{
 					ReleaseTemporaryVariable(ctx->type.stackOffset, &ctx->bc);
-				}
 
 				ctx->type.SetVariable(dt, offset, true);
 			}
@@ -1627,16 +1759,17 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 			if( !ctx->type.dataType.IsEqualExceptRef(dt) )
 			{
 				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format().AddressOf(), dt.Format().AddressOf());
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), dt.Format(outFunc->nameSpace).AddressOf());
 				Error(str, node);
 
 				ctx->type.Set(dt);
+				return -1;
 			}
 
 			if( dt.IsObjectHandle() )
 				ctx->type.isExplicitHandle = true;
 
-			if( dt.IsObject() )
+			if( dt.IsObject() && !dt.IsNullHandle() )
 			{
 				if( !dt.IsReference() )
 				{
@@ -1667,7 +1800,7 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 	}
 
 	// Don't put any pointer on the stack yet
-	if( param.IsReference() || param.IsObject() )
+	if( param.IsReference() || (param.IsObject() && !param.IsNullHandle()) )
 	{
 		// &inout parameter may leave the reference on the stack already
 		if( refType != 3 )
@@ -1683,6 +1816,8 @@ void asCCompiler::PrepareArgument(asCDataType *paramType, asSExprContext *ctx, a
 			}
 		}
 	}
+
+	return 0;
 }
 
 void asCCompiler::PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asSExprContext *> &args)
@@ -1692,6 +1827,7 @@ void asCCompiler::PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asSE
 
 	// If the function being called is the opAssign or copy constructor for the same type
 	// as the argument, then we should avoid making temporary copy of the argument
+	asASSERT( descr->parameterTypes.GetLength() == args.GetLength() );
 	bool makingCopy = false;
 	if( descr->parameterTypes.GetLength() == 1 &&
 		descr->parameterTypes[0].IsEqualExceptRefAndConst(args[0]->type.dataType) &&
@@ -1802,7 +1938,7 @@ void asCCompiler::MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asSExprC
 	}
 }
 
-int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asSExprContext*> &args)
+int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asSExprContext*> &args, asCArray<asSNamedArgument> &namedArgs)
 {
 	asASSERT(node->nodeType == snArgList);
 
@@ -1811,7 +1947,8 @@ int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asSExprContex
 	int argCount = 0;
 	while( arg )
 	{
-		argCount++;
+		if( arg->nodeType != snNamedArgument )
+			argCount++;
 		arg = arg->next;
 	}
 
@@ -1824,44 +1961,126 @@ int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asSExprContex
 	n = argCount-1;
 
 	// Compile the arguments in reverse order (as they will be pushed on the stack)
-	bool anyErrors = false;
+	bool anyErrors = false, inPositionalArguments = false;
 	arg = node->lastChild;
 	while( arg )
 	{
+		asCScriptNode *asgNode = arg, *namedNode = 0;
+		if( asgNode->nodeType == snNamedArgument )
+		{
+			if( inPositionalArguments )
+			{
+				Error(TXT_POS_ARG_AFTER_NAMED_ARG, node);
+				return -1;
+			}
+
+			asgNode = arg->firstChild->next;
+			namedNode = arg->firstChild;
+
+			asASSERT( namedNode->nodeType == snIdentifier );
+		}
+		else
+			inPositionalArguments = true;
+
 		asSExprContext expr(engine);
-		int r = CompileAssignment(arg, &expr);
+		int r = CompileAssignment(asgNode, &expr);
 		if( r < 0 ) anyErrors = true;
 
-		args[n] = asNEW(asSExprContext)(engine);
-		if( args[n] == 0 )
+		asSExprContext *ctx = asNEW(asSExprContext)(engine);
+		if( ctx == 0 )
 		{
 			// Out of memory
 			return -1;
 		}
-		MergeExprBytecodeAndType(args[n], &expr);
+		MergeExprBytecodeAndType(ctx, &expr);
+
+		if( inPositionalArguments )
+		{
+			args[n] = ctx;
+			n--;
+		}
+		else
+		{
+			asSNamedArgument namedArg;
+			namedArg.name = asCString(&script->code[namedNode->tokenPos], namedNode->tokenLength);
+			namedArg.ctx = ctx;
+
+			// Error out when multiple arguments with the same name are passed
+			for( asUINT n = 0; n < namedArgs.GetLength(); ++n )
+			{
+				if( namedArgs[n].name == namedArg.name )
+				{
+					Error(TXT_DUPLICATE_NAMED_ARG, asgNode);
+					anyErrors = true;
+					break;
+				}
+			}
+
+			namedArgs.PushLast(namedArg);
+		}
 
-		n--;
 		arg = arg->prev;
 	}
 
 	return anyErrors ? -1 : 0;
 }
 
-int asCCompiler::CompileDefaultArgs(asCScriptNode *node, asCArray<asSExprContext*> &args, asCScriptFunction *func)
+int asCCompiler::CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asSExprContext*> &args, int funcId, asCObjectType *objectType, asCArray<asSNamedArgument> *namedArgs)
 {
+	asCScriptFunction *func = builder->GetFunctionDescription(funcId);
+	if( func == 0 || args.GetLength() >= (asUINT)func->GetParamCount() )
+		return 0;
+
+	// Make sure to use the real function for virtual functions
+	if( func->funcType == asFUNC_VIRTUAL )
+	{
+		asASSERT( objectType );
+		func = objectType->virtualFunctionTable[func->vfTableIdx];
+	}
+
+	// Make sure none of the variables used in the previous arguments are reused in the default arguments
 	bool anyErrors = false;
-	asCArray<int> varsUsed;
+	int prevReservedVars = reservedVariables.GetLength();
+	
 	int explicitArgs = (int)args.GetLength();
 
 	for( int p = 0; p < explicitArgs; p++ )
-		args[p]->bc.GetVarsUsed(varsUsed);
+		args[p]->bc.GetVarsUsed(reservedVariables);
 
-	// Compile the arguments in reverse order (as they will be pushed on the stack)
+	// Make space for all the new arguments
 	args.SetLength(func->parameterTypes.GetLength());
 	for( asUINT c = explicitArgs; c < args.GetLength(); c++ )
 		args[c] = 0;
+
+	// Add the named arguments to the argument list in the right position
+	if( namedArgs )
+	{
+		for( asUINT n = 0; n < namedArgs->GetLength(); ++n )
+		{
+			asSNamedArgument &named = (*namedArgs)[n];
+			named.ctx->bc.GetVarsUsed(reservedVariables);
+
+			// Find the right spot to put it in
+			asUINT index = asUINT(-1);
+			for( asUINT j = 0; j < func->parameterTypes.GetLength(); ++j )
+			{
+				if( func->parameterNames[j] == (*namedArgs)[n].name )
+				{
+					index = j;
+					break;
+				}
+			}
+
+			asASSERT( index < args.GetLength() );
+			args[index] = named.ctx;
+			named.ctx = 0;
+		}
+	}
+
+	// Compile the arguments in reverse order (as they will be pushed on the stack)
 	for( int n = (int)func->parameterTypes.GetLength() - 1; n >= explicitArgs; n-- )
 	{
+		if( args[n] != 0 ) continue;
 		if( func->defaultArgs[n] == 0 ) { anyErrors = true; continue; }
 
 		// Parse the default arg string
@@ -1885,11 +2104,19 @@ int asCCompiler::CompileDefaultArgs(asCScriptNode *node, asCArray<asSExprContext
 		script = &code;
 
 		// Don't allow the expression to access local variables
-		// TODO: namespace: The default arg should see the symbols declared in the same scope as the function that is called
 		isCompilingDefaultArg = true;
+
+		// Temporarily set the namespace in the output function to the namespace of the called
+		// function so that the default arguments are evaluated in the correct namespace
+		asSNameSpace *origNameSpace = outFunc->nameSpace;
+		outFunc->nameSpace = func->nameSpace;
+
 		asSExprContext expr(engine);
 		r = CompileExpression(arg, &expr);
 
+		// Restore the namespace
+		outFunc->nameSpace = origNameSpace;
+
 		// Don't allow address of class method
 		if( expr.methodName != "" )
 		{
@@ -1928,48 +2155,18 @@ int asCCompiler::CompileDefaultArgs(asCScriptNode *node, asCArray<asSExprContext
 		if( args[n] == 0 )
 		{
 			// Out of memory
+			reservedVariables.SetLength(prevReservedVars);
 			return -1;
 		}
 
 		MergeExprBytecodeAndType(args[n], &expr);
-
-		// Make sure the default arg expression doesn't end up
-		// with a variable that is used in a previous expression
-		if( args[n]->type.isVariable )
-		{
-			int offset = args[n]->type.stackOffset;
-			if( varsUsed.Exists(offset) )
-			{
-				// Release the current temporary variable
-				ReleaseTemporaryVariable(args[n]->type, 0);
-
-				asCDataType dt = args[n]->type.dataType;
-				dt.MakeReference(false);
-
-				// Reserve all variables already used in the expression so none of them will be used
-				asCArray<int> used;
-				args[n]->bc.GetVarsUsed(used);
-				size_t prevReserved = reservedVariables.GetLength();
-				reservedVariables.Concatenate(used);
-
-				int newOffset = AllocateVariable(dt, true, IsVariableOnHeap(offset));
-				asASSERT( IsVariableOnHeap(offset) == IsVariableOnHeap(newOffset) );
-
-				reservedVariables.SetLength(prevReserved);
-
-				// Replace the variable in the expression
-				args[n]->bc.ExchangeVar(offset, newOffset);
-				args[n]->type.stackOffset = (short)newOffset;
-				args[n]->type.isTemporary = true;
-				args[n]->type.isVariable = true;
-			}
-		}
 	}
 
+	reservedVariables.SetLength(prevReservedVars);
 	return anyErrors ? -1 : 0;
 }
 
-asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext*> &args, asCScriptNode *node, const char *name, asCObjectType *objectType, bool isConstMethod, bool silent, bool allowObjectConstruct, const asCString &scope)
+asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs, asCObjectType *objectType, bool isConstMethod, bool silent, bool allowObjectConstruct, const asCString &scope)
 {
 	asCArray<int> origFuncs = funcs; // Keep the original list for error message
 	asUINT cost = 0;
@@ -1978,14 +2175,18 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 	if( funcs.GetLength() > 0 )
 	{
 		// Check the number of parameters in the found functions
+		asUINT totalArgs = (asUINT)args.GetLength();
+		if( namedArgs != 0 )
+			totalArgs += (asUINT)namedArgs->GetLength();
+
 		for( n = 0; n < funcs.GetLength(); ++n )
 		{
 			asCScriptFunction *desc = builder->GetFunctionDescription(funcs[n]);
 
-			if( desc->parameterTypes.GetLength() != args.GetLength() )
+			if( desc->parameterTypes.GetLength() != totalArgs )
 			{
 				bool noMatch = true;
-				if( args.GetLength() < desc->parameterTypes.GetLength() )
+				if( totalArgs < desc->parameterTypes.GetLength() )
 				{
 					// For virtual functions, the default args are defined in the real function of the object
 					if( desc->funcType == asFUNC_VIRTUAL )
@@ -1997,7 +2198,7 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 						if( desc->defaultArgs[d] )
 							defaultArgs++;
 
-					if( args.GetLength() >= desc->parameterTypes.GetLength() - defaultArgs )
+					if( totalArgs >= desc->parameterTypes.GetLength() - defaultArgs )
 						noMatch = false;
 				}
 
@@ -2022,6 +2223,7 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 			matchingFuncs[n].cost = 0;
 		}
 
+		// Match positionally passed arguments
 		for( n = 0; n < args.GetLength(); ++n )
 		{
 			asCArray<asSOverloadCandidate> tempFuncs;
@@ -2055,6 +2257,93 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 			}
 		}
 
+		// Match named arguments
+		if( namedArgs != 0 )
+		{
+			for( asUINT i = 0; i < matchingFuncs.GetLength(); ++i )
+			{
+				asCScriptFunction *desc = builder->GetFunctionDescription(matchingFuncs[i].funcId);
+				if( desc->funcType == asFUNC_VIRTUAL )
+					desc = objectType->virtualFunctionTable[desc->vfTableIdx];
+
+				//Match every named argument to an argument in the function
+				for( n = 0; n < namedArgs->GetLength(); ++n )
+					(*namedArgs)[n].match = asUINT(-1);
+
+				bool matchedAll = true;
+				for( asUINT j = 0; j < desc->parameterTypes.GetLength(); ++j )
+				{
+					asUINT match = asUINT(-1);
+					for( n = 0; n < namedArgs->GetLength(); ++n )
+					{
+						asSNamedArgument &namedArg = (*namedArgs)[n];
+						if( desc->parameterNames[j] == namedArg.name )
+						{
+							namedArg.match = j;
+							match = n;
+							break;
+						}
+					}
+
+					// Check that every position is filled somehow
+					if( j >= args.GetLength() )
+					{
+						if( match == asUINT(-1) && !desc->defaultArgs[j] )
+						{
+							// No argument was found for this, and there is no
+							// default, so it doesn't work.
+							matchedAll = false;
+							break;
+						}
+					}
+					else
+					{
+						if( match != asUINT(-1) )
+						{
+							// Can't name an argument that was already passed
+							matchedAll = false;
+							break;
+						}
+					}
+				}
+
+				//Check that every named argument was matched
+				if( matchedAll )
+				{
+					for( n = 0; n < namedArgs->GetLength(); ++n )
+					{
+						asSNamedArgument &named = (*namedArgs)[n];
+
+						if( named.match == asUINT(-1) )
+						{
+							matchedAll = false;
+							break;
+						}
+
+						// Add to the cost
+						asUINT cost = MatchArgument(desc, named.ctx, named.match, allowObjectConstruct);
+						if( cost == asUINT(-1) )
+						{
+							matchedAll = false;
+							break;
+						}
+
+						matchingFuncs[i].cost += cost;
+					}
+				}
+
+				if( !matchedAll )
+				{
+					// Remove the function, we didn't match all the arguments.
+					if( i == matchingFuncs.GetLength()-1 )
+						matchingFuncs.PopLast();
+					else
+						matchingFuncs[i] = matchingFuncs.PopLast();
+					i--;
+				}
+			}
+		}
+
 		// Select the overload(s) with the lowest overall cost
 		funcs.SetLength(0);
 		asUINT bestCost = asUINT(-1);
@@ -2080,30 +2369,44 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 	if( funcs.GetLength() != 1 && !silent )
 	{
 		// Build a readable string of the function with parameter types
+		bool attemptsPassingClassMethod = false;
 		asCString str;
-		if( scope != "" )
-		{
-			if( scope == "::" )
-				str = scope;
-			else
-				str = scope + "::";
-		}
+		if( scope != "" && scope != "::" )
+			str = scope + "::";
 		str += name;
 		str += "(";
-		if( args.GetLength() )
+		for( n = 0; n < args.GetLength(); n++ )
 		{
-			if( args[0]->methodName != "" )
-				str += args[0]->methodName;
-			else
-				str += args[0]->type.dataType.Format();
-		}
-		for( n = 1; n < args.GetLength(); n++ )
-		{
-			str += ", ";
+			if( n > 0 )
+				str += ", ";
 			if( args[n]->methodName != "" )
+			{
+				if( args[n]->IsClassMethod() )
+				{
+					attemptsPassingClassMethod = true;
+					str += args[n]->type.dataType.GetObjectType()->GetName();
+					str += "::";
+				}
 				str += args[n]->methodName;
+			}
 			else
-				str += args[n]->type.dataType.Format();
+				str += args[n]->type.dataType.Format(outFunc->nameSpace);
+		}
+		if( namedArgs != 0 )
+		{
+			for( n = 0; n < namedArgs->GetLength(); n++ )
+			{
+				if( n > 0 || args.GetLength() )
+					str += ", ";
+
+				asSNamedArgument &named = (*namedArgs)[n];
+				str += named.name;
+				str += "=";
+				if( named.ctx->methodName != "" )
+					str += named.ctx->methodName;
+				else
+					str += named.ctx->type.dataType.Format(outFunc->nameSpace);
+			}
 		}
 		str += ")";
 
@@ -2118,28 +2421,88 @@ asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext
 			str.Format(TXT_NO_MATCHING_SIGNATURES_TO_s, str.AddressOf());
 			Error(str, node);
 
-			// Print the list of candidates
-			if( origFuncs.GetLength() > 0 )
+			if( attemptsPassingClassMethod )
 			{
-				int r = 0, c = 0;
-				asASSERT( node );
-				if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-				builder->WriteInfo(script->name.AddressOf(), TXT_CANDIDATES_ARE, r, c, false);
-				PrintMatchingFuncs(origFuncs, node);
+				// Class methods must use delegate objects
+				Error(TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG, node);
+			}
+			else
+			{
+				// Print the list of candidates
+				if( origFuncs.GetLength() > 0 )
+				{
+					int r = 0, c = 0;
+					asASSERT( node );
+					if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+					builder->WriteInfo(script->name.AddressOf(), TXT_CANDIDATES_ARE, r, c, false);
+					PrintMatchingFuncs(origFuncs, node, objectType);
+				}
 			}
 		}
 		else
 		{
+			asASSERT( attemptsPassingClassMethod == false );
+
 			str.Format(TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s, str.AddressOf());
 			Error(str, node);
 
-			PrintMatchingFuncs(funcs, node);
+			PrintMatchingFuncs(funcs, node, objectType);
 		}
 	}
 
 	return cost;
 }
 
+bool asCCompiler::CompileAutoType(asCDataType &type, asSExprContext &compiledCtx, asCScriptNode *node, asCScriptNode *errNode)
+{
+	if( node && node->nodeType == snAssignment )
+	{
+		int r = CompileAssignment(node, &compiledCtx);
+		if( r >= 0 )
+		{
+			asCDataType newType = compiledCtx.type.dataType;
+			bool success = true;
+
+			// Handle const qualifier on auto
+			if( type.IsReadOnly() )
+				newType.MakeReadOnly(true);
+			else if( newType.IsPrimitive() )
+				newType.MakeReadOnly(false);
+
+			// Handle reference/value stuff
+			newType.MakeReference(false);
+			if( !newType.IsObjectHandle() )
+			{
+				// We got a value object or an object reference.
+				// Turn the variable into a handle if specified
+				// as auto@, otherwise make it a 'value'.
+				if( type.IsHandleToAuto() )
+				{
+					if( newType.MakeHandle(true) < 0 )
+					{
+						Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, errNode);
+						success = false;
+					}
+				}
+			}
+
+			if(success)
+				type = newType;
+			else
+				type = asCDataType::CreatePrimitive(ttInt, false);
+			return true;
+		}
+
+		return false;
+	}
+	else
+	{
+		Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
+		type = asCDataType::CreatePrimitive(ttInt, false);
+		return false;
+	}
+}
+
 void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
 {
 	// Get the data type
@@ -2149,12 +2512,23 @@ void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
 	asCScriptNode *node = decl->firstChild->next;
 	while( node )
 	{
+		// If this is an auto type, we have to compile the assignment now to figure out the type
+		asSExprContext compiledCtx(engine);
+		bool preCompiled = false;
+		if( type.IsAuto() )
+			preCompiled = CompileAutoType(type, compiledCtx, node->next, node);
+
 		// Is the type allowed?
-		if( !type.CanBeInstanciated() )
+		if( !type.CanBeInstantiated() )
 		{
 			asCString str;
-			// TODO: Change to "'type' cannot be declared as variable"
-			str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format().AddressOf());
+			if( type.IsAbstractClass() )
+				str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
+			else if( type.IsInterface() )
+				str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
+			else
+				// TODO: Improve error message to explain why
+				str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 
 			// Use int instead to avoid further problems
@@ -2198,6 +2572,16 @@ void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
 			// lead to more errors that are likely false
 			return;
 		}
+		else
+		{
+			// Warn if this variable hides another variable in a higher scope
+			if( variables->parent && variables->parent->GetVariable(name.AddressOf()) )
+			{
+				asCString str;
+				str.Format(TXT_s_HIDES_VAR_IN_OUTER_SCOPE, name.AddressOf());
+				Warning(str, node);
+			}
+		}
 
 		// Add marker that the variable has been declared
 		bc->VarDecl((int)outFunc->scriptData->variables.GetLength());
@@ -2217,7 +2601,7 @@ void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
 		{
 			// Compile the initialization expression
 			asQWORD constantValue = 0;
-			if( CompileInitialization(node, bc, type, varNode, offset, &constantValue, 0) )
+			if( CompileInitialization(node, bc, type, varNode, offset, &constantValue, 0, preCompiled ? &compiledCtx : 0) )
 			{
 				// Check if the variable should be marked as pure constant
 				if( type.IsPrimitive() && type.IsReadOnly() )
@@ -2234,7 +2618,8 @@ void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
 	bc->OptimizeLocally(tempVariableOffsets);
 }
 
-bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem)
+// Returns true if the initialization expression is a constant expression
+bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asSExprContext *preCompiled)
 {
 	bool isConstantExpression = false;
 	if( node && node->nodeType == snArgList )
@@ -2248,7 +2633,8 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 		{
 			// Compile the arguments
 			asCArray<asSExprContext *> args;
-			if( CompileArgumentList(node, args) >= 0 )
+			asCArray<asSNamedArgument> namedArgs;
+			if( CompileArgumentList(node, args, namedArgs) >= 0 )
 			{
 				// Find all constructors
 				asCArray<int> funcs;
@@ -2261,17 +2647,13 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 						funcs = beh->constructors;
 				}
 
-				asCString str = type.Format();
-				MatchFunctions(funcs, args, node, str.AddressOf());
+				asCString str = type.Format(outFunc->nameSpace);
+				MatchFunctions(funcs, args, node, str.AddressOf(), &namedArgs);
 
 				if( funcs.GetLength() == 1 )
 				{
-					int r = asSUCCESS;
-
 					// Add the default values for arguments not explicitly supplied
-					asCScriptFunction *func = (funcs[0] & FUNC_IMPORTED) == 0 ? engine->scriptFunctions[funcs[0]] : 0;
-					if( func && args.GetLength() < (asUINT)func->GetParamCount() )
-						r = CompileDefaultArgs(node, args, func);
+					int r = CompileDefaultAndNamedArgs(node, args, funcs[0], type.GetObjectType(), &namedArgs);
 
 					if( r == asSUCCESS )
 					{
@@ -2374,6 +2756,11 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 				{
 					asDELETE(args[n],asSExprContext);
 				}
+			for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+				if( namedArgs[n].ctx )
+				{
+					asDELETE(namedArgs[n].ctx,asSExprContext);
+				}
 		}
 	}
 	else if( node && node->nodeType == snInitList )
@@ -2395,6 +2782,21 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 		//             just the copy constructor. Only if no appropriate constructor is
 		//             available should the assignment operator be used.
 
+		// Compile the expression
+		asSExprContext newExpr(engine);
+		asSExprContext* expr;
+		int r = 0;
+
+		if( preCompiled )
+		{
+			expr = preCompiled;
+		}
+		else
+		{
+			expr = &newExpr;
+			r = CompileAssignment(node, expr);
+		}
+
 		// Call the default constructor here
 		if( isVarGlobOrMem == 0 )
 			CallDefaultConstructor(type, offset, IsVariableOnHeap(offset), &ctx.bc, errNode);
@@ -2403,20 +2805,17 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 		else if( isVarGlobOrMem == 2 )
 			CallDefaultConstructor(type, offset, type.IsReference(), &ctx.bc, errNode, isVarGlobOrMem);
 
-		// Compile the expression
-		asSExprContext expr(engine);
-		int r = CompileAssignment(node, &expr);
 		if( r >= 0 )
 		{
 			if( type.IsPrimitive() )
 			{
-				if( type.IsReadOnly() && expr.type.isConstant )
+				if( type.IsReadOnly() && expr->type.isConstant )
 				{
-					ImplicitConversion(&expr, type, node, asIC_IMPLICIT_CONV);
+					ImplicitConversion(expr, type, node, asIC_IMPLICIT_CONV);
 
 					// Tell caller that the expression is a constant so it can mark the variable as pure constant
 					isConstantExpression = true;
-					*constantValue = expr.type.qwordValue;
+					*constantValue = expr->type.qwordValue;
 				}
 
 				asSExprContext lctx(engine);
@@ -2447,7 +2846,7 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 				lctx.type.dataType.MakeReadOnly(false);
 				lctx.type.isLValue = true;
 
-				DoAssignment(&ctx, &lctx, &expr, node, node, ttAssignment, node);
+				DoAssignment(&ctx, &lctx, expr, node, node, ttAssignment, node);
 				ProcessDeferredParams(&ctx);
 			}
 			else
@@ -2503,7 +2902,8 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 				// Even though an ASHANDLE can be an explicit handle the overloaded operator needs to be called
 				if( lexpr.type.dataType.IsObject() && (!lexpr.type.isExplicitHandle || (lexpr.type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE)) )
 				{
-					assigned = CompileOverloadedDualOperator(node, &lexpr, &expr, &ctx);
+					bool useHndlAssign = lexpr.type.dataType.IsHandleToAsHandleType();
+					assigned = CompileOverloadedDualOperator(node, &lexpr, expr, &ctx, useHndlAssign);
 					if( assigned )
 					{
 						// Pop the resulting value
@@ -2520,27 +2920,27 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 
 				if( !assigned )
 				{
-					PrepareForAssignment(&lexpr.type.dataType, &expr, node, false);
+					PrepareForAssignment(&lexpr.type.dataType, expr, node, false);
 
 					// If the expression is constant and the variable also is constant
 					// then mark the variable as pure constant. This will allow the compiler
 					// to optimize expressions with this variable.
-					if( type.IsReadOnly() && expr.type.isConstant )
+					if( type.IsReadOnly() && expr->type.isConstant )
 					{
 						isConstantExpression = true;
-						*constantValue = expr.type.qwordValue;
+						*constantValue = expr->type.qwordValue;
 					}
 
 					// Add expression code to bytecode
-					MergeExprBytecode(&ctx, &expr);
+					MergeExprBytecode(&ctx, expr);
 
 					// Add byte code for storing value of expression in variable
 					ctx.bc.AddCode(&lexpr.bc);
 
-					PerformAssignment(&lexpr.type, &expr.type, &ctx.bc, errNode);
+					PerformAssignment(&lexpr.type, &expr->type, &ctx.bc, errNode);
 
 					// Release temporary variables used by expression
-					ReleaseTemporaryVariable(expr.type, &ctx.bc);
+					ReleaseTemporaryVariable(expr->type, &ctx.bc);
 
 					ctx.bc.Instr(asBC_PopPtr);
 
@@ -2569,8 +2969,6 @@ bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, as
 		}
 	}
 
-	bc->OptimizeLocally(tempVariableOffsets);
-
 	return isConstantExpression;
 }
 
@@ -2582,7 +2980,7 @@ void asCCompiler::CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByte
 		var->dataType.IsObjectHandle() )
 	{
 		asCString str;
-		str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, var->dataType.Format().AddressOf());
+		str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, var->dataType.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 		return;
 	}
@@ -2596,7 +2994,7 @@ void asCCompiler::CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByte
 	// TODO: runtime optimize: A future optimization should be to use the stack space directly
 	//                         for small buffers so that the dynamic allocation is skipped
 
-	// Create a new special object type for the lists. Both asCRestore and the 
+	// Create a new special object type for the lists. Both asCRestore and the
 	// context exception handler will need this to know how to parse the buffer.
 	asCObjectType *listPatternType = engine->GetListPatternType(funcId);
 
@@ -2608,13 +3006,14 @@ void asCCompiler::CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByte
 	asSExprContext valueExpr(engine);
 	asCScriptNode *el = node;
 	asSListPatternNode *patternNode = engine->scriptFunctions[listPatternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
-	int r = CompileInitListElement(patternNode, el, engine->GetTypeIdFromDataType(asCDataType::CreateObject(listPatternType, false)), bufferVar, bufferSize, valueExpr.bc);
+	int elementsInSubList = -1;
+	int r = CompileInitListElement(patternNode, el, engine->GetTypeIdFromDataType(asCDataType::CreateObject(listPatternType, false)), short(bufferVar), bufferSize, valueExpr.bc, elementsInSubList);
 	asASSERT( r || patternNode == 0 );
 	UNUSED_VAR(r);
 
 	// After all values have been evaluated we know the final size of the buffer
 	asSExprContext allocExpr(engine);
-	allocExpr.bc.InstrSHORT_DW(asBC_AllocMem, bufferVar, bufferSize);
+	allocExpr.bc.InstrSHORT_DW(asBC_AllocMem, short(bufferVar), bufferSize);
 
 	// Merge the bytecode into the final sequence
 	bc->AddCode(&allocExpr.bc);
@@ -2625,7 +3024,7 @@ void asCCompiler::CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByte
 	asSExprContext arg1(engine);
 	arg1.type.Set(asCDataType::CreatePrimitive(ttUInt, false));
 	arg1.type.dataType.MakeReference(true);
-	arg1.bc.InstrSHORT(asBC_PshVPtr, bufferVar);
+	arg1.bc.InstrSHORT(asBC_PshVPtr, short(bufferVar));
 	args.PushLast(&arg1);
 
 	asSExprContext ctx(engine);
@@ -2729,15 +3128,15 @@ void asCCompiler::CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByte
 
 	// Free the temporary buffer. The FREE instruction will make sure to destroy
 	// each element in the buffer so there is no need to do this manually
-	bc->InstrW_PTR(asBC_FREE, bufferVar, listPatternType);
+	bc->InstrW_PTR(asBC_FREE, short(bufferVar), listPatternType);
 	ReleaseTemporaryVariable(bufferVar, bc);
 }
 
-int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode)
+int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode, int &elementsInSubList)
 {
 	if( patternNode->type == asLPT_START )
 	{
-		if( valueNode->nodeType != snInitList )
+		if( valueNode == 0 || valueNode->nodeType != snInitList )
 		{
 			Error(TXT_EXPECTED_LIST, valueNode);
 			return -1;
@@ -2748,14 +3147,24 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 		asCScriptNode *node = valueNode->firstChild;
 		while( patternNode->type != asLPT_END )
 		{
-			if( node == 0 )
+			// Check for missing value here, else the error reporting will not have a source position to report the error for
+			if( node == 0 && patternNode->type == asLPT_TYPE )
 			{
 				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, valueNode);
 				return -1;
 			}
 
-			int r = CompileInitListElement(patternNode, node, bufferTypeId, bufferVar, bufferSize, byteCode);
+			asCScriptNode *errNode = node;
+			int r = CompileInitListElement(patternNode, node, bufferTypeId, bufferVar, bufferSize, byteCode, elementsInSubList);
 			if( r < 0 ) return r;
+
+			if( r == 1 )
+			{
+				asASSERT( engine->ep.disallowEmptyListElements );
+				// Empty elements in the middle are not allowed
+				Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
+			}
+
 			asASSERT( patternNode );
 		}
 
@@ -2764,13 +3173,19 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 			Error(TXT_TOO_MANY_VALUES_FOR_LIST, valueNode);
 			return -1;
 		}
-		
+
 		// Move to the next node
 		valueNode = valueNode->next;
 		patternNode = patternNode->next;
 	}
-	else if( patternNode->type == asLPT_REPEAT )
+	else if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
 	{
+		// TODO: list: repeat_inner should make sure the list has the same size as the inner list, i.e. square area
+		// TODO: list: repeat_prev should make sure the list is the same size as the previous
+
+		asEListPatternNodeType repeatType = patternNode->type;
+		asCScriptNode *firstValue = valueNode;
+
 		// The following values will be repeated N times
 		patternNode = patternNode->next;
 
@@ -2786,14 +3201,64 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 		bufferSize += 4;
 		asUINT countElements = 0;
 
+		int elementsInSubSubList = -1;
+
 		asSExprContext ctx(engine);
 		while( valueNode )
 		{
 			patternNode = nextNode;
-			int r = CompileInitListElement(patternNode, valueNode, bufferTypeId, bufferVar, bufferSize, ctx.bc);
+			asCScriptNode *errNode = valueNode;
+			int r = CompileInitListElement(patternNode, valueNode, bufferTypeId, bufferVar, bufferSize, ctx.bc, elementsInSubSubList);
 			if( r < 0 ) return r;
 
-			countElements++;
+			if( r == 0 )
+				countElements++;
+			else 
+			{
+				asASSERT( r == 1 && engine->ep.disallowEmptyListElements );
+				if( valueNode )
+				{
+					// Empty elements in the middle are not allowed
+					Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
+				}
+			}
+		}
+
+		if( countElements == 0 )
+		{
+			// Skip the sub pattern that was expected to be repeated, otherwise the caller will try to match these when we return
+			patternNode = nextNode;
+			if( patternNode->type == asLPT_TYPE )
+				patternNode = patternNode->next;
+			else if( patternNode->type == asLPT_START )
+			{
+				int subCount = 1;
+				do
+				{
+					patternNode = patternNode->next;
+					if( patternNode->type == asLPT_START )
+						subCount++;
+					else if( patternNode->type == asLPT_END )
+						subCount--;
+				} while( subCount > 0 );
+				patternNode = patternNode->next;
+			}
+		}
+
+		// For repeat_same each repeated sublist must have the same size to form a rectangular array
+		if( repeatType == asLPT_REPEAT_SAME && elementsInSubList != -1 && asUINT(elementsInSubList) != countElements )
+		{
+			if( countElements < asUINT(elementsInSubList) )
+				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, firstValue);
+			else
+				Error(TXT_TOO_MANY_VALUES_FOR_LIST, firstValue);
+
+			return -1;
+		}
+		else
+		{
+			// Return to caller the amount of elments in this sublist
+			elementsInSubList = countElements;
 		}
 
 		// The first dword in the buffer will hold the number of elements
@@ -2804,6 +3269,8 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 	}
 	else if( patternNode->type == asLPT_TYPE )
 	{
+		bool isEmpty = false;
+
 		// Determine the size of the element
 		asUINT size = 0;
 
@@ -2840,7 +3307,7 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 				if( dt.GetTokenType() == ttQuestion )
 				{
 					// Can't use init lists with var type as it is not possible to determine what type should be allocated
-					asCString str; 
+					asCString str;
 					str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, "?");
 					Error(str.AddressOf(), valueNode);
 					rctx.type.SetDummy();
@@ -2921,125 +3388,153 @@ int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScr
 				}
 			}
 
-			asSExprContext ctx(engine);
-			DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
+			if( lctx.type.dataType.IsNullHandle() )
+			{
+				// Don't add any code to assign a null handle. RefCpy doesn't work without a known type. 
+				// The buffer is already initialized to zero in asBC_AllocMem anyway.
+				asASSERT( rctx.bc.GetLastInstr() == asBC_PshNull );
+				asASSERT( reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType.GetTokenType() == ttQuestion );
+			}
+			else
+			{
+				asSExprContext ctx(engine);
+				DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
 
-			if( !lctx.type.dataType.IsPrimitive() )
-				ctx.bc.Instr(asBC_PopPtr);
+				if( !lctx.type.dataType.IsPrimitive() )
+					ctx.bc.Instr(asBC_PopPtr);
 
-			// Release temporary variables used by expression
-			ReleaseTemporaryVariable(ctx.type, &ctx.bc);
+				// Release temporary variables used by expression
+				ReleaseTemporaryVariable(ctx.type, &ctx.bc);
 
-			ProcessDeferredParams(&ctx);
+				ProcessDeferredParams(&ctx);
 
-			byteCode.AddCode(&ctx.bc);
+				byteCode.AddCode(&ctx.bc);
+			}
 		}
 		else
 		{
-			// There is no specific value so we need to fill it with a default value
-			if( dt.GetTokenType() == ttQuestion )
+			if( builder->engine->ep.disallowEmptyListElements )
 			{
-				// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-				if( bufferSize & 0x3 )
-					bufferSize += 4 - (bufferSize & 0x3);
-
-				// Place the type id for a null handle in the buffer
-				byteCode.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, 0);
-				bufferSize += 4;
-
-				dt = asCDataType::CreateNullHandle();
-
-				// No need to initialize the handle as the buffer is already initialized with zeroes
+				// Empty elements are not allowed, except if it is the last in the list
+				isEmpty = true;
 			}
-			else if( dt.GetObjectType() && dt.GetObjectType()->flags & asOBJ_VALUE )
+			else
 			{
-				// For value types with default constructor we need to call the constructor
-				asSTypeBehaviour *beh = dt.GetBehaviour();
-				int func = 0;
-				if( beh ) func = beh->construct;
-				if( func == 0 && (dt.GetObjectType()->flags & asOBJ_POD) == 0 )
-				{
-					asCString str;
-					// TODO: funcdef: asCDataType should have a GetTypeName()
-					if( dt.GetFuncDef() )
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetFuncDef()->GetName());
-					else
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetObjectType()->GetName());
-					Error(str, valueNode);
-				}
-				else if( func )
+				// There is no specific value so we need to fill it with a default value
+				if( dt.GetTokenType() == ttQuestion )
 				{
 					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
 					if( bufferSize & 0x3 )
 						bufferSize += 4 - (bufferSize & 0x3);
 
-					// Call the constructor as a normal function
-					byteCode.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+					// Place the type id for a null handle in the buffer
+					byteCode.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, 0);
+					bufferSize += 4;
 
-					asSExprContext ctx(engine);
-					PerformFunctionCall(func, &ctx, false, 0, dt.GetObjectType());
-					byteCode.AddCode(&ctx.bc);
+					dt = asCDataType::CreateNullHandle();
+
+					// No need to initialize the handle as the buffer is already initialized with zeroes
 				}
-			}
-			else if( !dt.IsObjectHandle() && dt.GetObjectType() && dt.GetObjectType()->flags & asOBJ_REF )
-			{
-				// For ref types (not handles) we need to call the default factory
-				asSTypeBehaviour *beh = dt.GetBehaviour();
-				int func = 0;
-				if( beh ) func = beh->factory;
-				if( func == 0 )
+				else if( dt.GetObjectType() && dt.GetObjectType()->flags & asOBJ_VALUE )
 				{
-					asCString str;
-					// TODO: funcdef: asCDataType should have a GetTypeName()
-					if( dt.GetFuncDef() )
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetFuncDef()->GetName());
-					else
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetObjectType()->GetName());
-					Error(str, valueNode);
+					// For value types with default constructor we need to call the constructor
+					asSTypeBehaviour *beh = dt.GetBehaviour();
+					int func = 0;
+					if( beh ) func = beh->construct;
+					if( func == 0 && (dt.GetObjectType()->flags & asOBJ_POD) == 0 )
+					{
+						asCString str;
+						// TODO: funcdef: asCDataType should have a GetTypeName()
+						if( dt.GetFuncDef() )
+							str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetFuncDef()->GetName());
+						else
+							str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetObjectType()->GetName());
+						Error(str, valueNode);
+					}
+					else if( func )
+					{
+						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+						if( bufferSize & 0x3 )
+							bufferSize += 4 - (bufferSize & 0x3);
+
+						// Call the constructor as a normal function
+						byteCode.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+
+						asSExprContext ctx(engine);
+						PerformFunctionCall(func, &ctx, false, 0, dt.GetObjectType());
+						byteCode.AddCode(&ctx.bc);
+					}
 				}
-				else if( func )
+				else if( !dt.IsObjectHandle() && dt.GetObjectType() && dt.GetObjectType()->flags & asOBJ_REF )
 				{
-					asSExprContext rctx(engine);
-					PerformFunctionCall(func, &rctx, false, 0, dt.GetObjectType());
+					// For ref types (not handles) we need to call the default factory
+					asSTypeBehaviour *beh = dt.GetBehaviour();
+					int func = 0;
+					if( beh ) func = beh->factory;
+					if( func == 0 )
+					{
+						asCString str;
+						// TODO: funcdef: asCDataType should have a GetTypeName()
+						if( dt.GetFuncDef() )
+							str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetFuncDef()->GetName());
+						else
+							str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetObjectType()->GetName());
+						Error(str, valueNode);
+					}
+					else if( func )
+					{
+						asSExprContext rctx(engine);
+						PerformFunctionCall(func, &rctx, false, 0, dt.GetObjectType());
 
-					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-					if( bufferSize & 0x3 )
-						bufferSize += 4 - (bufferSize & 0x3);
+						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+						if( bufferSize & 0x3 )
+							bufferSize += 4 - (bufferSize & 0x3);
 
-					asSExprContext lctx(engine);
-					lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
-					lctx.type.Set(dt);
-					lctx.type.isLValue = true;
-					lctx.type.isExplicitHandle = true;
-					lctx.type.dataType.MakeReference(true);
+						asSExprContext lctx(engine);
+						lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+						lctx.type.Set(dt);
+						lctx.type.isLValue = true;
+						lctx.type.isExplicitHandle = true;
+						lctx.type.dataType.MakeReference(true);
 
-					asSExprContext ctx(engine);
-					DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
+						asSExprContext ctx(engine);
+						DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
 
-					if( !lctx.type.dataType.IsPrimitive() )
-						ctx.bc.Instr(asBC_PopPtr);
+						if( !lctx.type.dataType.IsPrimitive() )
+							ctx.bc.Instr(asBC_PopPtr);
 
-					// Release temporary variables used by expression
-					ReleaseTemporaryVariable(ctx.type, &ctx.bc);
+						// Release temporary variables used by expression
+						ReleaseTemporaryVariable(ctx.type, &ctx.bc);
 
-					ProcessDeferredParams(&ctx);
+						ProcessDeferredParams(&ctx);
 
-					byteCode.AddCode(&ctx.bc);
+						byteCode.AddCode(&ctx.bc);
+					}
 				}
 			}
 		}
 
-		// Determine size of the element
-		if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetObjectType()->flags & asOBJ_VALUE)) )
-			size = dt.GetSizeInMemoryBytes();
-		else
-			size = AS_PTR_SIZE*4;
-		asASSERT( size <= 4 || (size & 0x3) == 0 );
-		
+		if( !isEmpty )
+		{
+			// Determine size of the element
+			if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetObjectType()->flags & asOBJ_VALUE)) )
+				size = dt.GetSizeInMemoryBytes();
+			else
+				size = AS_PTR_SIZE*4;
+			asASSERT( size <= 4 || (size & 0x3) == 0 );
+
+			bufferSize += size;
+		}
+
 		// Move to the next element
-		bufferSize += size;
 		patternNode = patternNode->next;
 		valueNode = valueNode->next;
+
+		if( isEmpty )
+		{
+			// The caller will determine if the empty element should be ignored or not
+			return 1;
+		}
 	}
 	else
 		asASSERT( false );
@@ -3415,37 +3910,43 @@ void asCCompiler::CompileIfStatement(asCScriptNode *inode, bool *hasReturn, asCB
 
 	// Compile the expression
 	asSExprContext expr(engine);
-	CompileAssignment(inode->firstChild, &expr);
-	if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+	int r = CompileAssignment(inode->firstChild, &expr);
+	if( r == 0 )
 	{
-		Error(TXT_EXPR_MUST_BE_BOOL, inode->firstChild);
-		expr.type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), 1);
-	}
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( expr.type.dataType.GetObjectType() && (expr.type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), inode, asIC_IMPLICIT_CONV);
 
-	if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-	ProcessDeferredParams(&expr);
+		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+			Error(TXT_EXPR_MUST_BE_BOOL, inode->firstChild);
+		else
+		{
+			if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
+			ProcessDeferredParams(&expr);
 
-	if( !expr.type.isConstant )
-	{
-		ProcessPropertyGetAccessor(&expr, inode);
+			if( !expr.type.isConstant )
+			{
+				ProcessPropertyGetAccessor(&expr, inode);
 
-		ConvertToVariable(&expr);
+				ConvertToVariable(&expr);
 
-		// Add a test
-		expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-		expr.bc.Instr(asBC_ClrHi);
-		expr.bc.InstrDWORD(asBC_JZ, afterLabel);
-		ReleaseTemporaryVariable(expr.type, &expr.bc);
+				// Add a test
+				expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
+				expr.bc.Instr(asBC_ClrHi);
+				expr.bc.InstrDWORD(asBC_JZ, afterLabel);
+				ReleaseTemporaryVariable(expr.type, &expr.bc);
 
-		expr.bc.OptimizeLocally(tempVariableOffsets);
-		bc->AddCode(&expr.bc);
-	}
-	else if( expr.type.dwordValue == 0 )
-	{
-		// Jump to the else case
-		bc->InstrINT(asBC_JMP, afterLabel);
+				expr.bc.OptimizeLocally(tempVariableOffsets);
+				bc->AddCode(&expr.bc);
+			}
+			else if( expr.type.dwordValue == 0 )
+			{
+				// Jump to the else case
+				bc->InstrINT(asBC_JMP, afterLabel);
 
-		// TODO: Should we warn that the expression will always go to the else?
+				// TODO: Should we warn that the expression will always go to the else?
+			}
+		}
 	}
 
 	// Compile the if statement
@@ -3565,6 +4066,10 @@ void asCCompiler::CompileForStatement(asCScriptNode *fnode, asCByteCode *bc)
 		int r = CompileAssignment(second->firstChild, &expr);
 		if( r >= 0 )
 		{
+			// Allow value types to be converted to bool using 'bool opImplConv()'
+			if( expr.type.dataType.GetObjectType() && (expr.type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+				ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), second->firstChild, asIC_IMPLICIT_CONV);
+
 			if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
 				Error(TXT_EXPR_MUST_BE_BOOL, second);
 			else
@@ -3671,27 +4176,34 @@ void asCCompiler::CompileWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
 
 	// Compile expression
 	asSExprContext expr(engine);
-	CompileAssignment(wnode->firstChild, &expr);
-	if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-		Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
-	else
+	int r = CompileAssignment(wnode->firstChild, &expr);
+	if( r == 0 )
 	{
-		if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-		ProcessDeferredParams(&expr);
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( expr.type.dataType.GetObjectType() && (expr.type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->firstChild, asIC_IMPLICIT_CONV);
 
-		ProcessPropertyGetAccessor(&expr, wnode);
+		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+			Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
+		else
+		{
+			if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
+			ProcessDeferredParams(&expr);
 
-		// Add byte code for the expression
-		ConvertToVariable(&expr);
+			ProcessPropertyGetAccessor(&expr, wnode);
 
-		// Jump to end of statement if expression is false
-		expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-		expr.bc.Instr(asBC_ClrHi);
-		expr.bc.InstrDWORD(asBC_JZ, afterLabel);
-		ReleaseTemporaryVariable(expr.type, &expr.bc);
+			// Add byte code for the expression
+			ConvertToVariable(&expr);
 
-		expr.bc.OptimizeLocally(tempVariableOffsets);
-		bc->AddCode(&expr.bc);
+			// Jump to end of statement if expression is false
+			expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
+			expr.bc.Instr(asBC_ClrHi);
+			expr.bc.InstrDWORD(asBC_JZ, afterLabel);
+			ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+			expr.bc.OptimizeLocally(tempVariableOffsets);
+			bc->AddCode(&expr.bc);
+		}
 	}
 
 	// Add a suspend bytecode inside the loop to guarantee
@@ -3759,6 +4271,11 @@ void asCCompiler::CompileDoWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
 	// Compile expression
 	asSExprContext expr(engine);
 	CompileAssignment(wnode->lastChild, &expr);
+
+	// Allow value types to be converted to bool using 'bool opImplConv()'
+	if( expr.type.dataType.GetObjectType() && (expr.type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->lastChild, asIC_IMPLICIT_CONV);
+
 	if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
 		Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
 	else
@@ -3846,6 +4363,10 @@ void asCCompiler::CompileExpressionStatement(asCScriptNode *enode, asCByteCode *
 		asSExprContext expr(engine);
 		CompileAssignment(enode->firstChild, &expr);
 
+		// Must not have unused ambiguous names
+		if( expr.IsClassMethod() || expr.IsGlobalFunc() )
+			Error(TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME, enode);
+
 		// If we get here and there is still an unprocessed property
 		// accessor, then process it as a get access. Don't call if there is
 		// already a compile error, or we might report an error that is not valid
@@ -3901,47 +4422,7 @@ void asCCompiler::PrepareTemporaryObject(asCScriptNode *node, asSExprContext *ct
 	lvalue.isExplicitHandle = ctx->type.isExplicitHandle;
 	bool isExplicitHandle = ctx->type.isExplicitHandle;
 
-	if( !dt.IsObjectHandle() &&
-		dt.GetObjectType() && (dt.GetBehaviour()->copyconstruct || dt.GetBehaviour()->copyfactory) )
-	{
-		PrepareForAssignment(&lvalue.dataType, ctx, node, true);
-
-		// Use the copy constructor/factory when available
-		CallCopyConstructor(dt, offset, IsVariableOnHeap(offset), &ctx->bc, ctx, node);
-	}
-	else
-	{
-		// Allocate and construct the temporary object
-		int r = CallDefaultConstructor(dt, offset, IsVariableOnHeap(offset), &ctx->bc, node);
-		if( r < 0 )
-		{
-			Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
-		}
-		else
-		{
-			// Assign the object to the temporary variable
-			PrepareForAssignment(&lvalue.dataType, ctx, node, true);
-
-			ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-			r = PerformAssignment(&lvalue, &ctx->type, &ctx->bc, node);
-			if( r < 0 )
-			{
-				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
-			}
-
-			// Release any temp that may have been created as the result of opAssign
-			ReleaseTemporaryVariable(lvalue, &ctx->bc);
-
-			// Pop the original reference
-			if( !lvalue.dataType.IsPrimitive() )
-				ctx->bc.Instr(asBC_PopPtr);
-		}
-
-		// If the expression was holding off on releasing a
-		// previously used object, we need to release it now
-		if( ctx->type.isTemporary )
-			ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-	}
+	CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
 
 	// Push the reference to the temporary variable on the stack
 	ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
@@ -4025,7 +4506,7 @@ void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
 				// Clean up the potential deferred parameters
 				ProcessDeferredParams(&expr);
 				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format().AddressOf(), v->type.Format().AddressOf());
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
 				Error(str, rnode);
 				return;
 			}
@@ -4059,6 +4540,14 @@ void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
 				}
 			}
 
+			// Can't return the reference if could point to a local variable
+			if( expr.type.isRefToLocal )
+			{
+				ProcessDeferredParams(&expr);
+				Error(TXT_REF_CANT_BE_TO_LOCAL_VAR, rnode);
+				return;
+			}
+
 			// All objects in the function must be cleaned up before the expression
 			// is evaluated, otherwise there is a possibility that the cleanup will
 			// invalidate the reference.
@@ -4101,7 +4590,7 @@ void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
 				if( expr.type.dataType != v->type )
 				{
 					asCString str;
-					str.Format(TXT_NO_CONVERSION_s_TO_s, expr.type.dataType.Format().AddressOf(), v->type.Format().AddressOf());
+					str.Format(TXT_NO_CONVERSION_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
 					Error(str, rnode);
 					return;
 				}
@@ -4137,35 +4626,14 @@ void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
 						if( !v->type.IsEqualExceptRefAndConst(expr.type.dataType) )
 						{
 							asCString str;
-							str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format().AddressOf(), v->type.Format().AddressOf());
+							str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
 							Error(str, rnode->firstChild);
 							return;
 						}
 					}
 
 					int offset = outFunc->objectType ? -AS_PTR_SIZE : 0;
-					if( v->type.GetObjectType()->beh.copyconstruct )
-					{
-						PrepareForAssignment(&v->type, &expr, rnode->firstChild, false);
-						CallCopyConstructor(v->type, offset, false, &expr.bc, &expr, rnode->firstChild, false, true);
-					}
-					else
-					{
-						// If the copy constructor doesn't exist, then a manual assignment needs to be done instead.
-						CallDefaultConstructor(v->type, offset, false, &expr.bc, rnode->firstChild, 0, true);
-						PrepareForAssignment(&v->type, &expr, rnode->firstChild, false);
-						expr.bc.InstrSHORT(asBC_PSF, (short)offset);
-						expr.bc.Instr(asBC_RDSPtr);
-
-						asSExprContext lexpr(engine);
-						lexpr.type.Set(v->type);
-						lexpr.type.isLValue = true;
-						PerformAssignment(&lexpr.type, &expr.type, &expr.bc, rnode->firstChild);
-						expr.bc.Instr(asBC_PopPtr);
-
-						// Release any temporary variable
-						ReleaseTemporaryVariable(expr.type, &expr.bc);
-					}
+					CompileInitAsCopy(v->type, offset, &expr.bc, &expr, rnode->firstChild, true);
 
 					// Clean up the local variables and process deferred parameters
 					DestroyVariables(&expr.bc);
@@ -4286,7 +4754,7 @@ void asCCompiler::Information(const asCString &msg, asCScriptNode *node)
 	builder->WriteInfo(script->name, msg, r, c, false);
 }
 
-void asCCompiler::PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node)
+void asCCompiler::PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType)
 {
 	int r = 0, c = 0;
 	asASSERT( node );
@@ -4294,9 +4762,11 @@ void asCCompiler::PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node)
 
 	for( unsigned int n = 0; n < funcs.GetLength(); n++ )
 	{
-		asIScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
+		asCScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
+		if( inType && func->funcType == asFUNC_VIRTUAL )
+			func = inType->virtualFunctionTable[func->vfTableIdx];
 
-		builder->WriteInfo(script->name, func->GetDeclaration(true), r, c, false);
+		builder->WriteInfo(script->name, func->GetDeclaration(true, false, true), r, c, false);
 	}
 }
 
@@ -4312,6 +4782,7 @@ int asCCompiler::AllocateVariableNotIn(const asCDataType &type, bool isTemporary
 int asCCompiler::AllocateVariable(const asCDataType &type, bool isTemporary, bool forceOnHeap)
 {
 	asCDataType t(type);
+	t.MakeReference(false);
 
 	if( t.IsPrimitive() && t.GetSizeOnStackDWords() == 1 )
 		t.SetTokenType(ttInt);
@@ -4484,6 +4955,8 @@ void asCCompiler::ReleaseTemporaryVariable(asCTypeInfo &t, asCByteCode *bc)
 
 void asCCompiler::ReleaseTemporaryVariable(int offset, asCByteCode *bc)
 {
+	asASSERT( tempVariables.Exists(offset) );
+
 	if( bc )
 	{
 		// We need to call the destructor on the true variable type
@@ -4596,7 +5069,7 @@ void asCCompiler::PrepareForAssignment(asCDataType *lvalue, asSExprContext *rctx
 		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
 		{
 			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format().AddressOf(), lvalue->Format().AddressOf());
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 
 			rctx->type.SetDummy();
@@ -4632,7 +5105,7 @@ void asCCompiler::PrepareForAssignment(asCDataType *lvalue, asSExprContext *rctx
 		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
 		{
 			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format().AddressOf(), lvalue->Format().AddressOf());
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 		}
 		else
@@ -4704,8 +5177,6 @@ int asCCompiler::PerformAssignment(asCTypeInfo *lvalue, asCTypeInfo *rvalue, asC
 		*lvalue = ctx.type;
 		bc->AddCode(&ctx.bc);
 
-		// TODO: Should find the opAssign method that implements the default copy behaviour.
-		//       The beh->copy member will be removed.
 		asSTypeBehaviour *beh = lvalue->dataType.GetBehaviour();
 		if( beh->copy && beh->copy != engine->scriptTypeBehaviours.beh.copy )
 		{
@@ -4720,7 +5191,7 @@ int asCCompiler::PerformAssignment(asCTypeInfo *lvalue, asCTypeInfo *rvalue, asC
 			// Call the default copy operator for script classes
 			// This is done differently because the default copy operator
 			// is registered as returning int&, but in reality it returns
-			// a reference to the object. 
+			// a reference to the object.
 			// TODO: Avoid this special case by implementing a copystub for
 			//       script classes that uses the default copy operator
 			bc->Call(asBC_CALLSYS, beh->copy, 2*AS_PTR_SIZE);
@@ -4772,7 +5243,177 @@ bool asCCompiler::CompileRefCast(asSExprContext *ctx, const asCDataType &to, boo
 	asCArray<int> ops;
 	asUINT n;
 
-	if( ctx->type.dataType.GetObjectType()->flags & asOBJ_SCRIPT_OBJECT )
+	// A ref cast must not remove the constness
+	bool isConst = ctx->type.dataType.IsObjectConst();
+
+	// Find a suitable opCast or opImplCast method
+	asCObjectType *ot = ctx->type.dataType.GetObjectType();
+	for( n = 0; n < ot->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+		if( (isExplicit && func->name == "opCast") ||
+			func->name == "opImplCast" )
+		{
+			// Is the operator for the output type?
+			if( func->returnType.GetObjectType() != to.GetObjectType() )
+				continue;
+
+			// Can't call a non-const function on a const object
+			if( isConst && !func->IsReadOnly() )
+				continue;
+
+			ops.PushLast(func->id);
+		}
+	}
+
+	// Filter the list by constness to remove const methods if there are matching non-const methods
+	FilterConst(ops, !isConst);
+
+	// It shouldn't be possible to have more than one
+	// TODO: Should be allowed to have different behaviours for const and non-const references
+	asASSERT( ops.GetLength() <= 1 );
+
+	// Should only have one behaviour for each output type
+	if( ops.GetLength() == 1 )
+	{
+		conversionDone = true;
+		if( generateCode )
+		{
+			// TODO: runtime optimize: Instead of producing bytecode for checking if the handle is
+			//                         null, we can create a special CALLSYS instruction that checks
+			//                         if the object pointer is null and if so sets the object register
+			//                         to null directly without executing the function.
+			//
+			//                         Alternatively I could force the ref cast behaviours be global
+			//                         functions with 1 parameter, even though they should still be
+			//                         registered with RegisterObjectBehaviour()
+
+			if( ctx->type.dataType.GetObjectType()->flags & asOBJ_REF )
+			{
+				// Add code to avoid calling the cast behaviour if the handle is already null,
+				// because that will raise a null pointer exception due to the cast behaviour
+				// being a class method, and the this pointer cannot be null.
+
+				if( !ctx->type.isVariable )
+				{
+					Dereference(ctx, true);
+					ConvertToVariable(ctx);
+				}
+
+				// The reference on the stack will not be used
+				ctx->bc.Instr(asBC_PopPtr);
+
+				// TODO: runtime optimize: should have immediate comparison for null pointer
+				int offset = AllocateVariable(asCDataType::CreateNullHandle(), true);
+				// TODO: runtime optimize: ClrVPtr is not necessary, because the VM should initialize the variable to null anyway (it is currently not done for null pointers though)
+				ctx->bc.InstrSHORT(asBC_ClrVPtr, (asWORD)offset);
+				ctx->bc.InstrW_W(asBC_CmpPtr, ctx->type.stackOffset, offset);
+				DeallocateVariable(offset);
+
+				int afterLabel = nextLabel++;
+				ctx->bc.InstrDWORD(asBC_JZ, afterLabel);
+
+				// Call the cast operator
+				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
+				ctx->bc.Instr(asBC_RDSPtr);
+				ctx->type.dataType.MakeReference(false);
+
+				asCArray<asSExprContext *> args;
+				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetObjectType(), args, node);
+				ctx->bc.Instr(asBC_PopPtr);
+
+				int endLabel = nextLabel++;
+
+				ctx->bc.InstrINT(asBC_JMP, endLabel);
+				ctx->bc.Label((short)afterLabel);
+
+				// Make a NULL pointer
+				ctx->bc.InstrSHORT(asBC_ClrVPtr, ctx->type.stackOffset);
+				ctx->bc.Label((short)endLabel);
+
+				// Push the reference to the handle on the stack
+				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
+			}
+			else
+			{
+				// Value types cannot be null, so there is no need to check for this
+
+				// Call the cast operator
+				asCArray<asSExprContext *> args;
+				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetObjectType(), args, node);
+			}
+		}
+		else
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ops[0]];
+			ctx->type.Set(func->returnType);
+		}
+	}
+	else if( ops.GetLength() == 0 && !(ctx->type.dataType.GetObjectType()->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		// Check for the generic ref cast method: void opCast(?&out)
+		for( n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+			if( (isExplicit && func->name == "opCast") ||
+				func->name == "opImplCast" )
+			{
+				// Does the operator take the ?&out parameter?
+				if( func->returnType.GetTokenType() != ttVoid ||
+					func->parameterTypes.GetLength() != 1 ||
+					func->parameterTypes[0].GetTokenType() != ttQuestion ||
+					func->inOutFlags[0] != asTM_OUTREF )
+					continue;
+
+				ops.PushLast(func->id);
+			}
+		}
+
+		// It shouldn't be possible to have more than one
+		// TODO: Should be allowed to have different implementations for const and non-const references
+		asASSERT( ops.GetLength() <= 1 );
+
+		if( ops.GetLength() == 1 )
+		{
+			conversionDone = true;
+			if( generateCode )
+			{
+				asASSERT(to.IsObjectHandle());
+
+				// Allocate a temporary variable of the requested handle type
+				int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+
+				// Pass the reference of that variable to the function as output parameter
+				asCDataType toRef(to);
+				toRef.MakeReference(true);
+				asCArray<asSExprContext *> args;
+				asSExprContext arg(engine);
+				arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+				// Don't mark the variable as temporary, so it won't be freed too early
+				arg.type.SetVariable(toRef, stackOffset, false);
+				arg.type.isLValue = true;
+				arg.type.isExplicitHandle = true;
+				args.PushLast(&arg);
+
+				// Call the behaviour method
+				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetObjectType(), args, node);
+
+				// Use the reference to the variable as the result of the expression
+				// Now we can mark the variable as temporary
+				ctx->type.SetVariable(toRef, stackOffset, true);
+				ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+			}
+			else
+			{
+				// All casts are legal
+				ctx->type.Set(to);
+			}
+		}
+	}
+
+	// If the script object didn't implement a matching opCast or opImplCast 
+	// then check if the desired type is part of the hierarchy
+	if( !conversionDone && (ctx->type.dataType.GetObjectType()->flags & asOBJ_SCRIPT_OBJECT) )
 	{
 		// We need it to be a reference
 		if( !ctx->type.dataType.IsReference() )
@@ -4819,163 +5460,10 @@ bool asCCompiler::CompileRefCast(asSExprContext *ctx, const asCDataType &to, boo
 				ctx->type.dataType.SetObjectType(to.GetObjectType());
 			}
 		}
-	}
-	else
-	{
-		// Find a suitable registered behaviour
-		asSTypeBehaviour *beh = &ctx->type.dataType.GetObjectType()->beh;
-		for( n = 0; n < beh->operators.GetLength(); n+= 2 )
-		{
-			if( (isExplicit && asBEHAVE_REF_CAST == beh->operators[n]) ||
-				asBEHAVE_IMPLICIT_REF_CAST == beh->operators[n] )
-			{
-				int funcId = beh->operators[n+1];
 
-				// Is the operator for the output type?
-				asCScriptFunction *func = engine->scriptFunctions[funcId];
-				if( func->returnType.GetObjectType() != to.GetObjectType() )
-					continue;
-
-				ops.PushLast(funcId);
-			}
-		}
-
-		// It shouldn't be possible to have more than one
-		asASSERT( ops.GetLength() <= 1 );
-
-		// Should only have one behaviour for each output type
-		if( ops.GetLength() == 1 )
-		{
-			if( generateCode )
-			{
-				// TODO: runtime optimize: Instead of producing bytecode for checking if the handle is
-				//                         null, we can create a special CALLSYS instruction that checks
-				//                         if the object pointer is null and if so sets the object register
-				//                         to null directly without executing the function.
-				//
-				//                         Alternatively I could force the ref cast behaviours be global
-				//                         functions with 1 parameter, even though they should still be
-				//                         registered with RegisterObjectBehaviour()
-
-				// Add code to avoid calling the cast behaviour if the handle is already null,
-				// because that will raise a null pointer exception due to the cast behaviour
-				// being a class method, and the this pointer cannot be null.
-
-				if( ctx->type.isVariable )
-					ctx->bc.Instr(asBC_PopPtr);
-				else
-				{
-					Dereference(ctx, true);
-					ConvertToVariable(ctx);
-				}
-
-				// TODO: runtime optimize: should have immediate comparison for null pointer
-				int offset = AllocateVariable(asCDataType::CreateNullHandle(), true);
-				// TODO: runtime optimize: ClrVPtr is not necessary, because the VM should initialize the variable to null anyway (it is currently not done for null pointers though)
-				ctx->bc.InstrSHORT(asBC_ClrVPtr, (asWORD)offset);
-				ctx->bc.InstrW_W(asBC_CmpPtr, ctx->type.stackOffset, offset);
-				DeallocateVariable(offset);
-
-				int afterLabel = nextLabel++;
-				ctx->bc.InstrDWORD(asBC_JZ, afterLabel);
-
-				// Call the cast operator
-				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-				ctx->bc.Instr(asBC_RDSPtr);
-				ctx->type.dataType.MakeReference(false);
-
-				asCTypeInfo objType = ctx->type;
-				asCArray<asSExprContext *> args;
-				MakeFunctionCall(ctx, ops[0], objType.dataType.GetObjectType(), args, node);
-
-				ctx->bc.Instr(asBC_PopPtr);
-
-				int endLabel = nextLabel++;
-
-				ctx->bc.InstrINT(asBC_JMP, endLabel);
-				ctx->bc.Label((short)afterLabel);
-
-				// Make a NULL pointer
-				ctx->bc.InstrSHORT(asBC_ClrVPtr, ctx->type.stackOffset);
-				ctx->bc.Label((short)endLabel);
-
-				// Since we're receiving a handle, we can release the original variable
-				ReleaseTemporaryVariable(objType, &ctx->bc);
-
-				// Push the reference to the handle on the stack
-				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-			}
-			else
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ops[0]];
-				ctx->type.Set(func->returnType);
-			}
-		}
-		else if( ops.GetLength() == 0 )
-		{
-			// Check for the generic ref cast behaviour
-			for( n = 0; n < beh->operators.GetLength(); n+= 2 )
-			{
-				if( (isExplicit && asBEHAVE_REF_CAST == beh->operators[n]) ||
-					asBEHAVE_IMPLICIT_REF_CAST == beh->operators[n] )
-				{
-					int funcId = beh->operators[n+1];
-
-					// Does the operator take the ?&out parameter?
-					asCScriptFunction *func = engine->scriptFunctions[funcId];
-					if( func->parameterTypes.GetLength() != 1 ||
-						func->parameterTypes[0].GetTokenType() != ttQuestion ||
-						func->inOutFlags[0] != asTM_OUTREF )
-						continue;
-
-					ops.PushLast(funcId);
-				}
-			}
-
-			// It shouldn't be possible to have more than one
-			asASSERT( ops.GetLength() <= 1 );
-
-			if( ops.GetLength() == 1 )
-			{
-				if( generateCode )
-				{
-					asASSERT(to.IsObjectHandle());
-
-					// Allocate a temporary variable of the requested handle type
-					int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
-
-					// Pass the reference of that variable to the function as output parameter
-					asCDataType toRef(to);
-					toRef.MakeReference(true);
-					asCArray<asSExprContext *> args;
-					asSExprContext arg(engine);
-					arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-					// Don't mark the variable as temporary, so it won't be freed too early
-					arg.type.SetVariable(toRef, stackOffset, false);
-					arg.type.isLValue = true;
-					arg.type.isExplicitHandle = true;
-					args.PushLast(&arg);
-
-					asCTypeInfo prev = ctx->type;
-
-					// Call the behaviour method
-					MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetObjectType(), args, node);
-
-					// Release previous temporary variable
-					ReleaseTemporaryVariable(prev, &ctx->bc);
-
-					// Use the reference to the variable as the result of the expression
-					// Now we can mark the variable as temporary
-					ctx->type.SetVariable(toRef, stackOffset, true);
-					ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-				}
-				else
-				{
-					// All casts are legal
-					ctx->type.Set(to);
-				}
-			}
-		}
+		// A ref cast must not remove the constness
+		if( isConst )
+			ctx->type.dataType.MakeHandleToConst(true);
 	}
 
 	return conversionDone;
@@ -5008,6 +5496,9 @@ asUINT asCCompiler::ImplicitConvPrimitiveToPrimitive(asSExprContext *ctx, const
 				ctx->type.SetConstantDW(out, value);
 				ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
 
+				// Reset the enum value since we no longer need it
+				ctx->enumValue = "";
+
 				// It wasn't really a conversion. The compiler just resolved the ambiguity (or not)
 				return asCC_NO_CONV;
 			}
@@ -5373,6 +5864,10 @@ asUINT asCCompiler::ImplicitConversion(asSExprContext *ctx, const asCDataType &t
 	if( ctx->type.dataType.GetTokenType() == ttVoid )
 		return asCC_NO_CONV;
 
+	// No conversion from class method to any type (it requires delegate)
+	if( ctx->IsClassMethod() )
+		return asCC_NO_CONV;
+
 	// Do we want a var type?
 	if( to.GetTokenType() == ttQuestion )
 	{
@@ -5410,7 +5905,7 @@ asUINT asCCompiler::ImplicitConvObjectToPrimitive(asSExprContext *ctx, const asC
 		if( convType != asIC_IMPLICIT_CONV && node )
 		{
 			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 		}
 		return asCC_NO_CONV;
@@ -5421,80 +5916,110 @@ asUINT asCCompiler::ImplicitConvObjectToPrimitive(asSExprContext *ctx, const asC
 	// Find matching value cast behaviours
 	// Here we're only interested in those that convert the type to a primitive type
 	asCArray<int> funcs;
-	asSTypeBehaviour *beh = ctx->type.dataType.GetBehaviour();
-	if( beh )
+	asCObjectType *ot = ctx->type.dataType.GetObjectType();
+	if( ot == 0 )
 	{
-		if( convType == asIC_EXPLICIT_VAL_CAST )
+		if( convType != asIC_IMPLICIT_CONV && node )
 		{
-			for( unsigned int n = 0; n < beh->operators.GetLength(); n += 2 )
-			{
-				// accept both implicit and explicit cast
-				if( (beh->operators[n] == asBEHAVE_VALUE_CAST ||
-					 beh->operators[n] == asBEHAVE_IMPLICIT_VALUE_CAST) &&
-					builder->GetFunctionDescription(beh->operators[n+1])->returnType.IsPrimitive() )
-					funcs.PushLast(beh->operators[n+1]);
-			}
+			asCString str;
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
 		}
-		else
+		return asCC_NO_CONV;
+	}
+
+
+	if( convType == asIC_EXPLICIT_VAL_CAST )
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
 		{
-			for( unsigned int n = 0; n < beh->operators.GetLength(); n += 2 )
-			{
-				// accept only implicit cast
-				if( beh->operators[n] == asBEHAVE_IMPLICIT_VALUE_CAST &&
-					builder->GetFunctionDescription(beh->operators[n+1])->returnType.IsPrimitive() )
-					funcs.PushLast(beh->operators[n+1]);
-			}
+			// accept both implicit and explicit cast
+			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
+			if( (mthd->name == "opConv" || mthd->name == "opImplConv") &&
+				mthd->parameterTypes.GetLength() == 0 &&
+				mthd->returnType.IsPrimitive() )
+				funcs.PushLast(ot->methods[n]);
+		}
+	}
+	else
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			// accept only implicit cast
+			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
+			if( mthd->name == "opImplConv" &&
+				mthd->parameterTypes.GetLength() == 0 &&
+				mthd->returnType.IsPrimitive() )
+				funcs.PushLast(ot->methods[n]);
 		}
 	}
 
-	// This matrix describes the priorities of the types to search for, for each target type
-	// The first column is the target type, the priorities goes from left to right
-	eTokenType matchMtx[10][10] =
-	{
-		{ttDouble, ttFloat,  ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
-		{ttFloat,  ttDouble, ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
-		{ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-		{ttUInt64, ttInt64,  ttUInt,   ttInt,    ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-		{ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-		{ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-		{ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-		{ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-		{ttInt8,   ttUInt8,  ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttDouble, ttFloat},
-		{ttUInt8,  ttInt8,   ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttDouble, ttFloat},
-	};
-
-	// Which row to use?
-	eTokenType *row = 0;
-	for( unsigned int type = 0; type < 10; type++ )
-	{
-		if( to.GetTokenType() == matchMtx[type][0] )
-		{
-			row = &matchMtx[type][0];
-			break;
-		}
-	}
-
-	// Find the best matching cast operator
 	int funcId = 0;
-	if( row )
+	if( to.IsMathType() )
 	{
-		asCDataType target(to);
-
-		// Priority goes from left to right in the matrix
-		for( unsigned int attempt = 0; attempt < 10 && funcId == 0; attempt++ )
+		// This matrix describes the priorities of the types to search for, for each target type
+		// The first column is the target type, the priorities goes from left to right
+		eTokenType matchMtx[10][10] =
 		{
-			target.SetTokenType(row[attempt]);
-			for( unsigned int n = 0; n < funcs.GetLength(); n++ )
+			{ttDouble, ttFloat,  ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
+			{ttFloat,  ttDouble, ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
+			{ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt64, ttInt64,  ttUInt,   ttInt,    ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt8,   ttUInt8,  ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttDouble, ttFloat},
+			{ttUInt8,  ttInt8,   ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttDouble, ttFloat},
+		};
+
+		// Which row to use?
+		eTokenType *row = 0;
+		for( unsigned int type = 0; type < 10; type++ )
+		{
+			if( to.GetTokenType() == matchMtx[type][0] )
 			{
-				asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
-				if( descr->returnType.IsEqualExceptRefAndConst(target) )
+				row = &matchMtx[type][0];
+				break;
+			}
+		}
+
+		// Find the best matching cast operator
+		if( row )
+		{
+			asCDataType target(to);
+
+			// Priority goes from left to right in the matrix
+			for( unsigned int attempt = 0; attempt < 10 && funcId == 0; attempt++ )
+			{
+				target.SetTokenType(row[attempt]);
+				for( unsigned int n = 0; n < funcs.GetLength(); n++ )
 				{
-					funcId = funcs[n];
-					break;
+					asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
+					if( descr->returnType.IsEqualExceptRefAndConst(target) )
+					{
+						funcId = funcs[n];
+						break;
+					}
 				}
 			}
 		}
 	}
+	else
+	{
+		// Only accept the exact conversion for non-math types
+
+		// Find the matching cast operator
+		for( unsigned int n = 0; n < funcs.GetLength(); n++ )
+		{
+			asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
+			if( descr->returnType.IsEqualExceptRefAndConst(to) )
+			{
+				funcId = funcs[n];
+				break;
+			}
+		}
+	}
 
 	// Did we find a suitable function?
 	if( funcId != 0 )
@@ -5502,13 +6027,8 @@ asUINT asCCompiler::ImplicitConvObjectToPrimitive(asSExprContext *ctx, const asC
 		asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
 		if( generateCode )
 		{
-			asCTypeInfo objType = ctx->type;
-
 			Dereference(ctx, true);
-
 			PerformFunctionCall(funcId, ctx);
-
-			ReleaseTemporaryVariable(objType, &ctx->bc);
 		}
 		else
 			ctx->type.Set(descr->returnType);
@@ -5516,16 +6036,71 @@ asUINT asCCompiler::ImplicitConvObjectToPrimitive(asSExprContext *ctx, const asC
 		// Allow one more implicit conversion to another primitive type
 		return asCC_OBJ_TO_PRIMITIVE_CONV + ImplicitConversion(ctx, to, node, convType, generateCode, false);
 	}
-	else
+
+	// TODO: clean-up: This part is similar to what is in ImplicitConvObjectValue
+	// If no direct conversion is found we should look for the generic form 'void opConv(?&out)'
+	funcs.SetLength(0);
+	for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
 	{
-		if( convType != asIC_IMPLICIT_CONV && node )
+		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+		if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
+			func->name == "opImplConv" )
 		{
-			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
-			Error(str, node);
+			// Does the operator take the ?&out parameter?
+			if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
+				func->parameterTypes.GetLength() != 1 ||
+				func->parameterTypes[0].GetTokenType() != ttQuestion ||
+				func->inOutFlags[0] != asTM_OUTREF )
+				continue;
+
+			funcs.PushLast(ot->methods[n]);
 		}
 	}
 
+	// TODO: If there are multiple valid value casts, then we must choose the most appropriate one
+	asASSERT( funcs.GetLength() <= 1 );
+
+	if( funcs.GetLength() == 1 )
+	{
+		if( generateCode )
+		{
+			// Allocate a temporary variable of the requested type
+			int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+			CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
+
+			// Pass the reference of that variable to the function as output parameter
+			asCDataType toRef(to);
+			toRef.MakeReference(true);
+			toRef.MakeReadOnly(false);
+			asCArray<asSExprContext *> args;
+			asSExprContext arg(engine);
+			// Don't mark the variable as temporary, so it won't be freed too early
+			arg.type.SetVariable(toRef, stackOffset, false);
+			arg.type.isLValue = true;
+			arg.exprNode = node;
+			args.PushLast(&arg);
+
+			// Call the behaviour method
+			MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetObjectType(), args, node);
+
+			// Use the reference to the variable as the result of the expression
+			// Now we can mark the variable as temporary
+			toRef.MakeReference(false);
+			ctx->type.SetVariable(toRef, stackOffset, true);
+		}
+		else
+			ctx->type.Set(to);
+
+		return asCC_OBJ_TO_PRIMITIVE_CONV;
+	}
+
+	if( convType != asIC_IMPLICIT_CONV && node )
+	{
+		asCString str;
+		str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+	}
+
 	return asCC_NO_CONV;
 }
 
@@ -5545,7 +6120,7 @@ asUINT asCCompiler::ImplicitConvObjectRef(asSExprContext *ctx, const asCDataType
 
 	asASSERT(ctx->type.dataType.GetObjectType() || ctx->methodName != "");
 
-	// First attempt to convert the base type without instanciating another instance
+	// First attempt to convert the base type without instantiating another instance
 	if( to.GetObjectType() != ctx->type.dataType.GetObjectType() && ctx->methodName == "" )
 	{
 		// If the to type is an interface and the from type implements it, then we can convert it immediately
@@ -5563,17 +6138,9 @@ asUINT asCCompiler::ImplicitConvObjectRef(asSExprContext *ctx, const asCDataType
 		// If the types are not equal yet, then we may still be able to find a reference cast
 		else if( ctx->type.dataType.GetObjectType() != to.GetObjectType() )
 		{
-			// A ref cast must not remove the constness
-			bool isConst = false;
-			if( (ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsHandleToConst()) ||
-				(!ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReadOnly()) )
-				isConst = true;
-
 			// We may still be able to find an implicit ref cast behaviour
 			CompileRefCast(ctx, to, convType == asIC_EXPLICIT_REF_CAST, node, generateCode);
 
-			ctx->type.dataType.MakeHandleToConst(isConst);
-
 			// Was the conversion done?
 			if( ctx->type.dataType.GetObjectType() == to.GetObjectType() )
 				return asCC_REF_CONV;
@@ -5607,7 +6174,7 @@ asUINT asCCompiler::ImplicitConvObjectRef(asSExprContext *ctx, const asCDataType
 			{
 				asCString nsName = ctx->methodName.SubString(0, pos+2);
 				// Trim off the last ::
-				if( nsName.GetLength() > 2 ) 
+				if( nsName.GetLength() > 2 )
 					nsName.SetLength(nsName.GetLength()-2);
 				ns = DetermineNameSpace(nsName);
 				name = ctx->methodName.SubString(pos+2);
@@ -5651,7 +6218,7 @@ asUINT asCCompiler::ImplicitConvObjectRef(asSExprContext *ctx, const asCDataType
 	return asCC_NO_CONV;
 }
 
-asUINT asCCompiler::ImplicitConvObjectValue(asSExprContext *ctx, const asCDataType &to, asCScriptNode * /*node*/, EImplicitConv convType, bool generateCode)
+asUINT asCCompiler::ImplicitConvObjectValue(asSExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
 {
 	asUINT cost = asCC_NO_CONV;
 
@@ -5660,31 +6227,36 @@ asUINT asCCompiler::ImplicitConvObjectValue(asSExprContext *ctx, const asCDataTy
 	if( to.GetObjectType() != ctx->type.dataType.GetObjectType() )
 	{
 		// TODO: Implement support for implicit constructor/factory
+		asCObjectType *ot = ctx->type.dataType.GetObjectType();
+		if( ot == 0 )
+			return cost;
 
 		asCArray<int> funcs;
-		asSTypeBehaviour *beh = ctx->type.dataType.GetBehaviour();
-		if( beh )
+		if( convType == asIC_EXPLICIT_VAL_CAST )
 		{
-			if( convType == asIC_EXPLICIT_VAL_CAST )
+			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
 			{
-				for( unsigned int n = 0; n < beh->operators.GetLength(); n += 2 )
-				{
-					// accept both implicit and explicit cast
-					if( (beh->operators[n] == asBEHAVE_VALUE_CAST ||
-						 beh->operators[n] == asBEHAVE_IMPLICIT_VALUE_CAST) &&
-						builder->GetFunctionDescription(beh->operators[n+1])->returnType.GetObjectType() == to.GetObjectType() )
-						funcs.PushLast(beh->operators[n+1]);
-				}
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+
+				// accept both implicit and explicit cast
+				if( (func->name == "opConv" ||
+					 func->name == "opImplConv") &&
+					func->returnType.GetObjectType() == to.GetObjectType() &&
+					func->parameterTypes.GetLength() == 0 )
+					funcs.PushLast(ot->methods[n]);
 			}
-			else
+		}
+		else
+		{
+			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
 			{
-				for( unsigned int n = 0; n < beh->operators.GetLength(); n += 2 )
-				{
-					// accept only implicit cast
-					if( beh->operators[n] == asBEHAVE_IMPLICIT_VALUE_CAST &&
-						builder->GetFunctionDescription(beh->operators[n+1])->returnType.GetObjectType() == to.GetObjectType() )
-						funcs.PushLast(beh->operators[n+1]);
-				}
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+
+				// accept only implicit cast
+				if( func->name == "opImplConv" &&
+					func->returnType.GetObjectType() == to.GetObjectType() &&
+					func->parameterTypes.GetLength() == 0 )
+					funcs.PushLast(ot->methods[n]);
 			}
 		}
 
@@ -5696,7 +6268,6 @@ asUINT asCCompiler::ImplicitConvObjectValue(asSExprContext *ctx, const asCDataTy
 			asCScriptFunction *f = builder->GetFunctionDescription(funcs[0]);
 			if( generateCode )
 			{
-				asCTypeInfo objType = ctx->type;
 				Dereference(ctx, true);
 
 				bool useVariable = false;
@@ -5716,13 +6287,72 @@ asUINT asCCompiler::ImplicitConvObjectValue(asSExprContext *ctx, const asCDataTy
 				}
 
 				PerformFunctionCall(funcs[0], ctx, false, 0, 0, useVariable, stackOffset);
-				ReleaseTemporaryVariable(objType, &ctx->bc);
 			}
 			else
 				ctx->type.Set(f->returnType);
 
 			cost = asCC_TO_OBJECT_CONV;
 		}
+		else
+		{
+			// TODO: cleanup: This part is similar to the second half of ImplicitConvObjectToPrimitive
+			// Look for a value cast with variable type
+			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+				if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
+					func->name == "opImplConv" )
+				{
+					// Does the operator take the ?&out parameter?
+					if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
+						func->parameterTypes.GetLength() != 1 ||
+						func->parameterTypes[0].GetTokenType() != ttQuestion ||
+						func->inOutFlags[0] != asTM_OUTREF )
+						continue;
+
+					funcs.PushLast(ot->methods[n]);
+				}
+			}
+
+			// TODO: If there are multiple valid value casts, then we must choose the most appropriate one
+			asASSERT( funcs.GetLength() <= 1 );
+
+			if( funcs.GetLength() == 1 )
+			{
+				cost = asCC_TO_OBJECT_CONV;
+				if( generateCode )
+				{
+					// Allocate a temporary variable of the requested type
+					int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+					CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
+
+					// Pass the reference of that variable to the function as output parameter
+					asCDataType toRef(to);
+					toRef.MakeReference(false);
+					asCArray<asSExprContext *> args;
+					asSExprContext arg(engine);
+					arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+					// Don't mark the variable as temporary, so it won't be freed too early
+					arg.type.SetVariable(toRef, stackOffset, false);
+					arg.type.isLValue = true;
+					arg.exprNode = node;
+					args.PushLast(&arg);
+
+					// Call the behaviour method
+					MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetObjectType(), args, node);
+
+					// Use the reference to the variable as the result of the expression
+					// Now we can mark the variable as temporary
+					ctx->type.SetVariable(toRef, stackOffset, true);
+					ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+				}
+				else
+				{
+					// All casts are legal
+					ctx->type.Set(to);
+				}
+			}
+		}
 	}
 
 	return cost;
@@ -5743,14 +6373,14 @@ asUINT asCCompiler::ImplicitConvObjectToObject(asSExprContext *ctx, const asCDat
 		asCArray<asSExprContext *> args;
 		args.PushLast(ctx);
 
-		cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, node, 0, 0, false, true, false);
+		cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, node, 0, 0, 0, false, true, false);
 
 		// Did we find a matching constructor?
 		if( funcs.GetLength() == 1 )
 		{
 			if( generateCode )
 			{
-				// If the ASHANDLE receives a variable type parameter, then we need to 
+				// If the ASHANDLE receives a variable type parameter, then we need to
 				// make sure the expression is treated as a handle and not as a value
 				asCScriptFunction *func = engine->scriptFunctions[funcs[0]];
 				if( func->parameterTypes[0].GetTokenType() == ttQuestion )
@@ -5860,7 +6490,7 @@ asUINT asCCompiler::ImplicitConvObjectToObject(asSExprContext *ctx, const asCDat
 			{
 				asASSERT(node);
 				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 				Error(str, node);
 			}
 		}
@@ -6190,7 +6820,7 @@ asUINT asCCompiler::ImplicitConvPrimitiveToObject(asSExprContext *ctx, const asC
 	arg.exprNode = ctx->exprNode; // Use the same node for compiler messages
 	asCArray<asSExprContext*> args;
 	args.PushLast(&arg);
-	asUINT cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, 0, 0, objType, false, true, false);
+	asUINT cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, 0, 0, 0, objType, false, true, false);
 	if( funcs.GetLength() != 1 )
 		return asCC_NO_CONV;
 
@@ -6202,7 +6832,8 @@ asUINT asCCompiler::ImplicitConvPrimitiveToObject(asSExprContext *ctx, const asC
 
 	// TODO: clean up: This part is similar to CompileConstructCall(). It should be put in a common function
 
-	bool onHeap = true;
+	// Clear the type of ctx, as the type is moved to the arg
+	ctx->type.SetDummy();
 
 	// Value types and script types are allocated through the constructor
 	asCTypeInfo tempObj;
@@ -6212,7 +6843,7 @@ asUINT asCCompiler::ImplicitConvPrimitiveToObject(asSExprContext *ctx, const asC
 	tempObj.isTemporary = true;
 	tempObj.isVariable = true;
 
-	onHeap = IsVariableOnHeap(tempObj.stackOffset);
+	bool onHeap = IsVariableOnHeap(tempObj.stackOffset);
 
 	// Push the address of the object on the stack
 	if( onHeap )
@@ -6474,7 +7105,7 @@ void asCCompiler::ImplicitConversionConstant(asSExprContext *from, const asCData
 		else if( from->type.dataType.IsIntegerType() )
 		{
 			// Verify that it is possible to convert to unsigned without loosing negative
-			if( (from->type.dataType.GetSizeInMemoryBytes() > 4 && asINT64(from->type.qwordValue) < 0) || 
+			if( (from->type.dataType.GetSizeInMemoryBytes() > 4 && asINT64(from->type.qwordValue) < 0) ||
 				(from->type.dataType.GetSizeInMemoryBytes() <= 4 && from->type.intValue < 0) )
 			{
 				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
@@ -6761,7 +7392,7 @@ void asCCompiler::ImplicitConversionConstant(asSExprContext *from, const asCData
 	}
 }
 
-int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, int op, asCScriptNode *opNode)
+int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode)
 {
 	// Don't allow any operators on expressions that take address of class method
 	// If methodName is set but the type is not an object, then it is a global function
@@ -6787,16 +7418,8 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 	{
 		if( op != ttAssignment )
 		{
-			// TODO: getset: We may actually be able to support this, if we can
-			//               guarantee that the object reference will stay valid
-			//               between the calls to the get and set accessors.
-
-			// Process the property to free the memory
-			ProcessPropertySetAccessor(lctx, rctx, opNode);
-
-			// Compound assignments are not allowed for properties
-			Error(TXT_COMPOUND_ASGN_WITH_PROP, opNode);
-			return -1;
+			// Generate the code for the compound assignment, i.e. get the value, apply operator, then set the value
+			return ProcessPropertyGetSetAccessor(ctx, lctx, rctx, op, opNode);
 		}
 
 		// It is not allowed to do a handle assignment on a property
@@ -6887,12 +7510,12 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 		if( op != ttAssignment )
 		{
 			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format().AddressOf());
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 			Error(str, lexpr);
 			return -1;
 		}
 
-		if( lctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE )
+		if( lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE) )
 		{
 			// The object is a value type but that should be treated as a handle
 
@@ -6911,21 +7534,23 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 					if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
 					{
 						asCString str;
-						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format().AddressOf(), lctx->type.dataType.Format().AddressOf());
+						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 						Error(str, rexpr);
 						return -1;
 					}
 				}
 			}
 
-			if( CompileOverloadedDualOperator(opNode, lctx, rctx, ctx) )
+			if( CompileOverloadedDualOperator(opNode, lctx, rctx, ctx, true) )
 			{
 				// An overloaded assignment operator was found (or a compilation error occured)
 				return 0;
 			}
 
 			// The object must implement the opAssign method
-			Error(TXT_NO_APPROPRIATE_OPASSIGN, opNode);
+			asCString msg;
+			msg.Format(TXT_NO_APPROPRIATE_OPHNDLASSIGN_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(msg.AddressOf(), opNode);
 			return -1;
 		}
 		else
@@ -6937,7 +7562,7 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
 			{
 				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format().AddressOf(), lctx->type.dataType.Format().AddressOf());
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 				Error(str, rexpr);
 				return -1;
 			}
@@ -6959,16 +7584,6 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 	}
 	else // if( lctx->type.dataType.IsObject() )
 	{
-		// An ASHANDLE type must not allow a value assignment, as
-		// the opAssign operator is used for the handle assignment
-		if( lctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE )
-		{
-			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format().AddressOf());
-			Error(str, lexpr);
-			return -1;
-		}
-
 		// The lvalue reference may be marked as a temporary, if for example
 		// it was originated as a handle returned from a function. In such
 		// cases it must be possible to assign values to it anyway.
@@ -6996,7 +7611,7 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 		if( op != ttAssignment )
 		{
 			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format().AddressOf());
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 			Error(str, lexpr);
 			return -1;
 		}
@@ -7023,11 +7638,13 @@ int asCCompiler::DoAssignment(asSExprContext *ctx, asSExprContext *lctx, asSExpr
 			asCDataType dt = lctx->type.dataType;
 			dt.MakeReference(true);
 			dt.MakeReadOnly(true);
-			PrepareArgument(&dt, rctx, rexpr, true, 1, !needConversion);
+			int r = PrepareArgument(&dt, rctx, rexpr, true, 1, !needConversion);
+			if( r < 0 )
+				return -1;
 			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
 			{
 				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format().AddressOf(), lctx->type.dataType.Format().AddressOf());
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 				Error(str, rexpr);
 				return -1;
 			}
@@ -7103,6 +7720,11 @@ int asCCompiler::CompileCondition(asCScriptNode *expr, asSExprContext *ctx)
 		int r = CompileExpression(cexpr, &e);
 		if( r < 0 )
 			e.type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( e.type.dataType.GetObjectType() && (e.type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&e, asCDataType::CreatePrimitive(ttBool, false), cexpr, asIC_IMPLICIT_CONV);
+
 		if( r >= 0 && !e.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
 		{
 			Error(TXT_EXPR_MUST_BE_BOOL, cexpr);
@@ -7198,101 +7820,182 @@ int asCCompiler::CompileCondition(asCScriptNode *expr, asSExprContext *ctx)
 			}
 			else
 			{
-				// Allocate temporary variable and copy the result to that one
-				asCTypeInfo temp;
-				temp = le.type;
-				temp.dataType.MakeReference(false);
-				temp.dataType.MakeReadOnly(false);
-				
-				// Make sure the variable isn't used in any of the expressions, 
-				// as it would be overwritten which may cause crashes or less visible bugs
-				int l = int(reservedVariables.GetLength());
-				e.bc.GetVarsUsed(reservedVariables);
-				le.bc.GetVarsUsed(reservedVariables);
-				re.bc.GetVarsUsed(reservedVariables);
-				int offset = AllocateVariable(temp.dataType, true, false);
-				reservedVariables.SetLength(l);
-				
-				temp.SetVariable(temp.dataType, offset, true);
+				// Allow "(a ? b : c) = d;" and "return (a ? b : c);" (where the latter returns the reference)
+				//
+				// Restrictions for the condition to be used as lvalue:
+				//  1. both b and c must be of the same type and be lvalue references
+				//  2. neither of the expressions can have any deferred arguments
+				//     that would have to be cleaned up after the reference
+				//  3. neither expression can be temporary
+				//
+				// If either expression is local, the resulting lvalue is not valid 
+				// for return since it is not allowed to return references to local 
+				// variables.
+				//
+				// The reference to the local variable must be loaded into the register,
+				// the resulting expression must not be considered as a local variable 
+				// with a stack offset (i.e. it will not be allowed to use asBC_VAR)
 
-				// TODO: copy: Use copy constructor if available. See PrepareTemporaryObject()
-
-				CallDefaultConstructor(temp.dataType, offset, IsVariableOnHeap(offset), &ctx->bc, expr);
-
-				// Put the code for the condition expression on the output
-				MergeExprBytecode(ctx, &e);
-
-				// Add the branch decision
-				ctx->type = e.type;
-				ConvertToVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
-				ctx->bc.Instr(asBC_ClrHi);
-				ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-				// Assign the result of the left expression to the temporary variable
-				asCTypeInfo rtemp;
-				rtemp = temp;
-				if( rtemp.dataType.IsObjectHandle() )
-					rtemp.isExplicitHandle = true;
-
-				PrepareForAssignment(&rtemp.dataType, &le, cexpr->next, true);
-				MergeExprBytecode(ctx, &le);
-
-				if( !rtemp.dataType.IsPrimitive() )
+				if( le.type.isLValue && re.type.isLValue &&
+					le.deferredParams.GetLength() == 0 && re.deferredParams.GetLength() ==0 &&
+					!le.type.isTemporary && !re.type.isTemporary &&
+					le.type.dataType == re.type.dataType )
 				{
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-					rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					// Put the code for the condition expression on the output
+					MergeExprBytecode(ctx, &e);
+
+					// Add the branch decision
+					ctx->type = e.type;
+					ConvertToVariable(ctx);
+					ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
+					ctx->bc.Instr(asBC_ClrHi);
+					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+					// Start of the left expression
+					MergeExprBytecode(ctx, &le);
+					if( !le.type.dataType.IsReference() && le.type.isVariable )
+					{
+						// Load the address of the variable into the register
+						ctx->bc.InstrSHORT(asBC_LDV, le.type.stackOffset);
+					}
+
+					ctx->bc.InstrINT(asBC_JMP, afterLabel);
+
+					// Start of the right expression
+					ctx->bc.Label((short)elseLabel);
+
+					MergeExprBytecode(ctx, &re);
+					if( !re.type.dataType.IsReference() && re.type.isVariable )
+					{
+						// Load the address of the variable into the register
+						ctx->bc.InstrSHORT(asBC_LDV, re.type.stackOffset);
+					}
+
+					ctx->bc.Label((short)afterLabel);
+
+					// In case the options were to objects, it is necessary to dereference the pointer on 
+					// the stack so it will point to the actual object, instead of the variable
+					if( le.type.dataType.IsReference() && le.type.isVariable && le.type.dataType.IsObject() && !le.type.dataType.IsObjectHandle() )
+					{
+						asASSERT( re.type.dataType.IsReference() && re.type.isVariable && re.type.dataType.IsObject() && !re.type.dataType.IsObjectHandle() );
+
+						ctx->bc.Instr(asBC_RDSPtr);
+					}
+
+					// The result is an lvalue
+					ctx->type.isLValue = true;
+					ctx->type.dataType = le.type.dataType;
+					if( ctx->type.dataType.IsPrimitive() || ctx->type.dataType.IsObjectHandle() )
+						ctx->type.dataType.MakeReference(true);
+					else
+						ctx->type.dataType.MakeReference(false);
+
+					// It can't be a treated as a variable, since we don't know which one was used
+					ctx->type.isVariable = false;
+					ctx->type.isTemporary = false;
+
+					// Must remember if the reference was to a local variable, since it must not be allowed to be returned
+					ctx->type.isRefToLocal = le.type.isVariable || le.type.isRefToLocal || re.type.isVariable || re.type.isRefToLocal; 
 				}
-				asCTypeInfo result;
-				result = rtemp;
-				PerformAssignment(&result, &le.type, &ctx->bc, cexpr->next);
-				if( !result.dataType.IsPrimitive() )
-					ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
-
-				// Release the old temporary variable
-				ReleaseTemporaryVariable(le.type, &ctx->bc);
-
-				ctx->bc.InstrINT(asBC_JMP, afterLabel);
-
-				// Start of the right expression
-				ctx->bc.Label((short)elseLabel);
-
-				// Copy the result to the same temporary variable
-				PrepareForAssignment(&rtemp.dataType, &re, cexpr->next, true);
-				MergeExprBytecode(ctx, &re);
-
-				if( !rtemp.dataType.IsPrimitive() )
+				else
 				{
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-					rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					// Allocate temporary variable and copy the result to that one
+					asCTypeInfo temp;
+					temp = le.type;
+					temp.dataType.MakeReference(false);
+					temp.dataType.MakeReadOnly(false);
+
+					// Make sure the variable isn't used in any of the expressions,
+					// as it would be overwritten which may cause crashes or less visible bugs
+					int l = int(reservedVariables.GetLength());
+					e.bc.GetVarsUsed(reservedVariables);
+					le.bc.GetVarsUsed(reservedVariables);
+					re.bc.GetVarsUsed(reservedVariables);
+					int offset = AllocateVariable(temp.dataType, true, false);
+					reservedVariables.SetLength(l);
+
+					temp.SetVariable(temp.dataType, offset, true);
+
+					// TODO: copy: Use copy constructor if available. See PrepareTemporaryObject()
+
+					CallDefaultConstructor(temp.dataType, offset, IsVariableOnHeap(offset), &ctx->bc, expr);
+
+					// Put the code for the condition expression on the output
+					MergeExprBytecode(ctx, &e);
+
+					// Add the branch decision
+					ctx->type = e.type;
+					ConvertToVariable(ctx);
+					ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
+					ctx->bc.Instr(asBC_ClrHi);
+					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+					// Assign the result of the left expression to the temporary variable
+					asCTypeInfo rtemp;
+					rtemp = temp;
+					if( rtemp.dataType.IsObjectHandle() )
+						rtemp.isExplicitHandle = true;
+
+					PrepareForAssignment(&rtemp.dataType, &le, cexpr->next, true);
+					MergeExprBytecode(ctx, &le);
+
+					if( !rtemp.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+					asCTypeInfo result;
+					result = rtemp;
+					PerformAssignment(&result, &le.type, &ctx->bc, cexpr->next);
+					if( !result.dataType.IsPrimitive() )
+						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
+
+					// Release the old temporary variable
+					ReleaseTemporaryVariable(le.type, &ctx->bc);
+
+					ctx->bc.InstrINT(asBC_JMP, afterLabel);
+
+					// Start of the right expression
+					ctx->bc.Label((short)elseLabel);
+
+					// Copy the result to the same temporary variable
+					PrepareForAssignment(&rtemp.dataType, &re, cexpr->next, true);
+					MergeExprBytecode(ctx, &re);
+
+					if( !rtemp.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+					result = rtemp;
+					PerformAssignment(&result, &re.type, &ctx->bc, cexpr->next);
+					if( !result.dataType.IsPrimitive() )
+						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
+
+					// Release the old temporary variable
+					ReleaseTemporaryVariable(re.type, &ctx->bc);
+
+					ctx->bc.Label((short)afterLabel);
+
+					// Make sure both expressions have the same type
+					if( !le.type.dataType.IsEqualExceptConst(re.type.dataType) )
+						Error(TXT_BOTH_MUST_BE_SAME, expr);
+
+					// Set the temporary variable as output
+					ctx->type = rtemp;
+					ctx->type.isExplicitHandle = isExplicitHandle;
+
+					if( !ctx->type.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+
+					// Make sure the output isn't marked as being a literal constant
+					ctx->type.isConstant = false;
 				}
-				result = rtemp;
-				PerformAssignment(&result, &re.type, &ctx->bc, cexpr->next);
-				if( !result.dataType.IsPrimitive() )
-					ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
-
-				// Release the old temporary variable
-				ReleaseTemporaryVariable(re.type, &ctx->bc);
-
-				ctx->bc.Label((short)afterLabel);
-
-				// Make sure both expressions have the same type
-				if( !le.type.dataType.IsEqualExceptConst(re.type.dataType) )
-					Error(TXT_BOTH_MUST_BE_SAME, expr);
-
-				// Set the temporary variable as output
-				ctx->type = rtemp;
-				ctx->type.isExplicitHandle = isExplicitHandle;
-
-				if( !ctx->type.dataType.IsPrimitive() )
-				{
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-					ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
-				}
-
-				// Make sure the output isn't marked as being a literal constant
-				ctx->type.isConstant = false;
 			}
 		}
 		else
@@ -7311,6 +8014,46 @@ int asCCompiler::CompileExpression(asCScriptNode *expr, asSExprContext *ctx)
 {
 	asASSERT(expr->nodeType == snExpression);
 
+	// Check if this is an initialization of a temp object with an initialization list
+	if( expr->firstChild && expr->firstChild->nodeType == snDataType )
+	{
+		// TODO: It should be possible to infer the type of the object from where the
+		//       expression will be used. The compilation of the initialization list
+		//       should be deferred until it is known for what it will be used. It will
+		//       then for example be possible to write expressions like:
+		//
+		//       @dict = {{'key', 'value'}};
+		//       funcTakingArrayOfInt({1,2,3,4});
+
+		// Determine the type of the temporary object
+		asCDataType dt = builder->CreateDataTypeFromNode(expr->firstChild, script, outFunc->nameSpace);
+
+		// Do not allow constructing non-shared types in shared functions
+		if( outFunc->IsShared() &&
+			dt.GetObjectType() && !dt.GetObjectType()->IsShared() )
+		{
+			asCString msg;
+			msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetObjectType()->name.AddressOf());
+			Error(msg, expr);
+		}
+
+		// Allocate and initialize the temporary object
+		int offset = AllocateVariable(dt, true);
+		CompileInitialization(expr->lastChild, &ctx->bc, dt, expr, offset, 0, 0);
+
+		// Push the reference to the object on the stack
+		ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+		ctx->type.SetVariable(dt, offset, true);
+		ctx->type.isLValue = false;
+
+		// If the variable is allocated on the heap we have a reference,
+		// otherwise the actual object pointer is pushed on the stack.
+		if( IsVariableOnHeap(offset) )
+			ctx->type.dataType.MakeReference(true);
+
+		return 0;
+	}
+
 	// Convert to polish post fix, i.e: a+b => ab+
 
 	// The algorithm that I've implemented here is similar to
@@ -7556,6 +8299,26 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 			asCObjectProperty *prop = builder->GetObjectProperty(dt, name.AddressOf());
 			if( prop )
 			{
+				// Is the property access allowed?
+				if( prop->isPrivate && prop->isInherited )
+				{
+					if( engine->ep.privatePropAsProtected )
+					{
+						// The application is allowing inherited classes to access private properties of the parent
+						// class. This option is allowed to provide backwards compatibility with pre-2.30.0 versions
+						// as it was how the compiler behaved earlier.
+						asCString msg;
+						msg.Format(TXT_ACCESSING_PRIVATE_PROP_s, name.AddressOf());
+						Warning(msg, errNode);
+					}
+					else
+					{
+						asCString msg;
+						msg.Format(TXT_INHERITED_PRIVATE_PROP_ACCESS_s, name.AddressOf());
+						Error(msg, errNode);
+					}
+				}
+
 				if( !objType )
 				{
 					// The object pointer is located at stack position 0
@@ -7604,9 +8367,11 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 				asCScriptFunction *func = 0;
 				for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
 				{
-					if( engine->scriptFunctions[ot->methods[n]]->name == name )
+					asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
+					if( f->name == name &&
+					    (builder->module->accessMask & f->accessMask) )
 					{
-						func = engine->scriptFunctions[ot->methods[n]];
+						func = f;
 						break;
 					}
 				}
@@ -7614,7 +8379,7 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 				if( func )
 				{
 					// An object method was found. Keep the name of the method in the expression, but
-					// don't actually modify the bytecode at this point since it is not yet known what 
+					// don't actually modify the bytecode at this point since it is not yet known what
 					// the method will be used for, or even what overloaded method should be used.
 					ctx->methodName = name;
 
@@ -7730,10 +8495,12 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 								// If the object is a value type or a non-handle variable to a reference type,
 								// then we must validate the existance as it could potentially be accessed
 								// before it is initialized.
-								if( (ctx->type.dataType.GetObjectType()->flags & asOBJ_VALUE) ||
-									!ctx->type.dataType.IsObjectHandle() )
+								// This check is not needed for application registered properties, since they
+								// are guaranteed to be valid by the application itself.
+								if( !isAppProp &&
+									((ctx->type.dataType.GetObjectType()->flags & asOBJ_VALUE) ||
+									 !ctx->type.dataType.IsObjectHandle()) )
 								{
-									// TODO: runtime optimize: This is not necessary for application registered properties
 									ctx->bc.Instr(asBC_ChkRefS);
 								}
 
@@ -7829,7 +8596,7 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 						// The ambiguity could be resolved now, but I hesitate
 						// to store too much information in the context.
 						ctx->enumValue = name.AddressOf();
-						
+
 						// We cannot set a dummy value because it will pass through
 						// cleanly as an integer.
 						ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttIdentifier, true), 0);
@@ -7848,7 +8615,7 @@ int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &s
 			}
 			else
 			{
-				// If nothing was found because the scope doesn't match a namespace or an enum 
+				// If nothing was found because the scope doesn't match a namespace or an enum
 				// then this should be reported as an error and the search interrupted
 				if( !ns && !scopeType )
 				{
@@ -8424,12 +9191,13 @@ void asCCompiler::CompileConversion(asCScriptNode *node, asSExprContext *ctx)
 
 		// Determine the requested type
 		to = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
-		to = builder->ModifyDataTypeFromNode(to, node->firstChild->next, script, 0, 0);
 
 		// If the type support object handles, then use it
 		if( to.SupportHandles() )
 		{
 			to.MakeHandle(true);
+			if( expr.type.dataType.IsObjectConst() )
+				to.MakeHandleToConst(true);
 		}
 		else if( !to.IsObjectHandle() )
 		{
@@ -8487,7 +9255,7 @@ void asCCompiler::CompileConversion(asCScriptNode *node, asSExprContext *ctx)
 		return;
 	}
 
-	if( to.IsEqualExceptConst(expr.type.dataType) && to.IsPrimitive() )
+	if( to.IsEqualExceptRefAndConst(expr.type.dataType) && to.IsPrimitive() )
 	{
 		MergeExprBytecode(ctx, &expr);
 		ctx->type = expr.type;
@@ -8523,8 +9291,8 @@ void asCCompiler::CompileConversion(asCScriptNode *node, asSExprContext *ctx)
 
 	asCString strTo, strFrom;
 
-	strTo = to.Format();
-	strFrom = expr.type.dataType.Format();
+	strTo = to.Format(outFunc->nameSpace);
+	strFrom = expr.type.dataType.Format(outFunc->nameSpace);
 
 	asCString msg;
 	msg.Format(TXT_NO_CONVERSION_s_TO_s, strFrom.AddressOf(), strTo.AddressOf());
@@ -8534,6 +9302,9 @@ void asCCompiler::CompileConversion(asCScriptNode *node, asSExprContext *ctx)
 
 void asCCompiler::AfterFunctionCall(int funcID, asCArray<asSExprContext*> &args, asSExprContext *ctx, bool deferAll)
 {
+	// deferAll is set to true if for example the function returns a reference, since in 
+	// this case the function might be returning a reference to one of the arguments.
+
 	asCScriptFunction *descr = builder->GetFunctionDescription(funcID);
 
 	// Parameters that are sent by reference should be assigned
@@ -8543,8 +9314,10 @@ void asCCompiler::AfterFunctionCall(int funcID, asCArray<asSExprContext*> &args,
 	int n = (int)descr->parameterTypes.GetLength() - 1;
 	for( ; n >= 0; n-- )
 	{
+		// All &out arguments must be deferred
+		// If deferAll is set all objects passed by reference or handle must be deferred
 		if( (descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] & asTM_OUTREF)) ||
-		    (descr->parameterTypes[n].IsObject() && deferAll) )
+			(descr->parameterTypes[n].IsObject() && deferAll && (descr->parameterTypes[n].IsReference() || descr->parameterTypes[n].IsObjectHandle())) )
 		{
 			asASSERT( !(descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] == asTM_OUTREF)) || args[n]->origExpr );
 
@@ -8638,9 +9411,9 @@ void asCCompiler::ProcessDeferredParams(asSExprContext *ctx)
 				if( !expr->type.IsVoidExpression() && (!expr->type.isConstant || expr->type.IsNullConstant()) )
 					ctx->bc.Instr(asBC_PopPtr);
 
-				// Give a warning, except if the argument is void, null or 0 which indicate the argument is really to be ignored
+				// Give an error, except if the argument is void, null or 0 which indicate the argument is explicitly to be ignored
 				if( !expr->type.IsVoidExpression() && !expr->type.IsNullConstant() && !(expr->type.isConstant && expr->type.qwordValue == 0) )
-					Warning(TXT_ARG_NOT_LVALUE, outParam.argNode);
+					Error(TXT_ARG_NOT_LVALUE, outParam.argNode);
 
 				ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
 			}
@@ -8691,6 +9464,37 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 		return;
 	}
 
+	if( dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_IMPLICIT_HANDLE) )
+	{
+		// Types declared as implicit handle must not attempt to construct a handle
+		dt.MakeHandle(false);
+	}
+
+	// Don't accept syntax like object@(expr)
+	if( dt.IsObjectHandle() )
+	{
+		asCString str;
+		str.Format(TXT_CANT_CONSTRUCT_s_USE_REF_CAST, dt.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ctx->type.SetDummy();
+		return;
+	}
+
+	if( !dt.CanBeInstantiated() )
+	{
+		asCString str;
+		if( dt.IsAbstractClass() )
+			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
+		else if( dt.IsInterface() )
+			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
+		else
+			// TODO: Improve error message to explain why
+			str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ctx->type.SetDummy();
+		return;
+	}
+
 	// Do not allow constructing non-shared types in shared functions
 	if( outFunc->IsShared() &&
 		dt.GetObjectType() && !dt.GetObjectType()->IsShared() )
@@ -8702,17 +9506,20 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 
 	// Compile the arguments
 	asCArray<asSExprContext *> args;
+	asCArray<asSNamedArgument> namedArgs;
 	asCArray<asCTypeInfo> temporaryVariables;
-	if( CompileArgumentList(node->lastChild, args) >= 0 )
+	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
 	{
 		// Check for a value cast behaviour
 		if( args.GetLength() == 1 && args[0]->type.dataType.GetObjectType() )
 		{
 			asSExprContext conv(engine);
 			conv.type = args[0]->type;
-			ImplicitConversion(&conv, dt, node->lastChild, asIC_EXPLICIT_VAL_CAST, false);
+			asUINT cost = ImplicitConversion(&conv, dt, node->lastChild, asIC_EXPLICIT_VAL_CAST, false);
 
-			if( conv.type.dataType.IsEqualExceptRef(dt) )
+			// Don't use this if the cost is 0 because it would mean that nothing
+			// is done and the scipt wants a new value to be constructed
+			if( conv.type.dataType.IsEqualExceptRef(dt) && cost > 0 )
 			{
 				ImplicitConversion(args[0], dt, node->lastChild, asIC_EXPLICIT_VAL_CAST);
 
@@ -8726,7 +9533,7 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 		}
 
 		// Check for possible constructor/factory
-		name = dt.Format();
+		name = dt.Format(outFunc->nameSpace);
 
 		asSTypeBehaviour *beh = dt.GetBehaviour();
 
@@ -8748,9 +9555,7 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 				ctx->bc.InstrSHORT(asBC_VAR, tempObj.stackOffset);
 		}
 		else
-		{
 			funcs = beh->factories;
-		}
 
 		// Special case: Allow calling func(void) with a void expression.
 		if( args.GetLength() == 1 && args[0]->type.dataType == asCDataType::CreatePrimitive(ttVoid, false) )
@@ -8790,7 +9595,7 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 		{
 			// TODO: delegate: It is possible that the argument returns a function pointer already, in which
 			//                 case no object delegate will be created, but instead a delegate for a function pointer
-			//                 In theory a simple cast would be good in this case, but this is a construct call so it 
+			//                 In theory a simple cast would be good in this case, but this is a construct call so it
 			//                 is expected that a new object is created.
 
 			dt.MakeHandle(true);
@@ -8807,7 +9612,7 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 				for( asUINT n = 0; n < type->methods.GetLength(); n++ )
 				{
 					asCScriptFunction *func = engine->scriptFunctions[type->methods[n]];
-					
+
 					if( func->name != args[0]->methodName )
 						continue;
 
@@ -8861,7 +9666,7 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 			return;
 		}
 
-		MatchFunctions(funcs, args, node, name.AddressOf(), NULL, false);
+		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, 0, false);
 
 		if( funcs.GetLength() != 1 )
 		{
@@ -8872,14 +9677,10 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 		}
 		else
 		{
-			int r = asSUCCESS;
-
-			// TODO: 2.28.1: Merge this with MakeFunctionCall
+			// TODO: Clean up: Merge this with MakeFunctionCall
 
 			// Add the default values for arguments not explicitly supplied
-			asCScriptFunction *func = (funcs[0] & FUNC_IMPORTED) == 0 ? engine->scriptFunctions[funcs[0]] : 0;
-			if( func && args.GetLength() < (asUINT)func->GetParamCount() )
-				r = CompileDefaultArgs(node, args, func);
+			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], dt.GetObjectType(), &namedArgs);
 
 			if( r == asSUCCESS )
 			{
@@ -8939,30 +9740,36 @@ void asCCompiler::CompileConstructCall(asCScriptNode *node, asSExprContext *ctx)
 		{
 			asDELETE(args[n],asSExprContext);
 		}
+	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+		if( namedArgs[n].ctx )
+		{
+			asDELETE(namedArgs[n].ctx,asSExprContext);
+		}
 }
 
 
 int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, asCObjectType *objectType, bool objIsConst, const asCString &scope)
 {
-	asCString name;
 	asCTypeInfo tempObj;
 	asCArray<int> funcs;
 	int localVar = -1;
 	bool initializeMembers = false;
+	asSExprContext funcExpr(engine);
 
 	asCScriptNode *nm = node->lastChild->prev;
-	name.Assign(&script->code[nm->tokenPos], nm->tokenLength);
+	asCString name(&script->code[nm->tokenPos], nm->tokenLength);
 
-	// First check for a local variable of a function type as it would take precedence
+	// First check for a local variable as it would take precedence
 	// Must not allow function names, nor global variables to be returned in this instance
 	// If objectType is set then this is a post op expression and we shouldn't look for local variables
-	asSExprContext funcPtr(engine);
 	if( objectType == 0 )
 	{
-		localVar = CompileVariableAccess(name, scope, &funcPtr, node, true, true, true);
-		if( localVar >= 0 && !funcPtr.type.dataType.GetFuncDef() && funcPtr.methodName == "" )
+		localVar = CompileVariableAccess(name, scope, &funcExpr, node, true, true, true);
+		if( localVar >= 0 &&
+			!(funcExpr.type.dataType.GetFuncDef() || funcExpr.type.dataType.IsObject()) &&
+			funcExpr.methodName == "" )
 		{
-			// The variable is not a function
+			// The variable is not a function or object with opCall
 			asCString msg;
 			msg.Format(TXT_NOT_A_FUNC_s_IS_VAR, name.AddressOf());
 			Error(msg, node);
@@ -8970,7 +9777,7 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 		}
 
 		// If the name matches a method name, then reset the indicator that nothing was found
-		if( funcPtr.methodName != "" )
+		if( funcExpr.methodName != "" )
 			localVar = -1;
 	}
 
@@ -9012,15 +9819,17 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 			}
 			else
 			{
-				// The scope is can be used to specify the base class
-				builder->GetObjectMethodDescriptions(name.AddressOf(), objectType ? objectType : outFunc->objectType, funcs, objIsConst, scope);
+				// The scope can be used to specify the base class
+				builder->GetObjectMethodDescriptions(name.AddressOf(), objectType ? objectType : outFunc->objectType, funcs, objIsConst, scope, node, script);
 			}
 
-			// It is still possible that there is a class member of a function type
+			// It is still possible that there is a class member of a function type or a type with opCall methods
 			if( funcs.GetLength() == 0 )
 			{
-				int r = CompileVariableAccess(name, scope, &funcPtr, node, true, true, true, objectType);
-				if( r >= 0 && !funcPtr.type.dataType.GetFuncDef() && funcPtr.methodName == "" )
+				int r = CompileVariableAccess(name, scope, &funcExpr, node, true, true, true, objectType);
+				if( r >= 0 &&
+					!(funcExpr.type.dataType.GetFuncDef() || funcExpr.type.dataType.IsObject()) &&
+					funcExpr.methodName == "" )
 				{
 					// The variable is not a function
 					asCString msg;
@@ -9028,6 +9837,11 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 					Error(msg, node);
 					return -1;
 				}
+
+				// If the name is an access property, make sure the original value isn't
+				// dereferenced when calling the access property as part a dot post operator
+				if( objectType && (funcExpr.property_get || funcExpr.property_set) && !ctx->type.dataType.IsReference() )
+					funcExpr.property_ref = false;
 			}
 
 			// If a class method is being called implicitly, then add the this pointer for the call
@@ -9050,20 +9864,22 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 		// then look for global functions or global function pointers,
 		// unless this is an expression post op, incase only member
 		// functions are expected
-		if( objectType == 0 && funcs.GetLength() == 0 && funcPtr.type.dataType.GetFuncDef() == 0 )
+		if( objectType == 0 && funcs.GetLength() == 0 && (funcExpr.type.dataType.GetFuncDef() == 0 || funcExpr.type.dataType.IsObject()) )
 		{
 			// The scope is used to define the namespace
 			asSNameSpace *ns = DetermineNameSpace(scope);
 			if( ns )
 			{
 				// Search recursively in parent namespaces
-				while( ns && funcs.GetLength() == 0 && funcPtr.type.dataType.GetFuncDef() == 0 )
+				while( ns && funcs.GetLength() == 0 && funcExpr.type.dataType.GetFuncDef() == 0 )
 				{
 					builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
 					if( funcs.GetLength() == 0 )
 					{
-						int r = CompileVariableAccess(name, scope, &funcPtr, node, true, true);
-						if( r >= 0 && !funcPtr.type.dataType.GetFuncDef() )
+						int r = CompileVariableAccess(name, scope, &funcExpr, node, true, true);
+						if( r >= 0 &&
+							!(funcExpr.type.dataType.GetFuncDef() || funcExpr.type.dataType.IsObject()) &&
+							funcExpr.methodName == "" )
 						{
 							// The variable is not a function
 							asCString msg;
@@ -9073,7 +9889,7 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 						}
 					}
 
-					ns = builder->GetParentNameSpace(ns);
+					ns = engine->GetParentNameSpace(ns);
 				}
 			}
 			else
@@ -9086,17 +9902,55 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 		}
 	}
 
-	if( funcs.GetLength() == 0 && funcPtr.type.dataType.GetFuncDef() )
+	if( funcs.GetLength() == 0 )
 	{
-		funcs.PushLast(funcPtr.type.dataType.GetFuncDef()->id);
+		if( funcExpr.type.dataType.GetFuncDef() )
+		{
+			funcs.PushLast(funcExpr.type.dataType.GetFuncDef()->id);
+		}
+		else if( funcExpr.type.dataType.IsObject() )
+		{
+			// Keep information about temporary variables as deferred expression so it can be properly cleaned up after the call
+			if( ctx->type.isTemporary )
+			{
+				asASSERT( objectType );
+
+				asSDeferredParam deferred;
+				deferred.origExpr = 0;
+				deferred.argInOutFlags = asTM_INREF;
+				deferred.argNode = 0;
+				deferred.argType.SetVariable(ctx->type.dataType, ctx->type.stackOffset, true);
+
+				ctx->deferredParams.PushLast(deferred);
+			}
+			if( funcExpr.property_get == 0 )
+				Dereference(ctx, true);
+
+			// Add the bytecode for accessing the object on which opCall will be called
+			MergeExprBytecodeAndType(ctx, &funcExpr);
+			ProcessPropertyGetAccessor(ctx, node);
+			Dereference(ctx, true);
+
+			objectType = funcExpr.type.dataType.GetObjectType();
+
+			// Get the opCall methods from the object type
+			if( funcExpr.type.dataType.IsObjectHandle() )
+				objIsConst = funcExpr.type.dataType.IsHandleToConst();
+			else
+				objIsConst = funcExpr.type.dataType.IsReadOnly();
+
+			builder->GetObjectMethodDescriptions("opCall", funcExpr.type.dataType.GetObjectType(), funcs, objIsConst);
+		}
 	}
 
 	// Compile the arguments
 	asCArray<asSExprContext *> args;
+	asCArray<asSNamedArgument> namedArgs;
 
-	if( CompileArgumentList(node->lastChild, args) >= 0 )
+	bool isOK = true;
+	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
 	{
-		// Special case: Allow calling func(void) with an expression that evaluates to no datatype, but isn't exactly 'void' 
+		// Special case: Allow calling func(void) with an expression that evaluates to no datatype, but isn't exactly 'void'
 		if( args.GetLength() == 1 && args[0]->type.dataType == asCDataType::CreatePrimitive(ttVoid, false) && !args[0]->type.IsVoidExpression() )
 		{
 			// Evaluate the expression before the function call
@@ -9105,7 +9959,7 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 			args.SetLength(0);
 		}
 
-		MatchFunctions(funcs, args, node, name.AddressOf(), objectType, objIsConst, false, true, scope);
+		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, objectType, objIsConst, false, true, scope);
 
 		if( funcs.GetLength() != 1 )
 		{
@@ -9113,22 +9967,12 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 
 			// Dummy value
 			ctx->type.SetDummy();
+			isOK = false;
 		}
 		else
 		{
-			int r = asSUCCESS;
-
 			// Add the default values for arguments not explicitly supplied
-			asCScriptFunction *func = builder->GetFunctionDescription(funcs[0]);
-			if( func && args.GetLength() < (asUINT)func->GetParamCount() )
-			{
-				// Make sure to use the real function for virtual functions
-				asCScriptFunction *realFunc = func;
-				if( realFunc->funcType == asFUNC_VIRTUAL )
-					realFunc = objectType->virtualFunctionTable[realFunc->vfTableIdx];
-
-				r = CompileDefaultArgs(node, args, realFunc);
-			}
+			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType, &namedArgs);
 
 			// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
 			//                is it enough to make sure it is in a local variable?
@@ -9137,52 +9981,48 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 			// by first storing the function pointer in a local variable (if it isn't already in one)
 			if( r == asSUCCESS )
 			{
+				asCScriptFunction *func = builder->GetFunctionDescription(funcs[0]);
 				if( func->funcType == asFUNC_FUNCDEF )
 				{
-					if( objectType && funcPtr.property_get <= 0 )
+					if( objectType && funcExpr.property_get <= 0 )
 					{
-						Dereference(ctx, true); // Dereference the object pointer to access the member
-
-						// The actual function should be called as if a global function
-						objectType = 0;
+						// Dereference the object pointer to access the member
+						Dereference(ctx, true); 
 					}
 
-					if( funcPtr.property_get > 0 )
+					if( funcExpr.property_get > 0 )
 					{
-						ProcessPropertyGetAccessor(&funcPtr, node);
-						Dereference(&funcPtr, true);
-
-						// The function call will be made directly from the local variable so the function pointer shouldn't be on the stack
-						funcPtr.bc.Instr(asBC_PopPtr);
+						ProcessPropertyGetAccessor(&funcExpr, node);
+						Dereference(&funcExpr, true);
 					}
 					else
 					{
-						Dereference(&funcPtr, true);
-						ConvertToVariable(&funcPtr);
-
-						// The function call will be made directly from the local variable so the function pointer shouldn't be on the stack
-						if( !funcPtr.type.isTemporary )
-							funcPtr.bc.Instr(asBC_PopPtr);
+						Dereference(&funcExpr, true);
+						ConvertToVariable(&funcExpr);
 					}
 
-					MergeExprBytecodeAndType(ctx, &funcPtr);
+					// The actual function should be called as if a global function
+					objectType = 0;
+
+					// The function call will be made directly from the local variable so the function pointer shouldn't be on the stack
+					funcExpr.bc.Instr(asBC_PopPtr);
+
+					asCTypeInfo tmp = ctx->type;
+					MergeExprBytecodeAndType(ctx, &funcExpr);
+					ReleaseTemporaryVariable(tmp, &ctx->bc);
 				}
 
-				MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, funcPtr.type.stackOffset);
-
-				// If the function pointer was copied to a local variable for the call, then
-				// release it again (temporary local variable)
-				if( (funcs[0] & FUNC_IMPORTED) == 0 && engine->scriptFunctions[funcs[0]]->funcType == asFUNC_FUNCDEF )
-				{
-					ReleaseTemporaryVariable(funcPtr.type, &ctx->bc);
-				}
+				MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, funcExpr.type.stackOffset);
 			}
+			else
+				isOK = false;
 		}
 	}
 	else
 	{
 		// Failed to compile the argument list, set the dummy type and continue compilation
 		ctx->type.SetDummy();
+		isOK = false;
 	}
 
 	// Cleanup
@@ -9191,6 +10031,11 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 		{
 			asDELETE(args[n],asSExprContext);
 		}
+	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+		if( namedArgs[n].ctx )
+		{
+			asDELETE(namedArgs[n].ctx,asSExprContext);
+		}
 
 	if( initializeMembers )
 	{
@@ -9208,7 +10053,7 @@ int asCCompiler::CompileFunctionCall(asCScriptNode *node, asSExprContext *ctx, a
 		CompileMemberInitialization(&ctx->bc, false);
 	}
 
-	return 0;
+	return isOK ? 0 : -1;
 }
 
 asSNameSpace *asCCompiler::DetermineNameSpace(const asCString &scope)
@@ -9334,16 +10179,10 @@ int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asSExprContext *ctx
 			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
 			ProcessPropertyGetAccessor(ctx, node);
 
-			// Is it a const value?
-			bool isConst = false;
-			if( ctx->type.dataType.IsObjectHandle() )
-				isConst = ctx->type.dataType.IsHandleToConst();
-			else
-				isConst = ctx->type.dataType.IsReadOnly();
-
 			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
 
 			// Find the correct method
+			bool isConst = ctx->type.dataType.IsObjectConst();
 			asCArray<int> funcs;
 			asCObjectType *ot = ctx->type.dataType.GetObjectType();
 			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
@@ -9360,10 +10199,8 @@ int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asSExprContext *ctx
 			// Did we find the method?
 			if( funcs.GetLength() == 1 )
 			{
-				asCTypeInfo objType = ctx->type;
 				asCArray<asSExprContext *> args;
-				MakeFunctionCall(ctx, funcs[0], objType.dataType.GetObjectType(), args, node);
-				ReleaseTemporaryVariable(objType, &ctx->bc);
+				MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetObjectType(), args, node);
 				return 0;
 			}
 			else if( funcs.GetLength() == 0 )
@@ -9412,8 +10249,6 @@ int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asSExprContext *ctx
 
 		asCDataType to = ctx->type.dataType;
 
-		// TODO: The case -2147483648 gives an unecessary warning of changed sign for implicit conversion
-
 		if( ctx->type.dataType.IsUnsignedType() )
 		{
 			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
@@ -9432,7 +10267,9 @@ int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asSExprContext *ctx
 		}
 
 		if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
-		ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV);
+
+		// Use an explicit conversion in case of constants to avoid unnecessary warning about change of sign
+		ImplicitConversion(ctx, to, node, ctx->type.isConstant ? asIC_EXPLICIT_VAL_CAST : asIC_IMPLICIT_CONV);
 
 		if( !ctx->type.isConstant )
 		{
@@ -9482,6 +10319,10 @@ int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asSExprContext *ctx
 	}
 	else if( op == ttNot )
 	{
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( ctx->type.dataType.GetObjectType() && (ctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(ctx, asCDataType::CreatePrimitive(ttBool, false), node, asIC_IMPLICIT_CONV);
+
 		if( ctx->type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
 		{
 			if( ctx->type.isConstant )
@@ -9766,11 +10607,7 @@ int asCCompiler::FindPropertyAccessor(const asCString &name, asSExprContext *ctx
 		}
 	}
 
-	bool isConst = false;
-	if( ctx->type.dataType.IsObjectHandle() )
-		isConst = ctx->type.dataType.IsHandleToConst();
-	else
-		isConst = ctx->type.dataType.IsReadOnly();
+	bool isConst = ctx->type.dataType.IsObjectConst();
 
 	// Check for multiple matches
 	if( multipleGetFuncs.GetLength() > 0 )
@@ -9949,7 +10786,6 @@ int asCCompiler::ProcessPropertySetAccessor(asSExprContext *ctx, asSExprContext
 		return -1;
 	}
 
-	asCTypeInfo objType = ctx->type;
 	asCScriptFunction *func = builder->GetFunctionDescription(ctx->property_set);
 
 	// Make sure the arg match the property
@@ -9959,7 +10795,7 @@ int asCCompiler::ProcessPropertySetAccessor(asSExprContext *ctx, asSExprContext
 	if( ctx->property_arg )
 		args.PushLast(ctx->property_arg);
 	args.PushLast(arg);
-	MatchFunctions(funcs, args, node, func->GetName(), func->objectType, ctx->property_const);
+	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
 	if( funcs.GetLength() == 0 )
 	{
 		// MatchFunctions already reported the error
@@ -9991,19 +10827,6 @@ int asCCompiler::ProcessPropertySetAccessor(asSExprContext *ctx, asSExprContext
 	// Call the accessor
 	MakeFunctionCall(ctx, ctx->property_set, func->objectType, args, node);
 
-	if( func->objectType )
-	{
-		// TODO: This is from CompileExpressionPostOp, can we unify the code?
-		if( !objType.isTemporary ||
-			!ctx->type.dataType.IsReference() ||
-			ctx->type.isVariable ) // If the resulting type is a variable, then the reference is not a member
-		{
-			// As the method didn't return a reference to a member
-			// we can safely release the original object now
-			ReleaseTemporaryVariable(objType, &ctx->bc);
-		}
-	}
-
 	ctx->property_get = 0;
 	ctx->property_set = 0;
 	if( ctx->property_arg )
@@ -10015,6 +10838,131 @@ int asCCompiler::ProcessPropertySetAccessor(asSExprContext *ctx, asSExprContext
 	return 0;
 }
 
+int asCCompiler::ProcessPropertyGetSetAccessor(asSExprContext *ctx, asSExprContext *lctx, asSExprContext *rctx, eTokenType op, asCScriptNode *errNode)
+{
+	// TODO: Perhaps it might be interesting to allow the definition of compound setters for better 
+	//       performance, e.g. set_add_prop, set_mul_prop, etc. With these it would also be possible 
+	//       to support value types, since it would be a single call
+
+	// Compound assignment for indexed property accessors is not supported yet
+	if( lctx->property_arg != 0 )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_WITH_IDX_PROP, errNode);
+		return -1;
+	}
+
+	// Compound assignments require both get and set accessors
+	if( lctx->property_set == 0 || lctx->property_get == 0 )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_REQUIRE_GET_SET, errNode);
+		return -1;
+	}
+
+	// Property accessors on value types (or scoped references types) are not supported since 
+	// it is not possible to guarantee that the object will stay alive between the two calls
+	asCScriptFunction *func = engine->scriptFunctions[lctx->property_set];
+	if( func->objectType && (func->objectType->flags & (asOBJ_VALUE | asOBJ_SCOPED)) )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_ON_VALUE_TYPE, errNode);
+		return -1;
+	}
+
+	// Translate the compound assignment to the corresponding dual operator
+	switch( op )
+	{
+	case ttAddAssign: op = ttPlus; break;
+	case ttSubAssign: op = ttMinus; break;
+	case ttMulAssign: op = ttStar; break;
+	case ttDivAssign: op = ttSlash; break;
+	case ttModAssign: op = ttPercent; break;
+	case ttPowAssign: op = ttStarStar; break;
+	
+	case ttAndAssign: op = ttAmp; break;
+	case ttOrAssign:  op = ttBitOr; break; 
+	case ttXorAssign: op = ttBitXor; break;
+
+	case ttShiftLeftAssign:   op = ttBitShiftLeft; break;
+	case ttShiftRightAAssign: op = ttBitShiftRightArith; break;
+	case ttShiftRightLAssign: op = ttBitShiftRight; break;
+
+	default: op = ttUnrecognizedToken; break;
+	}
+
+	if( op == ttUnrecognizedToken )
+	{
+		// Shouldn't happen
+		asASSERT(false); 
+
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		return -1;
+	}
+
+	asSExprContext before(engine);
+	if( func->objectType && (func->objectType->flags & (asOBJ_REF|asOBJ_SCOPED)) == asOBJ_REF )
+	{
+		// Keep a reference to the object in a local variable
+		before.bc.AddCode(&lctx->bc);
+
+		asUINT len = reservedVariables.GetLength();
+		rctx->bc.GetVarsUsed(reservedVariables);
+		before.bc.GetVarsUsed(reservedVariables);
+
+		asCDataType dt = asCDataType::CreateObjectHandle(func->objectType, false);
+		int offset = AllocateVariable(dt, true);
+
+		reservedVariables.SetLength(len);
+
+		before.type.SetVariable(dt, offset, true);
+
+		if( lctx->property_ref )
+			before.bc.Instr(asBC_RDSPtr);
+		before.bc.InstrSHORT(asBC_PSF, (short)offset);
+		before.bc.InstrPTR(asBC_REFCPY, func->objectType);
+		before.bc.Instr(asBC_PopPtr);
+
+		// Update the left expression to use the local variable
+		lctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+		lctx->type.stackOffset = (short)offset;
+		lctx->property_ref = true;
+
+		ctx->bc.AddCode(&before.bc);
+	}
+
+	// Keep the original information on the property
+	asSExprContext llctx(engine);
+	llctx.type = lctx->type;
+	llctx.property_arg    = lctx->property_arg;
+	llctx.property_const  = lctx->property_const;
+	llctx.property_get    = lctx->property_get;
+	llctx.property_handle = lctx->property_handle;
+	llctx.property_ref    = lctx->property_ref;
+	llctx.property_set    = lctx->property_set;
+
+	// Compile the dual operator using the get accessor
+	CompileOperator(errNode, lctx, rctx, ctx, op);
+
+	// If we made a local variable to hold the reference it must be reused
+	if( before.type.stackOffset )
+		llctx.bc.InstrSHORT(asBC_PSF, before.type.stackOffset);
+
+	// Compile the assignment using the set accessor
+	ProcessPropertySetAccessor(&llctx, ctx, errNode);
+
+	MergeExprBytecodeAndType(ctx, &llctx);
+
+	if( before.type.stackOffset )
+		ReleaseTemporaryVariable(before.type.stackOffset, &ctx->bc);
+
+	return 0;
+}
+
 void asCCompiler::ProcessPropertyGetAccessor(asSExprContext *ctx, asCScriptNode *node)
 {
 	// If no property accessor has been prepared then don't do anything
@@ -10038,7 +10986,7 @@ void asCCompiler::ProcessPropertyGetAccessor(asSExprContext *ctx, asCScriptNode
 	asCArray<asSExprContext *> args;
 	if( ctx->property_arg )
 		args.PushLast(ctx->property_arg);
-	MatchFunctions(funcs, args, node, func->GetName(), func->objectType, ctx->property_const);
+	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
 	if( funcs.GetLength() == 0 )
 	{
 		// MatchFunctions already reported the error
@@ -10068,25 +11016,15 @@ void asCCompiler::ProcessPropertyGetAccessor(asSExprContext *ctx, asCScriptNode
 		}
 	}
 
+	// The explicit handle flag must be remembered
+	bool isExplicitHandle = ctx->type.isExplicitHandle;
+
 	// Call the accessor
 	MakeFunctionCall(ctx, ctx->property_get, func->objectType, args, node);
+	if( isExplicitHandle )
+		ctx->type.isExplicitHandle = true;
 
-	if( func->objectType )
-	{
-		// TODO: This is from CompileExpressionPostOp, can we unify the code?
-
-		// If the method returned a reference, then we can't release the original
-		// object yet, because the reference may be to a member of it
-		if( !objType.isTemporary ||
-			!(ctx->type.dataType.IsReference() || (ctx->type.dataType.IsObject() && !ctx->type.dataType.IsObjectHandle())) ||
-			ctx->type.isVariable ) // If the resulting type is a variable, then the reference is not a member
-		{
-			// As the method didn't return a reference to a member
-			// we can safely release the original object now
-			ReleaseTemporaryVariable(objType, &ctx->bc);
-		}
-	}
-
+	// Clear the property get/set ids 
 	ctx->property_get = 0;
 	ctx->property_set = 0;
 	if( ctx->property_arg )
@@ -10130,16 +11068,10 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
 			ProcessPropertyGetAccessor(ctx, node);
 
-			// Is it a const value?
-			bool isConst = false;
-			if( ctx->type.dataType.IsObjectHandle() )
-				isConst = ctx->type.dataType.IsHandleToConst();
-			else
-				isConst = ctx->type.dataType.IsReadOnly();
-
 			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
 
 			// Find the correct method
+			bool isConst = ctx->type.dataType.IsObjectConst();
 			asCArray<int> funcs;
 			asCObjectType *ot = ctx->type.dataType.GetObjectType();
 			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
@@ -10156,10 +11088,8 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			// Did we find the method?
 			if( funcs.GetLength() == 1 )
 			{
-				asCTypeInfo objType = ctx->type;
 				asCArray<asSExprContext *> args;
-				MakeFunctionCall(ctx, funcs[0], objType.dataType.GetObjectType(), args, node);
-				ReleaseTemporaryVariable(objType, &ctx->bc);
+				MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetObjectType(), args, node);
 				return 0;
 			}
 			else if( funcs.GetLength() == 0 )
@@ -10301,16 +11231,19 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 					ctx->type.isLValue = true;
 				}
 
-				bool isConst = ctx->type.dataType.IsReadOnly();
+				bool isConst = ctx->type.dataType.IsObjectConst();
 
 				asCObjectProperty *prop = builder->GetObjectProperty(ctx->type.dataType, name.AddressOf());
 				if( prop )
 				{
 					// Is the property access allowed?
-					if( prop->isPrivate && (!outFunc || outFunc->objectType != ctx->type.dataType.GetObjectType()) )
+					if( (prop->isPrivate || prop->isProtected) && (!outFunc || outFunc->objectType != ctx->type.dataType.GetObjectType()) )
 					{
 						asCString msg;
-						msg.Format(TXT_PRIVATE_PROP_ACCESS_s, name.AddressOf());
+						if( prop->isPrivate )
+							msg.Format(TXT_PRIVATE_PROP_ACCESS_s, name.AddressOf());
+						else
+							msg.Format(TXT_PROTECTED_PROP_ACCESS_s, name.AddressOf());
 						Error(msg, node);
 					}
 
@@ -10371,14 +11304,14 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 					if( func )
 					{
 						// An object method was found. Keep the name of the method in the expression, but
-						// don't actually modify the bytecode at this point since it is not yet known what 
+						// don't actually modify the bytecode at this point since it is not yet known what
 						// the method will be used for, or even what overloaded method should be used.
 						ctx->methodName = name;
 					}
 					else
 					{
 						asCString str;
-						str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format().AddressOf());
+						str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 						Error(str, node);
 						return -1;
 					}
@@ -10387,7 +11320,7 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			else
 			{
 				asCString str;
-				str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format().AddressOf());
+				str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 				Error(str, node);
 				return -1;
 			}
@@ -10398,7 +11331,7 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			if( !ctx->type.dataType.IsObject() )
 			{
 				asCString str;
-				str.Format(TXT_ILLEGAL_OPERATION_ON_s, ctx->type.dataType.Format().AddressOf());
+				str.Format(TXT_ILLEGAL_OPERATION_ON_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 				Error(str, node);
 				return -1;
 			}
@@ -10406,30 +11339,9 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			// Process the get property accessor
 			ProcessPropertyGetAccessor(ctx, node);
 
-			bool isConst = false;
-			if( ctx->type.dataType.IsObjectHandle() )
-				isConst = ctx->type.dataType.IsHandleToConst();
-			else
-				isConst = ctx->type.dataType.IsReadOnly();
-
-			asCObjectType *trueObj = ctx->type.dataType.GetObjectType();
-
-			asCTypeInfo objType = ctx->type;
-
 			// Compile function call
-			int r = CompileFunctionCall(node->firstChild, ctx, trueObj, isConst);
+			int r = CompileFunctionCall(node->firstChild, ctx, ctx->type.dataType.GetObjectType(), ctx->type.dataType.IsObjectConst());
 			if( r < 0 ) return r;
-
-			// If the method returned a reference, then we can't release the original
-			// object yet, because the reference may be to a member of it
-			if( !objType.isTemporary ||
-				!(ctx->type.dataType.IsReference() || (ctx->type.dataType.IsObject() && !ctx->type.dataType.IsObjectHandle())) ||
-				ctx->type.isVariable ) // If the resulting type is a variable, then the reference is not a member
-			{
-				// As the method didn't return a reference to a member
-				// we can safely release the original object now
-				ReleaseTemporaryVariable(objType, &ctx->bc);
-			}
 		}
 	}
 	else if( op == ttOpenBracket )
@@ -10480,7 +11392,7 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			if( !ctx->type.dataType.IsObject() )
 			{
 				asCString str;
-				str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format().AddressOf());
+				str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 				Error(str, node);
 				return -1;
 			}
@@ -10488,41 +11400,94 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			ProcessPropertyGetAccessor(ctx, node);
 		}
 
-		Dereference(ctx, true);
-
 		// Compile the expression
-		asSExprContext expr(engine);
-		CompileAssignment(node->firstChild, &expr);
-
-		// Check for the existence of the opIndex method
-		asSExprContext lctx(engine);
-		MergeExprBytecodeAndType(&lctx, ctx);
-		int r = 0;
-		if( propertyName == "" )
-			r = CompileOverloadedDualOperator2(node, "opIndex", &lctx, &expr, ctx);
-		if( r == 0 )
+		bool isOK = true;
+		asCArray<asSExprContext *> args;
+		asCArray<asSNamedArgument> namedArgs;
+		asASSERT( node->firstChild->nodeType == snArgList );
+		if( CompileArgumentList(node->firstChild, args, namedArgs) >= 0 )
 		{
-			// Check for accessors methods for the opIndex
-			r = FindPropertyAccessor(propertyName == "" ? "opIndex" : propertyName.AddressOf(), &lctx, &expr, node, ns);
-			if( r == 0 )
+			// Check for the existence of the opIndex method
+			bool lookForProperty = true;
+			if( propertyName == "" )
 			{
-				asCString str;
-				str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format().AddressOf());
-				Error(str, node);
-				return -1;
-			}
-			else if( r < 0 )
-				return -1;
+				bool isConst = ctx->type.dataType.IsObjectConst();
+				asCObjectType *objectType = ctx->type.dataType.GetObjectType();
 
-			MergeExprBytecodeAndType(ctx, &lctx);
+				asCArray<int> funcs;
+				builder->GetObjectMethodDescriptions("opIndex", objectType, funcs, isConst);
+				if( funcs.GetLength() > 0 )
+				{
+					// Since there are opIndex methods, the compiler should not look for get/set_opIndex accessors
+					lookForProperty = false;
+
+					// Determine which of opIndex methods that match
+					MatchFunctions(funcs, args, node, "opIndex", 0, objectType, isConst);
+					if( funcs.GetLength() != 1 )
+					{
+						// The error has already been reported by MatchFunctions
+						isOK = false;
+					}
+					else
+					{
+						// Add the default values for arguments not explicitly supplied
+						int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType);
+
+						if( r == 0 )
+							MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, ctx->type.stackOffset);
+						else
+							isOK = false;
+					}
+				}
+			}
+			if( lookForProperty && isOK )
+			{
+				if( args.GetLength() != 1 )
+				{
+					// TODO: opIndex: Implement this
+					Error("Property accessor with index only support 1 index argument for now", node);
+					isOK = false;
+				}
+
+				Dereference(ctx, true);
+				asSExprContext lctx(engine);
+				MergeExprBytecodeAndType(&lctx, ctx);
+
+				// Check for accessors methods for the opIndex, either as get/set_opIndex or as get/set with the property name
+				int r = FindPropertyAccessor(propertyName == "" ? "opIndex" : propertyName.AddressOf(), &lctx, args[0], node, ns);
+				if( r == 0 )
+				{
+					asCString str;
+					str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+					Error(str, node);
+					isOK = false;
+				}
+				else if( r < 0 )
+					isOK = false;
+
+				if( isOK )
+					MergeExprBytecodeAndType(ctx, &lctx);
+			}
 		}
+		else
+			isOK = false;
+
+		// Cleanup
+		for( asUINT n = 0; n < args.GetLength(); n++ )
+			if( args[n] )
+			{
+				asDELETE(args[n],asSExprContext);
+			}
+
+		if( !isOK )
+			return -1;
 	}
 	else if( op == ttOpenParanthesis )
 	{
 		// TODO: Most of this is already done by CompileFunctionCall(). Can we share the code?
 
-		// Make sure the expression is a funcdef
-		if( !ctx->type.dataType.GetFuncDef() )
+		// Make sure the expression is a funcdef or an object that may have opCall methods
+		if( !ctx->type.dataType.GetFuncDef() && !ctx->type.dataType.IsObject() )
 		{
 			Error(TXT_EXPR_DOESNT_EVAL_TO_FUNC, node);
 			return -1;
@@ -10530,12 +11495,23 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 
 		// Compile arguments
 		asCArray<asSExprContext *> args;
-		if( CompileArgumentList(node->lastChild, args) >= 0 )
+		asCArray<asSNamedArgument> namedArgs;
+		if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
 		{
 			// Match arguments with the funcdef
 			asCArray<int> funcs;
-			funcs.PushLast(ctx->type.dataType.GetFuncDef()->id);
-			MatchFunctions(funcs, args, node, ctx->type.dataType.GetFuncDef()->name.AddressOf());
+			if( ctx->type.dataType.GetFuncDef() )
+			{
+				funcs.PushLast(ctx->type.dataType.GetFuncDef()->id);
+				MatchFunctions(funcs, args, node, ctx->type.dataType.GetFuncDef()->name.AddressOf(), &namedArgs);
+			}
+			else
+			{
+				bool isConst = ctx->type.dataType.IsObjectConst();
+
+				builder->GetObjectMethodDescriptions("opCall", ctx->type.dataType.GetObjectType(), funcs, isConst);
+				MatchFunctions(funcs, args, node, "opCall", &namedArgs, ctx->type.dataType.GetObjectType(), isConst);
+			}
 
 			if( funcs.GetLength() != 1 )
 			{
@@ -10546,12 +11522,8 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			}
 			else
 			{
-				int r = asSUCCESS;
-
 				// Add the default values for arguments not explicitly supplied
-				asCScriptFunction *func = (funcs[0] & FUNC_IMPORTED) == 0 ? engine->scriptFunctions[funcs[0]] : 0;
-				if( func && args.GetLength() < (asUINT)func->GetParamCount() )
-					r = CompileDefaultArgs(node, args, func);
+				int r = CompileDefaultAndNamedArgs(node, args, funcs[0], ctx->type.dataType.GetObjectType(), &namedArgs);
 
 				// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
 				//                is it enough to make sure it is in a local variable?
@@ -10561,18 +11533,16 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 				if( r == asSUCCESS )
 				{
 					Dereference(ctx, true);
-					if( !ctx->type.isVariable )
-						ConvertToVariable(ctx);
-					else
+					if( ctx->type.dataType.GetFuncDef() )
 					{
+						if( !ctx->type.isVariable )
+							ConvertToVariable(ctx);
+
 						// Remove the reference from the stack as the asBC_CALLPTR instruction takes the variable as argument
 						ctx->bc.Instr(asBC_PopPtr);
 					}
-					asCTypeInfo t = ctx->type;
 
-					MakeFunctionCall(ctx, funcs[0], 0, args, node, false, 0, ctx->type.stackOffset);
-
-					ReleaseTemporaryVariable(t, &ctx->bc);
+					MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetFuncDef() ? 0 : ctx->type.dataType.GetObjectType(), args, node, false, 0, ctx->type.stackOffset);
 				}
 			}
 		}
@@ -10585,6 +11555,11 @@ int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asSExprContext *ct
 			{
 				asDELETE(args[n],asSExprContext);
 			}
+		for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+			if( namedArgs[n].ctx )
+			{
+				asDELETE(namedArgs[n].ctx,asSExprContext);
+			}
 	}
 
 	return 0;
@@ -10667,73 +11642,84 @@ asUINT asCCompiler::MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCand
 		if( (int)desc->parameterTypes.GetLength() <= paramNum )
 			continue;
 
-		// void expressions can match any out parameter, but nothing else
-		if( argExpr->type.IsVoidExpression() )
-		{
-			if( desc->inOutFlags[paramNum] == asTM_OUTREF )
-				matches.PushLast(asSOverloadCandidate(funcs[n], 0));
-			continue;
-		}
-
-		// Can we make the match by implicit conversion?
-		asSExprContext ti(engine);
-		ti.type = argExpr->type;
-		ti.methodName = argExpr->methodName;
-		ti.enumValue = argExpr->enumValue;
-		if( argExpr->type.dataType.IsPrimitive() ) ti.type.dataType.MakeReference(false);
-		asUINT cost = ImplicitConversion(&ti, desc->parameterTypes[paramNum], 0, asIC_IMPLICIT_CONV, false, allowObjectConstruct);
-
-		// If the function parameter is an inout-reference then it must not be possible to call the
-		// function with an incorrect argument type, even though the type can normally be converted.
-		if( desc->parameterTypes[paramNum].IsReference() &&
-			desc->inOutFlags[paramNum] == asTM_INOUTREF &&
-			desc->parameterTypes[paramNum].GetTokenType() != ttQuestion )
-		{
-			// Observe, that the below checks are only necessary for when unsafe references have been
-			// enabled by the application. Without this the &inout reference form wouldn't be allowed
-			// for these value types.
-
-			// Don't allow a primitive to be converted to a reference of another primitive type
-			if( desc->parameterTypes[paramNum].IsPrimitive() &&
-				desc->parameterTypes[paramNum].GetTokenType() != argExpr->type.dataType.GetTokenType() )
-			{
-				asASSERT( engine->ep.allowUnsafeReferences );
-				continue;
-			}
-
-			// Don't allow an enum to be converted to a reference of another enum type
-			if( desc->parameterTypes[paramNum].IsEnumType() &&
-				desc->parameterTypes[paramNum].GetObjectType() != argExpr->type.dataType.GetObjectType() )
-			{
-				asASSERT( engine->ep.allowUnsafeReferences );
-				continue;
-			}
-
-			// Don't allow a non-handle expression to be converted to a reference to a handle
-			if( desc->parameterTypes[paramNum].IsObjectHandle() &&
-				!argExpr->type.dataType.IsObjectHandle() )
-			{
-				asASSERT( engine->ep.allowUnsafeReferences );
-				continue;
-			}
-
-			// Don't allow a value type to be converted
-			if( (desc->parameterTypes[paramNum].GetObjectType() && (desc->parameterTypes[paramNum].GetObjectType()->GetFlags() & asOBJ_VALUE)) &&
-				(desc->parameterTypes[paramNum].GetObjectType() != argExpr->type.dataType.GetObjectType()) )
-			{
-				asASSERT( engine->ep.allowUnsafeReferences );
-				continue;
-			}
-		}
-
-		// How well does the argument match the function parameter?
-		if( desc->parameterTypes[paramNum].IsEqualExceptRef(ti.type.dataType) )
-			matches.PushLast(asSOverloadCandidate(funcs[n], cost));
+		int cost = MatchArgument(desc, argExpr, paramNum, allowObjectConstruct);
+		if( cost != -1 )
+			matches.PushLast(asSOverloadCandidate(funcs[n], asUINT(cost)));
 	}
 
 	return (asUINT)matches.GetLength();
 }
 
+int asCCompiler::MatchArgument(asCScriptFunction *desc, const asSExprContext *argExpr, int paramNum, bool allowObjectConstruct)
+{
+	// void expressions can match any out parameter, but nothing else
+	if( argExpr->type.IsVoidExpression() )
+	{
+		if( desc->inOutFlags[paramNum] == asTM_OUTREF )
+			return 0;
+		return -1;
+	}
+
+	// Can we make the match by implicit conversion?
+	asSExprContext ti(engine);
+	ti.type = argExpr->type;
+	ti.methodName = argExpr->methodName;
+	ti.enumValue = argExpr->enumValue;
+	if( argExpr->type.dataType.IsPrimitive() )
+		ti.type.dataType.MakeReference(false);
+	int cost = ImplicitConversion(&ti, desc->parameterTypes[paramNum], 0, asIC_IMPLICIT_CONV, false, allowObjectConstruct);
+
+	// If the function parameter is an inout-reference then it must not be possible to call the
+	// function with an incorrect argument type, even though the type can normally be converted.
+	if( desc->parameterTypes[paramNum].IsReference() &&
+		desc->inOutFlags[paramNum] == asTM_INOUTREF &&
+		desc->parameterTypes[paramNum].GetTokenType() != ttQuestion )
+	{
+		// Observe, that the below checks are only necessary for when unsafe references have been
+		// enabled by the application. Without this the &inout reference form wouldn't be allowed
+		// for these value types.
+
+		// Don't allow a primitive to be converted to a reference of another primitive type
+		if( desc->parameterTypes[paramNum].IsPrimitive() &&
+			desc->parameterTypes[paramNum].GetTokenType() != argExpr->type.dataType.GetTokenType() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow an enum to be converted to a reference of another enum type
+		if( desc->parameterTypes[paramNum].IsEnumType() &&
+			desc->parameterTypes[paramNum].GetObjectType() != argExpr->type.dataType.GetObjectType() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow a non-handle expression to be converted to a reference to a handle
+		if( desc->parameterTypes[paramNum].IsObjectHandle() &&
+			!argExpr->type.dataType.IsObjectHandle() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow a value type to be converted
+		if( (desc->parameterTypes[paramNum].GetObjectType() && (desc->parameterTypes[paramNum].GetObjectType()->GetFlags() & asOBJ_VALUE)) &&
+			(desc->parameterTypes[paramNum].GetObjectType() != argExpr->type.dataType.GetObjectType()) )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+	}
+
+	// How well does the argument match the function parameter?
+	if( desc->parameterTypes[paramNum].IsEqualExceptRef(ti.type.dataType) )
+		return cost;
+
+	// No match is available
+	return -1;
+}
+
 void asCCompiler::PrepareArgument2(asSExprContext *ctx, asSExprContext *arg, asCDataType *paramType, bool isFunction, int refType, bool isMakingCopy)
 {
 	// Reference parameters whose value won't be used don't evaluate the expression
@@ -10756,7 +11742,7 @@ void asCCompiler::PrepareArgument2(asSExprContext *ctx, asSExprContext *arg, asC
 	ctx->bc.AddCode(&arg->bc);
 }
 
-bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, bool isHandle, eTokenType token)
 {
 	DetermineSingleFunc(lctx, node);
 	DetermineSingleFunc(rctx, node);
@@ -10764,7 +11750,8 @@ bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asSExprCont
 	ctx->exprNode = node;
 
 	// What type of operator is it?
-	int token = node->tokenType;
+	if( token == ttUnrecognizedToken )
+		token = node->tokenType;
 	if( token == ttUnrecognizedToken )
 	{
 		// This happens when the compiler is inferring an assignment
@@ -10869,7 +11856,7 @@ bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asSExprCont
 
 	// The rest of the operators are not commutative, and doesn't require specific return type
 	const char *op = 0, *op_r = 0;
-	switch( token )
+	switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
 	{
 	case ttPlus:               op = "opAdd";  op_r = "opAdd_r";  break;
 	case ttMinus:              op = "opSub";  op_r = "opSub_r";  break;
@@ -10913,26 +11900,38 @@ bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asSExprCont
 
 	// Assignment operators
 	op = 0;
-	switch( token )
+	if( isHandle )
 	{
-	case ttAssignment:        op = "opAssign";     break;
-	case ttAddAssign:         op = "opAddAssign";  break;
-	case ttSubAssign:         op = "opSubAssign";  break;
-	case ttMulAssign:         op = "opMulAssign";  break;
-	case ttDivAssign:         op = "opDivAssign";  break;
-	case ttModAssign:         op = "opModAssign";  break;
-	case ttPowAssign:         op = "opPowAssign";  break;
-	case ttOrAssign:          op = "opOrAssign";   break;
-	case ttAndAssign:         op = "opAndAssign";  break;
-	case ttXorAssign:         op = "opXorAssign";  break;
-	case ttShiftLeftAssign:   op = "opShlAssign";  break;
-	case ttShiftRightLAssign: op = "opShrAssign";  break;
-	case ttShiftRightAAssign: op = "opUShrAssign"; break;
+		// Only asOBJ_ASHANDLE types can get here
+		asASSERT( lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE) );
+		asASSERT( token == ttAssignment );
+
+		if( token == ttAssignment )
+			op = "opHndlAssign";
+	}
+	else
+	{
+		switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
+		{
+		case ttAssignment:        op = "opAssign";     break;
+		case ttAddAssign:         op = "opAddAssign";  break;
+		case ttSubAssign:         op = "opSubAssign";  break;
+		case ttMulAssign:         op = "opMulAssign";  break;
+		case ttDivAssign:         op = "opDivAssign";  break;
+		case ttModAssign:         op = "opModAssign";  break;
+		case ttPowAssign:         op = "opPowAssign";  break;
+		case ttOrAssign:          op = "opOrAssign";   break;
+		case ttAndAssign:         op = "opAndAssign";  break;
+		case ttXorAssign:         op = "opXorAssign";  break;
+		case ttShiftLeftAssign:   op = "opShlAssign";  break;
+		case ttShiftRightLAssign: op = "opShrAssign";  break;
+		case ttShiftRightAAssign: op = "opUShrAssign"; break;
+		}
 	}
 
 	if( op )
 	{
-		if( builder->engine->ep.disallowValueAssignForRefType && 
+		if( builder->engine->ep.disallowValueAssignForRefType &&
 			lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->flags & asOBJ_REF) && !(lctx->type.dataType.GetObjectType()->flags & asOBJ_SCOPED) )
 		{
 			if( token == ttAssignment )
@@ -10979,18 +11978,15 @@ int asCCompiler::CompileOverloadedDualOperator2(asCScriptNode *node, const char
 		asUINT n;
 
 		// Is the left value a const?
-		bool isConst = false;
-		if( lctx->type.dataType.IsObjectHandle() )
-			isConst = lctx->type.dataType.IsHandleToConst();
-		else
-			isConst = lctx->type.dataType.IsReadOnly();
+		bool isConst = lctx->type.dataType.IsObjectConst();
 
 		asCArray<int> funcs;
 		asCObjectType *ot = lctx->type.dataType.GetObjectType();
 		for( n = 0; n < ot->methods.GetLength(); n++ )
 		{
 			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-			if( func->name == methodName &&
+			asASSERT( func );
+			if( func && func->name == methodName &&
 				(!specificReturn || func->returnType == returnType) &&
 				func->parameterTypes.GetLength() == 1 &&
 				(!isConst || func->isReadOnly) )
@@ -11032,24 +12028,35 @@ int asCCompiler::CompileOverloadedDualOperator2(asCScriptNode *node, const char
 			// Process the lctx expression as get accessor
 			ProcessPropertyGetAccessor(lctx, node);
 
+			// Make sure the rvalue doesn't have deferred temporary variables that are also used in the lvalue,
+			// since that would cause the VM to overwrite the variable while executing the bytecode for the lvalue.
+			asCArray<int> usedVars;
+			lctx->bc.GetVarsUsed(usedVars);
+			asUINT oldReservedVars = reservedVariables.GetLength();
+			for( asUINT n = 0; n < rctx->deferredParams.GetLength(); n++ )
+			{
+				if( rctx->deferredParams[n].argType.isTemporary && 
+					usedVars.Exists(rctx->deferredParams[n].argType.stackOffset) )
+				{
+					if( reservedVariables.GetLength() == oldReservedVars )
+						reservedVariables.Concatenate(usedVars);
+
+					// Allocate a new variable for the deferred argument
+					int offset = AllocateVariableNotIn(rctx->deferredParams[n].argType.dataType, true, false, rctx);
+					int oldVar = rctx->deferredParams[n].argType.stackOffset;
+					rctx->deferredParams[n].argType.stackOffset = short(offset);
+					rctx->bc.ExchangeVar(oldVar, offset);
+					ReleaseTemporaryVariable(oldVar, 0);
+				}
+			}
+			reservedVariables.SetLength(oldReservedVars);
+
 			// Merge the bytecode so that it forms lvalue.methodName(rvalue)
-			asCTypeInfo objType = lctx->type;
 			asCArray<asSExprContext *> args;
 			args.PushLast(rctx);
 			MergeExprBytecode(ctx, lctx);
 			ctx->type = lctx->type;
-			MakeFunctionCall(ctx, ops[0], objType.dataType.GetObjectType(), args, node);
-
-			// If the method returned a reference, then we can't release the original
-			// object yet, because the reference may be to a member of it
-			if( !objType.isTemporary ||
-				!(ctx->type.dataType.IsReference() || (ctx->type.dataType.IsObject() && !ctx->type.dataType.IsObjectHandle())) ||
-				ctx->type.isVariable ) // If the resulting type is a variable, then the reference is not to a member
-			{
-				// As the index operator didn't return a reference to a
-				// member we can release the original object now
-				ReleaseTemporaryVariable(objType, &ctx->bc);
-			}
+			MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetObjectType(), args, node);
 
 			// Found matching operator
 			return 1;
@@ -11145,7 +12152,7 @@ void asCCompiler::MakeFunctionCall(asSExprContext *ctx, int funcId, asCObjectTyp
 	PerformFunctionCall(funcId, ctx, false, &args, 0, useVariable, stackOffset, funcPtrVar);
 }
 
-int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, eTokenType op)
 {
 	// Don't allow any operators on expressions that take address of class method, but allow it on global functions
 	if( (lctx->IsClassMethod()) || (rctx->IsClassMethod()) )
@@ -11161,27 +12168,30 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 		return -1;
 	}
 
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+
 	IsVariableInitialized(&lctx->type, node);
 	IsVariableInitialized(&rctx->type, node);
 
 	if( lctx->type.isExplicitHandle || rctx->type.isExplicitHandle ||
 		lctx->type.IsNullConstant() || rctx->type.IsNullConstant() ||
-		node->tokenType == ttIs || node->tokenType == ttNotIs )
+		op == ttIs || op == ttNotIs )
 	{
-		CompileOperatorOnHandles(node, lctx, rctx, ctx);
+		CompileOperatorOnHandles(node, lctx, rctx, ctx, op);
 		return 0;
 	}
 	else
 	{
 		// Compile an overloaded operator for the two operands
-		if( CompileOverloadedDualOperator(node, lctx, rctx, ctx) )
+		if( CompileOverloadedDualOperator(node, lctx, rctx, ctx, false, op) )
 			return 0;
 
 		// If both operands are objects, then we shouldn't continue
 		if( lctx->type.dataType.IsObject() && rctx->type.dataType.IsObject() )
 		{
 			asCString str;
-			str.Format(TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s, lctx->type.dataType.Format().AddressOf(), rctx->type.dataType.Format().AddressOf());
+			str.Format(TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 			ctx->type.SetDummy();
 			return -1;
@@ -11205,7 +12215,6 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 
 		// Math operators
 		// + - * / % ** += -= *= /= %= **=
-		int op = node->tokenType;
 		if( op == ttPlus     || op == ttAddAssign ||
 			op == ttMinus    || op == ttSubAssign ||
 			op == ttStar     || op == ttMulAssign ||
@@ -11213,7 +12222,7 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 			op == ttPercent  || op == ttModAssign ||
 			op == ttStarStar || op == ttPowAssign )
 		{
-			CompileMathOperator(node, lctx, rctx, ctx);
+			CompileMathOperator(node, lctx, rctx, ctx, op);
 			return 0;
 		}
 
@@ -11226,7 +12235,7 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 			op == ttBitShiftRight      || op == ttShiftRightLAssign ||
 			op == ttBitShiftRightArith || op == ttShiftRightAAssign )
 		{
-			CompileBitwiseOperator(node, lctx, rctx, ctx);
+			CompileBitwiseOperator(node, lctx, rctx, ctx, op);
 			return 0;
 		}
 
@@ -11236,7 +12245,7 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 			op == ttLessThan    || op == ttLessThanOrEqual    ||
 			op == ttGreaterThan || op == ttGreaterThanOrEqual )
 		{
-			CompileComparisonOperator(node, lctx, rctx, ctx);
+			CompileComparisonOperator(node, lctx, rctx, ctx, op);
 			return 0;
 		}
 
@@ -11244,7 +12253,7 @@ int asCCompiler::CompileOperator(asCScriptNode *node, asSExprContext *lctx, asSE
 		// && || ^^
 		if( op == ttAnd || op == ttOr || op == ttXor )
 		{
-			CompileBooleanOperator(node, lctx, rctx, ctx);
+			CompileBooleanOperator(node, lctx, rctx, ctx, op);
 			return 0;
 		}
 	}
@@ -11306,15 +12315,21 @@ void asCCompiler::ConvertToVariable(asSExprContext *ctx)
 		}
 		else
 		{
+			Dereference(ctx, true);
+
 			// Copy the object handle to a variable
 			ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
 			ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetObjectType());
 			ctx->bc.Instr(asBC_PopPtr);
 		}
 
+		// As this is an object the reference must be placed on the stack
+		ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+
 		ReleaseTemporaryVariable(ctx->type, &ctx->bc);
 		ctx->type.SetVariable(ctx->type.dataType, offset, true);
 		ctx->type.dataType.MakeHandle(true);
+		ctx->type.dataType.MakeReference(true);
 	}
 	else if( (!ctx->type.isVariable || ctx->type.dataType.IsReference()) &&
 		     ctx->type.dataType.IsPrimitive() )
@@ -11366,46 +12381,118 @@ void asCCompiler::ConvertToVariableNotIn(asSExprContext *ctx, asSExprContext *ex
 	reservedVariables.SetLength(l);
 }
 
+void asCCompiler::ImplicitConvObjectToBestMathType(asSExprContext *ctx, asCScriptNode *node)
+{
+	asCArray<int> funcs;
+	asCObjectType *ot = ctx->type.dataType.GetObjectType();
+	if( ot )
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			// Consider only implicit casts
+			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+			if( func->name == "opImplConv" &&
+				func->returnType.IsPrimitive() &&
+				func->parameterTypes.GetLength() == 0 )
+				funcs.PushLast(ot->methods[n]);
+		}
 
-void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext  *rctx, asSExprContext *ctx)
+		// Use the one with the highest precision
+		const eTokenType match[10] = {ttDouble, ttFloat, ttInt64, ttUInt64, ttInt, ttUInt, ttInt16, ttUInt16, ttInt8, ttUInt8};
+		while( funcs.GetLength() > 1 )
+		{
+			eTokenType returnType = builder->GetFunctionDescription(funcs[0])->returnType.GetTokenType();
+			int value1 = 11, value2 = 11;
+			for( asUINT i = 0; i < 10; i++ )
+			{
+				if( returnType == match[i] )
+				{
+					value1 = i;
+					break;
+				}
+			}
+
+			for( asUINT n = 1; n < funcs.GetLength(); n++ )
+			{
+				returnType = builder->GetFunctionDescription(funcs[n])->returnType.GetTokenType();
+				for( asUINT i = 0; i < 10; i++ )
+				{
+					if( returnType == match[i] )
+					{
+						value2 = i;
+						break;
+					}
+				}
+
+				if( value2 >= value1 )
+				{
+					// Remove this and continue searching
+					funcs.RemoveIndexUnordered(n--);
+				}
+				else
+				{
+					// Remove the first, and start over
+					funcs.RemoveIndexUnordered(0);
+					break;
+				}
+			}
+		}
+
+		// Do the conversion
+		if( funcs.GetLength() )
+			ImplicitConvObjectToPrimitive(ctx, builder->GetFunctionDescription(funcs[0])->returnType, node, asIC_IMPLICIT_CONV);
+	}
+}
+
+void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext  *rctx, asSExprContext *ctx, eTokenType op)
 {
 	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
 
 	// TODO: clean up: This initial part is identical to CompileComparisonOperator. Make a common function out of it
 
-	// Implicitly convert the operands to a number type
-	asCDataType to;
-
 	// If either operand is a non-primitive then use the primitive type
 	if( !lctx->type.dataType.IsPrimitive() )
-		to.SetTokenType(rctx->type.dataType.GetTokenType());
-	else if( !rctx->type.dataType.IsPrimitive() )
-			to.SetTokenType(lctx->type.dataType.GetTokenType());
-	else if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
+	{
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(lctx, node);
+		reservedVariables.SetLength(l);
+	}
+	if( !rctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(rctx, node);
+		reservedVariables.SetLength(l);
+	}
+
+	// Both types must now be primitives. Implicitly convert them so they match
+	asCDataType to;
+	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
 		to.SetTokenType(ttDouble);
 	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
 		to.SetTokenType(ttFloat);
 	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
 	{
 		// Convert to int64 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && rctx->type.dataType.IsIntegerType()) ||
-			(lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) || 
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
 			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
 			to.SetTokenType(ttInt64);
-		else
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
 			to.SetTokenType(ttUInt64);
+		else
+			to.SetTokenType(ttInt64);
 	}
 	else
 	{
 		// Convert to int32 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && rctx->type.dataType.IsIntegerType()) ||
-			(lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) || 
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
 			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
 			to.SetTokenType(ttInt);
 		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
 			to.SetTokenType(ttUInt);
-		else if( lctx->type.dataType.IsBooleanType() || rctx->type.dataType.IsBooleanType() )
-			to.SetTokenType(ttBool);
+		else
+			to.SetTokenType(ttInt);
 	}
 
 	// If doing an operation with double constant and float variable, the constant should be converted to float
@@ -11413,6 +12500,20 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 		(rctx->type.isConstant && rctx->type.dataType.IsDoubleType() && !lctx->type.isConstant && lctx->type.dataType.IsFloatType()) )
 		to.SetTokenType(ttFloat);
 
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+
+	// If integer division is disabled, convert to floating-point
+	if( engine->ep.disableIntegerDivision &&
+		(op == ttSlash || op == ttDivAssign) &&
+		(to.IsIntegerType() || to.IsUnsignedType()) )
+	{
+		// Use double to avoid losing precision when dividing with 32bit ints
+		// For 64bit ints there is unfortunately no greater type so with those
+		// there is still a risk of loosing precision
+		to.SetTokenType(ttDouble);
+	}
+
 	// Do the actual conversion
 	int l = int(reservedVariables.GetLength());
 	rctx->bc.GetVarsUsed(reservedVariables);
@@ -11423,7 +12524,6 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 	if( rctx->type.dataType.IsReference() )
 		ConvertToVariable(rctx);
 
-	int op = node->tokenType;
 	if( to.IsPrimitive() )
 	{
 		// ttStarStar allows an integer, right-hand operand and a double
@@ -11452,7 +12552,7 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 		!lctx->type.dataType.IsDoubleType() )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, lctx->type.dataType.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 
 		ctx->type.SetDummy();
@@ -11465,7 +12565,7 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 		!rctx->type.dataType.IsDoubleType() )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, rctx->type.dataType.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 
 		ctx->type.SetDummy();
@@ -11674,6 +12774,9 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 						v = as_powi(lctx->type.intValue, rctx->type.intValue, isOverflow);
 					else
 						v = as_powu(lctx->type.dwordValue, rctx->type.dwordValue, isOverflow);
+
+					if( isOverflow )
+						Error(TXT_POW_OVERFLOW, node);
 				}
 
 				ctx->type.SetConstantDW(lctx->type.dataType, v);
@@ -11720,6 +12823,9 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 						v = as_powi64(asINT64(lctx->type.qwordValue), asINT64(rctx->type.qwordValue), isOverflow);
 					else
 						v = as_powu64(lctx->type.qwordValue, rctx->type.qwordValue, isOverflow);
+
+					if( isOverflow )
+						Error(TXT_POW_OVERFLOW, node);
 				}
 
 				ctx->type.SetConstantQW(lctx->type.dataType, v);
@@ -11753,8 +12859,13 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 					v = fmodf(lctx->type.floatValue, rctx->type.floatValue);
 			}
 			else if( op == ttStarStar )
+			{
 				v = pow(lctx->type.floatValue, rctx->type.floatValue);
 
+				if( v == HUGE_VAL )
+					Error(TXT_POW_OVERFLOW, node);
+			}
+
 			ctx->type.SetConstantF(lctx->type.dataType, v);
 		}
 		else if( lctx->type.dataType.IsDoubleType() )
@@ -11765,7 +12876,11 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 				asASSERT(rctx->type.dataType.GetSizeInMemoryDWords() == 1);
 
 				if( op == ttStarStar || op == ttPowAssign )
+				{
 					v = pow(lctx->type.doubleValue, rctx->type.intValue);
+					if( v == HUGE_VAL )
+						Error(TXT_POW_OVERFLOW, node);
+				}
 				else
 					asASSERT(false);  // Should not be possible
 			}
@@ -11792,7 +12907,11 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 						v = fmod(lctx->type.doubleValue, rctx->type.doubleValue);
 				}
 				else if( op == ttStarStar )
+				{
 					v = pow(lctx->type.doubleValue, rctx->type.doubleValue);
+					if( v == HUGE_VAL )
+						Error(TXT_POW_OVERFLOW, node);
+				}
 			}
 
 			ctx->type.SetConstantD(lctx->type.dataType, v);
@@ -11805,11 +12924,12 @@ void asCCompiler::CompileMathOperator(asCScriptNode *node, asSExprContext *lctx,
 	}
 }
 
-void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, eTokenType op)
 {
 	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
 
-	int op = node->tokenType;
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
 	if( op == ttAmp    || op == ttAndAssign ||
 		op == ttBitOr  || op == ttOrAssign  ||
 		op == ttBitXor || op == ttXorAssign )
@@ -11818,33 +12938,41 @@ void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lc
 		asCDataType to;
 		if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 ||
 			rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			to.SetTokenType(ttUInt64);
+			to.SetTokenType(ttInt64);
 		else
-			to.SetTokenType(ttUInt);
+			to.SetTokenType(ttInt);
 
-		// Do the actual conversion
+		// Do the actual conversion (keep sign/unsigned if possible)
 		int l = int(reservedVariables.GetLength());
 		rctx->bc.GetVarsUsed(reservedVariables);
+		if( lctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
+		else
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
 		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
 		reservedVariables.SetLength(l);
 
 		// Verify that the conversion was successful
-		if( !lctx->type.dataType.IsUnsignedType() )
+		if( lctx->type.dataType != to )
 		{
 			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 		}
 
-		// Convert right hand operand to same type as left hand operand
+		// Convert right hand operand to same size as left hand
 		l = int(reservedVariables.GetLength());
 		lctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConversion(rctx, lctx->type.dataType, node, asIC_IMPLICIT_CONV, true);
+		if( rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
+		else
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
+		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
 		reservedVariables.SetLength(l);
-		if( !rctx->type.dataType.IsEqualExceptRef(lctx->type.dataType) )
+		if( rctx->type.dataType != to )
 		{
 			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format().AddressOf(), lctx->type.dataType.Format().AddressOf());
+			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 		}
 
@@ -11937,7 +13065,7 @@ void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lc
 		if( lctx->type.dataType.IsObject() )
 		{
 			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format().AddressOf());
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 
 			// Set an integer value and allow the compiler to continue
@@ -11971,7 +13099,7 @@ void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lc
 		if( lctx->type.dataType != to )
 		{
 			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 			Error(str, node);
 		}
 
@@ -11983,7 +13111,7 @@ void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lc
 		if( !rctx->type.dataType.IsUnsignedType() )
 		{
 			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format().AddressOf(), "uint");
+			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "uint");
 			Error(str, node);
 		}
 
@@ -12068,43 +13196,55 @@ void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asSExprContext *lc
 	}
 }
 
-void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, eTokenType op)
 {
 	// Both operands must be of the same type
 
-	// Implicitly convert the operands to a number type
-	asCDataType to;
-
-	// If either operand is a non-primitive then use the primitive type
+	// If either operand is a non-primitive then first convert them to the best number type
 	if( !lctx->type.dataType.IsPrimitive() )
-		to.SetTokenType(rctx->type.dataType.GetTokenType());
-	else if( !rctx->type.dataType.IsPrimitive() )
-			to.SetTokenType(lctx->type.dataType.GetTokenType());
-	else if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
+	{
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(lctx, node);
+		reservedVariables.SetLength(l);
+	}
+	if( !rctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(rctx, node);
+		reservedVariables.SetLength(l);
+	}
+
+	// Implicitly convert the operands to matching types
+	asCDataType to;
+	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
 		to.SetTokenType(ttDouble);
 	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
 		to.SetTokenType(ttFloat);
 	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
 	{
 		// Convert to int64 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && rctx->type.dataType.IsIntegerType()) ||
-			(lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) || 
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
 			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
 			to.SetTokenType(ttInt64);
-		else
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
 			to.SetTokenType(ttUInt64);
+		else
+			to.SetTokenType(ttInt64);
 	}
 	else
 	{
 		// Convert to int32 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && rctx->type.dataType.IsIntegerType()) ||
-			(lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) || 
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
 			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
 			to.SetTokenType(ttInt);
 		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
 			to.SetTokenType(ttUInt);
 		else if( lctx->type.dataType.IsBooleanType() || rctx->type.dataType.IsBooleanType() )
 			to.SetTokenType(ttBool);
+		else
+			to.SetTokenType(ttInt);
 	}
 
 	// If doing an operation with double constant and float variable, the constant should be converted to float
@@ -12147,6 +13287,12 @@ void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext
 	if( signMismatch )
 		Warning(TXT_SIGNED_UNSIGNED_MISMATCH, node);
 
+	// Attempt to resolve ambiguous enumerations
+	if( lctx->type.dataType.IsEnumType() && rctx->enumValue != "" )
+		ImplicitConversion(rctx, lctx->type.dataType, node, asIC_IMPLICIT_CONV);
+	else if( rctx->type.dataType.IsEnumType() && lctx->enumValue != "" )
+		ImplicitConversion(lctx, rctx->type.dataType, node, asIC_IMPLICIT_CONV);
+
 	// Do the actual conversion
 	int l = int(reservedVariables.GetLength());
 	rctx->bc.GetVarsUsed(reservedVariables);
@@ -12165,7 +13311,7 @@ void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext
 	if( !lctx->type.dataType.IsEqualExceptConst(to) )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 		ok = false;
 	}
@@ -12173,7 +13319,7 @@ void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext
 	if( !rctx->type.dataType.IsEqualExceptConst(to) )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 		ok = false;
 	}
@@ -12187,13 +13333,14 @@ void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext
 	}
 
 	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-	int op = node->tokenType;
+	
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
 
 	if( !isConstant )
 	{
 		if( to.IsBooleanType() )
 		{
-			int op = node->tokenType;
 			if( op == ttEqual || op == ttNotEqual )
 			{
 				// Must convert to temporary variable, because we are changing the value before comparison
@@ -12292,7 +13439,6 @@ void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asSExprContext
 	{
 		if( to.IsBooleanType() )
 		{
-			int op = node->tokenType;
 			if( op == ttEqual || op == ttNotEqual )
 			{
 				// Make sure they are equal if not false
@@ -12397,7 +13543,7 @@ void asCCompiler::PushVariableOnStack(asSExprContext *ctx, bool asReference)
 	}
 }
 
-void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, eTokenType op)
 {
 	// Both operands must be booleans
 	asCDataType to;
@@ -12407,15 +13553,19 @@ void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lc
 	int l = int(reservedVariables.GetLength());
 	rctx->bc.GetVarsUsed(reservedVariables);
 	lctx->bc.GetVarsUsed(reservedVariables);
-	ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
-	ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
+
+	// Allow value types to be converted to bool using 'bool opImplConv()'
+	if( lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
+	if( rctx->type.dataType.GetObjectType() && (rctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
 	reservedVariables.SetLength(l);
 
 	// Verify that the conversion was successful
 	if( !lctx->type.dataType.IsBooleanType() )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format().AddressOf(), "bool");
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
 		Error(str, node);
 		// Force the conversion to allow compilation to proceed
 		lctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
@@ -12424,7 +13574,7 @@ void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lc
 	if( !rctx->type.dataType.IsBooleanType() )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format().AddressOf(), "bool");
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
 		Error(str, node);
 		// Force the conversion to allow compilation to proceed
 		rctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
@@ -12435,7 +13585,8 @@ void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lc
 	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
 
 	// What kind of operator is it?
-	int op = node->tokenType;
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
 	if( op == ttXor )
 	{
 		if( !isConstant )
@@ -12559,7 +13710,7 @@ void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asSExprContext *lc
 	}
 }
 
-void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx)
+void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *lctx, asSExprContext *rctx, asSExprContext *ctx, eTokenType opToken)
 {
 	// Process the property accessor as get
 	ProcessPropertyGetAccessor(lctx, node);
@@ -12578,8 +13729,11 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 		ReleaseTemporaryVariable(offset, 0);
 	}
 
+	if( opToken == ttUnrecognizedToken )
+		opToken = node->tokenType;
+
 	// Warn if not both operands are explicit handles or null handles
-	if( (node->tokenType == ttEqual || node->tokenType == ttNotEqual) &&
+	if( (opToken == ttEqual || opToken == ttNotEqual) &&
 		((!(lctx->type.isExplicitHandle || lctx->type.IsNullConstant()) && !(lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->flags & asOBJ_IMPLICIT_HANDLE))) ||
 		 (!(rctx->type.isExplicitHandle || rctx->type.IsNullConstant()) && !(rctx->type.dataType.GetObjectType() && (rctx->type.dataType.GetObjectType()->flags & asOBJ_IMPLICIT_HANDLE)))) )
 	{
@@ -12589,8 +13743,8 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 	// If one of the operands is a value type used as handle, we should look for the opEquals method
 	if( ((lctx->type.dataType.GetObjectType() && (lctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE)) ||
 		 (rctx->type.dataType.GetObjectType() && (rctx->type.dataType.GetObjectType()->flags & asOBJ_ASHANDLE))) &&
-		(node->tokenType == ttEqual || node->tokenType == ttIs ||
-		 node->tokenType == ttNotEqual || node->tokenType == ttNotIs) )
+		(opToken == ttEqual || opToken == ttIs ||
+		 opToken == ttNotEqual || opToken == ttNotIs) )
 	{
 		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
 		// Find the matching opEquals method
@@ -12603,7 +13757,7 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 
 		if( r == 1 )
 		{
-			if( node->tokenType == ttNotEqual || node->tokenType == ttNotIs )
+			if( opToken == ttNotEqual || opToken == ttNotIs )
 				ctx->bc.InstrSHORT(asBC_NOT, ctx->type.stackOffset);
 
 			// Success, don't continue
@@ -12629,8 +13783,17 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 		to = lctx->type.dataType;
 	else
 	{
-		// TODO: Use the common base type
-		to = lctx->type.dataType;
+		// Find a common base type
+		asSExprContext tmp(engine);
+		tmp.type = rctx->type;
+		ImplicitConversion(&tmp, lctx->type.dataType, 0, asIC_IMPLICIT_CONV, false);
+		if( tmp.type.dataType.GetObjectType() == lctx->type.dataType.GetObjectType() )
+			to = lctx->type.dataType;
+		else
+			to = rctx->type.dataType;
+
+		// Assume handle-to-const as it is not possible to convert handle-to-const to handle-to-non-const
+		to.MakeHandleToConst(true);
 	}
 
 	// Need to pop the value if it is a null constant
@@ -12661,14 +13824,14 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 	if( !lctx->type.dataType.IsEqualExceptConst(to) )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 	}
 
 	if( !rctx->type.dataType.IsEqualExceptConst(to) )
 	{
 		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format().AddressOf(), to.Format().AddressOf());
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
 		Error(str, node);
 	}
 
@@ -12680,19 +13843,23 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 
 	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
 
-	int op = node->tokenType;
-	if( op == ttEqual || op == ttNotEqual || op == ttIs || op == ttNotIs )
+	if( opToken == ttEqual || opToken == ttNotEqual || opToken == ttIs || opToken == ttNotIs )
 	{
-		// If the object handle already is in a variable we must manually pop it from the stack
-		if( lctx->type.isVariable )
-			lctx->bc.Instr(asBC_PopPtr);
-		if( rctx->type.isVariable )
-			rctx->bc.Instr(asBC_PopPtr);
+		// Make sure handles received as parameters by reference are copied to a local variable before the 
+		// asBC_CmpPtr, so we don't end up comparing the reference to the handle instead of the handle itself
+		if( lctx->type.isVariable && !lctx->type.isTemporary && lctx->type.stackOffset <= 0 )
+			lctx->type.isVariable = false;
+		if( rctx->type.isVariable && !rctx->type.isTemporary && rctx->type.stackOffset <= 0 )
+			rctx->type.isVariable = false;
 
-		// TODO: runtime optimize: don't do REFCPY
+		// TODO: runtime optimize: don't do REFCPY if not necessary
 		ConvertToVariableNotIn(lctx, rctx);
 		ConvertToVariable(rctx);
 
+		// Pop the pointers from the stack as they will not be used
+		lctx->bc.Instr(asBC_PopPtr);
+		rctx->bc.Instr(asBC_PopPtr);
+
 		MergeExprBytecode(ctx, lctx);
 		MergeExprBytecode(ctx, rctx);
 
@@ -12702,9 +13869,9 @@ void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *
 
 		ctx->bc.InstrW_W(asBC_CmpPtr, b, c);
 
-		if( op == ttEqual || op == ttIs )
+		if( opToken == ttEqual || opToken == ttIs )
 			ctx->bc.Instr(asBC_TZ);
-		else if( op == ttNotEqual || op == ttNotIs )
+		else if( opToken == ttNotEqual || opToken == ttNotIs )
 			ctx->bc.Instr(asBC_TNZ);
 
 		ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
@@ -12735,42 +13902,77 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 		Error(msg, ctx->exprNode);
 	}
 
-	// Check if the function is private
+	// Check if the function is private or protected
 	if( descr->isPrivate && descr->GetObjectType() != outFunc->GetObjectType() )
 	{
 		asCString msg;
 		msg.Format(TXT_PRIVATE_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
 		Error(msg, ctx->exprNode);
 	}
+	else if( descr->isProtected && 
+		     !(descr->GetObjectType() == outFunc->GetObjectType() || 
+		       (outFunc->GetObjectType() && outFunc->GetObjectType()->DerivesFrom(descr->GetObjectType()))) )
+	{
+		asCString msg;
+		msg.Format(TXT_PROTECTED_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
+		Error(msg, ctx->exprNode);
+	}
 
 	int argSize = descr->GetSpaceNeededForArguments();
 
-	if( descr->objectType && descr->returnType.IsReference() &&
-		!(ctx->type.isVariable || ctx->type.isTemporary) &&
+	// If we're calling a class method we must make sure the object is guaranteed to stay
+	// alive throughout the call by holding on to a reference in a local variable. This must
+	// be done for any methods that return references, and any calls on script objects.
+	// Application registered objects are assumed to know to keep themselves alive even
+	// if the method doesn't return a refernce.
+	if( descr->objectType &&
 		(ctx->type.dataType.IsObjectHandle() || ctx->type.dataType.SupportHandles()) &&
+		(descr->returnType.IsReference() || (ctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_SCRIPT_OBJECT)) &&
+		!(ctx->type.isVariable || ctx->type.isTemporary) &&
 		!(ctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_SCOPED) &&
 		!(ctx->type.dataType.GetObjectType()->GetFlags() & asOBJ_ASHANDLE) )
 	{
-		// The class method we're calling is returning a reference, which may be to a member of the object.
-		// In order to guarantee the lifetime of the reference, we must hold a local reference to the object.
+		// TODO: runtime optimize: Avoid this for global variables, by storing a reference to the global variable once in a 
+		//                         local variable and then refer to the same for each call. An alias for the global variable
+		//                         should be stored in the variable scope so that the compiler can find it. For loops and 
+		//                         scopes that will always be executed, i.e. non-if scopes the alias should be stored in the 
+		//                         higher scope to increase the probability of re-use.
+
 		// TODO: runtime optimize: This can be avoided for local variables (non-handles) as they have a well defined life time
+
 		int tempRef = AllocateVariable(ctx->type.dataType, true);
 		ctx->bc.InstrSHORT(asBC_PSF, (short)tempRef);
 		ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetObjectType());
 
-		// Add the release of this reference, as a deferred expression
+		// Add the release of this reference as a deferred expression
 		asSDeferredParam deferred;
 		deferred.origExpr = 0;
 		deferred.argInOutFlags = asTM_INREF;
 		deferred.argNode = 0;
 		deferred.argType.SetVariable(ctx->type.dataType, tempRef, true);
-
 		ctx->deferredParams.PushLast(deferred);
 
 		// Forget the current type
 		ctx->type.SetDummy();
 	}
 
+	// Check if there is a need to add a hidden pointer for when the function returns an object by value
+	if( descr->DoesReturnOnStack() && !useVariable )
+	{
+		useVariable = true;
+		varOffset = AllocateVariable(descr->returnType, true);
+
+		// Push the pointer to the pre-allocated space for the return value
+		ctx->bc.InstrSHORT(asBC_PSF, short(varOffset));
+
+		if( descr->objectType )
+		{
+			// The object pointer is already on the stack, but should be the top
+			// one, so we need to swap the pointers in order to get the correct
+			ctx->bc.Instr(asBC_SwapPtr);
+		}
+	}
+
 	if( isConstructor )
 	{
 		// Sometimes the value types are allocated on the heap,
@@ -12778,7 +13980,30 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 
 		asASSERT(useVariable == false);
 
-		ctx->bc.Alloc(asBC_ALLOC, objType, descr->id, argSize+AS_PTR_SIZE);
+		if( (objType->flags & asOBJ_TEMPLATE) )
+		{
+			asASSERT( descr->funcType == asFUNC_SCRIPT );
+
+			// Find the id of the real constructor and not the generated stub
+			asUINT id = 0;
+			asDWORD *bc = descr->scriptData->byteCode.AddressOf();
+			while( bc )
+			{
+				if( (*(asBYTE*)bc) == asBC_CALLSYS )
+				{
+					id = asBC_INTARG(bc);
+					break;
+				}
+				bc += asBCTypeSize[asBCInfo[*(asBYTE*)bc].type];
+			}
+
+			asASSERT( id );
+
+			ctx->bc.InstrPTR(asBC_OBJTYPE, objType);
+			ctx->bc.Alloc(asBC_ALLOC, objType, id, argSize + AS_PTR_SIZE + AS_PTR_SIZE);
+		}
+		else
+			ctx->bc.Alloc(asBC_ALLOC, objType, descr->id, argSize+AS_PTR_SIZE);
 
 		// The instruction has already moved the returned object to the variable
 		ctx->type.Set(asCDataType::CreatePrimitive(ttVoid, false));
@@ -12800,9 +14025,7 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 		// If the function returns an object by value the address of the location
 		// where the value should be stored is passed as an argument too
 		if( descr->DoesReturnOnStack() )
-		{
 			argSize += AS_PTR_SIZE;
-		}
 
 		// TODO: runtime optimize: If it is known that a class method cannot be overridden the call
 		//                         should be made with asBC_CALL as it is faster. Examples where this
@@ -12828,6 +14051,8 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 	{
 		int returnOffset = 0;
 
+		asCTypeInfo tmpExpr = ctx->type;
+
 		if( descr->DoesReturnOnStack() )
 		{
 			asASSERT( useVariable );
@@ -12860,6 +14085,8 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 			ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
 		}
 
+		ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
+
 		ctx->type.dataType.MakeReference(IsVariableOnHeap(returnOffset));
 		ctx->type.isLValue = false; // It is a reference, but not an lvalue
 
@@ -12916,6 +14143,8 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 	{
 		asASSERT(useVariable == false);
 
+		asCTypeInfo tmpExpr = ctx->type;
+
 		if( descr->returnType.GetSizeInMemoryBytes() )
 		{
 			// Allocate a temporary variable to hold the value, but make sure
@@ -12941,6 +14170,8 @@ void asCCompiler::PerformFunctionCall(int funcId, asSExprContext *ctx, bool isCo
 		else
 			ctx->type.Set(descr->returnType);
 
+		ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
+
 		ctx->type.isLValue = false;
 
 		// Clean up arguments
diff --git a/lib/angelscript/source/as_compiler.h b/lib/angelscript/source/as_compiler.h
index 69ae45069..bd0ff7fd8 100644
--- a/lib/angelscript/source/as_compiler.h
+++ b/lib/angelscript/source/as_compiler.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -103,6 +103,7 @@ struct asSExprContext
 		property_handle = false;
 		property_ref    = false;
 		methodName      = "";
+		enumValue       = "";
 	}
 	bool IsClassMethod()
 	{
@@ -143,6 +144,13 @@ struct asSOverloadCandidate
 	asUINT cost;
 };
 
+struct asSNamedArgument
+{
+	asCString name;
+	asSExprContext *ctx;
+	asUINT match;
+};
+
 enum EImplicitConv
 {
 	asIC_IMPLICIT_CONV,
@@ -206,31 +214,34 @@ protected:
 	int  CompileFunctionCall(asCScriptNode *node, asSExprContext *out, asCObjectType *objectType, bool objIsConst, const asCString &scope = "");
 	void CompileConstructCall(asCScriptNode *node, asSExprContext *out);
 	void CompileConversion(asCScriptNode *node, asSExprContext *out);
-	int  CompileOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	void CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	void CompileMathOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	void CompileBitwiseOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	void CompileComparisonOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	void CompileBooleanOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
-	bool CompileOverloadedDualOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out);
+	int  CompileOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileOperatorOnHandles(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileMathOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileBitwiseOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileComparisonOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileBooleanOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	bool CompileOverloadedDualOperator(asCScriptNode *node, asSExprContext *l, asSExprContext *r, asSExprContext *out, bool isHandle = false, eTokenType opToken = ttUnrecognizedToken);
 	int  CompileOverloadedDualOperator2(asCScriptNode *node, const char *methodName, asSExprContext *l, asSExprContext *r, asSExprContext *out, bool specificReturn = false, const asCDataType &returnType = asCDataType::CreatePrimitive(ttVoid, false));
 
 	void CompileInitList(asCTypeInfo *var, asCScriptNode *node, asCByteCode *bc, int isVarGlobOrMem);
-	int  CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode);
+	int  CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode, int &elementsInSubList);
 
-	int  CallDefaultConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem = 0, bool derefDest = false);
+	int  CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem = 0, bool derefDest = false);
 	int  CallCopyConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asSExprContext *arg, asCScriptNode *node, bool isGlobalVar = false, bool derefDestination = false);
 	void CallDestructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc);
-	int  CompileArgumentList(asCScriptNode *node, asCArray<asSExprContext *> &args);
-	int  CompileDefaultArgs(asCScriptNode *node, asCArray<asSExprContext*> &args, asCScriptFunction *func);
-	asUINT MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext*> &args, asCScriptNode *node, const char *name, asCObjectType *objectType = NULL, bool isConstMethod = false, bool silent = false, bool allowObjectConstruct = true, const asCString &scope = "");
+	int  CompileArgumentList(asCScriptNode *node, asCArray<asSExprContext *> &args, asCArray<asSNamedArgument> &namedArgs);
+	int  CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asSExprContext*> &args, int funcId, asCObjectType *type, asCArray<asSNamedArgument> *namedArgs = 0);
+	asUINT MatchFunctions(asCArray<int> &funcs, asCArray<asSExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs = NULL, asCObjectType *objectType = NULL, bool isConstMethod = false, bool silent = false, bool allowObjectConstruct = true, const asCString &scope = "");
 	int  CompileVariableAccess(const asCString &name, const asCString &scope, asSExprContext *ctx, asCScriptNode *errNode, bool isOptional = false, bool noFunction = false, bool noGlobal = false, asCObjectType *objType = 0);
 	void CompileMemberInitialization(asCByteCode *bc, bool onlyDefaults);
-	bool CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem);
+	bool CompileAutoType(asCDataType &autoType, asSExprContext &compiledCtx, asCScriptNode *exprNode, asCScriptNode *errNode);
+	bool CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asSExprContext *preCompiled = 0);
+	void CompileInitAsCopy(asCDataType &type, int offset, asCByteCode *bc, asSExprContext *arg, asCScriptNode *node, bool derefDestination);
 
 	// Helper functions
 	void ProcessPropertyGetAccessor(asSExprContext *ctx, asCScriptNode *node);
 	int  ProcessPropertySetAccessor(asSExprContext *ctx, asSExprContext *arg, asCScriptNode *node);
+	int  ProcessPropertyGetSetAccessor(asSExprContext *ctx, asSExprContext *lctx, asSExprContext *rctx, eTokenType op, asCScriptNode *errNode);
 	int  FindPropertyAccessor(const asCString &name, asSExprContext *ctx, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
 	int  FindPropertyAccessor(const asCString &name, asSExprContext *ctx, asSExprContext *arg, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
 	void PrepareTemporaryObject(asCScriptNode *node, asSExprContext *ctx, bool forceOnHeap = false);
@@ -241,16 +252,17 @@ protected:
 	void Dereference(asSExprContext *ctx, bool generateCode);
 	bool CompileRefCast(asSExprContext *ctx, const asCDataType &to, bool isExplicit, asCScriptNode *node, bool generateCode = true);
 	asUINT MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCandidate> &matches, const asSExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
+	int  MatchArgument(asCScriptFunction *desc, const asSExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
 	void PerformFunctionCall(int funcId, asSExprContext *out, bool isConstructor = false, asCArray<asSExprContext*> *args = 0, asCObjectType *objTypeForConstruct = 0, bool useVariable = false, int varOffset = 0, int funcPtrVar = 0);
 	void MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asSExprContext *> &args, bool addOneToOffset);
 	void MakeFunctionCall(asSExprContext *ctx, int funcId, asCObjectType *objectType, asCArray<asSExprContext*> &args, asCScriptNode *node, bool useVariable = false, int stackOffset = 0, int funcPtrVar = 0);
 	void PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asSExprContext *> &args);
 	void AfterFunctionCall(int funcId, asCArray<asSExprContext*> &args, asSExprContext *ctx, bool deferAll);
 	void ProcessDeferredParams(asSExprContext *ctx);
-	void PrepareArgument(asCDataType *paramType, asSExprContext *ctx, asCScriptNode *node, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
+	int  PrepareArgument(asCDataType *paramType, asSExprContext *ctx, asCScriptNode *node, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
 	void PrepareArgument2(asSExprContext *ctx, asSExprContext *arg, asCDataType *paramType, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
 	bool IsLValue(asCTypeInfo &type);
-	int  DoAssignment(asSExprContext *out, asSExprContext *lctx, asSExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, int op, asCScriptNode *opNode);
+	int  DoAssignment(asSExprContext *out, asSExprContext *lctx, asSExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode);
 	void MergeExprBytecode(asSExprContext *before, asSExprContext *after);
 	void MergeExprBytecodeAndType(asSExprContext *before, asSExprContext *after);
 	void FilterConst(asCArray<int> &funcs, bool removeConst = true);
@@ -275,6 +287,7 @@ protected:
 	asUINT ImplicitConvObjectRef(asSExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
 	asUINT ImplicitConvObjectValue(asSExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
 	void   ImplicitConversionConstant(asSExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType);
+	void   ImplicitConvObjectToBestMathType(asSExprContext *ctx, asCScriptNode *node);
 
 	void LineInstr(asCByteCode *bc, size_t pos);
 
@@ -284,7 +297,7 @@ protected:
 	void Error(const asCString &msg, asCScriptNode *node);
 	void Warning(const asCString &msg, asCScriptNode *node);
 	void Information(const asCString &msg, asCScriptNode *node);
-	void PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node);
+	void PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType = 0);
 	void AddVariableScope(bool isBreakScope = false, bool isContinueScope = false);
 	void RemoveVariableScope();
 	void FinalizeFunction();
diff --git a/lib/angelscript/source/as_config.h b/lib/angelscript/source/as_config.h
index 492dcc6aa..c9771e4ac 100644
--- a/lib/angelscript/source/as_config.h
+++ b/lib/angelscript/source/as_config.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -101,6 +101,10 @@
 // if the new order of the member initialization caused null pointer exceptions in older
 // scripts (e.g. if a base class accessed members of a derived class through a virtual method).
 
+// AS_USE_NAMESPACE
+// Adds the AngelScript namespace on the declarations.
+
+
 
 //
 // Library usage
@@ -140,12 +144,12 @@
 // STDCALL
 // This is used to declare a function to use the stdcall calling convention.
 
-// AS_USE_NAMESPACE
-// Adds the AngelScript namespace on the declarations.
-
 // AS_NO_MEMORY_H
 // Some compilers don't come with the memory.h header file.
 
+// AS_NO_THISCALL_FUNCTOR_METHOD
+// Defined if the support for functor methods hasn't been implemented on the platform.
+
 
 
 //
@@ -166,6 +170,9 @@
 // Embarcadero C++Builder
 //  __BORLANDC__ is defined
 
+// Sun CC compiler
+// __SUNPRO_CC is defined
+
 
 
 //
@@ -213,6 +220,9 @@
 // AS_BIG_ENDIAN
 // Define this for CPUs that use big endian memory layout, e.g. PPC
 
+// AS_SPARC
+// Define this for SPARC CPU family
+
 
 
 //
@@ -230,6 +240,7 @@
 // AS_XBOX      - Microsoft XBox
 // AS_XBOX360   - Microsoft XBox 360
 // AS_PSP       - Sony Playstation Portable
+// AS_PSVITA    - Sony Playstation Vita
 // AS_PS2       - Sony Playstation 2
 // AS_PS3       - Sony Playstation 3
 // AS_DC        - Sega Dreamcast
@@ -241,6 +252,7 @@
 // AS_HAIKU     - Haiku
 // AS_ILLUMOS   - Illumos like (OpenSolaris, OpenIndiana, NCP, etc)
 // AS_MARMALADE - Marmalade cross platform SDK (a layer on top of the OS)
+// AS_SUN       - Sun UNIX
 
 
 
@@ -339,6 +351,9 @@
 #define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
 #define THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
 
+// Not implemented by default. Undefined with tested platforms.
+#define AS_NO_THISCALL_FUNCTOR_METHOD
+
 
 // Embarcadero C++Builder
 #if defined(__BORLANDC__)
@@ -437,6 +452,7 @@
 	#define THISCALL_CALLEE_POPS_ARGUMENTS
 	#define STDCALL __stdcall
 	#define AS_SIZEOF_BOOL 1
+	#define COMPLEX_OBJS_PASSED_BY_REF
 
 	#define ASM_INTEL  // Intel style for inline assembly on microsoft compilers
 
@@ -452,14 +468,18 @@
 	#else
 		#if defined(_XBOX) || (defined(_M_IX86) && !defined(__LP64__))
 			#define AS_X86
+			#ifndef _XBOX
+				// Not tested with xbox (only enabled if is Windows)
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#endif 
 		#elif defined(_M_X64)
 			#define AS_X64_MSVC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
 			#define AS_LARGE_OBJS_PASSED_BY_REF
 			#define AS_LARGE_OBJ_MIN_SIZE 3
-			#define COMPLEX_OBJS_PASSED_BY_REF
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 		#endif
 	#endif
 
@@ -468,18 +488,22 @@
 		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
 		#define CDECL_RETURN_SIMPLE_IN_MEMORY
 		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#define COMPLEX_OBJS_PASSED_BY_REF
-		#define COMPLEX_MASK asOBJ_APP_CLASS_ASSIGNMENT
-		#define COMPLEX_RETURN_MASK asOBJ_APP_CLASS_ASSIGNMENT
-		#define AS_SOFTFP
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
+	
+		// Windows CE uses softfp calling convention, while Windows RT uses hardfp calling convention
+		// ref: http://stackoverflow.com/questions/16375355/what-is-the-windows-rt-on-arm-native-code-calling-convention
+		#if defined(_WIN32_WCE)
+			#define AS_SOFTFP
+		#endif
 	#endif
 
 	#ifndef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
+		#define COMPLEX_MASK (asOBJ_APP_ARRAY)
 	#endif
 
 	#ifndef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
 	#endif
 
 	#define UNREACHABLE_RETURN
@@ -511,13 +535,26 @@
 
 // SN Systems ProDG
 #if defined(__SNC__) || defined(SNSYS)
-	#define GNU_STYLE_VIRTUAL_METHOD
 	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
 	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
 	#define COMPLEX_OBJS_PASSED_BY_REF
-	#define ASM_AT_N_T  // AT&T style inline assembly
-	#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
-	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+
+	#ifdef __psp2__
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+	#else
+		#define GNU_STYLE_VIRTUAL_METHOD
+		#define ASM_AT_N_T  // AT&T style inline assembly
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+	#endif
+
 	#define AS_SIZEOF_BOOL 1
 	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
 
@@ -541,11 +578,22 @@
 		// Support native calling conventions on PS3
 		#define AS_PS3
 		#define AS_PPC_64
+		#define AS_NO_MEMORY_H
+		#define AS_NO_EXCEPTIONS
+		#include <stdlib.h>
 	// PSP
 	#elif defined(__psp__)
 		#define AS_NO_MEMORY_H
 		#define AS_MIPS
 		#define AS_PSP
+	// PSVita
+	#elif defined(__psp2__)
+		#define AS_PSVITA
+		#define AS_ARM
+		#define AS_NO_MEMORY_H
+		#define AS_NO_EXCEPTIONS
+		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+		#undef AS_NO_THISCALL_FUNCTOR_METHOD
 	#endif
 
 	#define UNREACHABLE_RETURN
@@ -555,16 +603,12 @@
 // Use the following command to determine predefined macros: echo . | g++ -dM -E -
 #if (defined(__GNUC__) && !defined(__SNC__)) || defined(EPPC) || defined(__CYGWIN__) // JWC -- use this instead for Wii
 	#define GNU_STYLE_VIRTUAL_METHOD
-#if !defined( __amd64__ )
-	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
-#else
-	#define MULTI_BASE_OFFSET(x) (*((asQWORD*)(&x)+1))
-#endif
+	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
 	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
 	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
 	#define COMPLEX_OBJS_PASSED_BY_REF
-	#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
-	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+	#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
+	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
 	#define AS_NO_MEMORY_H
 	#define AS_SIZEOF_BOOL 1
 	#define STDCALL __attribute__((stdcall))
@@ -618,9 +662,9 @@
 			#undef GNU_STYLE_VIRTUAL_METHOD
 
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
 		#endif
@@ -651,6 +695,7 @@
 		#if (defined(_ARM_) || defined(__arm__))
 			// iOS use ARM processor
 			#define AS_ARM
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define CDECL_RETURN_SIMPLE_IN_MEMORY
 			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
 			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
@@ -666,9 +711,9 @@
 			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
 			#define COMPLEX_OBJS_PASSED_BY_REF
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 			// iOS uses soft-float ABI
 			#define AS_SOFTFP
@@ -679,8 +724,8 @@
 
 		#elif (defined(__arm64__))
 			// The IPhone 5S+ uses an ARM64 processor
-			
-			// AngelScript currently doesn't support native calling 
+
+			// AngelScript currently doesn't support native calling
 			// for 64bit ARM processors so it's necessary to turn on
 			// portability mode
 			#define AS_MAX_PORTABILITY
@@ -692,21 +737,23 @@
 		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
 			// Support native calling conventions on Mac OS X + Intel 32bit CPU
 			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 		#elif defined(__LP64__) && !defined(__ppc__) && !defined(__PPC__) && !defined(__arm64__)
 			// http://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/LowLevelABI/140-x86-64_Function_Calling_Conventions/x86_64.html#//apple_ref/doc/uid/TP40005035-SW1
 			#define AS_X64_GCC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define HAS_128_BIT_PRIMITIVES
 			#define SPLIT_OBJS_BY_MEMBER_TYPES
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#define AS_LARGE_OBJS_PASSED_BY_REF
 			#define AS_LARGE_OBJ_MIN_SIZE 5
 			// STDCALL is not available on 64bit Mac
@@ -720,9 +767,9 @@
 			#define CDECL_RETURN_SIMPLE_IN_MEMORY
 			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 		#elif (defined(__ppc__) || defined(__PPC__)) && defined(__LP64__)
 			#define AS_PPC_64
@@ -740,13 +787,14 @@
 		//#define STDCALL_RETURN_SIMPLE_IN_MEMORY
 
 		#undef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 		#undef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
 			// Support native calling conventions on Intel 32bit CPU
 			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 
 			// As of version 4.7 MinGW changed the ABI, presumably
 			// to be better aligned with how MSVC works
@@ -760,6 +808,7 @@
 
 		#elif defined(__x86_64__)
 			#define AS_X64_MINGW
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define AS_LARGE_OBJS_PASSED_BY_REF
 			#define AS_LARGE_OBJ_MIN_SIZE 3
 			#define COMPLEX_OBJS_PASSED_BY_REF
@@ -773,9 +822,9 @@
 	#elif defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID__)
 
 		#undef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 		#undef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
 			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
@@ -785,8 +834,10 @@
 			// Support native calling conventions on Intel 32bit CPU
 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
 			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 		#elif defined(__LP64__) && !defined(__arm64__)
 			#define AS_X64_GCC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define HAS_128_BIT_PRIMITIVES
 			#define SPLIT_OBJS_BY_MEMBER_TYPES
 			#define AS_LARGE_OBJS_PASSED_BY_REF
@@ -797,6 +848,9 @@
 		#elif defined(__ARMEL__) || defined(__arm__)
 			#define AS_ARM
 
+			// TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
+			#define AS_NO_EXCEPTIONS
+
 			#undef STDCALL
 			#define STDCALL
 
@@ -822,9 +876,12 @@
 			// Verify if soft-float or hard-float ABI is used
 			#if defined(__SOFTFP__) && __SOFTFP__ == 1
 				// -ffloat-abi=softfp or -ffloat-abi=soft
-				#define AS_SOFTFP	
+				#define AS_SOFTFP
 			#endif
 
+			// Tested with both hard float and soft float abi
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+
 		#elif defined(__mips__)
 			#define AS_MIPS
 			#define AS_BIG_ENDIAN
@@ -848,9 +905,9 @@
 		#define AS_BSD
 		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
 			#define AS_X86
 		#elif defined(__LP64__)
@@ -858,9 +915,9 @@
 			#define HAS_128_BIT_PRIMITIVES
 			#define SPLIT_OBJS_BY_MEMBER_TYPES
 			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 			#define AS_LARGE_OBJS_PASSED_BY_REF
 			#define AS_LARGE_OBJ_MIN_SIZE 5
 			#undef STDCALL
@@ -915,36 +972,47 @@
 	#elif defined(ANDROID) || defined(__ANDROID__)
 		#define AS_ANDROID
 
-		// Android NDK 9+ supports posix threads
+		// Android 2.3+ supports posix threads
 		#define AS_POSIX_THREADS
 
+		// Common configuration with Android arm and x86
 		#define CDECL_RETURN_SIMPLE_IN_MEMORY
 		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
 		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
 
-		#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-		#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-		#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+		#undef COMPLEX_MASK
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+		#undef COMPLEX_RETURN_MASK
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
 
 		#if (defined(_ARM_) || defined(__arm__))
+			// Android ARM
+
+			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
 			// The stdcall calling convention is not used on the arm cpu
 			#undef STDCALL
 			#define STDCALL
 
 			#undef GNU_STYLE_VIRTUAL_METHOD
 
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
-
 			#define AS_ARM
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 			#define AS_SOFTFP
 			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			// Android Intel x86 (same config as Linux x86). Tested with Intel x86 Atom System Image.
+
+			// Support native calling conventions on Intel 32bit CPU
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
 		#endif
 
 	// Haiku OS
@@ -1001,6 +1069,39 @@
 	#define UNREACHABLE_RETURN
 #endif
 
+// Sun CC
+// Initial information provided by Andrey Bergman
+#if defined(__SUNPRO_CC)
+	#if defined(__sparc)
+		#define AS_SPARC
+	#endif
+
+	#if defined(__sun)
+		#define AS_SUN
+	#endif
+
+	// Native calling conventions is not yet supported for Sun CC
+	#if !defined(AS_MAX_PORTABILITY)
+		#define AS_MAX_PORTABILITY
+	#endif
+
+	// I presume Sun CC uses a similar structure of method pointers as gnuc
+	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
+
+	#if !defined(AS_SIZEOF_BOOL)
+		#define AS_SIZEOF_BOOL 1 // sizeof(bool) == 1
+	#endif
+	#if !defined(UNREACHABLE_RETURN)
+		#define UNREACHABLE_RETURN
+	#endif
+	#if !defined(STDCALL)
+		#define STDCALL // There is no stdcall on Solaris/SunPro/SPARC
+	#endif
+	#if !defined(asVSNPRINTF)
+		#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
+	#endif
+#endif
+
 
 //
 // Detect target hardware
diff --git a/lib/angelscript/source/as_configgroup.cpp b/lib/angelscript/source/as_configgroup.cpp
index 1ae08ea8d..882fc4645 100644
--- a/lib/angelscript/source/as_configgroup.cpp
+++ b/lib/angelscript/source/as_configgroup.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -88,10 +88,29 @@ void asCConfigGroup::RefConfigGroup(asCConfigGroup *group)
 	group->AddRef();
 }
 
+void asCConfigGroup::AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func)
+{
+	AddReferencesForType(engine, func->returnType.GetObjectType());
+	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
+		AddReferencesForType(engine, func->parameterTypes[n].GetObjectType());
+}
+
+void asCConfigGroup::AddReferencesForType(asCScriptEngine *engine, asCObjectType *type)
+{
+	if( type == 0 ) return;
+
+	// Keep reference to other groups
+	RefConfigGroup(engine->FindConfigGroupForObjectType(type));
+
+	// Keep track of which generated template instances the config group uses
+	if( type->flags & asOBJ_TEMPLATE && engine->generatedTemplateTypes.Exists(type) && !generatedTemplateInstances.Exists(type) )
+		generatedTemplateInstances.PushLast(type);
+}
+
 bool asCConfigGroup::HasLiveObjects()
 {
 	for( asUINT n = 0; n < objTypes.GetLength(); n++ )
-		if( objTypes[n]->GetRefCount() != 0 )
+		if( objTypes[n]->externalRefCount.get() != 0 )
 			return true;
 
 	return false;
@@ -123,7 +142,7 @@ void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
 		int index = engine->registeredGlobalFuncs.GetIndex(scriptFunctions[n]);
 		if( index >= 0 )
 			engine->registeredGlobalFuncs.Erase(index);
-		scriptFunctions[n]->Release();
+		scriptFunctions[n]->ReleaseInternal();
 		if( engine->stringFactory == scriptFunctions[n] )
 			engine->stringFactory = 0;
 	}
@@ -141,27 +160,24 @@ void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
 	for( n = 0; n < funcDefs.GetLength(); n++ )
 	{
 		engine->registeredFuncDefs.RemoveValue(funcDefs[n]);
-		funcDefs[n]->Release();
+		funcDefs[n]->ReleaseInternal();
+		engine->RemoveFuncdef(funcDefs[n]);
+		funcDefs[n]->ReleaseInternal();
 	}
 	funcDefs.SetLength(0);
 
-	engine->ClearUnusedTypes();
-
 	// Remove object types (skip this if it is possible other groups are still using the types)
 	if( !notUsed )
 	{
-		for( n = 0; n < objTypes.GetLength(); n++ )
+		for( n = asUINT(objTypes.GetLength()); n-- > 0; )
 		{
 			asCObjectType *t = objTypes[n];
 			asSMapNode<asSNameSpaceNamePair, asCObjectType*> *cursor;
 			if( engine->allRegisteredTypes.MoveTo(&cursor, asSNameSpaceNamePair(t->nameSpace, t->name)) &&
 				cursor->value == t )
 			{
-#ifdef AS_DEBUG
-				ValidateNoUsage(engine, t);
-#endif
-
 				engine->allRegisteredTypes.Erase(cursor);
+
 				if( engine->defaultArrayObjectType == t )
 					engine->defaultArrayObjectType = 0;
 
@@ -174,21 +190,17 @@ void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
 				else
 					engine->registeredObjTypes.RemoveValue(t);
 
-				asDELETE(t, asCObjectType);
+				t->DestroyInternal();
+				t->ReleaseInternal();
 			}
 			else
 			{
 				int idx = engine->templateInstanceTypes.IndexOf(t);
 				if( idx >= 0 )
 				{
-#ifdef AS_DEBUG
-					ValidateNoUsage(engine, t);
-#endif
-
 					engine->templateInstanceTypes.RemoveIndexUnordered(idx);
-					t->templateSubTypes.SetLength(0);
-
-					asDELETE(t, asCObjectType);
+					t->DestroyInternal();
+					t->ReleaseInternal();
 				}
 			}
 		}
@@ -201,57 +213,4 @@ void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
 	referencedConfigGroups.SetLength(0);
 }
 
-#ifdef AS_DEBUG
-void asCConfigGroup::ValidateNoUsage(asCScriptEngine *engine, asCObjectType *type)
-{
-	for( asUINT n = 0; n < engine->scriptFunctions.GetLength(); n++ )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[n];
-		if( func == 0 ) continue;
-
-		// Ignore factory, list factory, and members
-		if( func->name == "_beh_3_" || func->name == "_beh_4_" || func->objectType == type )
-			continue;
-
-		// Ignore function definitions too, as they aren't released until the engine is destroyed
-		if( func->funcType == asFUNC_FUNCDEF )
-			continue;
-
-		// Ignore functions whose object type has already reached refCount 0 as they are to be removed
-		if( func->objectType && func->objectType->GetRefCount() == 0 )
-			continue;
-
-		if( func->returnType.GetObjectType() == type )
-		{
-			asCString msg;
-			// We can only use the function name here, because the types used by the function may have been deleted already
-			msg.Format(TXT_TYPE_s_IS_STILL_USED_BY_FUNC_s, type->name.AddressOf(), func->GetDeclaration());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
-		}
-		else
-		{
-			for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
-			{
-				if( func->parameterTypes[p].GetObjectType() == type )
-				{
-					asCString msg;
-					// We can only use the function name here, because the types used by the function may have been deleted already
-					msg.Format(TXT_TYPE_s_IS_STILL_USED_BY_FUNC_s, type->name.AddressOf(), func->GetDeclaration());
-					engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
-					break;
-				}
-			}
-		}	
-	}
-
-	// TODO: Check also usage of the type in global variables 
-
-	// TODO: Check also usage of the type in local variables in script functions
-
-	// TODO: Check also usage of the type as members of classes
-
-	// TODO: Check also usage of the type as sub types in other types
-}
-#endif
-
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_configgroup.h b/lib/angelscript/source/as_configgroup.h
index 4e8c6abce..ccf785e6c 100644
--- a/lib/angelscript/source/as_configgroup.h
+++ b/lib/angelscript/source/as_configgroup.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -63,9 +63,8 @@ public:
 	bool HasLiveObjects();
 	void RemoveConfiguration(asCScriptEngine *engine, bool notUsed = false);
 
-#ifdef AS_DEBUG
-	void ValidateNoUsage(asCScriptEngine *engine, asCObjectType *type);
-#endif
+	void AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func);
+	void AddReferencesForType(asCScriptEngine *engine, asCObjectType *type);
 
 	asCString groupName;
 	int refCount;
@@ -75,6 +74,10 @@ public:
 	asCArray<asCGlobalProperty*> globalProps;
 	asCArray<asCConfigGroup*>    referencedConfigGroups;
 	asCArray<asCScriptFunction*> funcDefs;
+
+	// This array holds the generated template instances that are used 
+	// by the config group as part of function signature or property
+	asCArray<asCObjectType*>     generatedTemplateInstances;
 };
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_context.cpp b/lib/angelscript/source/as_context.cpp
index 25a1e376c..489877a0f 100644
--- a/lib/angelscript/source/as_context.cpp
+++ b/lib/angelscript/source/as_context.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -61,7 +61,6 @@ const int RESERVE_STACK = 2*AS_PTR_SIZE;
 // For each script function call we push 9 PTRs on the call stack
 const int CALLSTACK_FRAME_SIZE = 9;
 
-
 #if defined(AS_DEBUG)
 
 class asCDebugStats
@@ -254,15 +253,27 @@ void asCContext::DetachEngine()
 	{
 		if( m_stackBlocks[n] )
 		{
+#ifndef WIP_16BYTE_ALIGN
 			asDELETEARRAY(m_stackBlocks[n]);
+#else
+			asDELETEARRAYALIGNED(m_stackBlocks[n]);
+#endif
 		}
 	}
 	m_stackBlocks.SetLength(0);
 	m_stackBlockSize = 0;
 
 	// Clean the user data
-	if( m_userData && m_engine->cleanContextFunc )
-		m_engine->cleanContextFunc(this);
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n+1] )
+		{
+			for( asUINT c = 0; c < m_engine->cleanContextFuncs.GetLength(); c++ )
+				if( m_engine->cleanContextFuncs[c].type == m_userData[n] )
+					m_engine->cleanContextFuncs[c].cleanFunc(this);
+		}
+	}
+	m_userData.SetLength(0);
 
 	// Clear engine pointer
 	if( m_holdEngineRef )
@@ -277,17 +288,55 @@ asIScriptEngine *asCContext::GetEngine() const
 }
 
 // interface
-void *asCContext::SetUserData(void *data)
+void *asCContext::SetUserData(void *data, asPWORD type)
 {
-	void *oldData = m_userData;
-	m_userData = data;
-	return oldData;
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(m_engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(m_userData[n+1]);
+			m_userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	m_userData.PushLast(type);
+	m_userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+	return 0;
 }
 
 // interface
-void *asCContext::GetUserData() const
+void *asCContext::GetUserData(asPWORD type) const
 {
-	return m_userData;
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(m_engine->engineRWLock);
+
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			RELEASESHARED(m_engine->engineRWLock);
+			return reinterpret_cast<void*>(m_userData[n+1]);
+		}
+	}
+
+	RELEASESHARED(m_engine->engineRWLock);
+
+	return 0;
 }
 
 // interface
@@ -322,6 +371,16 @@ int asCContext::Prepare(asIScriptFunction *func)
 	// Release the returned object (if any)
 	CleanReturnObject();
 
+	// Release the object if it is a script object
+	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
+		if( obj )
+			obj->Release();
+
+		*(asPWORD*)&m_regs.stackFramePointer[0] = 0;
+	}
+
 	if( m_initialFunction && m_initialFunction == func )
 	{
 		// If the same function is executed again, we can skip a lot of the setup
@@ -339,7 +398,7 @@ int asCContext::Prepare(asIScriptFunction *func)
 		asASSERT( m_engine );
 
 		// Make sure the function is from the same engine as the context to avoid mixups
-		if (m_engine != func->GetEngine())
+		if( m_engine != func->GetEngine() )
 		{
 			asCString str;
 			str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, "Prepare", func->GetDeclaration(true, true), asINVALID_ARG);
@@ -437,6 +496,14 @@ int asCContext::Unprepare()
 	// Release the returned object (if any)
 	CleanReturnObject();
 
+	// Release the object if it is a script object
+	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
+		if( obj )
+			obj->Release();
+	}
+
 	// Release the initial function
 	if( m_initialFunction )
 	{
@@ -624,8 +691,15 @@ int asCContext::SetObject(void *obj)
 		return asERROR;
 	}
 
+	asASSERT( *(asPWORD*)&m_regs.stackFramePointer[0] == 0 );
+
 	*(asPWORD*)&m_regs.stackFramePointer[0] = (asPWORD)obj;
 
+	// TODO: This should be optional by having a flag where the application can chose whether it should be done or not
+	//       The flag could be named something like takeOwnership and have default value of true
+	if( obj && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+		reinterpret_cast<asCScriptObject*>(obj)->AddRef();
+
 	return 0;
 }
 
@@ -977,6 +1051,44 @@ int asCContext::SetArgObject(asUINT arg, void *obj)
 	return 0;
 }
 
+int asCContext::SetArgVarType(asUINT arg, void *ptr, int typeId)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->GetTokenType() != ttQuestion )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the typeId and pointer
+	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)ptr;
+	offset += AS_PTR_SIZE;
+	*(int*)(&m_regs.stackFramePointer[offset]) = typeId;
+
+	return 0;
+}
 
 // TODO: Instead of GetAddressOfArg, maybe we need a SetArgValue(int arg, void *value, bool takeOwnership) instead.
 
@@ -1119,6 +1231,14 @@ int asCContext::Execute()
 					SetInternalException(TXT_NULL_POINTER_ACCESS);
 			}
 		}
+		else if( m_currentFunction->funcType == asFUNC_IMPORTED )
+		{
+			int funcId = m_engine->importedFunctions[m_currentFunction->id & ~FUNC_IMPORTED]->boundFunctionId;
+			if( funcId > 0 )
+				m_currentFunction = m_engine->scriptFunctions[funcId];
+			else
+				SetInternalException(TXT_UNBOUND_FUNCTION);
+		}
 
 		if( m_currentFunction->funcType == asFUNC_SCRIPT )
 		{
@@ -1132,7 +1252,7 @@ int asCContext::Execute()
 			// The current function is an application registered function
 
 			// Call the function directly
-			CallSystemFunction(m_currentFunction->id, this, 0);
+			CallSystemFunction(m_currentFunction->id, this);
 
 			// Was the call successful?
 			if( m_status == asEXECUTION_ACTIVE )
@@ -1174,13 +1294,12 @@ int asCContext::Execute()
 		if( gcPosObjects > gcPreObjects )
 		{
 			// Execute as many steps as there were new objects created
-			while( gcPosObjects-- > gcPreObjects )
-				m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE);
+			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, gcPosObjects - gcPreObjects);
 		}
 		else if( gcPosObjects > 0 )
 		{
 			// Execute at least one step, even if no new objects were created
-			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE);
+			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, 1);
 		}
 	}
 
@@ -1430,22 +1549,46 @@ int asCContext::GetLineNumber(asUINT stackLevel, int *column, const char **secti
 // internal
 bool asCContext::ReserveStackSpace(asUINT size)
 {
+#ifdef WIP_16BYTE_ALIGN
+	// Pad size to a multiple of MAX_TYPE_ALIGNMENT.
+	const asUINT remainder = size % MAX_TYPE_ALIGNMENT;
+	if(remainder != 0)
+	{
+		size = size + (MAX_TYPE_ALIGNMENT - (size % MAX_TYPE_ALIGNMENT));
+	}
+#endif
+
 	// Make sure the first stack block is allocated
 	if( m_stackBlocks.GetLength() == 0 )
 	{
 		m_stackBlockSize = m_engine->initialContextStackSize;
 		asASSERT( m_stackBlockSize > 0 );
 
+#ifndef WIP_16BYTE_ALIGN
 		asDWORD *stack = asNEWARRAY(asDWORD,m_stackBlockSize);
+#else
+		asDWORD *stack = asNEWARRAYALIGNED(asDWORD, m_stackBlockSize, MAX_TYPE_ALIGNMENT);
+#endif
 		if( stack == 0 )
 		{
 			// Out of memory
 			return false;
 		}
 
+#ifdef WIP_16BYTE_ALIGN
+		asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
+#endif
+
 		m_stackBlocks.PushLast(stack);
 		m_stackIndex = 0;
 		m_regs.stackPointer = m_stackBlocks[0] + m_stackBlockSize;
+
+#ifdef WIP_16BYTE_ALIGN
+		// Align the stack pointer. This is necessary as the m_stackBlockSize is not necessarily evenly divisable with the max alignment
+		((asPWORD&)m_regs.stackPointer) &= ~(MAX_TYPE_ALIGNMENT-1);
+
+		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
+#endif
 	}
 
 	// Check if there is enough space on the current stack block, otherwise move
@@ -1472,7 +1615,11 @@ bool asCContext::ReserveStackSpace(asUINT size)
 		if( m_stackBlocks.GetLength() == m_stackIndex )
 		{
 			// Allocate the new stack block, with twice the size of the previous
-			asDWORD *stack = asNEWARRAY(asDWORD,(m_stackBlockSize << m_stackIndex));
+#ifndef WIP_16BYTE_ALIGN
+			asDWORD *stack = asNEWARRAY(asDWORD, (m_stackBlockSize << m_stackIndex));
+#else
+			asDWORD *stack = asNEWARRAYALIGNED(asDWORD, (m_stackBlockSize << m_stackIndex), MAX_TYPE_ALIGNMENT);
+#endif
 			if( stack == 0 )
 			{
 				// Out of memory
@@ -1484,6 +1631,11 @@ bool asCContext::ReserveStackSpace(asUINT size)
 				SetInternalException(TXT_STACK_OVERFLOW);
 				return false;
 			}
+
+#ifdef WIP_16BYTE_ALIGN
+			asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
+#endif
+
 			m_stackBlocks.PushLast(stack);
 		}
 
@@ -1494,6 +1646,13 @@ bool asCContext::ReserveStackSpace(asUINT size)
 			                  m_currentFunction->GetSpaceNeededForArguments() -
 			                  (m_currentFunction->objectType ? AS_PTR_SIZE : 0) -
 			                  (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
+
+#ifdef WIP_16BYTE_ALIGN
+		// Align the stack pointer 
+		(asPWORD&)m_regs.stackPointer &= ~(MAX_TYPE_ALIGNMENT-1);
+
+		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
+#endif
 	}
 
 	return true;
@@ -1512,19 +1671,6 @@ void asCContext::CallScriptFunction(asCScriptFunction *func)
 	m_currentFunction = func;
 	m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf();
 
-	// Make sure there is space on the stack to execute the function
-	asDWORD *oldStackPointer = m_regs.stackPointer;
-	if( !ReserveStackSpace(func->scriptData->stackNeeded) )
-		return;
-
-	// If a new stack block was allocated then we'll need to move
-	// over the function arguments to the new block
-	if( m_regs.stackPointer != oldStackPointer )
-	{
-		int numDwords = func->GetSpaceNeededForArguments() + (func->objectType ? AS_PTR_SIZE : 0) + (func->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
-		memcpy(m_regs.stackPointer, oldStackPointer, sizeof(asDWORD)*numDwords);
-	}
-
 	PrepareScriptFunction();
 }
 
@@ -1532,6 +1678,21 @@ void asCContext::PrepareScriptFunction()
 {
 	asASSERT( m_currentFunction->scriptData );
 
+	// Make sure there is space on the stack to execute the function
+	asDWORD *oldStackPointer = m_regs.stackPointer;
+	if( !ReserveStackSpace(m_currentFunction->scriptData->stackNeeded) )
+		return;
+
+	// If a new stack block was allocated then we'll need to move
+	// over the function arguments to the new block.
+	if( m_regs.stackPointer != oldStackPointer )
+	{
+		int numDwords = m_currentFunction->GetSpaceNeededForArguments() + 
+		                (m_currentFunction->objectType ? AS_PTR_SIZE : 0) + 
+		                (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
+		memcpy(m_regs.stackPointer, oldStackPointer, sizeof(asDWORD)*numDwords);
+	}
+
 	// Update framepointer
 	m_regs.stackFramePointer = m_regs.stackPointer;
 
@@ -2329,7 +2490,7 @@ void asCContext::ExecuteNext()
 			m_regs.stackPointer      = l_sp;
 			m_regs.stackFramePointer = l_fp;
 
-			l_sp += CallSystemFunction(i, this, 0);
+			l_sp += CallSystemFunction(i, this);
 
 			// Update the program position after the call so that line number is correct
 			l_bc += 2;
@@ -2361,9 +2522,9 @@ void asCContext::ExecuteNext()
 
 	case asBC_CALLBND:
 		{
+			// TODO: Clean-up: This code is very similar to asBC_CallPtr. Create a shared method for them
 			// Get the function ID from the stack
 			int i = asBC_INTARG(l_bc);
-			l_bc += 2;
 
 			asASSERT( i >= 0 );
 			asASSERT( i & FUNC_IMPORTED );
@@ -2376,6 +2537,9 @@ void asCContext::ExecuteNext()
 			int funcId = m_engine->importedFunctions[i & ~FUNC_IMPORTED]->boundFunctionId;
 			if( funcId == -1 )
 			{
+				// Need to update the program pointer for the exception handler
+				m_regs.programPointer += 2;
+
 				// Tell the exception handler to clean up the arguments to this function
 				m_needToCleanupArgs = true;
 				SetInternalException(TXT_UNBOUND_FUNCTION);
@@ -2384,8 +2548,46 @@ void asCContext::ExecuteNext()
 			else
 			{
 				asCScriptFunction *func = m_engine->GetScriptFunction(funcId);
+				if( func->funcType == asFUNC_SCRIPT )
+				{
+					m_regs.programPointer += 2;
+					CallScriptFunction(func);
+				}
+				else if( func->funcType == asFUNC_DELEGATE )
+				{
+					// Push the object pointer on the stack. There is always a reserved space for this so
+					// we don't don't need to worry about overflowing the allocated memory buffer
+					asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
+					m_regs.stackPointer -= AS_PTR_SIZE;
+					*(asPWORD*)m_regs.stackPointer = asPWORD(func->objForDelegate);
 
-				CallScriptFunction(func);
+					// Call the delegated method
+					if( func->funcForDelegate->funcType == asFUNC_SYSTEM )
+					{
+						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
+
+						// Update program position after the call so the line number
+						// is correct in case the system function queries it
+						m_regs.programPointer += 2;
+					}
+					else
+					{
+						m_regs.programPointer += 2;
+
+						// TODO: run-time optimize: The true method could be figured out when creating the delegate
+						CallInterfaceMethod(func->funcForDelegate);
+					}
+				}
+				else
+				{
+					asASSERT( func->funcType == asFUNC_SYSTEM );
+
+					m_regs.stackPointer += CallSystemFunction(func->id, this);
+
+					// Update program position after the call so the line number
+					// is correct in case the system function queries it
+					m_regs.programPointer += 2;
+				}
 			}
 
 			// Extract the values from the context again
@@ -2476,13 +2678,17 @@ void asCContext::ExecuteNext()
 
 				if( func )
 				{
+					// Push the object pointer on the stack (it will be popped by the function)
+					l_sp -= AS_PTR_SIZE;
+					*(asPWORD*)l_sp = (asPWORD)mem;
+
 					// Need to move the values back to the context as the called functions
 					// may use the debug interface to inspect the registers
 					m_regs.programPointer    = l_bc;
 					m_regs.stackPointer      = l_sp;
 					m_regs.stackFramePointer = l_fp;
 
-					l_sp += CallSystemFunction(func, this, mem);
+					l_sp += CallSystemFunction(func, this);
 				}
 
 				// Pop the variable address from the stack
@@ -3352,7 +3558,7 @@ void asCContext::ExecuteNext()
 		break;
 
 	case asBC_u64TOf:
-#if _MSC_VER <= 1200 // MSVC6
+#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
 		{
 			// MSVC6 doesn't permit UINT64 to double
 			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc));
@@ -3373,7 +3579,7 @@ void asCContext::ExecuteNext()
 		break;
 
 	case asBC_u64TOd:
-#if _MSC_VER <= 1200 // MSVC6
+#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
 		{
 			// MSVC6 doesn't permit UINT64 to double
 			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
@@ -3655,7 +3861,7 @@ void asCContext::ExecuteNext()
 					// Call the delegated method
 					if( func->funcForDelegate->funcType == asFUNC_SYSTEM )
 					{
-						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this, 0);
+						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
 
 						// Update program position after the call so the line number
 						// is correct in case the system function queries it
@@ -3673,7 +3879,7 @@ void asCContext::ExecuteNext()
 				{
 					asASSERT( func->funcType == asFUNC_SYSTEM );
 
-					m_regs.stackPointer += CallSystemFunction(func->id, this, 0);
+					m_regs.stackPointer += CallSystemFunction(func->id, this);
 
 					// Update program position after the call so the line number
 					// is correct in case the system function queries it
@@ -3906,7 +4112,11 @@ void asCContext::ExecuteNext()
 
 			asUINT size = asBC_DWORDARG(l_bc);
 			asBYTE **var = (asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
+#ifndef WIP_16BYTE_ALIGN
 			*var = asNEWARRAY(asBYTE, size);
+#else
+			*var = asNEWARRAYALIGNED(asBYTE, size, MAX_TYPE_ALIGNMENT);
+#endif
 
 			// Clear the buffer for the pointers that will be placed in it
 			memset(*var, 0, size);
@@ -4622,23 +4832,6 @@ void asCContext::CleanStackFrame()
 				}
 			}
 		}
-
-		// If the object is a script declared object, then we must release it
-		// as the compiler adds a reference at the entry of the function. Make sure
-		// the function has actually been entered
-		if( m_currentFunction->objectType && m_regs.programPointer != m_currentFunction->scriptData->byteCode.AddressOf() )
-		{
-			// Methods returning a reference or constructors don't add a reference
-			if( !m_currentFunction->returnType.IsReference() && m_currentFunction->name != m_currentFunction->objectType->name )
-			{
-				asSTypeBehaviour *beh = &m_currentFunction->objectType->beh;
-				if( beh->release && *(asPWORD*)&m_regs.stackFramePointer[0] != 0 )
-				{
-					m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[0], beh->release);
-					*(asPWORD*)&m_regs.stackFramePointer[0] = 0;
-				}
-			}
-		}
 	}
 	else
 		m_isStackMemoryNotAllocated = false;
@@ -4729,13 +4922,14 @@ asEContextState asCContext::GetState() const
 // interface
 int asCContext::SetLineCallback(asSFuncPtr callback, void *obj, int callConv)
 {
-	m_lineCallback = true;
-	m_regs.doProcessSuspend = true;
+	// First turn off the line callback to avoid a second thread 
+	// attempting to call it while the new one is still being set
+	m_lineCallback = false;
+
 	m_lineCallbackObj = obj;
 	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC )
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
 	{
-		m_lineCallback = false;
 		m_regs.doProcessSuspend = m_doSuspend;
 		return asNOT_SUPPORTED;
 	}
@@ -4744,15 +4938,18 @@ int asCContext::SetLineCallback(asSFuncPtr callback, void *obj, int callConv)
 		isObj = true;
 		if( obj == 0 )
 		{
-			m_lineCallback = false;
 			m_regs.doProcessSuspend = m_doSuspend;
 			return asINVALID_ARG;
 		}
 	}
 
 	int r = DetectCallingConvention(isObj, callback, callConv, 0, &m_lineCallbackFunc);
-	if( r < 0 ) m_lineCallback = false;
+	
+	// Turn on the line callback after setting both the function pointer and object pointer
+	if( r >= 0 ) m_lineCallback = true;
 
+	// The BC_SUSPEND instruction should be processed if either line 
+	// callback is set or if the application has requested a suspension
 	m_regs.doProcessSuspend = m_doSuspend || m_lineCallback;
 
 	return r;
@@ -4772,7 +4969,7 @@ int asCContext::SetExceptionCallback(asSFuncPtr callback, void *obj, int callCon
 	m_exceptionCallback = true;
 	m_exceptionCallbackObj = obj;
 	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC )
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
 		return asNOT_SUPPORTED;
 	if( (unsigned)callConv >= asCALL_THISCALL )
 	{
@@ -4809,91 +5006,79 @@ void asCContext::ClearExceptionCallback()
 	m_exceptionCallback = false;
 }
 
-int asCContext::CallGeneric(int id, void *objectPointer)
+int asCContext::CallGeneric(asCScriptFunction *descr)
 {
-	asCScriptFunction *sysFunction = m_engine->scriptFunctions[id];
-	asSSystemFunctionInterface *sysFunc = sysFunction->sysFuncIntf;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
 	void (*func)(asIScriptGeneric*) = (void (*)(asIScriptGeneric*))sysFunc->func;
 	int popSize = sysFunc->paramSize;
 	asDWORD *args = m_regs.stackPointer;
 
 	// Verify the object pointer if it is a class method
 	void *currentObject = 0;
+	asASSERT( sysFunc->callConv == ICC_GENERIC_FUNC || sysFunc->callConv == ICC_GENERIC_METHOD );
 	if( sysFunc->callConv == ICC_GENERIC_METHOD )
 	{
-		if( objectPointer )
+		// The object pointer should be popped from the context stack
+		popSize += AS_PTR_SIZE;
+
+		// Check for null pointer
+		currentObject = (void*)*(asPWORD*)(args);
+		if( currentObject == 0 )
 		{
-			currentObject = objectPointer;
-
-			// Don't increase the reference of this pointer
-			// since it will not have been constructed yet
+			SetInternalException(TXT_NULL_POINTER_ACCESS);
+			return 0;
 		}
-		else
-		{
-			// The object pointer should be popped from the context stack
-			popSize += AS_PTR_SIZE;
 
-			// Check for null pointer
-			currentObject = (void*)*(asPWORD*)(args);
-			if( currentObject == 0 )
-			{
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return 0;
-			}
+		asASSERT( sysFunc->baseOffset == 0 );
 
-			// Add the base offset for multiple inheritance
-			currentObject = (void*)(asPWORD(currentObject) + sysFunc->baseOffset);
-
-			// Skip object pointer
-			args += AS_PTR_SIZE;
-		}
+		// Skip object pointer
+		args += AS_PTR_SIZE;
 	}
 
-	if( sysFunction->DoesReturnOnStack() )
+	if( descr->DoesReturnOnStack() )
 	{
 		// Skip the address where the return value will be stored
 		args += AS_PTR_SIZE;
 		popSize += AS_PTR_SIZE;
 	}
 
-	asCGeneric gen(m_engine, sysFunction, currentObject, args);
+	asCGeneric gen(m_engine, descr, currentObject, args);
 
-	m_callingSystemFunction = sysFunction;
+	m_callingSystemFunction = descr;
 	func(&gen);
 	m_callingSystemFunction = 0;
 
 	m_regs.valueRegister = gen.returnVal;
 	m_regs.objectRegister = gen.objectRegister;
-	m_regs.objectType = sysFunction->returnType.GetObjectType();
+	m_regs.objectType = descr->returnType.GetObjectType();
 
-	// Clean up function parameters
-	int offset = 0;
-	for( asUINT n = 0; n < sysFunction->parameterTypes.GetLength(); n++ )
+	// Clean up arguments
+	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
+	if( cleanCount )
 	{
-		if( sysFunction->parameterTypes[n].IsObject() && !sysFunction->parameterTypes[n].IsReference() )
+		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
+		for( asUINT n = 0; n < cleanCount; n++, clean++ )
 		{
-			void *obj = *(void**)&args[offset];
-			if( obj )
+			void **addr = (void**)&args[clean->off];
+			if( clean->op == 0 )
 			{
-				// Release the object
-				asSTypeBehaviour *beh = &sysFunction->parameterTypes[n].GetObjectType()->beh;
-				if( sysFunction->parameterTypes[n].GetObjectType()->flags & asOBJ_REF )
+				if( *addr != 0 )
 				{
-					asASSERT( (sysFunction->parameterTypes[n].GetObjectType()->flags & asOBJ_NOCOUNT) || beh->release );
-					if( beh->release )
-						m_engine->CallObjectMethod(obj, beh->release);
-				}
-				else
-				{
-					// Call the destructor then free the memory
-					if( beh->destruct )
-						m_engine->CallObjectMethod(obj, beh->destruct);
-
-					m_engine->CallFree(obj);
+					m_engine->CallObjectMethod(*addr, clean->ot->beh.release);
+					*addr = 0;
 				}
 			}
+			else 
+			{
+				asASSERT( clean->op == 1 || clean->op == 2 );
+				asASSERT( *addr );
+
+				if( clean->op == 2 )
+					m_engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
+				
+				m_engine->CallFree(*addr);
+			}
 		}
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
 	}
 
 	// Return how much should be popped from the stack
diff --git a/lib/angelscript/source/as_context.h b/lib/angelscript/source/as_context.h
index 8b29227ad..8396067e1 100644
--- a/lib/angelscript/source/as_context.h
+++ b/lib/angelscript/source/as_context.h
@@ -76,14 +76,15 @@ public:
 	int SetObject(void *obj);
 
 	// Arguments
-	int SetArgByte(asUINT arg, asBYTE value);
-	int SetArgWord(asUINT arg, asWORD value);
-	int SetArgDWord(asUINT arg, asDWORD value);
-	int SetArgQWord(asUINT arg, asQWORD value);
-	int SetArgFloat(asUINT arg, float value);
-	int SetArgDouble(asUINT arg, double value);
-	int SetArgAddress(asUINT arg, void *addr);
-	int SetArgObject(asUINT arg, void *obj);
+	int   SetArgByte(asUINT arg, asBYTE value);
+	int   SetArgWord(asUINT arg, asWORD value);
+	int   SetArgDWord(asUINT arg, asDWORD value);
+	int   SetArgQWord(asUINT arg, asQWORD value);
+	int   SetArgFloat(asUINT arg, float value);
+	int   SetArgDouble(asUINT arg, double value);
+	int   SetArgAddress(asUINT arg, void *addr);
+	int   SetArgObject(asUINT arg, void *obj);
+	int   SetArgVarType(asUINT arg, void *ptr, int typeId);
 	void *GetAddressOfArg(asUINT arg);
 
 	// Return value
@@ -122,8 +123,8 @@ public:
 	asIScriptFunction *GetSystemFunction();
 
 	// User data
-	void *SetUserData(void *data);
-	void *GetUserData() const;
+	void *SetUserData(void *data, asPWORD type);
+	void *GetUserData(asPWORD type) const;
 
 public:
 	// Internal public functions
@@ -136,7 +137,7 @@ public:
 	void CallLineCallback();
 	void CallExceptionCallback();
 
-	int  CallGeneric(int funcID, void *objectPointer);
+	int  CallGeneric(asCScriptFunction *func);
 
 	void DetachEngine();
 
@@ -204,7 +205,7 @@ public:
 	asSSystemFunctionInterface m_exceptionCallbackFunc;
 	void *                     m_exceptionCallbackObj;
 
-	void *m_userData;
+	asCArray<asPWORD> m_userData;
 
 	// Registers available to JIT compiler functions
 	asSVMRegisters m_regs;
diff --git a/lib/angelscript/source/as_datatype.cpp b/lib/angelscript/source/as_datatype.cpp
index 783929b16..05dc7b3ce 100644
--- a/lib/angelscript/source/as_datatype.cpp
+++ b/lib/angelscript/source/as_datatype.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -46,24 +46,28 @@ BEGIN_AS_NAMESPACE
 
 asCDataType::asCDataType()
 {
-	tokenType      = ttUnrecognizedToken;
-	objectType     = 0;
-	isReference    = false;
-	isReadOnly     = false;
-	isObjectHandle = false;
-	isConstHandle  = false;
-	funcDef        = 0;
+	tokenType              = ttUnrecognizedToken;
+	objectType             = 0;
+	isReference            = false;
+	isReadOnly             = false;
+	isAuto                 = false;
+	isObjectHandle         = false;
+	isConstHandle          = false;
+	funcDef                = 0;
+	isHandleToAsHandleType = false;
 }
 
 asCDataType::asCDataType(const asCDataType &dt)
 {
-	tokenType      = dt.tokenType;
-	objectType     = dt.objectType;
-	isReference    = dt.isReference;
-	isReadOnly     = dt.isReadOnly;
-	isObjectHandle = dt.isObjectHandle;
-	isConstHandle  = dt.isConstHandle;
-	funcDef        = dt.funcDef;
+	tokenType              = dt.tokenType;
+	objectType             = dt.objectType;
+	isReference            = dt.isReference;
+	isReadOnly             = dt.isReadOnly;
+	isAuto                 = dt.isAuto;
+	isObjectHandle         = dt.isObjectHandle;
+	isConstHandle          = dt.isConstHandle;
+	funcDef                = dt.funcDef;
+	isHandleToAsHandleType = dt.isHandleToAsHandleType;
 }
 
 asCDataType::~asCDataType()
@@ -90,6 +94,17 @@ asCDataType asCDataType::CreateObject(asCObjectType *ot, bool isConst)
 	return dt;
 }
 
+asCDataType asCDataType::CreateAuto(bool isConst)
+{
+	asCDataType dt;
+
+	dt.tokenType        = ttIdentifier;
+	dt.isReadOnly       = isConst;
+	dt.isAuto           = true;
+
+	return dt;
+}
+
 asCDataType asCDataType::CreateObjectHandle(asCObjectType *ot, bool isConst)
 {
 	asCDataType dt;
@@ -144,7 +159,7 @@ bool asCDataType::IsNullHandle() const
 	return false;
 }
 
-asCString asCDataType::Format(bool includeNamespace) const
+asCString asCDataType::Format(asSNameSpace *currNs, bool includeNamespace) const
 {
 	if( IsNullHandle() )
 		return "<null handle>";
@@ -154,11 +169,13 @@ asCString asCDataType::Format(bool includeNamespace) const
 	if( isReadOnly )
 		str = "const ";
 
-	if( includeNamespace )
+	// If the type is not declared in the current namespace, then the namespace 
+	// must always be informed to guarantee that the correct type is informed
+	if( includeNamespace || (objectType && objectType->nameSpace != currNs) || (funcDef && funcDef->nameSpace != currNs) )
 	{
-		if( objectType )
+		if( objectType && objectType->nameSpace->name != "" )
 			str += objectType->nameSpace->name + "::";
-		else if( funcDef )
+		else if( funcDef && funcDef->nameSpace->name != "" )
 			str += funcDef->nameSpace->name + "::";
 	}
 
@@ -169,7 +186,7 @@ asCString asCDataType::Format(bool includeNamespace) const
 	else if( IsArrayType() && objectType && !objectType->engine->ep.expandDefaultArrayToTemplate )
 	{
 		asASSERT( objectType->templateSubTypes.GetLength() == 1 );
-		str += objectType->templateSubTypes[0].Format(includeNamespace);
+		str += objectType->templateSubTypes[0].Format(currNs, includeNamespace);
 		str += "[]";
 	}
 	else if( funcDef )
@@ -184,13 +201,20 @@ asCString asCDataType::Format(bool includeNamespace) const
 			str += "<";
 			for( asUINT subtypeIndex = 0; subtypeIndex < objectType->templateSubTypes.GetLength(); subtypeIndex++ )
 			{
-				str += objectType->templateSubTypes[subtypeIndex].Format(includeNamespace);
+				str += objectType->templateSubTypes[subtypeIndex].Format(currNs, includeNamespace);
 				if( subtypeIndex != objectType->templateSubTypes.GetLength()-1 )
 					str += ",";
 			}
 			str += ">";
 		}
 	}
+	else if( isAuto )
+	{
+		if( isObjectHandle )
+			str += "<auto@>";
+		else
+			str += "<auto>";
+	}
 	else
 	{
 		str = "<unknown>";
@@ -211,13 +235,15 @@ asCString asCDataType::Format(bool includeNamespace) const
 
 asCDataType &asCDataType::operator =(const asCDataType &dt)
 {
-	tokenType        = dt.tokenType;
-	isReference      = dt.isReference;
-	objectType       = dt.objectType;
-	isReadOnly       = dt.isReadOnly;
-	isObjectHandle   = dt.isObjectHandle;
-	isConstHandle    = dt.isConstHandle;
-	funcDef          = dt.funcDef;
+	tokenType              = dt.tokenType;
+	isReference            = dt.isReference;
+	objectType             = dt.objectType;
+	isReadOnly             = dt.isReadOnly;
+	isObjectHandle         = dt.isObjectHandle;
+	isConstHandle          = dt.isConstHandle;
+	isAuto                 = dt.isAuto;
+	funcDef                = dt.funcDef;
+	isHandleToAsHandleType = dt.isHandleToAsHandleType;
 
 	return (asCDataType &)*this;
 }
@@ -226,35 +252,46 @@ int asCDataType::MakeHandle(bool b, bool acceptHandleForScope)
 {
 	if( !b )
 	{
-		isObjectHandle = b;
+		isObjectHandle = false;
 		isConstHandle = false;
+		isHandleToAsHandleType = false;
 	}
-	else if( b && !isObjectHandle )
+	else
 	{
-		// Only reference types are allowed to be handles, 
-		// but not nohandle reference types, and not scoped references 
-		// (except when returned from registered function)
-		// funcdefs are special reference types and support handles
-		// value types with asOBJ_ASHANDLE are treated as a handle
-		if( !funcDef && 
-			(!objectType || 
-			!((objectType->flags & asOBJ_REF) || (objectType->flags & asOBJ_TEMPLATE_SUBTYPE) || (objectType->flags & asOBJ_ASHANDLE)) || 
-			(objectType->flags & asOBJ_NOHANDLE) || 
-			((objectType->flags & asOBJ_SCOPED) && !acceptHandleForScope)) )
-			return -1;
+		if( isAuto )
+		{
+			isObjectHandle = true;
+		}
+		else if( !isObjectHandle )
+		{
+			// Only reference types are allowed to be handles, 
+			// but not nohandle reference types, and not scoped references 
+			// (except when returned from registered function)
+			// funcdefs are special reference types and support handles
+			// value types with asOBJ_ASHANDLE are treated as a handle
+			if( !funcDef && 
+				(!objectType || 
+				!((objectType->flags & asOBJ_REF) || (objectType->flags & asOBJ_TEMPLATE_SUBTYPE) || (objectType->flags & asOBJ_ASHANDLE)) || 
+				(objectType->flags & asOBJ_NOHANDLE) || 
+				((objectType->flags & asOBJ_SCOPED) && !acceptHandleForScope)) )
+				return -1;
 
-		isObjectHandle = b;
-		isConstHandle = false;
+			isObjectHandle = b;
+			isConstHandle = false;
 
-		// ASHANDLE supports being handle, but as it really is a value type it will not be marked as a handle
-		if( (objectType->flags & asOBJ_ASHANDLE) )
-			isObjectHandle = false;
+			// ASHANDLE supports being handle, but as it really is a value type it will not be marked as a handle
+			if( (objectType->flags & asOBJ_ASHANDLE) )
+			{
+				isObjectHandle = false;
+				isHandleToAsHandleType = true;
+			}
+		}
 	}
 
 	return 0;
 }
 
-int asCDataType::MakeArray(asCScriptEngine *engine)
+int asCDataType::MakeArray(asCScriptEngine *engine, asCModule *module)
 {
 	if( engine->defaultArrayObjectType == 0 )
 		return asINVALID_TYPE;
@@ -263,7 +300,7 @@ int asCDataType::MakeArray(asCScriptEngine *engine)
 	isReadOnly = false;
 	asCArray<asCDataType> subTypes;
 	subTypes.PushLast(*this);
-	asCObjectType *at = engine->GetTemplateInstanceType(engine->defaultArrayObjectType, subTypes);
+	asCObjectType *at = engine->GetTemplateInstanceType(engine->defaultArrayObjectType, subTypes, module);
 	isReadOnly = tmpIsReadOnly;
 
 	isObjectHandle = false;
@@ -305,7 +342,7 @@ int asCDataType::MakeHandleToConst(bool b)
 bool asCDataType::SupportHandles() const
 {
 	if( objectType &&
-		(objectType->flags & asOBJ_REF) && 
+		(objectType->flags & (asOBJ_REF | asOBJ_ASHANDLE)) && 
 		!(objectType->flags & asOBJ_NOHANDLE) &&
 		!isObjectHandle )
 		return true;
@@ -313,19 +350,39 @@ bool asCDataType::SupportHandles() const
 	return false;
 }
 
-bool asCDataType::CanBeInstanciated() const
+bool asCDataType::CanBeInstantiated() const
 {
-	if( GetSizeOnStackDWords() == 0 ||
-		(IsObject() && 
-		 (objectType->flags & asOBJ_REF) &&        // It's a ref type and
-		 ((objectType->flags & asOBJ_NOHANDLE) ||  // the ref type doesn't support handles or
-		  (!IsObjectHandle() &&                    // it's not a handle and
-		   objectType->beh.factories.GetLength() == 0))) ) // the ref type cannot be instanciated
+	if( GetSizeOnStackDWords() == 0 ) // Void
+		return false;
+
+	if( !IsObject() ) // Primitives
+		return true; 
+
+	if( IsObjectHandle() && !(objectType->flags & asOBJ_NOHANDLE) ) // Handles
+		return true;
+
+	if( funcDef ) // Funcdefs can be instantiated as delegates
+		 return true;
+
+	if( (objectType->flags & asOBJ_REF) && objectType->beh.factories.GetLength() == 0 ) // ref types without factories
+		return false;
+
+	if( (objectType->flags & asOBJ_ABSTRACT) && !IsObjectHandle() ) // Can't instantiate abstract classes
 		return false;
 
 	return true;
 }
 
+bool asCDataType::IsAbstractClass() const
+{
+	return objectType && (objectType->flags & asOBJ_ABSTRACT) ? true : false;
+}
+
+bool asCDataType::IsInterface() const
+{
+	return objectType && objectType->IsInterface();
+}
+
 bool asCDataType::CanBeCopied() const
 {
 	// All primitives can be copied
@@ -334,8 +391,8 @@ bool asCDataType::CanBeCopied() const
 	// Plain-old-data structures can always be copied
 	if( objectType->flags & asOBJ_POD ) return true;
 
-	// It must be possible to instanciate the type
-	if( !CanBeInstanciated() ) return false;
+	// It must be possible to instantiate the type
+	if( !CanBeInstantiated() ) return false;
 
 	// It must have a default constructor or factory
 	if( objectType->beh.construct == 0 &&
@@ -361,6 +418,14 @@ bool asCDataType::IsHandleToConst() const
 	return isReadOnly;
 }
 
+bool asCDataType::IsObjectConst() const
+{
+	if( IsObjectHandle() )
+		return IsHandleToConst();
+
+	return IsReadOnly();
+}
+
 // TODO: 3.0.0: This should be removed
 bool asCDataType::IsArrayType() const
 {
@@ -441,7 +506,7 @@ bool asCDataType::IsEqualExceptConst(const asCDataType &dt) const
 
 bool asCDataType::IsPrimitive() const
 {
-	//	Enumerations are primitives
+	// Enumerations are primitives
 	if( IsEnumType() )
 		return true;
 
@@ -456,6 +521,16 @@ bool asCDataType::IsPrimitive() const
 	return true;
 }
 
+bool asCDataType::IsMathType() const
+{
+	if( tokenType == ttInt || tokenType == ttInt8 || tokenType == ttInt16 || tokenType == ttInt64 ||
+		tokenType == ttUInt || tokenType == ttUInt8 || tokenType == ttUInt16 || tokenType == ttUInt64 ||
+		tokenType == ttFloat || tokenType == ttDouble )
+		return true;
+
+	return false;
+}
+
 bool asCDataType::IsIntegerType() const
 {
 	if( tokenType == ttInt ||
@@ -505,13 +580,14 @@ bool asCDataType::IsBooleanType() const
 
 bool asCDataType::IsObject() const
 {
-	//	Enumerations are not objects, even though they are described with an objectType.
-	if( IsEnumType() )
+	if( IsPrimitive() )
 		return false;
 
-	if( objectType ) return true;
+	// Null handle doesn't have an object type but should still be considered an object
+	if( objectType == 0 ) 
+		return IsNullHandle();
 
-	return false;
+	return true;
 }
 
 int asCDataType::GetSizeInMemoryBytes() const
@@ -569,6 +645,19 @@ int asCDataType::GetSizeOnStackDWords() const
 	return GetSizeInMemoryDWords() + size;
 }
 
+#ifdef WIP_16BYTE_ALIGN
+int  asCDataType::GetAlignment() const
+{
+	if( objectType == NULL )
+	{
+		// TODO: Small primitives should not be aligned to 4 byte boundaries
+		return 4; //Default alignment
+	}
+
+	return objectType->alignment;
+}
+#endif
+
 asSTypeBehaviour *asCDataType::GetBehaviour() const
 { 
 	return objectType ? &objectType->beh : 0; 
@@ -576,6 +665,9 @@ asSTypeBehaviour *asCDataType::GetBehaviour() const
 
 bool asCDataType::IsEnumType() const
 {
+	// Do a sanity check on the objectType, to verify that we aren't trying to access memory after it has been released
+	asASSERT( objectType == 0 || objectType->name.GetLength() < 100 );
+
 	if( objectType && (objectType->flags & asOBJ_ENUM) )
 		return true;
 
diff --git a/lib/angelscript/source/as_datatype.h b/lib/angelscript/source/as_datatype.h
index c329683b4..b079e447c 100644
--- a/lib/angelscript/source/as_datatype.h
+++ b/lib/angelscript/source/as_datatype.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -49,6 +49,8 @@ struct asSTypeBehaviour;
 class asCScriptEngine;
 class asCObjectType;
 class asCScriptFunction;
+class asCModule;
+struct asSNameSpace;
 
 // TODO: refactor: Reference should not be part of the datatype. This should be stored separately, e.g. in asCTypeInfo
 //                 MakeReference, MakeReadOnly, IsReference, IsReadOnly should be removed
@@ -62,36 +64,45 @@ public:
 
 	bool IsValid() const;
 
-	asCString Format(bool includeNamespace = false) const;
+	asCString Format(asSNameSpace *currNs, bool includeNamespace = false) const;
 
 	static asCDataType CreatePrimitive(eTokenType tt, bool isConst);
 	static asCDataType CreateObject(asCObjectType *ot, bool isConst);
+	static asCDataType CreateAuto(bool isConst);
 	static asCDataType CreateObjectHandle(asCObjectType *ot, bool isConst);
 	static asCDataType CreateFuncDef(asCScriptFunction *ot);
 	static asCDataType CreateNullHandle();
 
 	int MakeHandle(bool b, bool acceptHandleForScope = false);
-	int MakeArray(asCScriptEngine *engine);
+	int MakeArray(asCScriptEngine *engine, asCModule *requestingModule);
 	int MakeReference(bool b);
 	int MakeReadOnly(bool b);
 	int MakeHandleToConst(bool b);
 
-	bool IsTemplate()       const;
-	bool IsScriptObject()   const;
-	bool IsPrimitive()      const;
-	bool IsObject()         const;
-	bool IsReference()      const {return isReference;}
-	bool IsReadOnly()       const; 
-	bool IsIntegerType()    const;
-	bool IsUnsignedType()   const;
-	bool IsFloatType()      const;
-	bool IsDoubleType()     const;
-	bool IsBooleanType()    const;
-	bool IsObjectHandle()   const {return isObjectHandle;}
-	bool IsHandleToConst()  const;
-	bool IsArrayType()      const;
-	bool IsEnumType()       const;
-	bool IsAnyType()        const {return tokenType == ttQuestion;}
+	bool IsTemplate()             const;
+	bool IsScriptObject()         const;
+	bool IsPrimitive()            const;
+	bool IsMathType()             const;
+	bool IsObject()               const;
+	bool IsReference()            const {return isReference;}
+	bool IsAuto()                 const {return isAuto;}
+	bool IsReadOnly()             const;
+	bool IsIntegerType()          const;
+	bool IsUnsignedType()         const;
+	bool IsFloatType()            const;
+	bool IsDoubleType()           const;
+	bool IsBooleanType()          const;
+	bool IsObjectHandle()         const {return isObjectHandle;}
+	bool IsHandleToAuto()         const {return isAuto && isObjectHandle;}
+	bool IsHandleToConst()        const;
+	bool IsArrayType()            const;
+	bool IsEnumType()             const;
+	bool IsAnyType()              const {return tokenType == ttQuestion;}
+	bool IsHandleToAsHandleType() const {return isHandleToAsHandleType;}
+	bool IsAbstractClass()        const;
+	bool IsInterface()            const;
+
+	bool IsObjectConst()    const;
 
 	bool IsEqualExceptRef(const asCDataType &)             const;
 	bool IsEqualExceptRefAndConst(const asCDataType &)     const;
@@ -99,7 +110,7 @@ public:
 	bool IsNullHandle()                                    const;
 
 	bool SupportHandles() const;
-	bool CanBeInstanciated() const;
+	bool CanBeInstantiated() const;
 	bool CanBeCopied() const;
 
 	bool operator ==(const asCDataType &) const;
@@ -113,6 +124,9 @@ public:
 	int  GetSizeOnStackDWords()  const;
 	int  GetSizeInMemoryBytes()  const;
 	int  GetSizeInMemoryDWords() const;
+#ifdef WIP_16BYTE_ALIGN
+	int  GetAlignment()          const;
+#endif
 
 	void SetTokenType(eTokenType tt)         {tokenType = tt;}
 	void SetObjectType(asCObjectType *obj)   {objectType = obj;}
@@ -135,7 +149,9 @@ protected:
 	bool isReadOnly:1;
 	bool isObjectHandle:1;
 	bool isConstHandle:1;
-	char dummy:4;
+	bool isAuto:1;
+	bool isHandleToAsHandleType:1; // Used by the compiler to know how to initialize the object
+	char dummy:2;
 };
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_debug.h b/lib/angelscript/source/as_debug.h
index 8d9ebad19..a86428d41 100644
--- a/lib/angelscript/source/as_debug.h
+++ b/lib/angelscript/source/as_debug.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -38,12 +38,16 @@
 
 #include "as_config.h"
 
+#if defined(AS_DEBUG)
+
 #ifndef AS_WII
 // The Wii SDK doesn't have these, we'll survive without AS_DEBUG
 
 #ifndef _WIN32_WCE
 // Neither does WinCE
 
+#ifndef AS_PSVITA
+// Possible on PSVita, but requires SDK access
 
 #if defined(__GNUC__) || defined( AS_MARMALADE )
 
@@ -256,10 +260,17 @@ END_AS_NAMESPACE
 
 
 
-
+#endif // AS_PSVITA
 #endif // _WIN32_WCE
 #endif // AS_WII
 
+#else // !defined(AS_DEBUG)
+
+// Define it so nothing is done
+#define TimeIt(x) 
+
+#endif // !defined(AS_DEBUG)
+
 #endif
 
 
diff --git a/lib/angelscript/source/as_gc.cpp b/lib/angelscript/source/as_gc.cpp
index 4c3edc94c..36f6230db 100644
--- a/lib/angelscript/source/as_gc.cpp
+++ b/lib/angelscript/source/as_gc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -156,7 +156,14 @@ int asCGarbageCollector::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, a
 	return asSUCCESS;
 }
 
-int asCGarbageCollector::GarbageCollect(asDWORD flags)
+// TODO: Should have a flag to tell the garbage collector to automatically determine how many iterations are needed
+//       It should then gather statistics such as how many objects has been created since last run, and how many objects
+//       are destroyed per iteration, and how many objects are detected as cyclic garbage per iteration.
+//       It should try to reach a stable number of objects, i.e. so that on average the number of objects added to 
+//       the garbage collector is the same as the number of objects destroyed. And it should try to minimize the number
+//       of iterations of detections that must be executed per cycle while still identifying the cyclic garbage
+//       These variables should also be available for inspection through the gcstatistics.
+int asCGarbageCollector::GarbageCollect(asDWORD flags, asUINT iterations)
 {
 	// If the GC is already processing in another thread, then don't enter here again
 	if( TRYENTERCRITICALSECTION(gcCollecting) )
@@ -178,9 +185,8 @@ int asCGarbageCollector::GarbageCollect(asDWORD flags)
 			// Reset the state
 			if( doDetect )
 			{
-				// Move all objects to the old list, so we guarantee that all is detected
-				for( asUINT n = (asUINT)gcNewObjects.GetLength(); n-- > 0; )
-					MoveObjectToOldList(n);
+				// Move all new objects to the old list, so we guarantee that all is detected
+				MoveAllObjectsToOldList();
 				detectState  = clearCounters_init;
 			}
 			if( doDestroy )
@@ -189,7 +195,10 @@ int asCGarbageCollector::GarbageCollect(asDWORD flags)
 				destroyOldState = destroyGarbage_init;
 			}
 
-			unsigned int count = (unsigned int)(gcNewObjects.GetLength() + gcOldObjects.GetLength());
+			// The full cycle only works with the objects in the old list so that the
+			// set of objects scanned for garbage is fixed even if new objects are added
+			// by other threads in parallel.
+			unsigned int count = (unsigned int)(gcOldObjects.GetLength());
 			for(;;)
 			{
 				// Detect all garbage with cyclic references
@@ -199,25 +208,16 @@ int asCGarbageCollector::GarbageCollect(asDWORD flags)
 				// Now destroy all known garbage
 				if( doDestroy )
 				{
-					while( DestroyNewGarbage() == 1 ) {}
+					if( !doDetect )
+						while( DestroyNewGarbage() == 1 ) {}
 					while( DestroyOldGarbage() == 1 ) {}
 				}
 
 				// Run another iteration if any garbage was destroyed
-				if( count != (unsigned int)(gcNewObjects.GetLength() + gcOldObjects.GetLength()) )
-					count = (unsigned int)(gcNewObjects.GetLength() + gcOldObjects.GetLength());
+				if( count != (unsigned int)(gcOldObjects.GetLength()) )
+					count = (unsigned int)(gcOldObjects.GetLength());
 				else
-				{
-					// Let the engine destroy the types that reached refCount 0
-					// If none were destroyed, then leave the GC
-					// TODO: The asCObjectType should destroy its content when refCount reaches 0
-					//       since no-one is using them. The registered types should have their
-					//       refcount increased by the config groups. Doing it like that will allow 
-					//       me to remove this call to ClearUnusedTypes() that the GC really 
-					//       shouldn't be calling.
-					if( engine->ClearUnusedTypes() == 0 )
-						break;
-				}
+					break;
 			}
 
 			isProcessing = false;
@@ -226,16 +226,19 @@ int asCGarbageCollector::GarbageCollect(asDWORD flags)
 		}
 		else
 		{
-			// Destroy the garbage that we know of
-			if( doDestroy )
+			while( iterations-- > 0 )
 			{
-				DestroyNewGarbage();
-				DestroyOldGarbage();
-			}
+				// Destroy the garbage that we know of
+				if( doDestroy )
+				{
+					DestroyNewGarbage();
+					DestroyOldGarbage();
+				}
 
-			// Run another incremental step of the identification of cyclic references
-			if( doDetect )
-				IdentifyGarbageWithCyclicRefs();
+				// Run another incremental step of the identification of cyclic references
+				if( doDetect && gcOldObjects.GetLength() > 0 )
+					IdentifyGarbageWithCyclicRefs();
+			}
 		}
 
 		isProcessing = false;
@@ -246,19 +249,33 @@ int asCGarbageCollector::GarbageCollect(asDWORD flags)
 	return 1;
 }
 
+// TODO: Additional statistics to gather
+//
+//       - How many objects are added on average between each destroyed object
+//       - How many objects are added on average between each detected object
+//       - how many iterations are needed for each destroyed object
+//       - how many iterations are needed for each detected object
+//
+//       The average must have a decay so that long running applications will not suffer
+//       from objects being created early on in the application and then never destroyed.
+//
+//       This ought to be possible to accomplish by holding two buckets.
+//       Numbers will be accumulated in one bucket while the other is held fixed.
+//       When returning the average it should use a weighted average between the two buckets using the size as weight.
+//       When a bucket is filled up, the buckets are switched, and then new bucket is emptied to gather new statistics.
 void asCGarbageCollector::GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const
 {
-	// It's not necessary to protect this access, as
-	// it doesn't matter if another thread is currently
-	// appending a new object.
+	// It is not necessary to protect this with critical sections, however
+	// as it is not protected the variables can be filled in slightly different
+	// moments and might not match perfectly when inspected by the application
+	// afterwards.
+
 	if( currentSize )
 		*currentSize = (asUINT)(gcNewObjects.GetLength() + gcOldObjects.GetLength());
 
 	if( totalDestroyed )
 		*totalDestroyed = numDestroyed;
 
-	asASSERT( numAdded == gcNewObjects.GetLength() + gcOldObjects.GetLength() + numDestroyed );
-
 	if( totalDetected )
 		*totalDetected = numDetected;
 
@@ -328,6 +345,16 @@ void asCGarbageCollector::MoveObjectToOldList(int idx)
 	LEAVECRITICALSECTION(gcCritical);
 }
 
+void asCGarbageCollector::MoveAllObjectsToOldList()
+{
+	// We need to protect this update with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	if( gcOldObjects.Concatenate(gcNewObjects) )
+		gcNewObjects.SetLength(0);
+	LEAVECRITICALSECTION(gcCritical);
+}
+
 int asCGarbageCollector::DestroyNewGarbage()
 {
 	// This function will only be called within the critical section gcCollecting
@@ -900,8 +927,15 @@ asCGarbageCollector::asSMapNode_t *asCGarbageCollector::GetNode(void *obj, asSIn
 	if( freeNodes.GetLength() )
 		node = freeNodes.PopLast();
 	else
+	{
 		node = asNEW(asSMapNode_t);
-
+		if( !node )
+		{
+			// Out of memory
+			return 0;
+		}
+	}
+	
 	node->Init(obj, it);
 	return node;
 }
diff --git a/lib/angelscript/source/as_gc.h b/lib/angelscript/source/as_gc.h
index 9dc235b8f..3609ec42b 100644
--- a/lib/angelscript/source/as_gc.h
+++ b/lib/angelscript/source/as_gc.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -56,7 +56,7 @@ public:
 	asCGarbageCollector();
 	~asCGarbageCollector();
 
-	int    GarbageCollect(asDWORD flags);
+	int    GarbageCollect(asDWORD flags, asUINT iterations);
 	void   GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
 	void   GCEnumCallback(void *reference);
 	int    AddScriptObjectToGC(void *obj, asCObjectType *objType);
@@ -104,6 +104,7 @@ protected:
 	void           RemoveNewObjectAtIdx(int idx);
 	void           RemoveOldObjectAtIdx(int idx);
 	void           MoveObjectToOldList(int idx);
+	void           MoveAllObjectsToOldList();
 
 	// Holds all the objects known by the garbage collector
 	asCArray<asSObjTypePair>           gcNewObjects;
diff --git a/lib/angelscript/source/as_globalproperty.cpp b/lib/angelscript/source/as_globalproperty.cpp
index 210c97f0c..df2e51557 100644
--- a/lib/angelscript/source/as_globalproperty.cpp
+++ b/lib/angelscript/source/as_globalproperty.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -50,31 +50,32 @@ asCGlobalProperty::asCGlobalProperty()
 
 asCGlobalProperty::~asCGlobalProperty()
 { 
+#ifndef WIP_16BYTE_ALIGNED
 	if( memoryAllocated ) { asDELETEARRAY(memory); } 
+#else
+	if( memoryAllocated ) { asDELETEARRAYALIGNED(memory); } 
+#endif
+
 	if( initFunc )
-		initFunc->Release();
+		initFunc->ReleaseInternal();
 }
 
 void asCGlobalProperty::AddRef()
 {
-	gcFlag = false;
 	refCount.atomicInc();
 }
 
 void asCGlobalProperty::Release()
 {
-	gcFlag = false;
+	if( refCount.atomicDec() == 0 )
+		asDELETE(this, asCGlobalProperty);
+}
 
-	// The property doesn't delete itself. The  
-	// engine will do that at a later time
-	if( refCount.atomicDec() == 2 && initFunc )
+void asCGlobalProperty::DestroyInternal()
+{
+	if( initFunc )
 	{
-		// Since the initFunc holds references to the property,
-		// we'll release it when we reach refCount 2. This will
-		// break the circle and allow the engine to free the property
-		// without the need for the GC to attempt finding circular 
-		// references.
-		initFunc->Release();
+		initFunc->ReleaseInternal();
 		initFunc = 0;
 	}
 }
@@ -92,14 +93,19 @@ void asCGlobalProperty::AllocateMemory()
 { 
 	if( type.GetSizeOnStackDWords() > 2 ) 
 	{ 
+#ifndef WIP_16BYTE_ALIGNED
 		memory = asNEWARRAY(asDWORD, type.GetSizeOnStackDWords()); 
+#else
+		// TODO: Avoid aligned allocation if not needed to reduce the waste of memory for the alignment
+		memory = asNEWARRAYALIGNED(asDWORD, type.GetSizeOnStackDWords(), type.GetAlignment()); 
+#endif
 		memoryAllocated = true; 
 	} 
 }
 
 void asCGlobalProperty::SetRegisteredAddress(void *p) 
 { 
-	realAddress = p; 	
+	realAddress = p;
 	if( type.IsObject() && !type.IsReference() && !type.IsObjectHandle() )
 	{
 		// The global property is a pointer to a pointer 
@@ -114,60 +120,13 @@ void *asCGlobalProperty::GetRegisteredAddress() const
 	return realAddress;
 }
 
-int asCGlobalProperty::GetRefCount()
-{
-	return refCount.get();
-}
-
-void asCGlobalProperty::SetGCFlag()
-{
-	gcFlag = true;
-}
-
-bool asCGlobalProperty::GetGCFlag()
-{
-	return gcFlag;
-}
-
-void asCGlobalProperty::EnumReferences(asIScriptEngine *engine)
-{
-	engine->GCEnumCallback(initFunc);
-}
-
-void asCGlobalProperty::ReleaseAllHandles(asIScriptEngine *)
-{
-	if( initFunc )
-	{
-		initFunc->Release();
-		initFunc = 0;
-	}
-}
-
-void asCGlobalProperty::Orphan(asCModule *module)
-{
-	if( initFunc && initFunc->module == module )
-	{
-		// The owning module is releasing the property, so we need to notify 
-		// the GC in order to resolve any circular references that may exists
-
-		// This will add the property
-		initFunc->engine->gc.AddScriptObjectToGC(this, &initFunc->engine->globalPropertyBehaviours);
-
-		// This will add the function
-		initFunc->AddRef();
-		initFunc->Orphan(module);
-	}
-
-	Release();
-}
-
 void asCGlobalProperty::SetInitFunc(asCScriptFunction *initFunc)
 {
 	// This should only be done once
 	asASSERT( this->initFunc == 0 );
 
 	this->initFunc = initFunc;
-	this->initFunc->AddRef();
+	this->initFunc->AddRefInternal();
 }
 
 asCScriptFunction *asCGlobalProperty::GetInitFunc()
@@ -175,81 +134,4 @@ asCScriptFunction *asCGlobalProperty::GetInitFunc()
 	return initFunc;
 }
 
-
-#ifdef AS_MAX_PORTABILITY
-
-static void GlobalProperty_AddRef_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	self->AddRef();
-}
-
-static void GlobalProperty_Release_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	self->Release();
-}
-
-static void GlobalProperty_GetRefCount_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void GlobalProperty_SetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	self->SetGCFlag();
-}
-
-static void GlobalProperty_GetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetGCFlag();
-}
-
-static void GlobalProperty_EnumReferences_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void GlobalProperty_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	asCGlobalProperty *self = (asCGlobalProperty*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-#endif
-
-
-void asCGlobalProperty::RegisterGCBehaviours(asCScriptEngine *engine)
-{
-	// Register the gc behaviours for the global properties
-	int r = 0;
-	UNUSED_VAR(r); // It is only used in debug mode
-	engine->globalPropertyBehaviours.engine = engine;
-	engine->globalPropertyBehaviours.flags = asOBJ_REF | asOBJ_GC;
-	engine->globalPropertyBehaviours.name = "_builtin_globalprop_";
-#ifndef AS_MAX_PORTABILITY
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCGlobalProperty,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCGlobalProperty,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCGlobalProperty,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCGlobalProperty,SetGCFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCGlobalProperty,GetGCFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCGlobalProperty,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCGlobalProperty,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-#else
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(GlobalProperty_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(GlobalProperty_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(GlobalProperty_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(GlobalProperty_SetGCFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(GlobalProperty_GetGCFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(GlobalProperty_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->globalPropertyBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(GlobalProperty_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-#endif
-}
-
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_memory.cpp b/lib/angelscript/source/as_memory.cpp
index edc8c7fc5..13fd081f2 100644
--- a/lib/angelscript/source/as_memory.cpp
+++ b/lib/angelscript/source/as_memory.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -49,6 +49,63 @@
 
 BEGIN_AS_NAMESPACE
 
+#ifdef WIP_16BYTE_ALIGN
+
+// TODO: Add support for 16byte aligned application types (e.g. __m128). The following is a list of things that needs to be implemented:
+//
+//  ok  - The script context must make sure to always allocate the local stack memory buffer on 16byte aligned boundaries (asCContext::ReserveStackSpace)
+//  ok  - The engine must make sure to always allocate the memory for the script objects on 16byte aligned boundaries (asCScriptEngine::CallAlloc)
+//  ok  - The application needs to inform a new flag when registering types that require 16byte alignment, e.g. asOBJ_APP_ALIGN16 (asCScriptEngine::RegisterObjectType)
+//  ok  - The script object type must make sure to align member properties of these types correctly (asCObjectType::AddPropertyToClass)
+//  ok  - Script global properties must allocate memory on 16byte boundaries if holding these types (asCGlobalProperty::AllocateMemory)
+// TODO - The script compiler must make sure to allocate the local variables on 16byte boundaries (asCCompiler::AllocateVariable)
+// TODO - The script compiler must add pad bytes on the stack for all function calls to guarantee that the stack position is 16byte aligned on entry in the called function (asCCompiler)
+// TODO - The bytecode serializer must be capable of adjusting these pad bytes to guarantee platform independent saved bytecode. Remember that the registered type may not be 16byte aligned on all platforms (asCWriter & asCReader) 
+// TODO - The bytecode serializer must also be prepared to adjust the position of the local variables according to the need fro 16byte alignment (asCWriter & asCReader)
+// TODO - The code for the native calling conventions must be adjusted for all platforms that should support 16byte aligned types (as_callfunc...)
+//  ok  - When the context needs to grow the local stack memory it must copy the function arguments so that the stack entry position is 16byte aligned (asCContext::CallScriptFunction)
+// TODO - When the context is prepared for a new call, it must set the initial stack position so the stack entry position is 16byte aligned (asCContext::Prepare)
+//
+// http://www.gamedev.net/topic/650555-alignment-requirements/
+
+
+// TODO: Allow user to register its own aligned memory routines
+// Wrappers for aligned allocations
+void *debugAlignedMalloc(size_t size, size_t align, const char *file, int line)
+{
+	void *mem = ((asALLOCFUNCDEBUG_t)userAlloc)(size + (align-1) + sizeof(void*), file, line);
+
+	char *amem = ((char*)mem) + sizeof(void*);
+	if( (uintptr_t)amem & (align - 1) )
+		amem += align - ((uintptr_t)amem & (align - 1));
+
+	((void**)amem)[-1] = mem;
+	return amem;
+}
+
+void *alignedMalloc(size_t size, size_t align)
+{
+	void *mem = userAlloc(size + (align-1) + sizeof(void*));
+
+	char *amem = ((char*)mem) + sizeof(void*);
+	if( (uintptr_t)amem & (align - 1) )
+		amem += align - ((uintptr_t)amem & (align - 1));
+
+	((void**)amem)[-1] = mem;
+	return amem;
+}
+
+void alignedFree(void *mem)
+{
+	userFree( ((void**)mem)[-1] );
+}
+
+bool isAligned(const void* const pointer, asUINT alignment)
+{
+	return (uintptr_t(pointer) % alignment) == 0;
+}
+#endif
+
 // By default we'll use the standard memory management functions
 
 // Make sure these globals are initialized first. Otherwise the
@@ -61,25 +118,47 @@ BEGIN_AS_NAMESPACE
 #pragma init_seg(lib)
 asALLOCFUNC_t userAlloc = malloc;
 asFREEFUNC_t  userFree  = free;
+#ifdef WIP_16BYTE_ALIGN
+#ifdef AS_DEBUG
+asALLOCALIGNEDFUNC_t userAllocAligned = (asALLOCALIGNEDFUNC_t)debugAlignedMalloc;
+#else
+asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
+#endif
+asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
+#endif
 #else
 // Other compilers will just have to rely on luck.
 asALLOCFUNC_t userAlloc = malloc;
 asFREEFUNC_t  userFree  = free;
+#ifdef WIP_16BYTE_ALIGN
+asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
+asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
+#endif
 #endif
 
 extern "C"
 {
 
+// interface
 int asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
 {
+	// Clean-up thread local memory before changing the allocation routines to avoid 
+	// potential problem with trying to free memory using a different allocation
+	// routine than used when allocating it.
+	asThreadCleanup();
+
 	userAlloc = allocFunc;
 	userFree  = freeFunc;
 
 	return 0;
 }
 
+// interface
 int asResetGlobalMemoryFunctions()
 {
+	// Clean-up thread local memory before changing the allocation routines to avoid 
+	// potential problem with trying to free memory using a different allocation
+	// routine than used when allocating it.
 	asThreadCleanup();
 
 	userAlloc = malloc;
@@ -88,6 +167,18 @@ int asResetGlobalMemoryFunctions()
 	return 0;
 }
 
+// interface
+void *asAllocMem(size_t size)
+{
+	return asNEWARRAY(asBYTE, size);
+}
+
+// interface
+void asFreeMem(void *mem)
+{
+	asDELETEARRAY(mem);
+}
+
 } // extern "C"
 
 asCMemoryMgr::asCMemoryMgr()
diff --git a/lib/angelscript/source/as_memory.h b/lib/angelscript/source/as_memory.h
index 1b8e06a7f..369af642b 100644
--- a/lib/angelscript/source/as_memory.h
+++ b/lib/angelscript/source/as_memory.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -48,6 +48,25 @@ BEGIN_AS_NAMESPACE
 extern asALLOCFUNC_t userAlloc;
 extern asFREEFUNC_t  userFree;
 
+#ifdef WIP_16BYTE_ALIGN
+
+// TODO: This declaration should be in angelscript.h
+//       when the application can register it's own
+//       aligned memory routines
+typedef void *(*asALLOCALIGNEDFUNC_t)(size_t, size_t);
+typedef void (*asFREEALIGNEDFUNC_t)(void *);
+extern asALLOCALIGNEDFUNC_t userAllocAligned;
+extern asFREEALIGNEDFUNC_t  userFreeAligned;
+typedef void *(*asALLOCALIGNEDFUNCDEBUG_t)(size_t, size_t, const char *, unsigned int);
+
+// The maximum type alignment supported.
+const int MAX_TYPE_ALIGNMENT = 16;
+
+// Utility function used for assertions.
+bool isAligned(const void* const pointer, asUINT alignment);
+
+#endif // WIP_16BYTE_ALIGN
+
 // We don't overload the new operator as that would affect the application as well
 
 #ifndef AS_DEBUG
@@ -58,6 +77,11 @@ extern asFREEFUNC_t  userFree;
 	#define asNEWARRAY(x,cnt)  (x*)userAlloc(sizeof(x)*cnt)
 	#define asDELETEARRAY(ptr) userFree(ptr)
 
+#ifdef WIP_16BYTE_ALIGN
+	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
+	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
+#endif
+
 #else
 
 	typedef void *(*asALLOCFUNCDEBUG_t)(size_t, const char *, unsigned int);
@@ -68,6 +92,12 @@ extern asFREEFUNC_t  userFree;
 	#define asNEWARRAY(x,cnt)  (x*)((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(x)*cnt, __FILE__, __LINE__)
 	#define asDELETEARRAY(ptr) userFree(ptr)
 
+#ifdef WIP_16BYTE_ALIGN
+	//TODO: Equivalent of debug allocation function with alignment?
+	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
+	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
+#endif
+
 #endif
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_module.cpp b/lib/angelscript/source/as_module.cpp
index 10aeab0bd..232e17be1 100644
--- a/lib/angelscript/source/as_module.cpp
+++ b/lib/angelscript/source/as_module.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -46,6 +46,33 @@
 
 BEGIN_AS_NAMESPACE
 
+// TODO: 2.30.0: redesign: Improved method for discarding modules (faster clean-up, less abuse of garbage collector)
+//
+// I need to separate the reference counter for internal references and outside references:
+//
+//  - Internal references are for example, when the module refers to a function or object since it is declared in the module, or when
+//    a function refers to another function since it is being called in the code.
+//  - Outside references are for example object instances holding a reference to the object type, or a context currently
+//    executing a function.
+//
+// If no object instances are alive or no contexts are alive it is known that functions from a discarded module
+// can be called, so they can be destroyed without any need to execute the complex garbage collection routines.
+//
+// If there are live objects, the entire module should be kept for safe keeping, though no longer visible.
+//
+// TODO: It may not be necessary to keep track of internal references. Without keeping track of internal references, can I still
+//       handle RemoveFunction and RemoveGlobalVariable correctly?
+//
+// TODO: How to avoid global variables keeping code alive? For example a script object, or a funcdef?
+//       Can I do a quick check of the object types and functions to count number of outside references, and then do another
+//       check over the global variables to subtract the outside references coming from these? What if the outside reference
+//       is added by an application type in a global variable that the engine doesn't know about? Example, a global dictionary 
+//       holding object instances. Should discarding a module immediately destroy the content of the global variables? What if
+//       a live object tries to access the global variable after it has been discarded? Throwing a script exception is acceptable?
+//       Perhaps I need to allow the user to provide a clean-up routine that will be executed before destroying the objects. 
+//       Or I might just put that responsibility on the application.
+
+
 // internal
 asCModule::asCModule(const char *name, asCScriptEngine *engine)
 {
@@ -66,6 +93,8 @@ asCModule::~asCModule()
 {
 	InternalReset();
 
+	// The builder is not removed by InternalReset because it holds the script 
+	// sections that will be built, so we need to explictly remove it now if it exists
 	if( builder )
 	{
 		asDELETE(builder,asCBuilder);
@@ -75,34 +104,114 @@ asCModule::~asCModule()
 	if( engine )
 	{
 		// Clean the user data
-		if( userData && engine->cleanModuleFunc )
-			engine->cleanModuleFunc(this);
+		for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+		{
+			if( userData[n+1] )
+			{
+				for( asUINT c = 0; c < engine->cleanModuleFuncs.GetLength(); c++ )
+					if( engine->cleanModuleFuncs[c].type == userData[n] )
+						engine->cleanModuleFuncs[c].cleanFunc(this);
+			}
+		}
 
 		// Remove the module from the engine
-		if( engine->lastModule == this )
-			engine->lastModule = 0;
-		engine->scriptModules.RemoveValue(this);
+		ACQUIREEXCLUSIVE(engine->engineRWLock);
+		// The module must have been discarded before it is deleted
+		asASSERT( !engine->scriptModules.Exists(this) );
+		engine->discardedModules.RemoveValue(this);
+		RELEASEEXCLUSIVE(engine->engineRWLock);
 	}
 }
 
 // interface
 void asCModule::Discard()
 {
-	asDELETE(this,asCModule);
+	// Reset the global variables already so that no object in the global variables keep the module alive forever.
+	// If any live object tries to access the global variables during clean up they will fail with a script exception,
+	// so the application must keep that in mind before discarding a module.
+	CallExit();
+
+	// Keep a local copy of the engine pointer, because once the module is moved do the discarded
+	// pile, it is possible that another thread might discard it while we are still in here. So no
+	// further access to members may be done after that
+	asCScriptEngine *lEngine = engine;
+
+	// Instead of deleting the module immediately, move it to the discarded pile
+	// This will turn it invisible to the application, yet keep it alive until all 
+	// external references to its entities have been released.
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+	if( lEngine->lastModule == this )
+		lEngine->lastModule = 0;
+	lEngine->scriptModules.RemoveValue(this);
+	lEngine->discardedModules.PushLast(this);
+	RELEASEEXCLUSIVE(lEngine->engineRWLock);
+
+	// Allow the engine to go over the list of discarded modules to see what can be cleaned up at this moment.
+	// Don't do this if the engine is already shutting down, as it will be done explicitly by the engine itself with error reporting
+	if( !lEngine->shuttingDown )
+	{
+		if( lEngine->ep.autoGarbageCollect )
+			lEngine->GarbageCollect();
+		else
+		{
+			// GarbageCollect calls DeleteDiscardedModules, so no need
+			// to call it again if we already called GarbageCollect
+			lEngine->DeleteDiscardedModules();
+		}
+	}
 }
 
 // interface
-void *asCModule::SetUserData(void *data)
+void *asCModule::SetUserData(void *data, asPWORD type)
 {
-	void *oldData = userData;
-	userData = data;
-	return oldData;
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(userData[n+1]);
+			userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	userData.PushLast(type);
+	userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(engine->engineRWLock);
+
+	return 0;
 }
 
 // interface
-void *asCModule::GetUserData() const
+void *asCModule::GetUserData(asPWORD type) const
 {
-	return userData;
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(engine->engineRWLock);
+
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			void *ud = reinterpret_cast<void*>(userData[n+1]);
+			RELEASESHARED(engine->engineRWLock);
+			return ud;
+		}
+	}
+
+	RELEASESHARED(engine->engineRWLock);
+
+	return 0;
 }
 
 // interface
@@ -204,6 +313,15 @@ int asCModule::Build()
 #else
 	TimeIt("asCModule::Build");
 
+	// Don't allow the module to be rebuilt if there are still 
+	// external references that will need the previous code
+	// TODO: 2.30.0: interface: The asIScriptModule must have a method for querying if the module is used
+	if( HasExternalReferences(false) )
+	{
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
+		return asMODULE_IS_IN_USE;
+	}
+
 	// Only one thread may build at one time
 	// TODO: It should be possible to have multiple threads perform compilations
 	int r = engine->RequestBuild();
@@ -218,7 +336,7 @@ int asCModule::Build()
 		return asINVALID_CONFIGURATION;
 	}
 
- 	InternalReset();
+	InternalReset();
 
 	if( !builder )
 	{
@@ -306,8 +424,8 @@ int asCModule::CallInit(asIScriptContext *myCtx)
 		{
 			if( ctx == 0 )
 			{
-				r = engine->CreateContext(&ctx, true);
-				if( r < 0 )
+				ctx = engine->RequestContext();
+				if( ctx == 0 )
 					break;
 			}
 
@@ -346,7 +464,7 @@ int asCModule::CallInit(asIScriptContext *myCtx)
 
 	if( ctx && !myCtx )
 	{
-		ctx->Release();
+		engine->ReturnContext(ctx);
 		ctx = 0;
 	}
 
@@ -401,33 +519,98 @@ void asCModule::CallExit()
 	isGlobalVarInitialized = false;
 }
 
+// internal
+bool asCModule::HasExternalReferences(bool shuttingDown)
+{
+	// Check all entiteis in the module for any external references.
+	// If there are any external references the module cannot be deleted yet.
+	
+	for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
+		if( scriptFunctions[n] && scriptFunctions[n]->externalRefCount.get() )
+		{
+			if( !shuttingDown )
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, scriptFunctions[n]->GetName(), scriptFunctions[n]->GetFuncType());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+
+	for( asUINT n = 0; n < classTypes.GetLength(); n++ )
+		if( classTypes[n] && classTypes[n]->externalRefCount.get() )
+		{
+			if( !shuttingDown )
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, classTypes[n]->GetName());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+
+	for( asUINT n = 0; n < funcDefs.GetLength(); n++ )
+		if( funcDefs[n] && funcDefs[n]->externalRefCount.get() )
+		{
+			if( !shuttingDown )
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, funcDefs[n]->GetName(), funcDefs[n]->GetFuncType());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+
+	for( asUINT n = 0; n < templateInstances.GetLength(); n++ )
+		if( templateInstances[n] && templateInstances[n]->externalRefCount.get() )
+		{
+			if( !shuttingDown )
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, templateInstances[n]->GetName());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+
+	return false;
+}
+
 // internal
 void asCModule::InternalReset()
 {
 	CallExit();
 
-	size_t n;
+	asUINT n;
 
-	// Release all global functions
-	asCSymbolTable<asCScriptFunction>::iterator funcIt = globalFunctions.List();
-	for( ; funcIt; funcIt++ )
-		(*funcIt)->Release();
+	// Remove all global functions
 	globalFunctions.Clear();
 
-	// First release all compiled functions
-	for( n = 0; n < scriptFunctions.GetLength(); n++ )
-		if( scriptFunctions[n] )
-			scriptFunctions[n]->Orphan(this);
-	scriptFunctions.SetLength(0);
-
-	// Release the global properties declared in the module
+	// Destroy the internals of the global properties here, but do not yet remove them from the 
+	// engine, because functions need the engine's varAddressMap to get to the property. If the
+	// property is removed already, it may leak as the refCount doesn't reach 0.
 	asCSymbolTableIterator<asCGlobalProperty> globIt = scriptGlobals.List();
 	while( globIt )
 	{
-		(*globIt)->Orphan(this);
+		(*globIt)->DestroyInternal();
 		globIt++;
 	}
-	scriptGlobals.Clear();
 
 	UnbindAllImportedFunctions();
 
@@ -436,39 +619,156 @@ void asCModule::InternalReset()
 	{
 		if( bindInformations[n] )
 		{
-			asUINT id = bindInformations[n]->importedFunctionSignature->id & ~FUNC_IMPORTED;
-			engine->importedFunctions[id] = 0;
-			engine->freeImportedFunctionIdxs.PushLast(id);
+			bindInformations[n]->importedFunctionSignature->ReleaseInternal();
 
-			asDELETE(bindInformations[n]->importedFunctionSignature, asCScriptFunction);
 			asDELETE(bindInformations[n], sBindInfo);
 		}
 	}
 	bindInformations.SetLength(0);
 
 	// Free declared types, including classes, typedefs, and enums
-	// TODO: optimize: Check if it is possible to destroy the object directly without notifying the GC
+	for( n = 0; n < templateInstances.GetLength(); n++ )
+	{
+		asCObjectType *type = templateInstances[n];
+		if( engine->FindNewOwnerForSharedType(type, this) != this )
+		{
+			// The type is owned by another module, just release our reference
+			type->ReleaseInternal();
+			continue;
+		}
+
+		// Orphan the template instance
+		type->module = 0;
+
+		// No other module is holding the template type
+		engine->RemoveTemplateInstanceType(type);
+		type->ReleaseInternal();
+	}
+	templateInstances.SetLength(0);
 	for( n = 0; n < classTypes.GetLength(); n++ )
-		classTypes[n]->Orphan(this);
+	{
+		asCObjectType *type = classTypes[n];
+		if( type->IsShared() )
+		{
+			// The type is shared, so transfer ownership to another module that also uses it
+			if( engine->FindNewOwnerForSharedType(type, this) != this )
+			{
+				// The type is owned by another module, just release our reference
+				type->ReleaseInternal();
+				continue;
+			}
+		}
+
+		// The type should be destroyed now
+		type->DestroyInternal();
+
+		// Remove the type from the engine
+		if( type->IsShared() )
+		{
+			engine->sharedScriptTypes.RemoveValue(type);
+			type->ReleaseInternal();
+		}
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
 	classTypes.SetLength(0);
 	for( n = 0; n < enumTypes.GetLength(); n++ )
-		enumTypes[n]->Release();
+	{
+		asCObjectType *type = enumTypes[n];
+		if( type->IsShared() )
+		{
+			// The type is shared, so transfer ownership to another module that also uses it
+			if( engine->FindNewOwnerForSharedType(type, this) != this )
+			{
+				// The type is owned by another module, just release our reference
+				type->ReleaseInternal();
+				continue;
+			}
+		}
+
+		// The type should be destroyed now
+		type->DestroyInternal();
+
+		// Remove the type from the engine
+		if( type->IsShared() )
+		{
+			engine->sharedScriptTypes.RemoveValue(type);
+			type->ReleaseInternal();
+		}
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
 	enumTypes.SetLength(0);
 	for( n = 0; n < typeDefs.GetLength(); n++ )
-		typeDefs[n]->Release();
+	{
+		asCObjectType *type = typeDefs[n];
+
+		// The type should be destroyed now
+		type->DestroyInternal();
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
 	typeDefs.SetLength(0);
 
 	// Free funcdefs
 	for( n = 0; n < funcDefs.GetLength(); n++ )
 	{
-		// The funcdefs are not removed from the engine at this moment as they may still be referred
-		// to by other types. The engine's ClearUnusedTypes will take care of the clean up.
-		funcDefs[n]->Release();
+		asCScriptFunction *func = funcDefs[n];
+		if( func->IsShared() )
+		{
+			// The func is shared, so transfer ownership to another module that also uses it
+			if( engine->FindNewOwnerForSharedFunc(func, this) != this )
+			{
+				// The func is owned by another module, just release our reference
+				func->ReleaseInternal();
+				continue;
+			}
+		}
+
+		func->DestroyInternal();
+		engine->RemoveFuncdef(func);
+		func->module = 0;
+		func->ReleaseInternal();
 	}
 	funcDefs.SetLength(0);
 
-	// Allow the engine to clean up what is not used
-	engine->CleanupAfterDiscardModule();
+	// Then release the functions
+	for( n = 0; n < scriptFunctions.GetLength(); n++ )
+	{
+		asCScriptFunction *func = scriptFunctions[n];
+		if( func->IsShared() )
+		{
+			// The func is shared, so transfer ownership to another module that also uses it
+			if( engine->FindNewOwnerForSharedFunc(func, this) != this )
+			{
+				// The func is owned by another module, just release our reference
+				func->ReleaseInternal();
+				continue;
+			}
+		}
+
+		func->DestroyInternal();
+		func->module = 0;
+		func->ReleaseInternal();
+	}
+	scriptFunctions.SetLength(0);
+
+	// Now remove and release the global properties as there are no more references to them
+	globIt = scriptGlobals.List();
+	while( globIt )
+	{
+		engine->RemoveGlobalProperty(*globIt);
+		asASSERT( (*globIt)->refCount.get() == 1 );
+		(*globIt)->Release();
+		globIt++;
+	}
+	scriptGlobals.Clear();
 
 	asASSERT( IsEmpty() );
 }
@@ -476,12 +776,22 @@ void asCModule::InternalReset()
 // interface
 asIScriptFunction *asCModule::GetFunctionByName(const char *name) const
 {
-	const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(defaultNamespace, name);
-	if( idxs.GetLength() != 1 )
-		return 0;
+	asSNameSpace *ns = defaultNamespace;
+	while( ns )
+	{
+		const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(ns, name);
+		if( idxs.GetLength() != 1 )
+			return 0;
 
-	const asIScriptFunction *func = globalFunctions.Get(idxs[0]);
-	return const_cast<asIScriptFunction*>(func);
+		const asIScriptFunction *func = globalFunctions.Get(idxs[0]);
+		if( func )
+			return const_cast<asIScriptFunction*>(func);
+
+		// Recursively search parent namespaces
+		ns = engine->GetParentNameSpace(ns);
+	}
+
+	return 0;
 }
 
 // interface
@@ -562,38 +872,49 @@ asIScriptFunction *asCModule::GetFunctionByDecl(const char *decl) const
 	asSNameSpace *ns = func.nameSpace == engine->nameSpaces[0] ? defaultNamespace : func.nameSpace;
 
 	// Search script functions for matching interface
-	asIScriptFunction *f = 0;
-	const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(ns, func.name);
-	for( unsigned int n = 0; n < idxs.GetLength(); n++ )
+	while( ns )
 	{
-		const asCScriptFunction *funcPtr = globalFunctions.Get(idxs[n]);
-		if( funcPtr->objectType == 0 &&
-			func.returnType                 == funcPtr->returnType &&
-			func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
-			)
+		asIScriptFunction *f = 0;
+		const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(ns, func.name);
+		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
 		{
-			bool match = true;
-			for( size_t p = 0; p < func.parameterTypes.GetLength(); ++p )
+			const asCScriptFunction *funcPtr = globalFunctions.Get(idxs[n]);
+			if( funcPtr->objectType == 0 &&
+				func.returnType                 == funcPtr->returnType &&
+				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
+				)
 			{
-				if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+				bool match = true;
+				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
 				{
-					match = false;
-					break;
+					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if( match )
+				{
+					if( f == 0 )
+						f = const_cast<asCScriptFunction*>(funcPtr);
+					else
+						// Multiple functions
+						return 0;
 				}
 			}
+		}
 
-			if( match )
-			{
-				if( f == 0 )
-					f = const_cast<asCScriptFunction*>(funcPtr);
-				else
-					// Multiple functions
-					return 0;
-			}
+		if( f )
+			return f;
+		else
+		{
+			// Search for matching functions in the parent namespace
+			ns = engine->GetParentNameSpace(ns);
 		}
 	}
 
-	return f;
+	return 0;
 }
 
 // interface
@@ -605,21 +926,41 @@ asUINT asCModule::GetGlobalVarCount() const
 // interface
 int asCModule::GetGlobalVarIndexByName(const char *name) const
 {
+	asSNameSpace *ns = defaultNamespace;
+
 	// Find the global var id
-	int id = scriptGlobals.GetFirstIndex(defaultNamespace, name);
+	while( ns )
+	{
+		int id = scriptGlobals.GetFirstIndex(ns, name);
+		if( id >= 0 ) return id;
 
-	if( id == -1 ) return asNO_GLOBAL_VAR;
+		// Recursively search parent namespaces
+		ns = engine->GetParentNameSpace(ns);
+	}
 
-	return id;
+	return asNO_GLOBAL_VAR;
 }
 
 // interface
 int asCModule::RemoveGlobalVar(asUINT index)
 {
+	// TODO: 2.30.0: redesign: Before removing the variable, clear it to free the object
+	//                         The property shouldn't be orphaned.
+
 	asCGlobalProperty *prop = scriptGlobals.Get(index);
 	if( !prop )
 		return asINVALID_ARG;
-	prop->Orphan(this);
+
+	// Destroy the internal of the global variable (removes the initialization function)
+	prop->DestroyInternal();
+
+	// Check if the module is the only one referring to the module, if so remove it from the engine too
+	// If the property is not removed now, it will be removed later when the module is discarded
+	if( prop->refCount.get() == 2 )
+		engine->RemoveGlobalProperty(prop);
+
+	// Remove the global variable from the module
+	prop->Release();
 	scriptGlobals.Erase(index);
 
 	return 0;
@@ -641,9 +982,15 @@ int asCModule::GetGlobalVarIndexByDecl(const char *decl) const
 		return r;
 
 	// Search global variables for a match
-	int id = scriptGlobals.GetFirstIndex(nameSpace, name, asCCompGlobPropType(dt));
-	if( id != -1 )
-		return id;
+	while( nameSpace )
+	{
+		int id = scriptGlobals.GetFirstIndex(nameSpace, name, asCCompGlobPropType(dt));
+		if( id != -1 )
+			return id;
+
+		// Recursively search parent namespace
+		nameSpace = engine->GetParentNameSpace(nameSpace);
+	}
 
 	return asNO_GLOBAL_VAR;
 }
@@ -670,9 +1017,9 @@ const char *asCModule::GetGlobalVarDeclaration(asUINT index, bool includeNamespa
 	if (!prop) return 0;
 
 	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = prop->type.Format();
+	*tempString = prop->type.Format(defaultNamespace);
 	*tempString += " ";
-	if( includeNamespace )
+	if( includeNamespace && prop->nameSpace->name != "" )
 		*tempString += prop->nameSpace->name + "::";
 	*tempString += prop->name;
 
@@ -715,12 +1062,19 @@ asIObjectType *asCModule::GetObjectTypeByIndex(asUINT index) const
 // interface
 asIObjectType *asCModule::GetObjectTypeByName(const char *name) const
 {
-	for( asUINT n = 0; n < classTypes.GetLength(); n++ )
+	asSNameSpace *ns = defaultNamespace;
+	while( ns )
 	{
-		if( classTypes[n] &&
-			classTypes[n]->name == name &&
-			classTypes[n]->nameSpace == defaultNamespace )
-			return classTypes[n];
+		for( asUINT n = 0; n < classTypes.GetLength(); n++ )
+		{
+			if( classTypes[n] &&
+				classTypes[n]->name == name &&
+				classTypes[n]->nameSpace == ns )
+				return classTypes[n];
+		}
+
+		// Recursively search parent namespace
+		ns = engine->GetParentNameSpace(ns);
 	}
 
 	return 0;
@@ -744,6 +1098,24 @@ int asCModule::GetTypeIdByDecl(const char *decl) const
 	return engine->GetTypeIdFromDataType(dt);
 }
 
+// interface
+asIObjectType *asCModule::GetObjectTypeByDecl(const char *decl) const
+{
+	asCDataType dt;
+
+	// This const cast is safe since we know the engine won't be modified
+	asCBuilder bld(engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
+	if( r < 0 )
+		return 0;
+
+	return dt.GetObjectType();
+}
+
 // interface
 asUINT asCModule::GetEnumCount() const
 {
@@ -827,7 +1199,7 @@ int asCModule::GetNextImportedFunctionId()
 
 #ifndef AS_NO_COMPILER
 // internal
-int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType, bool isConstMethod, bool isGlobalFunction, bool isPrivate, bool isFinal, bool isOverride, bool isShared, asSNameSpace *ns)
+int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType, bool isConstMethod, bool isGlobalFunction, bool isPrivate, bool isProtected, bool isFinal, bool isOverride, bool isShared, asSNameSpace *ns)
 {
 	asASSERT(id >= 0);
 
@@ -860,11 +1232,15 @@ int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const a
 		func->scriptData->declaredAt = declaredAt;
 	}
 	func->parameterTypes   = params;
+	func->parameterNames   = paramNames;
 	func->inOutFlags       = inOutFlags;
 	func->defaultArgs      = defaultArgs;
 	func->objectType       = objType;
+	if( objType )
+		objType->AddRefInternal();
 	func->isReadOnly       = isConstMethod;
 	func->isPrivate        = isPrivate;
+	func->isProtected      = isProtected;
 	func->isFinal          = isFinal;
 	func->isOverride       = isOverride;
 	func->isShared         = isShared;
@@ -875,9 +1251,9 @@ int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const a
 	asASSERT( !(!objType && isFinal) );
 	asASSERT( !(!objType && isOverride) );
 
-	// The script function's refCount was initialized to 1
+	// The internal ref count was already set by the constructor
 	scriptFunctions.PushLast(func);
-	engine->SetScriptFunction(func);
+	engine->AddScriptFunction(func);
 
 	// Compute the signature id
 	if( objType )
@@ -885,10 +1261,7 @@ int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const a
 
 	// Add reference
 	if( isGlobalFunction )
-	{
 		globalFunctions.Put(func);
-		func->AddRef();
-	}
 
 	return 0;
 }
@@ -897,8 +1270,8 @@ int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const a
 int asCModule::AddScriptFunction(asCScriptFunction *func)
 {
 	scriptFunctions.PushLast(func);
-	func->AddRef();
-	engine->SetScriptFunction(func);
+	func->AddRefInternal();
+	engine->AddScriptFunction(func);
 
 	return 0;
 }
@@ -982,14 +1355,14 @@ int asCModule::BindImportedFunction(asUINT index, asIScriptFunction *func)
 	if( dst->parameterTypes.GetLength() != src->parameterTypes.GetLength() )
 		return asINVALID_INTERFACE;
 
-	for( size_t n = 0; n < dst->parameterTypes.GetLength(); ++n )
+	for( asUINT n = 0; n < dst->parameterTypes.GetLength(); ++n )
 	{
 		if( dst->parameterTypes[n] != src->parameterTypes[n] )
 			return asINVALID_INTERFACE;
 	}
 
 	bindInformations[index]->boundFunctionId = src->GetId();
-	src->AddRef();
+	src->AddRefInternal();
 
 	return asSUCCESS;
 }
@@ -1007,7 +1380,7 @@ int asCModule::UnbindImportedFunction(asUINT index)
 		if( oldFuncID != -1 )
 		{
 			bindInformations[index]->boundFunctionId = -1;
-			engine->scriptFunctions[oldFuncID]->Release();
+			engine->scriptFunctions[oldFuncID]->ReleaseInternal();
 		}
 	}
 
@@ -1047,7 +1420,7 @@ int asCModule::BindAllImportedFunctions()
 		asCScriptFunction *importFunc = GetImportedFunction(n);
 		if( importFunc == 0 ) return asERROR;
 
-		asCString str = importFunc->GetDeclarationStr();
+		asCString str = importFunc->GetDeclarationStr(false, true);
 
 		// Get module name from where the function should be imported
 		const char *moduleName = GetImportedFunctionSourceModule(n);
@@ -1086,7 +1459,7 @@ int asCModule::UnbindAllImportedFunctions()
 // internal
 asCObjectType *asCModule::GetObjectType(const char *type, asSNameSpace *ns)
 {
-	size_t n;
+	asUINT n;
 
 	// TODO: optimize: Improve linear search
 	for( n = 0; n < classTypes.GetLength(); n++ )
@@ -1121,8 +1494,9 @@ asCGlobalProperty *asCModule::AllocateGlobalProperty(const char *name, const asC
 	// Make an entry in the address to variable map
 	engine->varAddressMap.Insert(prop->GetAddressOfValue(), prop);
 
-	// Store the variable in the module scope (the reference count is already set to 1)
+	// Store the variable in the module scope
 	scriptGlobals.Put(prop);
+	prop->AddRef();
 
 	return prop;
 }
@@ -1166,6 +1540,14 @@ int asCModule::LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped)
 {
 	if( in == 0 ) return asINVALID_ARG;
 
+	// Don't allow the module to be rebuilt if there are still 
+	// external references that will need the previous code
+	if( HasExternalReferences(false) )
+	{
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
+		return asMODULE_IS_IN_USE;
+	}
+
 	// Only permit loading bytecode if no other thread is currently compiling
 	// TODO: It should be possible to have multiple threads perform compilations
 	int r = engine->RequestBuild();
@@ -1302,14 +1684,14 @@ int asCModule::CompileFunction(const char *sectionName, const char *code, int li
 
 	if( r >= 0 && outFunc && func )
 	{
-		// Return the function to the caller
+		// Return the function to the caller and add an external reference
 		*outFunc = func;
 		func->AddRef();
 	}
 
 	// Release our reference to the function
 	if( func )
-		func->Release();
+		func->ReleaseInternal();
 
 	return r;
 #endif
@@ -1318,15 +1700,24 @@ int asCModule::CompileFunction(const char *sectionName, const char *code, int li
 // interface
 int asCModule::RemoveFunction(asIScriptFunction *func)
 {
+	// TODO: 2.30.0: redesign: Check if there are any references before removing the function
+	//                         if there are, just hide it from the visible but do not destroy or 
+	//                         remove it from the module.
+	//
+	//                         Only if the function has no live references, nor internal references
+	//                         can it be immediately removed, and its internal references released.
+	//
+	//                         Check if any previously hidden functions are without references,
+	//                         if so they should removed too.
+
 	// Find the global function
 	asCScriptFunction *f = static_cast<asCScriptFunction*>(func);
 	int idx = globalFunctions.GetIndex(f);
 	if( idx >= 0 )
 	{
 		globalFunctions.Erase(idx);
-		f->Release();
 		scriptFunctions.RemoveValue(f);
-		f->Orphan(this);
+		f->ReleaseInternal();
 		return 0;
 	}
 
@@ -1348,7 +1739,7 @@ int asCModule::AddFuncDef(const asCString &name, asSNameSpace *ns)
 
 	engine->funcDefs.PushLast(func);
 	func->id = engine->GetNextScriptFunctionId();
-	engine->SetScriptFunction(func);
+	engine->AddScriptFunction(func);
 
 	return (int)funcDefs.GetLength()-1;
 }
diff --git a/lib/angelscript/source/as_module.h b/lib/angelscript/source/as_module.h
index 6023052ad..22ad598d4 100644
--- a/lib/angelscript/source/as_module.h
+++ b/lib/angelscript/source/as_module.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -132,6 +132,7 @@ public:
 	virtual asUINT         GetObjectTypeCount() const;
 	virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const;
 	virtual asIObjectType *GetObjectTypeByName(const char *name) const;
+	virtual asIObjectType *GetObjectTypeByDecl(const char *decl) const;
 	virtual int            GetTypeIdByDecl(const char *decl) const;
 
 	// Enums
@@ -159,8 +160,8 @@ public:
 	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped);
 
 	// User data
-	virtual void *SetUserData(void *data);
-	virtual void *GetUserData() const;
+	virtual void *SetUserData(void *data, asPWORD type);
+	virtual void *GetUserData(asPWORD type) const;
 
 //-----------------------------------------------
 // Internal
@@ -177,6 +178,7 @@ public:
 
 	void InternalReset();
 	bool IsEmpty() const;
+	bool HasExternalReferences(bool shuttingDown);
 
 	int  CallInit(asIScriptContext *ctx);
 	void CallExit();
@@ -184,7 +186,7 @@ public:
 	void JITCompile();
 
 #ifndef AS_NO_COMPILER
-	int  AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType = 0, bool isConstMethod = false, bool isGlobalFunction = false, bool isPrivate = false, bool isFinal = false, bool isOverride = false, bool isShared = false, asSNameSpace *ns = 0);
+	int  AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType = 0, bool isConstMethod = false, bool isGlobalFunction = false, bool isPrivate = false, bool isProtected = false, bool isFinal = false, bool isOverride = false, bool isShared = false, asSNameSpace *ns = 0);
 	int  AddScriptFunction(asCScriptFunction *func);
 	int  AddImportedFunction(int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, asSNameSpace *ns, const asCString &moduleName);
 	int  AddFuncDef(const asCString &name, asSNameSpace *ns);
@@ -197,31 +199,35 @@ public:
 
 	asCString name;
 
-	asCScriptEngine *engine;
-	asCBuilder      *builder;
-	void            *userData;
-	asDWORD          accessMask;
-	asSNameSpace    *defaultNamespace;
+	asCScriptEngine  *engine;
+	asCBuilder       *builder;
+	asCArray<asPWORD> userData;
+	asDWORD           accessMask;
+	asSNameSpace     *defaultNamespace;
 
-	// This array holds all functions, class members, factories, etc that were compiled with the module
-	asCArray<asCScriptFunction *>     scriptFunctions;
-	// This array holds global functions declared in the module
-	asCSymbolTable<asCScriptFunction> globalFunctions;
-	// This array holds imported functions in the module
-	asCArray<sBindInfo *>             bindInformations;
+	// This array holds all functions, class members, factories, etc that were compiled with the module.
+	// These references hold an internal reference to the function object.
+	asCArray<asCScriptFunction *>     scriptFunctions; // increases ref count
+	// This array holds global functions declared in the module. These references are not counted, 
+	// as the same pointer is always present in the scriptFunctions array too.
+	asCSymbolTable<asCScriptFunction> globalFunctions; // doesn't increase ref count
+	// This array holds imported functions in the module.
+	asCArray<sBindInfo *>             bindInformations; // increases ref count
+	// This array holds template instance types created for the module's object types
+	asCArray<asCObjectType*>          templateInstances; // increases ref count
 
 	// This array holds the global variables declared in the script
-	asCSymbolTable<asCGlobalProperty> scriptGlobals;
+	asCSymbolTable<asCGlobalProperty> scriptGlobals; // increases ref count
 	bool                              isGlobalVarInitialized;
 
 	// This array holds class and interface types
-	asCArray<asCObjectType*>       classTypes;
+	asCArray<asCObjectType*>       classTypes; // increases ref count
 	// This array holds enum types
-	asCArray<asCObjectType*>       enumTypes;
+	asCArray<asCObjectType*>       enumTypes; // increases ref count
 	// This array holds typedefs
-	asCArray<asCObjectType*>       typeDefs;
+	asCArray<asCObjectType*>       typeDefs; // increases ref count
 	// This array holds the funcdefs declared in the module
-	asCArray<asCScriptFunction*>   funcDefs;
+	asCArray<asCScriptFunction*>   funcDefs; // increases ref count
 };
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_namespace.h b/lib/angelscript/source/as_namespace.h
index 9cb6ed990..ae384e7aa 100644
--- a/lib/angelscript/source/as_namespace.h
+++ b/lib/angelscript/source/as_namespace.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2013 Andreas Jonsson
+   Copyright (c) 2013-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -73,4 +73,5 @@ struct asSNameSpaceNamePair
 
 END_AS_NAMESPACE
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/lib/angelscript/source/as_objecttype.cpp b/lib/angelscript/source/as_objecttype.cpp
index 3646b122b..92ceaece3 100644
--- a/lib/angelscript/source/as_objecttype.cpp
+++ b/lib/angelscript/source/as_objecttype.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -45,140 +45,95 @@
 
 BEGIN_AS_NAMESPACE
 
-#ifdef AS_MAX_PORTABILITY
-
-static void ObjectType_AddRef_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	self->AddRef();
-}
-
-static void ObjectType_Release_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	self->Release();
-}
-
-static void ObjectType_GetRefCount_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void ObjectType_SetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	self->SetGCFlag();
-}
-
-static void ObjectType_GetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetGCFlag();
-}
-
-static void ObjectType_EnumReferences_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ObjectType_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *self = (asCObjectType*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-#endif
-
-
-void RegisterObjectTypeGCBehaviours(asCScriptEngine *engine)
-{
-	// Register the gc behaviours for the object types
-	int r = 0;
-	UNUSED_VAR(r); // It is only used in debug mode
-	engine->objectTypeBehaviours.engine = engine;
-	engine->objectTypeBehaviours.flags = asOBJ_REF | asOBJ_GC;
-	engine->objectTypeBehaviours.name = "_builtin_objecttype_";
-#ifndef AS_MAX_PORTABILITY
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCObjectType,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCObjectType,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCObjectType,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCObjectType,SetGCFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCObjectType,GetGCFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCObjectType,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCObjectType,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-#else
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ObjectType_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ObjectType_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ObjectType_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ObjectType_SetGCFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ObjectType_GetGCFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ObjectType_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->objectTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ObjectType_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-#endif
-}
-
 asCObjectType::asCObjectType() 
 {
-	engine = 0; 
-	module = 0;
-	refCount.set(0); 
+	externalRefCount.set(0); 
+	internalRefCount.set(1); // start with one internal ref-count
+	engine      = 0; 
+	module      = 0;
 	derivedFrom = 0;
+	size        = 0;
 
 	acceptValueSubType = true;
-	acceptRefSubType = true;
+	acceptRefSubType   = true;
+
+	scriptSectionIdx = -1;
+	declaredAt       = 0;
 
 	accessMask = 0xFFFFFFFF;
-	nameSpace = 0;
+	nameSpace  = 0;
+#ifdef WIP_16BYTE_ALIGN
+	alignment  = 4;
+#endif
 }
 
 asCObjectType::asCObjectType(asCScriptEngine *engine) 
 {
+	externalRefCount.set(0); 
+	internalRefCount.set(1); // start with one internal ref count
 	this->engine = engine; 
-	module = 0;
-	refCount.set(0); 
+	module       = 0;
 	derivedFrom  = 0;
 
 	acceptValueSubType = true;
-	acceptRefSubType = true;
+	acceptRefSubType   = true;
+
+	scriptSectionIdx = -1;
+	declaredAt       = 0;
 
 	accessMask = 0xFFFFFFFF;
-	nameSpace = engine->nameSpaces[0];
+	nameSpace  = engine->nameSpaces[0];
+#ifdef WIP_16BYTE_ALIGN
+	alignment  = 4;
+#endif
 }
 
 int asCObjectType::AddRef() const
 {
-	gcFlag = false;
-	return refCount.atomicInc();
+	return externalRefCount.atomicInc();
 }
 
 int asCObjectType::Release() const
 {
-	gcFlag = false;
-	return refCount.atomicDec();
-}
+	int r = externalRefCount.atomicDec();
 
-void asCObjectType::Orphan(asCModule *mod)
-{
-	if( mod && mod == module )
+	if( r == 0 )
 	{
-		module = 0;
-		if( flags & asOBJ_SCRIPT_OBJECT )
+		// There are no more external references, if there are also no
+		// internal references then it is time to delete the object type
+		if( internalRefCount.get() == 0 )
 		{
-			// Tell the GC that this type exists so it can resolve potential circular references
-			engine->gc.AddScriptObjectToGC(this, &engine->objectTypeBehaviours);
-
-			// It's necessary to orphan the template instance types that refer to this object type,
-			// otherwise the garbage collector cannot identify the circular references that involve 
-			// the type and the template type
-			engine->OrphanTemplateInstances(this);
+			// If the engine is no longer set, then it has already been 
+			// released and we must take care of the deletion ourselves
+			asDELETE(const_cast<asCObjectType*>(this), asCObjectType);
 		}
 	}
 
-	Release();
+	return r;
+}
+
+int asCObjectType::AddRefInternal()
+{
+	return internalRefCount.atomicInc();
+}
+
+int asCObjectType::ReleaseInternal()
+{
+	int r = internalRefCount.atomicDec();
+
+	if( r == 0 )
+	{
+		// There are no more internal references, if there are also no
+		// external references then it is time to delete the object type
+		if( externalRefCount.get() == 0 )
+		{
+			// If the engine is no longer set, then it has already been 
+			// released and we must take care of the deletion ourselves
+			asDELETE(const_cast<asCObjectType*>(this), asCObjectType);
+		}
+	}
+
+	return r;
 }
 
 // interface
@@ -237,36 +192,29 @@ void *asCObjectType::GetUserData(asPWORD type) const
 	return 0;
 }
 
-int asCObjectType::GetRefCount()
+void asCObjectType::DestroyInternal()
 {
-	return refCount.get();
-}
+	if( engine == 0 ) return;
 
-bool asCObjectType::GetGCFlag()
-{
-	return gcFlag;
-}
-
-void asCObjectType::SetGCFlag()
-{
-	gcFlag = true;
-}
-
-asCObjectType::~asCObjectType()
-{
 	// Skip this for list patterns as they do not increase the references
 	if( flags & asOBJ_LIST_PATTERN )
+	{
+		// Clear the engine pointer to mark the object type as invalid
+		engine = 0;
 		return;
+	}
 
 	// Release the object types held by the templateSubTypes
 	for( asUINT subtypeIndex = 0; subtypeIndex < templateSubTypes.GetLength(); subtypeIndex++ )
 	{
 		if( templateSubTypes[subtypeIndex].GetObjectType() )
-			templateSubTypes[subtypeIndex].GetObjectType()->Release();
+			templateSubTypes[subtypeIndex].GetObjectType()->ReleaseInternal();
 	}
+	templateSubTypes.SetLength(0);
 
 	if( derivedFrom )
-		derivedFrom->Release();
+		derivedFrom->ReleaseInternal();
+	derivedFrom = 0;
 
 	ReleaseAllProperties();
 
@@ -290,6 +238,22 @@ asCObjectType::~asCObjectType()
 					engine->cleanObjectTypeFuncs[c].cleanFunc(this);
 		}
 	}
+	userData.SetLength(0);
+
+	// Remove the type from the engine
+	engine->RemoveFromTypeIdMap(this);
+
+	// Clear the engine pointer to mark the object type as invalid
+	engine = 0;
+}
+
+asCObjectType::~asCObjectType()
+{
+	if( engine == 0 )
+		return;
+
+	// TODO: 2.30.0: redesign: Shouldn't this have been done already?
+	DestroyInternal();
 }
 
 // interface
@@ -369,30 +333,23 @@ int asCObjectType::GetTypeId() const
 // interface
 int asCObjectType::GetSubTypeId(asUINT subtypeIndex) const
 {
-	if( flags & asOBJ_TEMPLATE )
-	{
-		if( subtypeIndex >= templateSubTypes.GetLength() )
-			return asINVALID_ARG;
+	// This method is only supported for templates and template specializations
+	if( templateSubTypes.GetLength() == 0 )
+		return asERROR;
 
-		return engine->GetTypeIdFromDataType(templateSubTypes[subtypeIndex]);
-	}
+	if( subtypeIndex >= templateSubTypes.GetLength() )
+		return asINVALID_ARG;
 
-	// Only template types have sub types
-	return asERROR;
+	return engine->GetTypeIdFromDataType(templateSubTypes[subtypeIndex]);
 }
 
 // interface
 asIObjectType *asCObjectType::GetSubType(asUINT subtypeIndex) const
 {
-	if( flags & asOBJ_TEMPLATE )
-	{
-		if( subtypeIndex >= templateSubTypes.GetLength() )
-			return 0;
+	if( subtypeIndex >= templateSubTypes.GetLength() )
+		return 0;
 
-		return templateSubTypes[subtypeIndex].GetObjectType();
-	}
-
-	return 0;
+	return templateSubTypes[subtypeIndex].GetObjectType();
 }
 
 asUINT asCObjectType::GetSubTypeCount() const
@@ -475,7 +432,7 @@ asIScriptFunction *asCObjectType::GetMethodByIndex(asUINT index, bool getVirtual
 asIScriptFunction *asCObjectType::GetMethodByName(const char *name, bool getVirtual) const
 {
 	int id = -1;
-	for( size_t n = 0; n < methods.GetLength(); n++ )
+	for( asUINT n = 0; n < methods.GetLength(); n++ )
 	{
 		if( engine->scriptFunctions[methods[n]]->name == name )
 		{
@@ -532,23 +489,26 @@ asUINT asCObjectType::GetPropertyCount() const
 }
 
 // interface
-int asCObjectType::GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, int *offset, bool *isReference, asDWORD *accessMask) const
+int asCObjectType::GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask) const
 {
 	if( index >= properties.GetLength() )
 		return asINVALID_ARG;
 
+	asCObjectProperty *prop = properties[index];
 	if( name )
-		*name = properties[index]->name.AddressOf();
+		*name = prop->name.AddressOf();
 	if( typeId )
-		*typeId = engine->GetTypeIdFromDataType(properties[index]->type);
+		*typeId = engine->GetTypeIdFromDataType(prop->type);
 	if( isPrivate )
-		*isPrivate = properties[index]->isPrivate;
+		*isPrivate = prop->isPrivate;
+	if( isProtected )
+		*isProtected = prop->isProtected;
 	if( offset )
-		*offset = properties[index]->byteOffset;
+		*offset = prop->byteOffset;
 	if( isReference )
-		*isReference = properties[index]->type.IsReference();
+		*isReference = prop->type.IsReference();
 	if( accessMask )
-		*accessMask = properties[index]->accessMask;
+		*accessMask = prop->accessMask;
 
 	return 0;
 }
@@ -562,9 +522,11 @@ const char *asCObjectType::GetPropertyDeclaration(asUINT index, bool includeName
 	asCString *tempString = &asCThreadManager::GetLocalData()->string;
 	if( properties[index]->isPrivate )
 		*tempString = "private ";
+	else if( properties[index]->isProtected )
+		*tempString = "protected ";
 	else
 		*tempString = "";
-	*tempString += properties[index]->type.Format(includeNamespace);
+	*tempString += properties[index]->type.Format(nameSpace, includeNamespace);
 	*tempString += " ";
 	*tempString += properties[index]->name;
 
@@ -596,7 +558,6 @@ asUINT asCObjectType::GetBehaviourCount() const
 	// For reference types, the factories are also stored in the constructor
 	// list, so it is sufficient to enumerate only those
 	count += (asUINT)beh.constructors.GetLength();
-	count += (asUINT)beh.operators.GetLength() / 2;
 
 	return count;
 }
@@ -689,14 +650,6 @@ asIScriptFunction *asCObjectType::GetBehaviourByIndex(asUINT index, asEBehaviour
 	else 
 		count += (asUINT)beh.constructors.GetLength();
 
-	if( index - count < beh.operators.GetLength() / 2 )
-	{
-		index = 2*(index - count);
-
-		if( outBehaviour ) *outBehaviour = static_cast<asEBehaviours>(beh.operators[index]);
-		return engine->scriptFunctions[beh.operators[index + 1]];
-	}
-
 	return 0;
 }
 
@@ -717,10 +670,10 @@ asDWORD asCObjectType::GetAccessMask() const
 }
 
 // internal
-asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate)
+asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited)
 {
 	asASSERT( flags & asOBJ_SCRIPT_OBJECT );
-	asASSERT( dt.CanBeInstanciated() );
+	asASSERT( dt.CanBeInstantiated() );
 	asASSERT( !IsInterface() );
 
 	// Store the properties in the object type descriptor
@@ -731,9 +684,11 @@ asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &name, cons
 		return 0;
 	}
 
-	prop->name      = name;
-	prop->type      = dt;
-	prop->isPrivate = isPrivate;
+	prop->name        = name;
+	prop->type        = dt;
+	prop->isPrivate   = isPrivate;
+	prop->isProtected = isProtected;
+	prop->isInherited = isInherited;
 
 	int propSize;
 	if( dt.IsObject() )
@@ -755,8 +710,19 @@ asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &name, cons
 		propSize = dt.GetSizeInMemoryBytes();
 
 	// Add extra bytes so that the property will be properly aligned
+#ifndef WIP_16BYTE_ALIGN
 	if( propSize == 2 && (size & 1) ) size += 1;
 	if( propSize > 2 && (size & 3) ) size += 4 - (size & 3);
+#else
+	asUINT alignment = dt.GetAlignment();
+	const asUINT propSizeAlignmentDifference = size & (alignment-1);
+	if( propSizeAlignmentDifference != 0 )
+	{
+		size += (alignment - propSizeAlignmentDifference);
+	}
+
+	asASSERT((size % alignment) == 0);
+#endif
 
 	prop->byteOffset = size;
 	size += propSize;
@@ -770,7 +736,7 @@ asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &name, cons
 	// Add reference to object types
 	asCObjectType *type = prop->type.GetObjectType();
 	if( type )
-		type->AddRef();
+		type->AddRefInternal();
 
 	return prop;
 }
@@ -791,7 +757,14 @@ void asCObjectType::ReleaseAllProperties()
 				// Release references to objects types
 				asCObjectType *type = properties[n]->type.GetObjectType();
 				if( type )
-					type->Release();
+					type->ReleaseInternal();
+			}
+			else
+			{
+				// Release template instance types (ref increased by RegisterObjectProperty)
+				asCObjectType *type = properties[n]->type.GetObjectType();
+				if( type )
+					type->ReleaseInternal();
 			}
 
 			asDELETE(properties[n],asCObjectProperty);
@@ -801,13 +774,6 @@ void asCObjectType::ReleaseAllProperties()
 	properties.SetLength(0);
 }
 
-// internal
-void asCObjectType::ReleaseAllHandles(asIScriptEngine *)
-{
-	ReleaseAllFunctions();
-	ReleaseAllProperties();
-}
-
 // internal
 void asCObjectType::ReleaseAllFunctions()
 {
@@ -816,7 +782,7 @@ void asCObjectType::ReleaseAllFunctions()
 	for( asUINT a = 0; a < beh.factories.GetLength(); a++ )
 	{
 		if( engine->scriptFunctions[beh.factories[a]] ) 
-			engine->scriptFunctions[beh.factories[a]]->Release();
+			engine->scriptFunctions[beh.factories[a]]->ReleaseInternal();
 	}
 	beh.factories.SetLength(0);
 
@@ -825,155 +791,74 @@ void asCObjectType::ReleaseAllFunctions()
 	for( asUINT b = 0; b < beh.constructors.GetLength(); b++ )
 	{
 		if( engine->scriptFunctions[beh.constructors[b]] ) 
-			engine->scriptFunctions[beh.constructors[b]]->Release();
+			engine->scriptFunctions[beh.constructors[b]]->ReleaseInternal();
 	}
 	beh.constructors.SetLength(0);
 
 	if( beh.templateCallback )
-		engine->scriptFunctions[beh.templateCallback]->Release();
+		engine->scriptFunctions[beh.templateCallback]->ReleaseInternal();
 	beh.templateCallback = 0;
 
 	if( beh.listFactory )
-		engine->scriptFunctions[beh.listFactory]->Release();
+		engine->scriptFunctions[beh.listFactory]->ReleaseInternal();
 	beh.listFactory = 0;
 
 	if( beh.destruct )
-		engine->scriptFunctions[beh.destruct]->Release();
+		engine->scriptFunctions[beh.destruct]->ReleaseInternal();
 	beh.destruct  = 0;
 
 	if( beh.copy )
-		engine->scriptFunctions[beh.copy]->Release();
+		engine->scriptFunctions[beh.copy]->ReleaseInternal();
 	beh.copy = 0;
 
-	for( asUINT e = 1; e < beh.operators.GetLength(); e += 2 )
-	{
-		if( engine->scriptFunctions[beh.operators[e]] )
-			engine->scriptFunctions[beh.operators[e]]->Release();
-	}
-	beh.operators.SetLength(0);
-
 	for( asUINT c = 0; c < methods.GetLength(); c++ )
 	{
 		if( engine->scriptFunctions[methods[c]] ) 
-			engine->scriptFunctions[methods[c]]->Release();
+			engine->scriptFunctions[methods[c]]->ReleaseInternal();
 	}
 	methods.SetLength(0);
 
 	for( asUINT d = 0; d < virtualFunctionTable.GetLength(); d++ )
 	{
 		if( virtualFunctionTable[d] )
-			virtualFunctionTable[d]->Release();
+			virtualFunctionTable[d]->ReleaseInternal();
 	}
 	virtualFunctionTable.SetLength(0);
 
 	// GC behaviours
 	if( beh.addref )
-		engine->scriptFunctions[beh.addref]->Release();
+		engine->scriptFunctions[beh.addref]->ReleaseInternal();
 	beh.addref = 0;
 
 	if( beh.release )
-		engine->scriptFunctions[beh.release]->Release();
+		engine->scriptFunctions[beh.release]->ReleaseInternal();
 	beh.release = 0;
 
 	if( beh.gcEnumReferences )
-		engine->scriptFunctions[beh.gcEnumReferences]->Release();
+		engine->scriptFunctions[beh.gcEnumReferences]->ReleaseInternal();
 	beh.gcEnumReferences = 0;
 
 	if( beh.gcGetFlag )
-		engine->scriptFunctions[beh.gcGetFlag]->Release();
+		engine->scriptFunctions[beh.gcGetFlag]->ReleaseInternal();
 	beh.gcGetFlag = 0;
 
 	if( beh.gcGetRefCount )
-		engine->scriptFunctions[beh.gcGetRefCount]->Release();
+		engine->scriptFunctions[beh.gcGetRefCount]->ReleaseInternal();
 	beh.gcGetRefCount = 0;
 
 	if( beh.gcReleaseAllReferences )
-		engine->scriptFunctions[beh.gcReleaseAllReferences]->Release();
+		engine->scriptFunctions[beh.gcReleaseAllReferences]->ReleaseInternal();
 	beh.gcReleaseAllReferences = 0;
 
 	if( beh.gcSetFlag )
-		engine->scriptFunctions[beh.gcSetFlag]->Release();
+		engine->scriptFunctions[beh.gcSetFlag]->ReleaseInternal();
 	beh.gcSetFlag = 0;
 
 	if ( beh.getWeakRefFlag )
-		engine->scriptFunctions[beh.getWeakRefFlag]->Release();
+		engine->scriptFunctions[beh.getWeakRefFlag]->ReleaseInternal();
 	beh.getWeakRefFlag = 0;
 }
 
-// internal
-void asCObjectType::EnumReferences(asIScriptEngine *)
-{
-	for( asUINT a = 0; a < beh.factories.GetLength(); a++ )
-		if( engine->scriptFunctions[beh.factories[a]] ) 
-			engine->GCEnumCallback(engine->scriptFunctions[beh.factories[a]]);
-
-	for( asUINT b = 0; b < beh.constructors.GetLength(); b++ )
-		if( engine->scriptFunctions[beh.constructors[b]] ) 
-			engine->GCEnumCallback(engine->scriptFunctions[beh.constructors[b]]);
-
-	if( beh.templateCallback )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.templateCallback]);
-
-	if( beh.listFactory )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.listFactory]);
-		
-	if( beh.destruct )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.destruct]);
-
-	if( beh.addref )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.addref]);
-
-	if( beh.release )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.release]);
-
-	if( beh.copy )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.copy]);
-
-	if( beh.gcEnumReferences )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.gcEnumReferences]);
-
-	if( beh.gcGetFlag )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.gcGetFlag]);
-
-	if( beh.gcGetRefCount )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.gcGetRefCount]);
-
-	if( beh.gcReleaseAllReferences )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.gcReleaseAllReferences]);
-
-	if( beh.gcSetFlag )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.gcSetFlag]);
-
-	for( asUINT e = 1; e < beh.operators.GetLength(); e += 2 )
-		if( engine->scriptFunctions[beh.operators[e]] )
-			engine->GCEnumCallback(engine->scriptFunctions[beh.operators[e]]);
-
-	for( asUINT c = 0; c < methods.GetLength(); c++ )
-		if( engine->scriptFunctions[methods[c]] ) 
-			engine->GCEnumCallback(engine->scriptFunctions[methods[c]]);
-
-	for( asUINT d = 0; d < virtualFunctionTable.GetLength(); d++ )
-		if( virtualFunctionTable[d] )
-			engine->GCEnumCallback(virtualFunctionTable[d]);
-
-	for( asUINT p = 0; p < properties.GetLength(); p++ )
-	{
-		asCObjectType *type = properties[p]->type.GetObjectType();
-		if( type )
-			engine->GCEnumCallback(type);
-	}
-
-	for( asUINT t = 0; t < templateSubTypes.GetLength(); t++ )
-		if( templateSubTypes[t].GetObjectType() )
-			engine->GCEnumCallback(templateSubTypes[t].GetObjectType());
-
-	if( beh.getWeakRefFlag )
-		engine->GCEnumCallback(engine->scriptFunctions[beh.getWeakRefFlag]);
-
-	if( derivedFrom )
-		engine->GCEnumCallback(derivedFrom);
-}
-
 END_AS_NAMESPACE
 
 
diff --git a/lib/angelscript/source/as_objecttype.h b/lib/angelscript/source/as_objecttype.h
index 4538c951f..2a72e514f 100644
--- a/lib/angelscript/source/as_objecttype.h
+++ b/lib/angelscript/source/as_objecttype.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -51,28 +51,6 @@ BEGIN_AS_NAMESPACE
 
 // TODO: memory: Need to minimize used memory here, because not all types use all properties of the class
 
-// TODO: The type id should have flags for differenciating between value types and reference types. It should also have a flag for differenciating interface types.
-
-// Additional flag to the class object type
-const asDWORD asOBJ_IMPLICIT_HANDLE  = 0x00400000;
-const asDWORD asOBJ_LIST_PATTERN     = 0x08000000;
-const asDWORD asOBJ_ENUM             = 0x10000000;
-const asDWORD asOBJ_TEMPLATE_SUBTYPE = 0x20000000;
-const asDWORD asOBJ_TYPEDEF          = 0x40000000;
-
-
-
-// asOBJ_GC is used to indicate that the type can potentially 
-// form circular references, thus is garbage collected.
-
-// The fact that an object is garbage collected doesn't imply that an other object  
-// that can reference it also must be garbage collected, only if the garbage collected 
-// object can reference the other object as well.
-
-// For registered types however, we set the flag asOBJ_GC if the GC 
-// behaviours are registered. For script types that contain any such type we 
-// automatically make garbage collected as well, because we cannot know what type
-// of references that object can contain, and must assume the worst.
 
 struct asSTypeBehaviour
 {
@@ -119,7 +97,6 @@ struct asSTypeBehaviour
 
 	asCArray<int> factories;
 	asCArray<int> constructors;
-	asCArray<int> operators;
 };
 
 struct asSEnumValue
@@ -131,8 +108,6 @@ struct asSEnumValue
 class asCScriptEngine;
 struct asSNameSpace;
 
-void RegisterObjectTypeGCBehaviours(asCScriptEngine *engine);
-
 class asCObjectType : public asIObjectType
 {
 public:
@@ -178,7 +153,7 @@ public:
 
 	// Properties
 	asUINT      GetPropertyCount() const;
-	int         GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, int *offset, bool *isReference, asDWORD *accessMask) const;
+	int         GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask) const;
 	const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const;
 
 	// Behaviours
@@ -195,25 +170,27 @@ public:
 public:
 	asCObjectType(asCScriptEngine *engine);
 	~asCObjectType();
+	void DestroyInternal();
 
-	void Orphan(asCModule *module);
-	int  GetRefCount();
-	void SetGCFlag();
-	bool GetGCFlag();
-	void EnumReferences(asIScriptEngine *);
-	void ReleaseAllHandles(asIScriptEngine *);
+	// Keep an internal reference counter to separate references coming from 
+	// application or script objects and references coming from the script code
+	int AddRefInternal();
+	int ReleaseInternal();
 
 	void ReleaseAllFunctions();
 
 	bool IsInterface() const;
 	bool IsShared() const;
 
-	asCObjectProperty *AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate);
+	asCObjectProperty *AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited);
 	void ReleaseAllProperties();
 
 	asCString                    name;
 	asSNameSpace                *nameSpace;
 	int                          size;
+#ifdef WIP_16BYTE_ALIGN
+	int                          alignment;
+#endif
 	asCArray<asCObjectProperty*> properties;
 	asCArray<int>                methods;
 	asCArray<asCObjectType*>     interfaces;
@@ -232,16 +209,23 @@ public:
 	bool                  acceptValueSubType;
 	bool                  acceptRefSubType;
 
+	// Store the script section where the code was declared
+	int                             scriptSectionIdx;
+	// Store the location where the function was declared (row in the lower 20 bits, and column in the upper 12)
+	int                             declaredAt;
+
 	asCScriptEngine  *engine;
 	asCModule        *module;
 	asCArray<asPWORD> userData;
 
 protected:
 	friend class asCScriptEngine;
+	friend class asCConfigGroup;
+	friend class asCModule;
 	asCObjectType();
 
-	mutable asCAtomic refCount;
-	mutable bool      gcFlag;
+	mutable asCAtomic externalRefCount;
+	asCAtomic         internalRefCount;
 };
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_parser.cpp b/lib/angelscript/source/as_parser.cpp
index e1b273b6f..eaa0768f8 100644
--- a/lib/angelscript/source/as_parser.cpp
+++ b/lib/angelscript/source/as_parser.cpp
@@ -34,6 +34,18 @@
 //
 // This class parses the script code and builds a tree for compilation
 //
+//
+// I've documented the syntax in Extended BNF. You'll find it by doing a search in 
+// this file by "BNF:". The starting point for the script language is SCRIPT ::=.
+//
+// Ref: http://matt.might.net/articles/grammars-bnf-ebnf/
+//
+// ( )  - used for grouping
+// { }  - 0 or more repetitions
+// [ ]  - optional
+//  |   - or
+// ' '  - token
+//
 
 
 
@@ -113,6 +125,7 @@ int asCParser::ParseFunctionDefinition(asCScriptCode *script, bool expectListPat
 		if( t.type != ttEnd )
 		{
 			Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+			Error(InsteadFound(t), &t);
 			return -1;
 		}
 	}
@@ -160,6 +173,7 @@ int asCParser::ParseDataType(asCScriptCode *script, bool isReturnType)
 	if( t.type != ttEnd )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
 		return -1;
 	}
 
@@ -187,6 +201,7 @@ int asCParser::ParseTemplateDecl(asCScriptCode *script)
 	if( t.type != ttLessThan )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
+		Error(InsteadFound(t), &t);
 		return -1;
 	}
 
@@ -216,6 +231,7 @@ int asCParser::ParseTemplateDecl(asCScriptCode *script)
 	if( t.type != ttGreaterThan )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
+		Error(InsteadFound(t), &t);
 		return -1;
 	}
 
@@ -223,6 +239,7 @@ int asCParser::ParseTemplateDecl(asCScriptCode *script)
 	if( t.type != ttEnd )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
 		return -1;
 	}
 
@@ -257,12 +274,14 @@ int asCParser::ParsePropertyDeclaration(asCScriptCode *script)
 	if( t.type != ttEnd )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
 		return -1;
 	}
 
 	return 0;
 }
 
+// BNF: SCOPE ::= [[IDENTIFIER] '::' {IDENTIFIER '::'}]
 void asCParser::ParseOptionalScope(asCScriptNode *node)
 {
 	sToken t1, t2;
@@ -315,6 +334,7 @@ asCScriptNode *asCParser::ParseFunctionDefinition()
 	return node;
 }
 
+// BNF: TYPEMOD ::= ['&' ['in' | 'out' | 'inout']]
 asCScriptNode *asCParser::ParseTypeMod(bool isParam)
 {
 	asCScriptNode *node = CreateNode(snDataType);
@@ -355,7 +375,8 @@ asCScriptNode *asCParser::ParseTypeMod(bool isParam)
 	return node;
 }
 
-asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType)
+// BNF: TYPE ::= ['const'] SCOPE DATATYPE ['<' TYPE {',' TYPE} '>'] { ('[' ']') | '@' }
+asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType, bool allowAuto)
 {
 	asCScriptNode *node = CreateNode(snDataType);
 	if( node == 0 ) return 0;
@@ -377,7 +398,8 @@ asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType)
 	ParseOptionalScope(node);
 
 	// Parse the actual type
-	node->AddChildLast(ParseDataType(allowVariableType));
+	node->AddChildLast(ParseDataType(allowVariableType, allowAuto));
+	if( isSyntaxError ) return node;
 
 	// If the datatype is a template type, then parse the subtype within the < >
 	asCScriptNode *type = node->lastChild;
@@ -388,6 +410,7 @@ asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType)
 		if( t.type != ttLessThan )
 		{
 			Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
@@ -410,6 +433,7 @@ asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType)
 		if( script->code[t.pos] != '>' )
 		{
 			Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 		else
@@ -433,6 +457,7 @@ asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType)
 			if( t.type != ttCloseBracket )
 			{
 				Error(ExpectedToken("]"), &t);
+				Error(InsteadFound(t), &t);
 				return node;
 			}
 		}
@@ -460,6 +485,7 @@ asCScriptNode *asCParser::ParseToken(int token)
 	if( t1.type != token )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(token)), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -486,6 +512,7 @@ asCScriptNode *asCParser::ParseOneOf(int *tokens, int count)
 	if( n == count )
 	{
 		Error(ExpectedOneOf(tokens, count), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -495,8 +522,8 @@ asCScriptNode *asCParser::ParseOneOf(int *tokens, int count)
 	return node;
 }
 
-
-asCScriptNode *asCParser::ParseDataType(bool allowVariableType)
+// BNF: DATATYPE ::= (IDENTIFIER | PRIMTYPE | '?' | 'auto')
+asCScriptNode *asCParser::ParseDataType(bool allowVariableType, bool allowAuto)
 {
 	asCScriptNode *node = CreateNode(snDataType);
 	if( node == 0 ) return 0;
@@ -504,7 +531,7 @@ asCScriptNode *asCParser::ParseDataType(bool allowVariableType)
 	sToken t1;
 
 	GetToken(&t1);
-	if( !IsDataType(t1) && !(allowVariableType && t1.type == ttQuestion) )
+	if( !IsDataType(t1) && !(allowVariableType && t1.type == ttQuestion) && !(allowAuto && t1.type == ttAuto) )
 	{
 		if( t1.type == ttIdentifier )
 		{
@@ -513,8 +540,15 @@ asCScriptNode *asCParser::ParseDataType(bool allowVariableType)
 			errMsg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE, tempString.AddressOf());
 			Error(errMsg, &t1);
 		}
+		else if( t1.type == ttAuto )
+		{
+			Error(TXT_AUTO_NOT_ALLOWED, &t1);
+		}
 		else
+		{
 			Error(TXT_EXPECTED_DATA_TYPE, &t1);
+			Error(InsteadFound(t1), &t1);
+		}
 		return node;
 	}
 
@@ -524,6 +558,7 @@ asCScriptNode *asCParser::ParseDataType(bool allowVariableType)
 	return node;
 }
 
+// BNF: PRIMTYPE ::= 'void' | 'int' | 'int8' | 'int16' | 'int32' | 'int64' | 'uint' | 'uint8' | 'uint16' | 'uint32' | 'uint64' | 'float' | 'double' | 'bool'
 asCScriptNode *asCParser::ParseRealType()
 {
 	asCScriptNode *node = CreateNode(snDataType);
@@ -535,6 +570,7 @@ asCScriptNode *asCParser::ParseRealType()
 	if( !IsRealType(t1.type) )
 	{
 		Error(TXT_EXPECTED_DATA_TYPE, &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -544,6 +580,7 @@ asCScriptNode *asCParser::ParseRealType()
 	return node;
 }
 
+// BNF: IDENTIFIER ::= single token:  starts with letter or _, can include any letter and digit, same as in C++
 asCScriptNode *asCParser::ParseIdentifier()
 {
 	asCScriptNode *node = CreateNode(snIdentifier);
@@ -555,6 +592,7 @@ asCScriptNode *asCParser::ParseIdentifier()
 	if( t1.type != ttIdentifier )
 	{
 		Error(TXT_EXPECTED_IDENTIFIER, &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -564,6 +602,7 @@ asCScriptNode *asCParser::ParseIdentifier()
 	return node;
 }
 
+// BNF: PARAMLIST ::= '(' ('void' | (TYPE TYPEMOD [IDENTIFIER] ['=' EXPR] {',' TYPE TYPEMOD [IDENTIFIER] ['=' EXPR]}) ')'
 asCScriptNode *asCParser::ParseParameterList()
 {
 	asCScriptNode *node = CreateNode(snParameterList);
@@ -574,6 +613,7 @@ asCScriptNode *asCParser::ParseParameterList()
 	if( t1.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -647,6 +687,7 @@ asCScriptNode *asCParser::ParseParameterList()
 			else
 			{
 				Error(ExpectedTokens(")", ","), &t1);
+				Error(InsteadFound(t1), &t1);
 				return node;
 			}
 		}
@@ -828,6 +869,15 @@ void asCParser::Error(const asCString &text, sToken *token)
 		builder->WriteError(script->name, text, row, col);
 }
 
+void asCParser::Warning(const asCString &text, sToken *token)
+{
+	int row, col;
+	script->ConvertPosToRowCol(token->pos, &row, &col);
+
+	if( builder )
+		builder->WriteWarning(script->name, text, row, col);
+}
+
 void asCParser::Info(const asCString &text, sToken *token)
 {
 	RewindTo(token);
@@ -931,6 +981,19 @@ asCString asCParser::ExpectedOneOf(const char **tokens, int count)
 	return str;
 }
 
+asCString asCParser::InsteadFound(sToken &t)
+{
+	asCString str;
+	if( t.type == ttIdentifier )
+	{
+		asCString id(&script->code[t.pos], t.length);
+		str.Format(TXT_INSTEAD_FOUND_s, id.AddressOf());
+	}
+	else
+		str.Format(TXT_INSTEAD_FOUND_s, asCTokenizer::GetDefinition(t.type));
+	return str;
+}
+
 asCScriptNode *asCParser::ParseListPattern()
 {
 	asCScriptNode *node = CreateNode(snListPattern);
@@ -942,6 +1005,7 @@ asCScriptNode *asCParser::ParseListPattern()
 	if( t1.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -957,27 +1021,30 @@ asCScriptNode *asCParser::ParseListPattern()
 		if( t1.type == ttEndStatementBlock )
 		{
 			if( !afterType )
+			{
 				Error(TXT_EXPECTED_DATA_TYPE, &t1);
+				Error(InsteadFound(t1), &t1);
+			}
 			break;
 		}
 		else if( t1.type == ttStartStatementBlock )
 		{
 			if( afterType )
 			{
-				asCString msg;
-				msg.Format(TXT_EXPECTED_s_OR_s, ",", "}");
-				Error(msg.AddressOf(), &t1);
+				Error(ExpectedTokens(",","}"), &t1);
+				Error(InsteadFound(t1), &t1);
 			}
 			RewindTo(&t1);
 			node->AddChildLast(ParseListPattern());
 			afterType = true;
 		}
-		else if( t1.type == ttIdentifier && IdentifierIs(t1, "repeat") )
+		else if( t1.type == ttIdentifier && (IdentifierIs(t1, "repeat") || IdentifierIs(t1, "repeat_same")) )
 		{
 			if( !isBeginning )
 			{
 				asCString msg;
-				msg.Format(TXT_UNEXPECTED_TOKEN_s, "repeat");
+				asCString token(&script->code[t1.pos], t1.length);
+				msg.Format(TXT_UNEXPECTED_TOKEN_s, token.AddressOf());
 				Error(msg.AddressOf(), &t1);
 			}
 			RewindTo(&t1);
@@ -992,16 +1059,18 @@ asCScriptNode *asCParser::ParseListPattern()
 		else if( t1.type == ttListSeparator )
 		{
 			if( !afterType )
+			{
 				Error(TXT_EXPECTED_DATA_TYPE, &t1);
+				Error(InsteadFound(t1), &t1);
+			}
 			afterType = false;
 		}
 		else
 		{
 			if( afterType )
 			{
-				asCString msg;
-				msg.Format(TXT_EXPECTED_s_OR_s, ",", "}");
-				Error(msg.AddressOf(), &t1);
+				Error(ExpectedTokens(",", "}"), &t1);
+				Error(InsteadFound(t1), &t1);
 			}
 			RewindTo(&t1);
 			node->AddChildLast(ParseType(true, true));
@@ -1025,6 +1094,10 @@ bool asCParser::IdentifierIs(const sToken &t, const char *str)
 }
 
 #ifndef AS_NO_COMPILER
+
+// This function will return true if the current token is not a template, or if it is and 
+// the following has a valid syntax for a template type. The source position will be left 
+// at the first token after the type in case of success
 bool asCParser::CheckTemplateType(sToken &t)
 {
 	// Is this a template type?
@@ -1098,6 +1171,7 @@ bool asCParser::CheckTemplateType(sToken &t)
 	return true;
 }
 
+// BNF: CAST ::= 'cast' '<' TYPE '>' '(' ASSIGN ')'
 asCScriptNode *asCParser::ParseCast()
 {
 	asCScriptNode *node = CreateNode(snCast);
@@ -1108,6 +1182,7 @@ asCScriptNode *asCParser::ParseCast()
 	if( t1.type != ttCast )
 	{
 		Error(ExpectedToken("cast"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1117,6 +1192,7 @@ asCScriptNode *asCParser::ParseCast()
 	if( t1.type != ttLessThan )
 	{
 		Error(ExpectedToken("<"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1124,13 +1200,11 @@ asCScriptNode *asCParser::ParseCast()
 	node->AddChildLast(ParseType(true));
 	if( isSyntaxError ) return node;
 
-	node->AddChildLast(ParseTypeMod(false));
-	if( isSyntaxError ) return node;
-
 	GetToken(&t1);
 	if( t1.type != ttGreaterThan )
 	{
 		Error(ExpectedToken(">"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1138,6 +1212,7 @@ asCScriptNode *asCParser::ParseCast()
 	if( t1.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1148,6 +1223,7 @@ asCScriptNode *asCParser::ParseCast()
 	if( t1.type != ttCloseParanthesis )
 	{
 		Error(ExpectedToken(")"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1156,6 +1232,7 @@ asCScriptNode *asCParser::ParseCast()
 	return node;
 }
 
+// BNF: EXPRVALUE ::= 'void' | CONSTRUCTCALL | FUNCCALL | VARACCESS | CAST | LITERAL | '(' ASSIGN ')'
 asCScriptNode *asCParser::ParseExprValue()
 {
 	asCScriptNode *node = CreateNode(snExprValue);
@@ -1187,14 +1264,25 @@ asCScriptNode *asCParser::ParseExprValue()
 			else 
 				break;
 		}
+
+		bool isDataType = IsDataType(t2);
+		bool isTemplateType = false;
+		if( isDataType )
+		{
+			// Is this a template type?
+			tempString.Assign(&script->code[t2.pos], t2.length);
+			if( engine->IsTemplateType(tempString.AddressOf()) )
+				isTemplateType = true;
+		}
 		
 		// Rewind so the real parsing can be done, after deciding what to parse
 		RewindTo(&t1);
 
 		// Check if this is a construct call
-		if( IsDataType(t2) && (t.type == ttOpenParanthesis || 
-		                       t.type == ttLessThan || 
-		                       t.type == ttOpenBracket) )
+		if( isDataType && (t.type == ttOpenParanthesis ||  // type()
+			               t.type == ttOpenBracket) )      // type[]()
+			node->AddChildLast(ParseConstructCall());
+		else if( isTemplateType && t.type == ttLessThan )  // type<t>()
 			node->AddChildLast(ParseConstructCall());
 		else if( IsFunctionCall() )
 			node->AddChildLast(ParseFunctionCall());
@@ -1215,16 +1303,26 @@ asCScriptNode *asCParser::ParseExprValue()
 
 		GetToken(&t1);
 		if( t1.type != ttCloseParanthesis )
+		{
 			Error(ExpectedToken(")"), &t1);
+			Error(InsteadFound(t1), &t1);
+		}
 
 		node->UpdateSourcePos(t1.pos, t1.length);
 	}
 	else
+	{
 		Error(TXT_EXPECTED_EXPRESSION_VALUE, &t1);
+		Error(InsteadFound(t1), &t1);
+	}
 
 	return node;
 }
 
+// BNF: LITERAL ::= NUMBER | STRING | BITS | 'true' | 'false' | 'null'
+// BNF: NUMBER ::= single token:  includes integers and real numbers, same as C++
+// BNF: STRING ::= single token:  single quoted ', double quoted ", or heredoc multi-line string """
+// BNF: BITS ::= single token:  binary 0b or 0B, octal 0o or 0O, decimal 0d or 0D, hexadecimal 0x or 0X
 asCScriptNode *asCParser::ParseConstant()
 {
 	asCScriptNode *node = CreateNode(snConstant);
@@ -1235,6 +1333,7 @@ asCScriptNode *asCParser::ParseConstant()
 	if( !IsConstant(t.type) )
 	{
 		Error(TXT_EXPECTED_CONSTANT, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1266,6 +1365,7 @@ asCScriptNode *asCParser::ParseStringConstant()
 	if( t.type != ttStringConstant && t.type != ttMultilineStringConstant && t.type != ttHeredocStringConstant )
 	{
 		Error(TXT_EXPECTED_STRING, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1275,6 +1375,7 @@ asCScriptNode *asCParser::ParseStringConstant()
 	return node;
 }
 
+// BNF: FUNCCALL ::= SCOPE IDENTIFIER ARGLIST
 asCScriptNode *asCParser::ParseFunctionCall()
 {
 	asCScriptNode *node = CreateNode(snFunctionCall);
@@ -1292,6 +1393,7 @@ asCScriptNode *asCParser::ParseFunctionCall()
 	return node;
 }
 
+// BNF: VARACCESS ::= SCOPE IDENTIFIER
 asCScriptNode *asCParser::ParseVariableAccess()
 {
 	asCScriptNode *node = CreateNode(snVariableAccess);
@@ -1306,6 +1408,7 @@ asCScriptNode *asCParser::ParseVariableAccess()
 	return node;
 }
 
+// BNF: CONSTRUCTCALL ::= TYPE ARGLIST
 asCScriptNode *asCParser::ParseConstructCall()
 {
 	asCScriptNode *node = CreateNode(snConstructCall);
@@ -1319,27 +1422,45 @@ asCScriptNode *asCParser::ParseConstructCall()
 	return node;
 }
 
-asCScriptNode *asCParser::ParseArgList()
+// BNF: ARGLIST ::= '(' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':'] ASSIGN} ')'
+asCScriptNode *asCParser::ParseArgList(bool withParenthesis)
 {
 	asCScriptNode *node = CreateNode(snArgList);
 	if( node == 0 ) return 0;
 
 	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttOpenParanthesis )
+	if( withParenthesis )
 	{
-		Error(ExpectedToken("("), &t1);
-		return node;
+		GetToken(&t1);
+		if( t1.type != ttOpenParanthesis )
+		{
+			Error(ExpectedToken("("), &t1);
+			Error(InsteadFound(t1), &t1);
+			return node;
+		}
+
+		node->UpdateSourcePos(t1.pos, t1.length);
 	}
 
-	node->UpdateSourcePos(t1.pos, t1.length);
-
 	GetToken(&t1);
-	if( t1.type == ttCloseParanthesis )
+	if( t1.type == ttCloseParanthesis || t1.type == ttCloseBracket )
 	{
-		node->UpdateSourcePos(t1.pos, t1.length);
+		if( withParenthesis )
+		{
+			if( t1.type == ttCloseParanthesis )
+				node->UpdateSourcePos(t1.pos, t1.length);
+			else
+			{
+				asCString str;
+				str.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(ttCloseBracket));
 
-		// Statement block is finished
+				Error(str.AddressOf(), &t1);
+			}
+		}
+		else
+			RewindTo(&t1);
+
+		// Argument list has ended
 		return node;
 	}
 	else
@@ -1348,22 +1469,55 @@ asCScriptNode *asCParser::ParseArgList()
 
 		for(;;)
 		{
-			node->AddChildLast(ParseAssignment());
+			// Determine if this is a named argument
+			sToken tl, t2;
+			GetToken(&tl);
+			GetToken(&t2);
+			RewindTo(&tl);
+
+			// Named arguments uses the syntax: arg : expr
+			// This avoids confusion when the argument has the same name as a local variable, i.e. var = expr
+			// It also avoids conflict with expressions to that creates anonymous objects initialized with lists, i.e. type = {...}
+			// The alternate syntax: arg = expr, is supported to provide backwards compatibility with 2.29.0
+			// TODO: 3.0.0: Remove the alternate syntax
+			if( tl.type == ttIdentifier && (t2.type == ttColon || (engine->ep.alterSyntaxNamedArgs && t2.type == ttAssignment)) )
+			{
+				asCScriptNode *named = CreateNode(snNamedArgument);
+				if( named == 0 ) return 0;
+				node->AddChildLast(named);
+
+				named->AddChildLast(ParseIdentifier());
+				GetToken(&t2);
+
+				if( engine->ep.alterSyntaxNamedArgs == 1 && t2.type == ttAssignment )
+					Warning(TXT_NAMED_ARGS_WITH_OLD_SYNTAX, &t2);
+
+				named->AddChildLast(ParseAssignment());
+			}
+			else
+				node->AddChildLast(ParseAssignment());
+
 			if( isSyntaxError ) return node;
 
 			// Check if list continues
 			GetToken(&t1);
-			if( t1.type == ttCloseParanthesis )
-			{
-				node->UpdateSourcePos(t1.pos, t1.length);
-
-				return node;
-			}
-			else if( t1.type == ttListSeparator )
+			if( t1.type == ttListSeparator )
 				continue;
 			else
 			{
-				Error(ExpectedTokens(")", ","), &t1);
+				if( withParenthesis )
+				{
+					if( t1.type == ttCloseParanthesis )
+						node->UpdateSourcePos(t1.pos, t1.length);
+					else
+					{
+						Error(ExpectedTokens(")", ","), &t1);
+						Error(InsteadFound(t1), &t1);
+					}
+				}
+				else 
+					RewindTo(&t1);
+
 				return node;
 			}
 		}
@@ -1406,6 +1560,7 @@ bool asCParser::IsFunctionCall()
 	return false;
 }
 
+// BNF: ASSIGN ::= CONDITION [ ASSIGNOP ASSIGN ]
 asCScriptNode *asCParser::ParseAssignment()
 {
 	asCScriptNode *node = CreateNode(snAssignment);
@@ -1430,6 +1585,7 @@ asCScriptNode *asCParser::ParseAssignment()
 	return node;
 }
 
+// BNF: CONDITION ::= EXPR ['?' ASSIGN ':' ASSIGN]
 asCScriptNode *asCParser::ParseCondition()
 {
 	asCScriptNode *node = CreateNode(snCondition);
@@ -1449,6 +1605,7 @@ asCScriptNode *asCParser::ParseCondition()
 		if( t.type != ttColon )
 		{
 			Error(ExpectedToken(":"), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
@@ -1461,11 +1618,35 @@ asCScriptNode *asCParser::ParseCondition()
 	return node;
 }
 
+// BNF: EXPR ::= (TYPE '=' INILIST) | (EXPRTERM {EXPROP EXPRTERM})
 asCScriptNode *asCParser::ParseExpression()
 {
 	asCScriptNode *node = CreateNode(snExpression);
 	if( node == 0 ) return 0;
 
+	// Check if the expression is a initialization of a temp object with init list, i.e. type = {...}
+	sToken t;
+	GetToken(&t);
+	sToken t2 = t, t3;
+	if( IsDataType(t2) && CheckTemplateType(t2) )
+	{
+		// The next token must be a = followed by a {
+		GetToken(&t2);
+		GetToken(&t3);
+		if( t2.type == ttAssignment && t3.type == ttStartStatementBlock )
+		{
+			// It is an initialization, now parse it for real
+			RewindTo(&t);
+			node->AddChildLast(ParseType(false));
+			GetToken(&t2);
+			node->AddChildLast(ParseInitList());
+			return node;
+		}
+	}
+	
+	// It wasn't an initialization, so it must be an ordinary expression
+	RewindTo(&t);
+
 	node->AddChildLast(ParseExprTerm());
 	if( isSyntaxError ) return node;
 
@@ -1487,6 +1668,7 @@ asCScriptNode *asCParser::ParseExpression()
 	UNREACHABLE_RETURN;
 }
 
+// BNF: EXPRTERM ::= {EXPRPREOP} EXPRVALUE {EXPRPOSTOP}
 asCScriptNode *asCParser::ParseExprTerm()
 {
 	asCScriptNode *node = CreateNode(snExprTerm);
@@ -1522,6 +1704,7 @@ asCScriptNode *asCParser::ParseExprTerm()
 	UNREACHABLE_RETURN;
 }
 
+// BNF: EXPRPREOP ::= '-' | '+' | '!' | '++' | '--' | '~' | '@'
 asCScriptNode *asCParser::ParseExprPreOp()
 {
 	asCScriptNode *node = CreateNode(snExprPreOp);
@@ -1532,6 +1715,7 @@ asCScriptNode *asCParser::ParseExprPreOp()
 	if( !IsPreOperator(t.type) )
 	{
 		Error(TXT_EXPECTED_PRE_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1541,6 +1725,7 @@ asCScriptNode *asCParser::ParseExprPreOp()
 	return node;
 }
 
+// BNF: EXPRPOSTOP ::= ('.' (FUNCCALL | IDENTIFIER)) | ('[' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':' ASSIGN} ']') | ARGLIST | '++' | '--'
 asCScriptNode *asCParser::ParseExprPostOp()
 {
 	asCScriptNode *node = CreateNode(snExprPostOp);
@@ -1551,6 +1736,7 @@ asCScriptNode *asCParser::ParseExprPostOp()
 	if( !IsPostOperator(t.type) )
 	{
 		Error(TXT_EXPECTED_POST_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1570,12 +1756,13 @@ asCScriptNode *asCParser::ParseExprPostOp()
 	}
 	else if( t.type == ttOpenBracket )
 	{
-		node->AddChildLast(ParseAssignment());
+		node->AddChildLast(ParseArgList(false));
 
 		GetToken(&t);
 		if( t.type != ttCloseBracket )
 		{
 			Error(ExpectedToken("]"), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
@@ -1590,6 +1777,11 @@ asCScriptNode *asCParser::ParseExprPostOp()
 	return node;
 }
 
+// BNF: EXPROP ::= MATHOP | COMPOP | LOGICOP | BITOP
+// BNF: MATHOP ::= '+' | '-' | '*' | '/' | '%' | '**'
+// BNF: COMPOP ::= '==' | '!=' | '<' | '<=' | '>' | '>=' | 'is' | '!is'
+// BNF: LOGICOP ::= '&&' | '||' | '^^' | 'and' | 'or' | 'xor'
+// BNF: BITOP ::= '&' | '|' | '^' | '<<' | '>>' | '>>>'
 asCScriptNode *asCParser::ParseExprOperator()
 {
 	asCScriptNode *node = CreateNode(snExprOperator);
@@ -1600,6 +1792,7 @@ asCScriptNode *asCParser::ParseExprOperator()
 	if( !IsOperator(t.type) )
 	{
 		Error(TXT_EXPECTED_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1609,6 +1802,7 @@ asCScriptNode *asCParser::ParseExprOperator()
 	return node;
 }
 
+// BNF: ASSIGNOP ::= '=' | '+=' | '-=' | '*=' | '/=' | '|=' | '&=' | '^=' | '%=' | '**=' | '<<=' | '>>=' | '>>>=' 
 asCScriptNode *asCParser::ParseAssignOperator()
 {
 	asCScriptNode *node = CreateNode(snExprOperator);
@@ -1619,6 +1813,7 @@ asCScriptNode *asCParser::ParseAssignOperator()
 	if( !IsAssignOperator(t.type) )
 	{
 		Error(TXT_EXPECTED_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1730,13 +1925,17 @@ int asCParser::ParseScript(asCScriptCode *script)
 	if( errorWhileParsing )
 		return -1;
 
+	// TODO: Should allow application to request this warning to be generated. 
+	//       It should be off by default, since pre-processor may remove all
+	//       code from a section while still being meant as valid code
+/*
 	// Warn in case there isn't anything in the script
 	if( scriptNode->firstChild == 0 )
 	{
 		if( builder )
 			builder->WriteWarning(script->name, TXT_SECTION_IS_EMPTY, 1, 1);
 	}
-
+*/
 	return 0;
 }
 
@@ -1755,6 +1954,7 @@ int asCParser::ParseExpression(asCScriptCode *script)
 	return 0;
 }
 
+// BNF: IMPORT ::= 'import' TYPE ['&'] IDENTIFIER PARAMLIST 'from' STRING ';'
 asCScriptNode *asCParser::ParseImport()
 {
 	asCScriptNode *node = CreateNode(snImport);
@@ -1765,6 +1965,7 @@ asCScriptNode *asCParser::ParseImport()
 	if( t.type != ttImport )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttImport)), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1778,6 +1979,7 @@ asCScriptNode *asCParser::ParseImport()
 	if( t.type != ttIdentifier )
 	{
 		Error(ExpectedToken(FROM_TOKEN), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1785,6 +1987,7 @@ asCScriptNode *asCParser::ParseImport()
 	if( tempString != FROM_TOKEN )
 	{
 		Error(ExpectedToken(FROM_TOKEN), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1794,6 +1997,7 @@ asCScriptNode *asCParser::ParseImport()
 	if( t.type != ttStringConstant )
 	{
 		Error(TXT_EXPECTED_STRING, &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1809,6 +2013,7 @@ asCScriptNode *asCParser::ParseImport()
 	if( t.type != ttEndStatement )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -1817,6 +2022,7 @@ asCScriptNode *asCParser::ParseImport()
 	return node;
 }
 
+// BNF: SCRIPT ::= {IMPORT | ENUM | TYPEDEF | CLASS | MIXIN | INTERFACE | FUNCDEF | VIRTPROP | VAR | FUNC | NAMESPACE | ';'}
 asCScriptNode *asCParser::ParseScript(bool inBlock)
 {
 	asCScriptNode *node = CreateNode(snScript);
@@ -1840,8 +2046,8 @@ asCScriptNode *asCParser::ParseScript(bool inBlock)
 			else if( t1.type == ttTypedef )
 				node->AddChildLast(ParseTypedef());		// Handle primitive typedefs
 			else if( t1.type == ttClass || 
-					 ((IdentifierIs(t1, SHARED_TOKEN) || IdentifierIs(t1, FINAL_TOKEN)) && t2.type == ttClass) || 
-					 (IdentifierIs(t1, SHARED_TOKEN) && IdentifierIs(t2, FINAL_TOKEN)) )
+					((IdentifierIs(t1, SHARED_TOKEN) || IdentifierIs(t1, FINAL_TOKEN) || IdentifierIs(t1, ABSTRACT_TOKEN)) && t2.type == ttClass) || 
+					 (IdentifierIs(t1, SHARED_TOKEN) && (IdentifierIs(t2, FINAL_TOKEN) || IdentifierIs(t2, ABSTRACT_TOKEN))) )
 				node->AddChildLast(ParseClass());
 			else if( t1.type == ttMixin )
 				node->AddChildLast(ParseMixin());
@@ -1849,7 +2055,7 @@ asCScriptNode *asCParser::ParseScript(bool inBlock)
 				node->AddChildLast(ParseInterface());
 			else if( t1.type == ttFuncDef )
 				node->AddChildLast(ParseFuncDef());
-			else if( t1.type == ttConst || t1.type == ttScope || IsDataType(t1) )
+			else if( t1.type == ttConst || t1.type == ttScope || t1.type == ttAuto || IsDataType(t1) )
 			{
 				if( IsVirtualPropertyDecl() )
 					node->AddChildLast(ParseVirtualPropertyDecl(false, false));
@@ -1908,6 +2114,7 @@ asCScriptNode *asCParser::ParseScript(bool inBlock)
 	UNREACHABLE_RETURN;
 }
 
+// BNF: NAMESPACE ::= 'namespace' IDENTIFIER '{' SCRIPT '}'
 asCScriptNode *asCParser::ParseNamespace()
 {
 	asCScriptNode *node = CreateNode(snNamespace);
@@ -1919,7 +2126,10 @@ asCScriptNode *asCParser::ParseNamespace()
 	if( t1.type == ttNamespace )
 		node->UpdateSourcePos(t1.pos, t1.length);
 	else
+	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttNamespace)), &t1);
+		Error(InsteadFound(t1), &t1);
+	}
 
 	// TODO: namespace: Allow declaration of multiple nested namespace with namespace A::B::C { }
 	node->AddChildLast(ParseIdentifier());
@@ -1931,6 +2141,7 @@ asCScriptNode *asCParser::ParseNamespace()
 	else
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttStartStatementBlock)), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -1948,7 +2159,10 @@ asCScriptNode *asCParser::ParseNamespace()
 			if( t1.type == ttEnd )
 				Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
 			else
+			{
 				Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatementBlock)), &t1);
+				Error(InsteadFound(t1), &t1);
+			}
 			Info(TXT_WHILE_PARSING_NAMESPACE, &start);
 			return node;
 		}
@@ -1977,6 +2191,7 @@ int asCParser::ParseStatementBlock(asCScriptCode *script, asCScriptNode *block)
 	return 0;
 }
 
+// BNF: ENUM ::= ['shared'] 'enum' IDENTIFIER '{' IDENTIFIER ['=' EXPR] {',' IDENTIFIER ['=' EXPR]} '}'
 asCScriptNode *asCParser::ParseEnumeration()
 {
 	asCScriptNode *ident;
@@ -2002,6 +2217,7 @@ asCScriptNode *asCParser::ParseEnumeration()
 	if( token.type != ttEnum )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnum)), &token);
+		Error(InsteadFound(token), &token);
 		return node;
 	}
 
@@ -2013,6 +2229,7 @@ asCScriptNode *asCParser::ParseEnumeration()
 	if(ttIdentifier != token.type) 
 	{
 		Error(TXT_EXPECTED_IDENTIFIER, &token);
+		Error(InsteadFound(token), &token);
 		return node;
 	}
 
@@ -2034,6 +2251,7 @@ asCScriptNode *asCParser::ParseEnumeration()
 	{
 		RewindTo(&token);
 		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
+		Error(InsteadFound(token), &token);
 		return node;
 	}
 
@@ -2050,6 +2268,7 @@ asCScriptNode *asCParser::ParseEnumeration()
 		if(ttIdentifier != token.type) 
 		{
 			Error(TXT_EXPECTED_IDENTIFIER, &token);
+			Error(InsteadFound(token), &token);
 			return node;
 		}
 
@@ -2088,7 +2307,8 @@ asCScriptNode *asCParser::ParseEnumeration()
 	if( token.type != ttEndStatementBlock ) 
 	{
 		RewindTo(&token);
-		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
+		Error(ExpectedToken("}"), &token);
+		Error(InsteadFound(token), &token);
 		return node;
 	}
 
@@ -2103,10 +2323,10 @@ bool asCParser::IsVarDecl()
 	GetToken(&t);
 	RewindTo(&t);
 
-	// A class property decl can be preceded by 'private' 
+	// A class property decl can be preceded by 'private' or 'protected'
 	sToken t1;
 	GetToken(&t1);
-	if( t1.type != ttPrivate )
+	if( t1.type != ttPrivate && t1.type != ttProtected )
 		RewindTo(&t1);
 
 	// A variable decl can start with a const
@@ -2114,25 +2334,28 @@ bool asCParser::IsVarDecl()
 	if( t1.type == ttConst )
 		GetToken(&t1);
 
-	// The type may be initiated with the scope operator
-	if( t1.type == ttScope )
-		GetToken(&t1);
-
-	// The type may be preceeded with a multilevel scope
 	sToken t2;
-	GetToken(&t2);
-	while( t1.type == ttIdentifier && t2.type == ttScope )
+	if( t1.type != ttAuto )
 	{
-		GetToken(&t1);
+		// The type may be initiated with the scope operator
+		if( t1.type == ttScope )
+			GetToken(&t1);
+
+		// The type may be preceeded with a multilevel scope
 		GetToken(&t2);
+		while( t1.type == ttIdentifier && t2.type == ttScope )
+		{
+			GetToken(&t1);
+			GetToken(&t2);
+		}
+		RewindTo(&t2);
 	}
-	RewindTo(&t2);
 
 	// We don't validate if the identifier is an actual declared type at this moment
 	// as it may wrongly identify the statement as a non-declaration if the user typed
 	// the name incorrectly. The real type is validated in ParseDeclaration where a
 	// proper error message can be given.
-	if( !IsRealType(t1.type) && t1.type != ttIdentifier )
+	if( !IsRealType(t1.type) && t1.type != ttIdentifier && t1.type != ttAuto )
 	{
 		RewindTo(&t);
 		return false;
@@ -2145,8 +2368,10 @@ bool asCParser::IsVarDecl()
 	}
 
 	// Object handles can be interleaved with the array brackets
+	// Even though declaring variables with & is invalid we'll accept 
+	// it here to give an appropriate error message later
 	GetToken(&t2);
-	while( t2.type == ttHandle || t2.type == ttOpenBracket )
+	while( t2.type == ttHandle || t2.type == ttAmp || t2.type == ttOpenBracket )
 	{
 		if( t2.type == ttOpenBracket )
 		{
@@ -2193,7 +2418,7 @@ bool asCParser::IsVarDecl()
 			GetToken(&t2);
 		}
 
-		if( t2.type == ttEnd ) 
+		if( t2.type == ttEnd )
 			return false;
 		else
 		{
@@ -2219,10 +2444,10 @@ bool asCParser::IsVirtualPropertyDecl()
 	GetToken(&t);
 	RewindTo(&t);
 
-	// A class property decl can be preceded by 'private' 
+	// A class property decl can be preceded by 'private' or 'protected'
 	sToken t1;
 	GetToken(&t1);
-	if( t1.type != ttPrivate )
+	if( t1.type != ttPrivate && t1.type != ttProtected )
 		RewindTo(&t1);
 
 	// A variable decl can start with a const
@@ -2290,10 +2515,10 @@ bool asCParser::IsFuncDecl(bool isMethod)
 
 	if( isMethod )
 	{
-		// A class method decl can be preceded by 'private' 
+		// A class method decl can be preceded by 'private' or 'protected'
 		sToken t1, t2;
 		GetToken(&t1);
-		if( t1.type != ttPrivate )
+		if( t1.type != ttPrivate && t1.type != ttProtected )
 			RewindTo(&t1);
 
 		// A class constructor starts with identifier followed by parenthesis
@@ -2393,7 +2618,7 @@ bool asCParser::IsFuncDecl(bool isMethod)
 			GetToken(&t2);
 		}
 
-		if( t2.type == ttEnd ) 
+		if( t2.type == ttEnd )
 			return false;
 		else
 		{
@@ -2430,6 +2655,7 @@ bool asCParser::IsFuncDecl(bool isMethod)
 	return false;
 }
 
+// BNF: FUNCDEF ::= 'funcdef' TYPE ['&'] IDENTIFIER PARAMLIST ';'
 asCScriptNode *asCParser::ParseFuncDef()
 {
 	asCScriptNode *node = CreateNode(snFuncDef);
@@ -2461,6 +2687,7 @@ asCScriptNode *asCParser::ParseFuncDef()
 	if( t1.type != ttEndStatement )
 	{
 		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -2469,6 +2696,7 @@ asCScriptNode *asCParser::ParseFuncDef()
 	return node;
 }
 
+// BNF: FUNC ::= ['private' | 'protected' | 'shared'] [((TYPE ['&']) | '~')] IDENTIFIER PARAMLIST ['const'] {'override' | 'final'} STATBLOCK 
 asCScriptNode *asCParser::ParseFunction(bool isMethod)
 {
 	asCScriptNode *node = CreateNode(snFunction);
@@ -2479,12 +2707,12 @@ asCScriptNode *asCParser::ParseFunction(bool isMethod)
 	GetToken(&t2);
 	RewindTo(&t1);
 
-	// A class method can start with private
+	// A class method can start with 'private' or 'protected'
 	if( isMethod && t1.type == ttPrivate )
-	{
 		node->AddChildLast(ParseToken(ttPrivate));
-		if( isSyntaxError ) return node;
-	}
+	else if( isMethod && t1.type == ttProtected )
+		node->AddChildLast(ParseToken(ttProtected));
+	if( isSyntaxError ) return node;
 
 	// A global function can be marked as shared
 	if( !isMethod && IdentifierIs(t1, SHARED_TOKEN) )
@@ -2525,6 +2753,7 @@ asCScriptNode *asCParser::ParseFunction(bool isMethod)
 		if( t1.type == ttConst )
 			node->AddChildLast(ParseToken(ttConst));
 
+		// TODO: Should support abstract methods, in which case no statement block should be provided
 		ParseMethodOverrideBehaviors(node);
 		if( isSyntaxError ) return node;
 	}
@@ -2536,6 +2765,7 @@ asCScriptNode *asCParser::ParseFunction(bool isMethod)
 	return node;
 }
 
+// BNF: INTFMTHD ::= TYPE ['&'] IDENTIFIER PARAMLIST ['const'] ';'
 asCScriptNode *asCParser::ParseInterfaceMethod()
 {
 	asCScriptNode *node = CreateNode(snFunction);
@@ -2564,6 +2794,7 @@ asCScriptNode *asCParser::ParseInterfaceMethod()
 	if( t1.type != ttEndStatement )
 	{
 		Error(ExpectedToken(";"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -2572,6 +2803,7 @@ asCScriptNode *asCParser::ParseInterfaceMethod()
 	return node;
 }
 
+// BNF: VIRTPROP ::= ['private' | 'protected'] TYPE ['&'] IDENTIFIER '{' {('get' | 'set') ['const'] [('override' | 'final')] (STATBLOCK | ';')} '}'
 asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterface)
 {
 	asCScriptNode *node = CreateNode(snVirtualProperty);
@@ -2582,12 +2814,12 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 	GetToken(&t2);
 	RewindTo(&t1);
 
-	// A class method can start with private
+	// A class method can start with 'private' or 'protected'
 	if( isMethod && t1.type == ttPrivate )
-	{
 		node->AddChildLast(ParseToken(ttPrivate));
-		if( isSyntaxError ) return node;
-	}
+	else if( isMethod && t1.type == ttProtected )
+		node->AddChildLast(ParseToken(ttProtected));
+	if( isSyntaxError ) return node;
 
 	node->AddChildLast(ParseType(true));
 	if( isSyntaxError ) return node;
@@ -2602,6 +2834,7 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 	if( t1.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -2646,6 +2879,7 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 				else if( t1.type != ttEndStatement )
 				{
 					Error(ExpectedTokens(";", "{"), &t1);
+					Error(InsteadFound(t1), &t1);
 					return node;
 				}
 			}
@@ -2655,6 +2889,7 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 				if( t1.type != ttEndStatement )
 				{
 					Error(ExpectedToken(";"), &t1);
+					Error(InsteadFound(t1), &t1);
 					return node;
 				}
 			}
@@ -2665,6 +2900,7 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 		{
 			const char *tokens[] = { GET_TOKEN, SET_TOKEN, asCTokenizer::GetDefinition(ttEndStatementBlock) };
 			Error(ExpectedOneOf(tokens, 3), &t1);
+			Error(InsteadFound(t1), &t1);
 			return node;
 		}
 	}
@@ -2672,6 +2908,7 @@ asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterfa
 	return node;
 }
 
+// BNF: INTERFACE ::= ['shared'] 'interface' IDENTIFIER [':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | INTFMTHD} '}'
 asCScriptNode *asCParser::ParseInterface()
 {
 	asCScriptNode *node = CreateNode(snInterface);
@@ -2687,6 +2924,7 @@ asCScriptNode *asCParser::ParseInterface()
 		if( tempString != SHARED_TOKEN )
 		{
 			Error(ExpectedToken(SHARED_TOKEN), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
@@ -2698,6 +2936,7 @@ asCScriptNode *asCParser::ParseInterface()
 	if( t.type != ttInterface )
 	{
 		Error(ExpectedToken("interface"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2729,6 +2968,7 @@ asCScriptNode *asCParser::ParseInterface()
 	if( t.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2756,6 +2996,7 @@ asCScriptNode *asCParser::ParseInterface()
 	if( t.type != ttEndStatementBlock )
 	{
 		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2764,6 +3005,7 @@ asCScriptNode *asCParser::ParseInterface()
 	return node;
 }
 
+// BNF: MIXIN ::= 'mixin' CLASS
 asCScriptNode *asCParser::ParseMixin()
 {
 	asCScriptNode *node = CreateNode(snMixin);
@@ -2775,6 +3017,7 @@ asCScriptNode *asCParser::ParseMixin()
 	if( t.type != ttMixin )
 	{
 		Error(ExpectedToken("mixin"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2786,6 +3029,7 @@ asCScriptNode *asCParser::ParseMixin()
 	return node;
 }
 
+// BNF: CLASS ::= {'shared' | 'abstract' | 'final'} 'class' IDENTIFIER [':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | FUNC | VAR} '}'
 asCScriptNode *asCParser::ParseClass()
 {
 	asCScriptNode *node = CreateNode(snClass);
@@ -2794,15 +3038,10 @@ asCScriptNode *asCParser::ParseClass()
 	sToken t;
 	GetToken(&t);
 
-	// Allow the keyword 'shared' before 'class'
-	if( IdentifierIs(t, SHARED_TOKEN) )
-	{
-		RewindTo(&t);
-		node->AddChildLast(ParseIdentifier());
-		GetToken(&t);
-	}
-
-	if( IdentifierIs(t, FINAL_TOKEN) )
+	// Allow the keywords 'shared', 'abstract', and 'final' before 'class'
+	while( IdentifierIs(t, SHARED_TOKEN) ||
+		   IdentifierIs(t, ABSTRACT_TOKEN) ||
+		   IdentifierIs(t, FINAL_TOKEN) )
 	{
 		RewindTo(&t);
 		node->AddChildLast(ParseIdentifier());
@@ -2812,6 +3051,7 @@ asCScriptNode *asCParser::ParseClass()
 	if( t.type != ttClass )
 	{
 		Error(ExpectedToken("class"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2855,6 +3095,7 @@ asCScriptNode *asCParser::ParseClass()
 	if( t.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -2876,9 +3117,13 @@ asCScriptNode *asCParser::ParseClass()
 		else 
 		{
 			Error(TXT_EXPECTED_METHOD_OR_PROPERTY, &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
+		if( isSyntaxError )
+			return node;
+
 		GetToken(&t);
 		RewindTo(&t);
 	}
@@ -2887,6 +3132,7 @@ asCScriptNode *asCParser::ParseClass()
 	if( t.type != ttEndStatementBlock )
 	{
 		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 	node->UpdateSourcePos(t.pos, t.length);
@@ -2925,6 +3171,7 @@ int asCParser::ParseVarInit(asCScriptCode *script, asCScriptNode *init)
 	{
 		int tokens[] = {ttAssignment, ttOpenParanthesis};
 		Error(ExpectedOneOf(tokens, 2), &t);
+		Error(InsteadFound(t), &t);
 	}
 
 	// Don't allow any more tokens after the expression
@@ -3040,6 +3287,7 @@ asCScriptNode *asCParser::SuperficiallyParseVarInit()
 	{
 		int tokens[] = {ttAssignment, ttOpenParanthesis};
 		Error(ExpectedOneOf(tokens, 2), &t);
+		Error(InsteadFound(t), &t);
 	}
 
 	return node;
@@ -3057,6 +3305,7 @@ asCScriptNode *asCParser::SuperficiallyParseStatementBlock()
 	if( t1.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -3090,6 +3339,7 @@ asCScriptNode *asCParser::SuperficiallyParseStatementBlock()
 	return node;
 }
 
+// BNF: STATBLOCK ::= '{' {VAR | STATEMENT} '}'
 asCScriptNode *asCParser::ParseStatementBlock()
 {
 	asCScriptNode *node = CreateNode(snStatementBlock);
@@ -3101,6 +3351,7 @@ asCScriptNode *asCParser::ParseStatementBlock()
 	if( t1.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -3171,6 +3422,7 @@ asCScriptNode *asCParser::ParseStatementBlock()
 	UNREACHABLE_RETURN;
 }
 
+// BNF: INITLIST ::= '{' [ASSIGN | INITLIST] {',' [ASSIGN | INITLIST]} '}'
 asCScriptNode *asCParser::ParseInitList()
 {
 	asCScriptNode *node = CreateNode(snInitList);
@@ -3182,6 +3434,7 @@ asCScriptNode *asCParser::ParseInitList()
 	if( t1.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
 		return node;
 	}
 
@@ -3205,12 +3458,14 @@ asCScriptNode *asCParser::ParseInitList()
 			{
 				// No expression 
 				node->AddChildLast(CreateNode(snUndefined));
+				node->lastChild->UpdateSourcePos(t1.pos, 1);
 				
 				GetToken(&t1);
 				if( t1.type == ttEndStatementBlock )
 				{
 					// No expression
 					node->AddChildLast(CreateNode(snUndefined));
+					node->lastChild->UpdateSourcePos(t1.pos, 1);
 					node->UpdateSourcePos(t1.pos, t1.length);
 					return node;
 				}
@@ -3220,7 +3475,7 @@ asCScriptNode *asCParser::ParseInitList()
 			{
 				// No expression 
 				node->AddChildLast(CreateNode(snUndefined));
-
+				node->lastChild->UpdateSourcePos(t1.pos, 1);
 				node->UpdateSourcePos(t1.pos, t1.length);
 
 				// Statement block is finished
@@ -3245,6 +3500,7 @@ asCScriptNode *asCParser::ParseInitList()
 				else
 				{
 					Error(ExpectedTokens("}", ","), &t1);
+					Error(InsteadFound(t1), &t1);
 					return node;
 				}
 			}
@@ -3268,6 +3524,7 @@ asCScriptNode *asCParser::ParseInitList()
 				else
 				{
 					Error(ExpectedTokens("}", ","), &t1);
+					Error(InsteadFound(t1), &t1);
 					return node;
 				}
 			}
@@ -3276,6 +3533,7 @@ asCScriptNode *asCParser::ParseInitList()
 	UNREACHABLE_RETURN;
 }
 
+// BNF: VAR ::= ['private'|'protected'] TYPE IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST] {',' IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST]} ';'
 asCScriptNode *asCParser::ParseDeclaration(bool isClassProp, bool isGlobalVar)
 {
 	asCScriptNode *node = CreateNode(snDeclaration);
@@ -3288,9 +3546,11 @@ asCScriptNode *asCParser::ParseDeclaration(bool isClassProp, bool isGlobalVar)
 	// A class property can be preceeded by private
 	if( t.type == ttPrivate && isClassProp )
 		node->AddChildLast(ParseToken(ttPrivate));
+	else if( t.type == ttProtected && isClassProp )
+		node->AddChildLast(ParseToken(ttProtected));
 	
 	// Parse data type
-	node->AddChildLast(ParseType(true));
+	node->AddChildLast(ParseType(true, false, !isClassProp));
 	if( isSyntaxError ) return node;
 
 	for(;;)
@@ -3352,12 +3612,14 @@ asCScriptNode *asCParser::ParseDeclaration(bool isClassProp, bool isGlobalVar)
 		else
 		{
 			Error(ExpectedTokens(",", ";"), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 	}
 	UNREACHABLE_RETURN;
 }
 
+// BNF: STATEMENT ::= (IF | FOR | WHILE | RETURN | STATBLOCK | BREAK | CONTINUE | DOWHILE | SWITCH | EXPRSTAT)
 asCScriptNode *asCParser::ParseStatement()
 {
 	sToken t1;
@@ -3384,9 +3646,17 @@ asCScriptNode *asCParser::ParseStatement()
 	else if( t1.type == ttSwitch )
 		return ParseSwitch();
 	else
+	{
+		if( IsVarDecl() )
+		{
+			Error(TXT_UNEXPECTED_VAR_DECL, &t1);
+			return 0;
+		}
 		return ParseExpressionStatement();
+	}
 }
 
+// BNF: EXPRSTAT ::= [ASSIGN] ';'
 asCScriptNode *asCParser::ParseExpressionStatement()
 {
 	asCScriptNode *node = CreateNode(snExpressionStatement);
@@ -3410,6 +3680,7 @@ asCScriptNode *asCParser::ParseExpressionStatement()
 	if( t.type != ttEndStatement )
 	{
 		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3418,6 +3689,7 @@ asCScriptNode *asCParser::ParseExpressionStatement()
 	return node;
 }
 
+// BNF: SWITCH ::= 'switch' '(' ASSIGN ')' '{' {CASE} '}'
 asCScriptNode *asCParser::ParseSwitch()
 {
 	asCScriptNode *node = CreateNode(snSwitch);
@@ -3428,6 +3700,7 @@ asCScriptNode *asCParser::ParseSwitch()
 	if( t.type != ttSwitch )
 	{
 		Error(ExpectedToken("switch"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3437,6 +3710,7 @@ asCScriptNode *asCParser::ParseSwitch()
 	if( t.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3447,6 +3721,7 @@ asCScriptNode *asCParser::ParseSwitch()
 	if( t.type != ttCloseParanthesis )
 	{
 		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3454,6 +3729,7 @@ asCScriptNode *asCParser::ParseSwitch()
 	if( t.type != ttStartStatementBlock )
 	{
 		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 	
@@ -3470,6 +3746,7 @@ asCScriptNode *asCParser::ParseSwitch()
 		{
 			const char *tokens[] = {"case", "default"};
 			Error(ExpectedOneOf(tokens, 2), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 
@@ -3480,12 +3757,14 @@ asCScriptNode *asCParser::ParseSwitch()
 	if( t.type != ttEndStatementBlock )
 	{
 		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
 	return node;
 }
 
+// BNF: CASE ::= (('case' EXPR) | 'default') ':' {STATEMENT}
 asCScriptNode *asCParser::ParseCase()
 {
 	asCScriptNode *node = CreateNode(snCase);
@@ -3496,6 +3775,7 @@ asCScriptNode *asCParser::ParseCase()
 	if( t.type != ttCase && t.type != ttDefault )
 	{
 		Error(ExpectedTokens("case", "default"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3510,6 +3790,7 @@ asCScriptNode *asCParser::ParseCase()
 	if( t.type != ttColon )
 	{
 		Error(ExpectedToken(":"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3539,6 +3820,7 @@ asCScriptNode *asCParser::ParseCase()
 	return node;
 }
 
+// BNF: IF ::= 'if' '(' ASSIGN ')' STATEMENT ['else' STATEMENT]
 asCScriptNode *asCParser::ParseIf()
 {
 	asCScriptNode *node = CreateNode(snIf);
@@ -3549,6 +3831,7 @@ asCScriptNode *asCParser::ParseIf()
 	if( t.type != ttIf )
 	{
 		Error(ExpectedToken("if"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3558,6 +3841,7 @@ asCScriptNode *asCParser::ParseIf()
 	if( t.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3568,6 +3852,7 @@ asCScriptNode *asCParser::ParseIf()
 	if( t.type != ttCloseParanthesis )
 	{
 		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3587,6 +3872,7 @@ asCScriptNode *asCParser::ParseIf()
 	return node;
 }
 
+// BNF: FOR ::= 'for' '(' (VAR | EXPRSTAT) EXPRSTAT [ASSIGN] ')' STATEMENT
 asCScriptNode *asCParser::ParseFor()
 {
 	asCScriptNode *node = CreateNode(snFor);
@@ -3597,6 +3883,7 @@ asCScriptNode *asCParser::ParseFor()
 	if( t.type != ttFor )
 	{
 		Error(ExpectedToken("for"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3606,6 +3893,7 @@ asCScriptNode *asCParser::ParseFor()
 	if( t.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3633,6 +3921,7 @@ asCScriptNode *asCParser::ParseFor()
 		if( t.type != ttCloseParanthesis )
 		{
 			Error(ExpectedToken(")"), &t);
+			Error(InsteadFound(t), &t);
 			return node;
 		}
 	}
@@ -3642,6 +3931,7 @@ asCScriptNode *asCParser::ParseFor()
 	return node;
 }
 
+// BNF: WHILE ::= 'while' '(' ASSIGN ')' STATEMENT
 asCScriptNode *asCParser::ParseWhile()
 {
 	asCScriptNode *node = CreateNode(snWhile);
@@ -3652,6 +3942,7 @@ asCScriptNode *asCParser::ParseWhile()
 	if( t.type != ttWhile )
 	{
 		Error(ExpectedToken("while"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3661,6 +3952,7 @@ asCScriptNode *asCParser::ParseWhile()
 	if( t.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3671,6 +3963,7 @@ asCScriptNode *asCParser::ParseWhile()
 	if( t.type != ttCloseParanthesis )
 	{
 		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3679,6 +3972,7 @@ asCScriptNode *asCParser::ParseWhile()
 	return node;
 }
 
+// BNF: DOWHILE ::= 'do' STATEMENT 'while' '(' ASSIGN ')' ';'
 asCScriptNode *asCParser::ParseDoWhile()
 {
 	asCScriptNode *node = CreateNode(snDoWhile);
@@ -3689,6 +3983,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	if( t.type != ttDo )
 	{
 		Error(ExpectedToken("do"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3701,6 +3996,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	if( t.type != ttWhile )
 	{
 		Error(ExpectedToken("while"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3708,6 +4004,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	if( t.type != ttOpenParanthesis )
 	{
 		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3718,6 +4015,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	if( t.type != ttCloseParanthesis )
 	{
 		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3725,6 +4023,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	if( t.type != ttEndStatement )
 	{
 		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 	node->UpdateSourcePos(t.pos, t.length);
@@ -3732,6 +4031,7 @@ asCScriptNode *asCParser::ParseDoWhile()
 	return node;
 }
 
+// BNF: RETURN ::= 'return' [ASSIGN] ';'
 asCScriptNode *asCParser::ParseReturn()
 {
 	asCScriptNode *node = CreateNode(snReturn);
@@ -3742,6 +4042,7 @@ asCScriptNode *asCParser::ParseReturn()
 	if( t.type != ttReturn )
 	{
 		Error(ExpectedToken("return"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3763,6 +4064,7 @@ asCScriptNode *asCParser::ParseReturn()
 	if( t.type != ttEndStatement )
 	{
 		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3771,6 +4073,7 @@ asCScriptNode *asCParser::ParseReturn()
 	return node;
 }
 
+// BNF: BREAK ::= 'break' ';'
 asCScriptNode *asCParser::ParseBreak()
 {
 	asCScriptNode *node = CreateNode(snBreak);
@@ -3781,6 +4084,7 @@ asCScriptNode *asCParser::ParseBreak()
 	if( t.type != ttBreak )
 	{
 		Error(ExpectedToken("break"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3788,13 +4092,17 @@ asCScriptNode *asCParser::ParseBreak()
 
 	GetToken(&t);
 	if( t.type != ttEndStatement )
+	{
 		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+	}
 
 	node->UpdateSourcePos(t.pos, t.length);
 
 	return node;
 }
 
+// BNF: CONTINUE ::= 'continue' ';'
 asCScriptNode *asCParser::ParseContinue()
 {
 	asCScriptNode *node = CreateNode(snContinue);
@@ -3805,6 +4113,7 @@ asCScriptNode *asCParser::ParseContinue()
 	if( t.type != ttContinue )
 	{
 		Error(ExpectedToken("continue"), &t);
+		Error(InsteadFound(t), &t);
 		return node;
 	}
 
@@ -3812,7 +4121,10 @@ asCScriptNode *asCParser::ParseContinue()
 
 	GetToken(&t);
 	if( t.type != ttEndStatement )
+	{
 		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+	}
 
 	node->UpdateSourcePos(t.pos, t.length);
 
@@ -3820,6 +4132,7 @@ asCScriptNode *asCParser::ParseContinue()
 }
 
 // TODO: typedef: Typedefs should accept complex types as well
+// BNF: TYPEDEF ::= 'typedef' PRIMTYPE IDENTIFIER ';'
 asCScriptNode *asCParser::ParseTypedef()
 {
 	// Create the typedef node
@@ -3831,7 +4144,8 @@ asCScriptNode *asCParser::ParseTypedef()
 	GetToken(&token);
 	if( token.type != ttTypedef)
 	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttTypedef)), &token);
+		Error(InsteadFound(token), &token);
 		return node;
 	}
 	
@@ -3860,6 +4174,7 @@ asCScriptNode *asCParser::ParseTypedef()
 	{
 		RewindTo(&token);
 		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
+		Error(InsteadFound(token), &token);
 	}
 
 	return node;
@@ -3884,3 +4199,4 @@ void asCParser::ParseMethodOverrideBehaviors(asCScriptNode *funcNode)
 
 END_AS_NAMESPACE
 
+
diff --git a/lib/angelscript/source/as_parser.h b/lib/angelscript/source/as_parser.h
index ed2f15cc9..76d74c0ba 100644
--- a/lib/angelscript/source/as_parser.h
+++ b/lib/angelscript/source/as_parser.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -76,6 +76,7 @@ protected:
 	void RewindTo(const sToken *token);
 	void SetPos(size_t pos);
 	void Error(const asCString &text, sToken *token);
+	void Warning(const asCString &text, sToken *token);
 	void Info(const asCString &text, sToken *token);
 
 	asCScriptNode *CreateNode(eScriptNode type);
@@ -83,11 +84,11 @@ protected:
 	asCScriptNode *ParseFunctionDefinition();
 	asCScriptNode *ParseParameterList();
 	asCScriptNode *SuperficiallyParseExpression();
-	asCScriptNode *ParseType(bool allowConst, bool allowVariableType = false);
+	asCScriptNode *ParseType(bool allowConst, bool allowVariableType = false, bool allowAuto = false);
 	asCScriptNode *ParseTypeMod(bool isParam);
 	void           ParseOptionalScope(asCScriptNode *node);
 	asCScriptNode *ParseRealType();
-	asCScriptNode *ParseDataType(bool allowVariableType = false);
+	asCScriptNode *ParseDataType(bool allowVariableType = false, bool allowAuto = false);
 	asCScriptNode *ParseIdentifier();
 
 	asCScriptNode *ParseListPattern();
@@ -143,7 +144,7 @@ protected:
 	asCScriptNode *ParseExprPreOp();
 	asCScriptNode *ParseExprPostOp();
 	asCScriptNode *ParseExprValue();
-	asCScriptNode *ParseArgList();
+	asCScriptNode *ParseArgList(bool withParenthesis = true);
 	asCScriptNode *ParseFunctionCall();
 	asCScriptNode *ParseVariableAccess();
 	asCScriptNode *ParseConstructCall();
@@ -168,6 +169,7 @@ protected:
 	asCString ExpectedTokens(const char *token1, const char *token2);
 	asCString ExpectedOneOf(int *tokens, int count);
 	asCString ExpectedOneOf(const char **tokens, int count);
+	asCString InsteadFound(sToken &t);
 
 	bool errorWhileParsing;
 	bool isSyntaxError;
diff --git a/lib/angelscript/source/as_property.h b/lib/angelscript/source/as_property.h
index cb489c4b7..983ee644f 100644
--- a/lib/angelscript/source/as_property.h
+++ b/lib/angelscript/source/as_property.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -54,11 +54,14 @@ class asCObjectProperty
 {
 public:
 	asCObjectProperty() {accessMask = 0xFFFFFFFF;}
+	asCObjectProperty(const asCObjectProperty &o) : name(o.name), type(o.type), byteOffset(o.byteOffset), accessMask(o.accessMask), isPrivate(o.isPrivate), isProtected(o.isProtected), isInherited(o.isInherited) {}
 	asCString   name;
 	asCDataType type;
 	int         byteOffset;
-	bool		isPrivate;
 	asDWORD     accessMask;
+	bool        isPrivate;
+	bool        isProtected;
+	bool        isInherited;
 };
 
 class asCGlobalProperty
@@ -69,7 +72,7 @@ public:
 
 	void AddRef();
 	void Release();
-	int  GetRefCount();
+	void DestroyInternal();
 
 	void *GetAddressOfValue();
 	void  AllocateMemory();
@@ -84,16 +87,7 @@ public:
 	void SetInitFunc(asCScriptFunction *initFunc);
 	asCScriptFunction *GetInitFunc();
 
-	static void RegisterGCBehaviours(asCScriptEngine *engine);
-
 //protected:
-	void SetGCFlag();
-	bool GetGCFlag();
-	void EnumReferences(asIScriptEngine *);
-	void ReleaseAllHandles(asIScriptEngine *);
-
-	void Orphan(asCModule *module);
-
 	// This is only stored for registered properties, and keeps the pointer given by the application
 	void       *realAddress;
 
@@ -108,7 +102,6 @@ public:
 	// The global property structure is reference counted, so that the
 	// engine can keep track of how many references to the property there are.
 	asCAtomic refCount;
-	bool      gcFlag;
 };
 
 class asCCompGlobPropType : public asIFilter
diff --git a/lib/angelscript/source/as_restore.cpp b/lib/angelscript/source/as_restore.cpp
index fd0a1322d..19eacc933 100644
--- a/lib/angelscript/source/as_restore.cpp
+++ b/lib/angelscript/source/as_restore.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -119,7 +119,7 @@ int asCReader::Error(const char *msg)
 		error = true;
 	}
 
-	return -1;
+	return asERROR;
 }
 
 int asCReader::ReadInner() 
@@ -153,9 +153,9 @@ int asCReader::ReadInner()
 		bool sharedExists = false;
 		if( ot->IsShared() )
 		{
-			for( asUINT n = 0; n < engine->classTypes.GetLength(); n++ )
+			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
 			{
-				asCObjectType *t = engine->classTypes[n];
+				asCObjectType *t = engine->sharedScriptTypes[n];
 				if( t && 
 					t->IsShared() &&
 					t->name == ot->name &&
@@ -171,11 +171,22 @@ int asCReader::ReadInner()
 		}
 
 		if( sharedExists )
+		{
 			existingShared.Insert(ot, true);
+			ot->AddRefInternal();
+		}
 		else
-			engine->classTypes.PushLast(ot);
+		{
+			if( ot->IsShared() )
+			{
+				engine->sharedScriptTypes.PushLast(ot);
+				ot->AddRefInternal();
+			}
+
+			// Set this module as the owner
+			ot->module = module;
+		}
 		module->enumTypes.PushLast(ot);
-		ot->AddRef();
 		ReadObjectTypeDeclaration(ot, 2);
 	}
 
@@ -200,9 +211,9 @@ int asCReader::ReadInner()
 		bool sharedExists = false;
 		if( ot->IsShared() )
 		{
-			for( asUINT n = 0; n < engine->classTypes.GetLength(); n++ )
+			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
 			{
-				asCObjectType *t = engine->classTypes[n];
+				asCObjectType *t = engine->sharedScriptTypes[n];
 				if( t &&
 					t->IsShared() &&
 					t->name == ot->name &&
@@ -218,16 +229,22 @@ int asCReader::ReadInner()
 		}
 
 		if( sharedExists )
+		{
 			existingShared.Insert(ot, true);
+			ot->AddRefInternal();
+		}
 		else
 		{
-			engine->classTypes.PushLast(ot);
+			if( ot->IsShared() )
+			{
+				engine->sharedScriptTypes.PushLast(ot);
+				ot->AddRefInternal();
+			}
 
 			// Set this module as the owner
 			ot->module = module;
 		}
 		module->classTypes.PushLast(ot);
-		ot->AddRef();
 	}
 
 	if( error ) return asERROR;
@@ -258,16 +275,13 @@ int asCReader::ReadInner()
 				{
 					// Replace our funcdef for the existing one
 					module->funcDefs[module->funcDefs.IndexOf(func)] = f2;
-					f2->AddRef();
+					f2->AddRefInternal();
 
 					engine->funcDefs.RemoveValue(func);
 
 					savedFunctions[savedFunctions.IndexOf(func)] = f2;
 
-					func->Release();
-
-					// Funcdefs aren't deleted when the ref count reaches zero so we must manually delete it here
-					asDELETE(func,asCScriptFunction);
+					func->ReleaseInternal();
 					break;
 				}
 			}
@@ -312,9 +326,8 @@ int asCReader::ReadInner()
 		}
 
 		ReadObjectTypeDeclaration(ot, 1);
-		engine->classTypes.PushLast(ot);
+		ot->module = module;
 		module->typeDefs.PushLast(ot);
-		ot->AddRef();
 		ReadObjectTypeDeclaration(ot, 2);
 	}
 
@@ -361,9 +374,9 @@ int asCReader::ReadInner()
 				{
 					// Replace the recently created function with the pre-existing function
 					module->scriptFunctions[module->scriptFunctions.GetLength()-1] = realFunc;
-					realFunc->AddRef();
+					realFunc->AddRefInternal();
 					savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-					engine->FreeScriptFunctionId(func->id);
+					engine->RemoveScriptFunction(func);
 
 					// Insert the function in the dontTranslate array
 					dontTranslate.Insert(realFunc, true);
@@ -371,7 +384,7 @@ int asCReader::ReadInner()
 					// Release the function, but make sure nothing else is released
 					func->id = 0;
 					func->scriptData->byteCode.SetLength(0);
-					func->Release();
+					func->ReleaseInternal();
 					break;
 				}
 			}
@@ -386,8 +399,11 @@ int asCReader::ReadInner()
 		func = ReadFunction(isNew, false, false);
 		if( func )
 		{
+			// All the global functions were already loaded while loading the scriptFunctions, here
+			// we're just re-reading the references to know which goes into the globalFunctions array
+			asASSERT( !isNew );
+
 			module->globalFunctions.Put(func);
-			func->AddRef();
 		}
 		else
 			Error(TXT_INVALID_BYTECODE_d);
@@ -475,17 +491,23 @@ int asCReader::ReadInner()
 			asCScriptFunction *callback = engine->scriptFunctions[usedTypes[i]->beh.templateCallback];
 			if( !engine->CallGlobalFunctionRetBool(usedTypes[i], &dontGarbageCollect, callback->sysFuncIntf, callback) )
 			{
-				asCString sub = usedTypes[i]->templateSubTypes[0].Format();
+				asCString sub = usedTypes[i]->templateSubTypes[0].Format(usedTypes[i]->nameSpace);
 				for( asUINT n = 1; n < usedTypes[i]->templateSubTypes.GetLength(); n++ )
 				{
 					sub += ",";
-					sub += usedTypes[i]->templateSubTypes[n].Format();
+					sub += usedTypes[i]->templateSubTypes[n].Format(usedTypes[i]->nameSpace);
 				}
 				asCString str;
 				str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, usedTypes[i]->name.AddressOf(), sub.AddressOf());
 				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
 				Error(TXT_INVALID_BYTECODE_d);
 			}
+			else
+			{
+				// If the callback said this template instance won't be garbage collected then remove the flag
+				if( dontGarbageCollect )
+					usedTypes[i]->flags &= ~asOBJ_GC;
+			}
 		}
 	}
 	engine->deferValidationOfTemplateTypes = false;
@@ -544,6 +566,12 @@ void asCReader::ReadUsedFunctions()
 	asUINT count;
 	count = ReadEncodedUInt();
 	usedFunctions.SetLength(count);
+	if( usedFunctions.GetLength() != count )
+	{
+		// Out of memory
+		error = true;
+		return;
+	}
 	memset(usedFunctions.AddressOf(), 0, sizeof(asCScriptFunction *)*count);
 
 	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
@@ -573,17 +601,35 @@ void asCReader::ReadUsedFunctions()
 			// Find the correct function
 			if( c == 'm' )
 			{
-				for( asUINT i = 0; i < module->scriptFunctions.GetLength(); i++ )
+				if( func.funcType == asFUNC_IMPORTED )
 				{
-					asCScriptFunction *f = module->scriptFunctions[i];
-					if( !func.IsSignatureEqual(f) ||
-						func.objectType != f->objectType ||
-						func.funcType != f->funcType || 
-						func.nameSpace != f->nameSpace )
-						continue;
+					for( asUINT i = 0; i < module->bindInformations.GetLength(); i++ )
+					{
+						asCScriptFunction *f = module->bindInformations[i]->importedFunctionSignature;
+						if( !func.IsSignatureEqual(f) ||
+							func.objectType != f->objectType ||
+							func.funcType != f->funcType || 
+							func.nameSpace != f->nameSpace )
+							continue;
 
-					usedFunctions[n] = f;
-					break;
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else
+				{
+					for( asUINT i = 0; i < module->scriptFunctions.GetLength(); i++ )
+					{
+						asCScriptFunction *f = module->scriptFunctions[i];
+						if( !func.IsSignatureEqual(f) ||
+							func.objectType != f->objectType ||
+							func.funcType != f->funcType || 
+							func.nameSpace != f->nameSpace )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
 				}
 			}
 			else
@@ -652,6 +698,12 @@ void asCReader::ReadFunctionSignature(asCScriptFunction *func)
 	}
 
 	func->inOutFlags.SetLength(func->parameterTypes.GetLength());
+	if( func->inOutFlags.GetLength() != func->parameterTypes.GetLength() )
+	{
+		// Out of memory
+		error = true;
+		return;
+	}
 	memset(func->inOutFlags.AddressOf(), 0, sizeof(asETypeModifiers)*func->inOutFlags.GetLength());
 	count = ReadEncodedUInt();
 	if( count > func->parameterTypes.GetLength() )
@@ -679,6 +731,12 @@ void asCReader::ReadFunctionSignature(asCScriptFunction *func)
 	if( count )
 	{
 		func->defaultArgs.SetLength(func->parameterTypes.GetLength());
+		if( func->defaultArgs.GetLength() != func->parameterTypes.GetLength() )
+		{
+			// Out of memory
+			error = true;
+			return;
+		}
 		memset(func->defaultArgs.AddressOf(), 0, sizeof(asCString*)*func->defaultArgs.GetLength());
 		for( i = 0; i < count; i++ )
 		{
@@ -697,10 +755,13 @@ void asCReader::ReadFunctionSignature(asCScriptFunction *func)
 	func->objectType = ReadObjectType();
 	if( func->objectType )
 	{
+		func->objectType->AddRefInternal();
+
 		asBYTE b;
 		ReadData(&b, 1);
 		func->isReadOnly = (b & 1) ? true : false;
 		func->isPrivate  = (b & 2) ? true : false;
+		func->isProtected = (b & 4) ? true : false;
 		func->nameSpace = engine->nameSpaces[0];
 	}
 	else
@@ -740,7 +801,7 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 
 	// Load the new function
 	isNew = true;
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine,module,asFUNC_DUMMY);
+	asCScriptFunction *func = asNEW(asCScriptFunction)(engine,0,asFUNC_DUMMY);
 	if( func == 0 )
 	{
 		// Out of memory
@@ -756,13 +817,20 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 	ReadFunctionSignature(func);
 	if( error )
 	{
-		asDELETE(func, asCScriptFunction);
+		func->DestroyHalfCreated();
 		return 0;
 	}
 
 	if( func->funcType == asFUNC_SCRIPT )
 	{
 		func->AllocateScriptFunctionData();
+		if( func->scriptData == 0 )
+		{
+			// Out of memory
+			error = true;
+			func->DestroyHalfCreated();
+			return 0;
+		}
 
 		if( addToGC && !addToModule )
 			engine->gc.AddScriptObjectToGC(func, &engine->functionBehaviours);
@@ -782,6 +850,13 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 			func->scriptData->funcVariableTypes.PushLast((asCScriptFunction*)(asPWORD)idx);
 			num = ReadEncodedUInt();
 			func->scriptData->objVariablePos.PushLast(num);
+
+			if( error )
+			{
+				// No need to continue (the error has already been reported before)
+				func->DestroyHalfCreated();
+				return 0;
+			}
 		}
 		if( count > 0 )
 			func->scriptData->objVariablesOnHeap = ReadEncodedUInt();
@@ -801,12 +876,26 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 		{
 			length = ReadEncodedUInt();
 			func->scriptData->lineNumbers.SetLength(length);
+			if( int(func->scriptData->lineNumbers.GetLength()) != length )
+			{
+				// Out of memory
+				error = true;
+				func->DestroyHalfCreated();
+				return 0;
+			}
 			for( i = 0; i < length; ++i )
 				func->scriptData->lineNumbers[i] = ReadEncodedUInt();
 
 			// Read the array of script sections 
 			length = ReadEncodedUInt();
 			func->scriptData->sectionIdxs.SetLength(length);
+			if( int(func->scriptData->sectionIdxs.GetLength()) != length )
+			{
+				// Out of memory
+				error = true;
+				func->DestroyHalfCreated();
+				return 0;
+			}
 			for( i = 0; i < length; ++i )
 			{
 				if( (i & 1) == 0 )
@@ -820,8 +909,6 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 			}
 		}
 
-		ReadData(&func->isShared, 1);
-
 		// Read the variable information
 		if( !noDebugInfo )
 		{
@@ -834,7 +921,7 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 				{
 					// Out of memory
 					error = true;
-					asDELETE(func, asCScriptFunction);
+					func->DestroyHalfCreated();
 					return 0;
 				}
 				func->scriptData->variables.PushLast(var);
@@ -843,10 +930,20 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 				var->stackOffset = ReadEncodedUInt();
 				ReadString(&var->name);
 				ReadDataType(&var->type);
+
+				if( error )
+				{
+					// No need to continue (the error has already been reported before)
+					func->DestroyHalfCreated();
+					return 0;
+				}
 			}
 		}
 
-		ReadData(&func->dontCleanUpOnException, 1);
+		char bits;
+		ReadData(&bits, 1);
+		func->isShared               = bits & 1 ? true : false;
+		func->dontCleanUpOnException = bits & 2 ? true : false;
 
 		// Read script section name
 		if( !noDebugInfo )
@@ -856,6 +953,21 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 			func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(name.AddressOf());
 			func->scriptData->declaredAt = ReadEncodedUInt();
 		}
+
+		// Read parameter names
+		if( !noDebugInfo )
+		{
+			asUINT count = asUINT(ReadEncodedUInt64());
+			if( count > func->parameterTypes.GetLength() )
+			{
+				error = true;
+				func->DestroyHalfCreated();
+				return 0;
+			}
+			func->parameterNames.SetLength(count);
+			for( asUINT n = 0; n < count; n++ )
+				ReadString(&func->parameterNames[n]);
+		}
 	}
 	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
 	{
@@ -866,11 +978,12 @@ asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool a
 	{
 		// The refCount is already 1
 		module->scriptFunctions.PushLast(func);
+		func->module = module;
 	}
 	if( addToEngine )
 	{
 		func->id = engine->GetNextScriptFunctionId();
-		engine->SetScriptFunction(func);
+		engine->AddScriptFunction(func);
 	}
 	if( func->objectType )
 		func->ComputeSignatureId();
@@ -900,18 +1013,16 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 		ot->beh.factory = 0;
 		ot->beh.constructors.PopLast(); // These will be read from the file
 		ot->beh.factories.PopLast(); // These will be read from the file
-		engine->scriptFunctions[ot->beh.addref]->AddRef();
-		engine->scriptFunctions[ot->beh.release]->AddRef();
-		engine->scriptFunctions[ot->beh.gcEnumReferences]->AddRef();
-		engine->scriptFunctions[ot->beh.gcGetFlag]->AddRef();
-		engine->scriptFunctions[ot->beh.gcGetRefCount]->AddRef();
-		engine->scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRef();
-		engine->scriptFunctions[ot->beh.gcSetFlag]->AddRef();
-		engine->scriptFunctions[ot->beh.copy]->AddRef();
+		engine->scriptFunctions[ot->beh.addref]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.release]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
+		engine->scriptFunctions[ot->beh.copy]->AddRefInternal();
 		// TODO: weak: Should not do this if the class has been declared with 'noweak'
-		engine->scriptFunctions[ot->beh.getWeakRefFlag]->AddRef();
-		for( asUINT i = 1; i < ot->beh.operators.GetLength(); i += 2 )
-			engine->scriptFunctions[ot->beh.operators[i]]->AddRef();
+		engine->scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
 	}
 	else if( phase == 2 )
 	{
@@ -990,7 +1101,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 			{
 				ot->derivedFrom = ReadObjectType();
 				if( ot->derivedFrom )
-					ot->derivedFrom->AddRef();
+					ot->derivedFrom->AddRefInternal();
 			}
 
 			// interfaces[] / interfaceVFTOffsets[]
@@ -1054,10 +1165,10 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 							// Destroy the function without releasing any references
 							func->id = 0;
 							func->scriptData->byteCode.SetLength(0);
-							func->Release();
+							func->ReleaseInternal();
 						}
 						module->scriptFunctions.PushLast(realFunc);
-						realFunc->AddRef();
+						realFunc->AddRefInternal();
 						dontTranslate.Insert(realFunc, true);
 					}
 				}
@@ -1066,7 +1177,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 					if( func )
 					{
 						ot->beh.destruct = func->id;
-						func->AddRef();
+						func->AddRefInternal();
 					}
 					else
 						ot->beh.destruct = 0;
@@ -1093,7 +1204,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
 									found = true;
 									module->scriptFunctions.PushLast(realFunc);
-									realFunc->AddRef();
+									realFunc->AddRefInternal();
 									dontTranslate.Insert(realFunc, true);
 									break;
 								}
@@ -1110,13 +1221,13 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 								// Destroy the function without releasing any references
 								func->id = 0;
 								func->scriptData->byteCode.SetLength(0);
-								func->Release();
+								func->ReleaseInternal();
 							}
 						}
 						else
 						{
 							ot->beh.constructors.PushLast(func->id);
-							func->AddRef();
+							func->AddRefInternal();
 
 							if( func->parameterTypes.GetLength() == 0 )
 								ot->beh.construct = func->id;
@@ -1144,7 +1255,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
 									found = true;
 									module->scriptFunctions.PushLast(realFunc);
-									realFunc->AddRef();
+									realFunc->AddRefInternal();
 									dontTranslate.Insert(realFunc, true);
 									break;
 								}
@@ -1161,13 +1272,13 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 								// Destroy the function without releasing any references
 								func->id = 0;
 								func->scriptData->byteCode.SetLength(0);
-								func->Release();
+								func->ReleaseInternal();
 							}
 						}
 						else
 						{
 							ot->beh.factories.PushLast(func->id);
-							func->AddRef();
+							func->AddRefInternal();
 
 							if( func->parameterTypes.GetLength() == 0 )
 								ot->beh.factory = func->id;
@@ -1203,7 +1314,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
 								found = true;
 								module->scriptFunctions.PushLast(realFunc);
-								realFunc->AddRef();
+								realFunc->AddRefInternal();
 								dontTranslate.Insert(realFunc, true);
 								break;
 							}
@@ -1221,7 +1332,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 							func->id = 0;
 							if( func->scriptData )
 								func->scriptData->byteCode.SetLength(0);
-							func->Release();
+							func->ReleaseInternal();
 						}
 					}
 					else
@@ -1231,13 +1342,13 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 							func->parameterTypes[0].GetObjectType() == func->objectType &&
 							(func->inOutFlags[0] & asTM_INREF) )
 						{
-							engine->scriptFunctions[ot->beh.copy]->Release();
+							engine->scriptFunctions[ot->beh.copy]->ReleaseInternal();
 							ot->beh.copy = func->id;
-							func->AddRef();
+							func->AddRefInternal();
 						}
 						
 						ot->methods.PushLast(func->id);
-						func->AddRef();
+						func->AddRefInternal();
 					}
 				}
 				else
@@ -1268,7 +1379,7 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
 								found = true;
 								module->scriptFunctions.PushLast(realFunc);
-								realFunc->AddRef();
+								realFunc->AddRefInternal();
 								dontTranslate.Insert(realFunc, true);
 								break;
 							}
@@ -1286,13 +1397,13 @@ void asCReader::ReadObjectTypeDeclaration(asCObjectType *ot, int phase)
 							func->id = 0;
 							if( func->scriptData )
 								func->scriptData->byteCode.SetLength(0);
-							func->Release();
+							func->ReleaseInternal();
 						}
 					}
 					else
 					{
 						ot->virtualFunctionTable.PushLast(func);
-						func->AddRef();
+						func->AddRefInternal();
 					}
 				}
 				else
@@ -1449,21 +1560,17 @@ void asCReader::ReadGlobalProperty()
 	asCGlobalProperty *prop = module->AllocateGlobalProperty(name.AddressOf(), type, nameSpace);
 
 	// Read the initialization function
-	bool f;
-	ReadData(&f, 1);
-	if( f )
+	bool isNew;
+	// Do not add the function to the GC at this time. It will 
+	// only be added to the GC when the module releases the property
+	asCScriptFunction *func = ReadFunction(isNew, false, true, false);
+	if( func )
 	{
-		bool isNew;
-		// Do not add the function to the GC at this time. It will 
-		// only be added to the GC when the module releases the property
-		asCScriptFunction *func = ReadFunction(isNew, false, true, false);
-		if( func )
-		{
-			prop->SetInitFunc(func);
-			func->Release();
-		}
-		else
-			Error(TXT_INVALID_BYTECODE_d);
+		// Make sure the function knows it is owned by the module
+		func->module = module;
+
+		prop->SetInitFunc(func);
+		func->ReleaseInternal();
 	}
 }
 
@@ -1473,47 +1580,49 @@ void asCReader::ReadObjectProperty(asCObjectType *ot)
 	ReadString(&name);
 	asCDataType dt;
 	ReadDataType(&dt);
-	bool isPrivate;
-	ReadData(&isPrivate, 1);
+	int flags = ReadEncodedUInt();
+	bool isPrivate = (flags & 1) ? true : false;
+	bool isProtected = (flags & 2) ? true : false;
+	bool isInherited = (flags & 4) ? true : false;
 
 	// TODO: shared: If the type is shared and pre-existing, we should just 
 	//               validate that the loaded methods match the original 
 	if( !existingShared.MoveTo(0, ot) )
-		ot->AddPropertyToClass(name, dt, isPrivate);
+		ot->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
 }
 
 void asCReader::ReadDataType(asCDataType *dt) 
 {
-	eTokenType tokenType;
-
-	tokenType = (eTokenType)ReadEncodedUInt();
-	if( tokenType == 0 )
+	// Check if this is a previously used type
+	asUINT n = ReadEncodedUInt();
+	if( n != 0 )
 	{
 		// Get the datatype from the cache
-		asUINT n = ReadEncodedUInt();
-		*dt = savedDataTypes[n];
+		*dt = savedDataTypes[n-1];
 		return;
 	}
 
+	// Read the type definition
+	eTokenType tokenType = (eTokenType)ReadEncodedUInt();
+
 	// Reserve a spot in the savedDataTypes
-	size_t saveSlot = savedDataTypes.GetLength();
+	asUINT saveSlot = savedDataTypes.GetLength();
 	savedDataTypes.PushLast(asCDataType());
 
 	// Read the datatype for the first time
 	asCObjectType *objType = 0;
-	bool isObjectHandle  = false;
-	bool isReadOnly      = false;
-	bool isHandleToConst = false;
-	bool isReference     = false;
-
 	if( tokenType == ttIdentifier )
-	{
 		objType = ReadObjectType();
-		ReadData(&isObjectHandle, 1);
-		ReadData(&isHandleToConst, 1);
-	}
-	ReadData(&isReference, 1);
-	ReadData(&isReadOnly, 1);
+
+	struct
+	{
+		char isObjectHandle :1;
+		char isHandleToConst:1;
+		char isReference    :1;
+		char isReadOnly     :1;
+	} bits = {0};
+	asASSERT( sizeof(bits) == 1 );
+	ReadData(&bits, 1);
 
 	asCScriptFunction *funcDef = 0;
 	if( tokenType == ttIdentifier && objType && objType->name == "_builtin_function_" )
@@ -1555,16 +1664,16 @@ void asCReader::ReadDataType(asCDataType *dt)
 		*dt = asCDataType::CreateObject(objType, false);
 	else
 		*dt = asCDataType::CreatePrimitive(tokenType, false);
-	if( isObjectHandle )
+	if( bits.isObjectHandle )
 	{
-		dt->MakeReadOnly(isHandleToConst);
+		dt->MakeReadOnly(bits.isHandleToConst ? true : false);
 		
 		// Here we must allow a scoped type to be a handle 
 		// e.g. if the datatype is for a system function
 		dt->MakeHandle(true, true);
 	}
-	dt->MakeReadOnly(isReadOnly);
-	dt->MakeReference(isReference);
+	dt->MakeReadOnly(bits.isReadOnly ? true : false);
+	dt->MakeReference(bits.isReference ? true : false);
 
 	// Update the previously saved slot
 	savedDataTypes[saveSlot] = *dt;
@@ -1578,9 +1687,12 @@ asCObjectType* asCReader::ReadObjectType()
 	if( ch == 'a' )
 	{
 		// Read the name of the template type
-		asCString typeName;
+		asCString typeName, ns;
 		ReadString(&typeName);
-		asCObjectType *tmpl = engine->GetRegisteredObjectType(typeName.AddressOf(), engine->nameSpaces[0]);
+		ReadString(&ns);
+		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+		asCObjectType *tmpl = engine->GetRegisteredObjectType(typeName.AddressOf(), nameSpace);
 		if( tmpl == 0 )
 		{
 			asCString str;
@@ -1615,17 +1727,17 @@ asCObjectType* asCReader::ReadObjectType()
 		else
 		{
 			// Get the template instance type based on the loaded subtypes
-			ot = engine->GetTemplateInstanceType(tmpl, subTypes);
+			ot = engine->GetTemplateInstanceType(tmpl, subTypes, module);
 		}
 
 		if( ot == 0 )
 		{
 			// Show all subtypes in error message
-			asCString sub = subTypes[0].Format();
+			asCString sub = subTypes[0].Format(nameSpace);
 			for( asUINT n = 1; n < subTypes.GetLength(); n++ )
 			{
 				sub += ",";
-				sub += subTypes[n].Format();
+				sub += subTypes[n].Format(nameSpace);
 			}
 			asCString str;
 			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, typeName.AddressOf(), sub.AddressOf());
@@ -1708,7 +1820,7 @@ asCObjectType* asCReader::ReadObjectType()
 	else
 	{
 		// No object type
-		asASSERT( ch == '\0' );
+		asASSERT( ch == '\0' || error );
 		ot = 0;
 	}
 
@@ -2080,9 +2192,10 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 	// Pre-compute the size of each instruction in order to translate jump offsets
 	asUINT n;
 	asDWORD *bc = func->scriptData->byteCode.AddressOf();
-	asCArray<asUINT> bcSizes(func->scriptData->byteCode.GetLength());
-	asCArray<asUINT> instructionNbrToPos(func->scriptData->byteCode.GetLength());
-	for( n = 0; n < func->scriptData->byteCode.GetLength(); )
+	asUINT bcLength = (asUINT)func->scriptData->byteCode.GetLength();
+	asCArray<asUINT> bcSizes(bcLength);
+	asCArray<asUINT> instructionNbrToPos(bcLength);
+	for( n = 0; n < bcLength; )
 	{
 		int c = *(asBYTE*)&bc[n];
 		asUINT size = asBCTypeSize[asBCInfo[c].type];
@@ -2097,7 +2210,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 	}
 
 	asUINT bcNum = 0;
-	for( n = 0; n < func->scriptData->byteCode.GetLength(); bcNum++ )
+	for( n = 0; n < bcLength; bcNum++ )
 	{
 		int c = *(asBYTE*)&bc[n];
 		if( c == asBC_REFCPY || 
@@ -2137,7 +2250,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 			{
 				// List patterns have a different way of adjusting the offsets
 				SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-				*(((short*)&bc[n])+2) = (short)listAdj->AdjustOffset(*(((short*)&bc[n])+2), ot);
+				*(((short*)&bc[n])+2) = (short)listAdj->AdjustOffset(*(((short*)&bc[n])+2));
 			}
 			else
 			{
@@ -2308,7 +2421,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 
 			// The adjuster also needs to know the list type so it can know the type of the elements
 			asCObjectType *ot = func->GetObjectTypeOfLocalVar(asBC_SWORDARG0(&bc[n]));
-			listAdjusters.PushLast(asNEW(SListAdjuster)(&bc[n], ot));
+			listAdjusters.PushLast(asNEW(SListAdjuster)(this, &bc[n], ot));
 		}
 		else if( c == asBC_FREE )
 		{
@@ -2319,6 +2432,12 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 			asCObjectType *ot = *(asCObjectType**)pot;
 			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
 			{
+				if( listAdjusters.GetLength() == 0 )
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+
 				// Finalize the adjustment of the list buffer that was initiated with asBC_AllocMem
 				SListAdjuster *list = listAdjusters.PopLast();
 				list->AdjustAllocMem();
@@ -2329,7 +2448,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 		{
 			// Adjust the offset in the list where the size is informed
 			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1], listAdj->patternType);
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
 
 			// Inform the list adjuster how many values will be repeated
 			listAdj->SetRepeatCount(bc[n+2]);
@@ -2338,13 +2457,13 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 		{
 			// Adjust the offset in the list where the size is informed
 			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1], listAdj->patternType);
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
 		}
 		else if( c == asBC_SetListType )
 		{
 			// Adjust the offset in the list where the typeid is informed
 			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1], listAdj->patternType);
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
 
 			// Translate the type id
 			bc[n+2] = FindTypeId(bc[n+2]);
@@ -2361,7 +2480,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 
 	// Adjust all variable positions in the bytecode
 	bc = func->scriptData->byteCode.AddressOf();
-	for( n = 0; n < func->scriptData->byteCode.GetLength(); )
+	for( n = 0; n < bcLength; )
 	{
 		int c = *(asBYTE*)&bc[n];
 		switch( asBCInfo[c].type )
@@ -2430,7 +2549,7 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 	//                 This will also make the AdjustGetOffset() function quicker as it can 
 	//                 receive the called function directly instead of having to search for it.
 	bc = func->scriptData->byteCode.AddressOf();
-	for( n = 0; n < func->scriptData->byteCode.GetLength(); )
+	for( n = 0; n < bcLength; )
 	{
 		int c = *(asBYTE*)&bc[n];
 
@@ -2461,8 +2580,8 @@ void asCReader::TranslateFunction(asCScriptFunction *func)
 	CalculateStackNeeded(func);
 }
 
-asCReader::SListAdjuster::SListAdjuster(asDWORD *bc, asCObjectType *listType) : 
-	allocMemBC(bc), maxOffset(0), patternType(listType), repeatCount(0), lastOffset(-1), nextTypeId(-1)
+asCReader::SListAdjuster::SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *listType) : 
+	reader(rd), allocMemBC(bc), maxOffset(0), patternType(listType), repeatCount(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
 {
 	asASSERT( patternType && (patternType->flags & asOBJ_LIST_PATTERN) );
 
@@ -2472,13 +2591,13 @@ asCReader::SListAdjuster::SListAdjuster(asDWORD *bc, asCObjectType *listType) :
 	patternNode = node->next;
 }
 
-int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatternType)
+int asCReader::SListAdjuster::AdjustOffset(int offset)
 {
-	// TODO: cleanup: The listPatternType parameter is not needed
-	asASSERT( listPatternType == patternType );
-	UNUSED_VAR( listPatternType );
-
-	asASSERT( offset >= lastOffset );
+	if( offset < lastOffset )
+	{
+		reader->Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
 
 	// If it is the same offset being accessed again, just return the same adjusted value
 	if( lastOffset == offset )
@@ -2488,7 +2607,7 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 	lastAdjustedOffset = maxOffset;
 
 	// What is being expected at this position?
-	if( patternNode->type == asLPT_REPEAT )
+	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
 	{
 		// Align the offset to 4 bytes boundary
 		if( maxOffset & 0x3 )
@@ -2499,6 +2618,7 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 
 		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
 		maxOffset += 4;
+		nextOffset = offset+1;
 		return lastAdjustedOffset;
 	}
 	else if( patternNode->type == asLPT_TYPE )
@@ -2513,7 +2633,7 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 
 				asCDataType dt = patternType->engine->GetDataTypeFromTypeId(nextTypeId);
 				asUINT size;
-				if( dt.IsObjectHandle() )
+				if( dt.IsObjectHandle() || (dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_REF)) )
 					size = AS_PTR_SIZE*4;
 				else
 					size = dt.GetSizeInMemoryBytes();
@@ -2532,6 +2652,7 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 				nextTypeId = -1;
 
 				maxOffset += size;
+				nextOffset = offset+1;
 				return lastAdjustedOffset;
 			}
 			else
@@ -2545,36 +2666,40 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 
 				// The first adjustment is for the typeId
 				maxOffset += 4;
-
+				nextOffset = offset+1;
 				return lastAdjustedOffset;
 			}
 		}
 		else
 		{
-			if( repeatCount > 0 )
-				repeatCount--;
-
 			// Determine the size of the element
 			asUINT size;
 			asCDataType dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
-			if( dt.IsObjectHandle() )
+			if( dt.IsObjectHandle() || (dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_REF)) )
 				size = AS_PTR_SIZE*4;
 			else
 				size = dt.GetSizeInMemoryBytes();
 
-			// Align the offset to 4 bytes boundary
-			if( size >= 4 && (maxOffset & 0x3) )
+			// If values are skipped, the offset needs to be incremented
+			while( nextOffset <= offset )
 			{
-				maxOffset += 4 - (maxOffset & 0x3);
-				lastAdjustedOffset = maxOffset;
-			}
+				if( repeatCount > 0 )
+					repeatCount--;
 
-			maxOffset += size;
+				// Align the offset to 4 bytes boundary
+				if( size >= 4 && (maxOffset & 0x3) )
+					maxOffset += 4 - (maxOffset & 0x3);
+
+				lastAdjustedOffset = maxOffset;
+				nextOffset += 1;
+				maxOffset += size;
+			}
 
 			// Only move the patternNode if we're not expecting any more repeated entries
 			if( repeatCount == 0 )
 				patternNode = patternNode->next;
 
+			nextOffset = offset+1;
 			return lastAdjustedOffset;
 		}
 	}
@@ -2589,10 +2714,16 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 		patternNode = patternNode->next;
 
 		lastOffset--;
-		return AdjustOffset(offset, listPatternType);
+		return AdjustOffset(offset);
 	}
 	else if( patternNode->type == asLPT_END )
 	{
+		if( stack.GetLength() == 0 )
+		{
+			reader->Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+
 		SInfo info = stack.PopLast();
 		repeatCount = info.repeatCount;
 		if( repeatCount )
@@ -2601,21 +2732,22 @@ int asCReader::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 			patternNode = patternNode->next;
 
 		lastOffset--;
-		return AdjustOffset(offset, listPatternType);
+		return AdjustOffset(offset);
 	}
 	else
 	{
 		// Something is wrong with the pattern list declaration
-		asASSERT( false );
+		reader->Error(TXT_INVALID_BYTECODE_d);
+		return 0;
 	}
 
-	return 0;
+	UNREACHABLE_RETURN;
 }
 
 void asCReader::SListAdjuster::SetRepeatCount(asUINT rc)
 {
 	// Make sure the list is expecting a repeat at this location
-	asASSERT( patternNode->type == asLPT_REPEAT );
+	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
 
 	// Now move to the next patternNode
 	patternNode = patternNode->next;
@@ -3285,6 +3417,7 @@ void asCWriter::WriteFunctionSignature(asCScriptFunction *func)
 		asBYTE b = 0;
 		b += func->isReadOnly ? 1 : 0;
 		b += func->isPrivate  ? 2 : 0;
+		b += func->isProtected ? 4 : 0;
 		WriteData(&b, 1);
 	}
 	else
@@ -3392,8 +3525,6 @@ void asCWriter::WriteFunction(asCScriptFunction* func)
 			}
 		}
 
-		WriteData(&func->isShared, 1);
-
 		// Write the variable information
 		if( !stripDebugInfo )
 		{
@@ -3409,7 +3540,10 @@ void asCWriter::WriteFunction(asCScriptFunction* func)
 			}
 		}
 
-		WriteData(&func->dontCleanUpOnException, 1);
+		char bits = 0;
+		bits += func->isShared ? 1 : 0;
+		bits += func->dontCleanUpOnException ? 2 : 0;
+		WriteData(&bits,1);
 
 		// Store script section name
 		if( !stripDebugInfo )
@@ -3423,6 +3557,15 @@ void asCWriter::WriteFunction(asCScriptFunction* func)
 			}
 			WriteEncodedInt64(func->scriptData->declaredAt);
 		}
+
+		// Store the parameter names
+		if( !stripDebugInfo )
+		{
+			asUINT count = asUINT(func->parameterNames.GetLength());
+			WriteEncodedInt64(count);
+			for( asUINT n = 0; n < count; n++ )
+				WriteString(&func->parameterNames[n]);
+		}
 	}
 	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
 	{
@@ -3487,6 +3630,7 @@ void asCWriter::WriteObjectTypeDeclaration(asCObjectType *ot, int phase)
 			int size = (asUINT)ot->interfaces.GetLength();
 			WriteEncodedInt64(size);
 			asUINT n;
+			asASSERT( ot->interfaces.GetLength() == ot->interfaceVFTOffsets.GetLength() );
 			for( n = 0; n < ot->interfaces.GetLength(); n++ )
 			{
 				WriteObjectType(ot->interfaces[n]);
@@ -3655,25 +3799,18 @@ void asCWriter::WriteGlobalProperty(asCGlobalProperty* prop)
 	WriteDataType(&prop->type);
 
 	// Store the initialization function
-	if( prop->GetInitFunc() )
-	{
-		bool f = true;
-		WriteData(&f, 1);
-
-		WriteFunction(prop->GetInitFunc());
-	}
-	else
-	{
-		bool f = false;
-		WriteData(&f, 1);
-	}
+	WriteFunction(prop->GetInitFunc());
 }
 
 void asCWriter::WriteObjectProperty(asCObjectProperty* prop) 
 {
 	WriteString(&prop->name);
 	WriteDataType(&prop->type);
-	WriteData(&prop->isPrivate, 1);
+	int flags = 0;
+	if( prop->isPrivate ) flags |= 1;
+	if( prop->isProtected ) flags |= 2;
+	if( prop->isInherited ) flags |= 4;
+	WriteEncodedInt64(flags);
 }
 
 void asCWriter::WriteDataType(const asCDataType *dt) 
@@ -3683,31 +3820,36 @@ void asCWriter::WriteDataType(const asCDataType *dt)
 	{
 		if( *dt == savedDataTypes[n] )
 		{
-			asUINT c = 0;
-			WriteEncodedInt64(c);
-			WriteEncodedInt64(n);
+			WriteEncodedInt64(n+1);
 			return;
 		}
 	}
 
+	// Indicate a new type with a null byte
+	asUINT c = 0;
+	WriteEncodedInt64(c);
+
 	// Save the new datatype
 	savedDataTypes.PushLast(*dt);
 
-	bool b;
 	int t = dt->GetTokenType();
 	WriteEncodedInt64(t);
 	if( t == ttIdentifier )
-	{
 		WriteObjectType(dt->GetObjectType());
-		b = dt->IsObjectHandle();
-		WriteData(&b, 1);
-		b = dt->IsHandleToConst();
-		WriteData(&b, 1);
-	}
-	b = dt->IsReference();
-	WriteData(&b, 1);
-	b = dt->IsReadOnly();
-	WriteData(&b, 1);
+
+	struct
+	{
+		char isObjectHandle :1;
+		char isHandleToConst:1;
+		char isReference    :1;
+		char isReadOnly     :1;
+	} bits = {0};
+
+	bits.isObjectHandle  = dt->IsObjectHandle();
+	bits.isHandleToConst = dt->IsHandleToConst();
+	bits.isReference     = dt->IsReference();
+	bits.isReadOnly      = dt->IsReadOnly();
+	WriteData(&bits, 1);
 
 	if( t == ttIdentifier && dt->GetObjectType()->name == "_builtin_function_" )
 	{
@@ -3736,6 +3878,7 @@ void asCWriter::WriteObjectType(asCObjectType* ot)
 				ch = 'a';
 				WriteData(&ch, 1);
 				WriteString(&ot->name);
+				WriteString(&ot->nameSpace->name);
 
 				WriteEncodedInt64(ot->templateSubTypes.GetLength());
 				for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
@@ -3865,7 +4008,7 @@ void asCWriter::CalculateAdjustmentByPos(asCScriptFunction *func)
 	}
 
 	// Compute the sequence number of each bytecode instruction in order to update the jump offsets
-	size_t length = func->scriptData->byteCode.GetLength();
+	asUINT length = func->scriptData->byteCode.GetLength();
 	asDWORD *bc = func->scriptData->byteCode.AddressOf();
 	bytecodeNbrByPos.SetLength(length);
 	asUINT num;
@@ -4174,9 +4317,9 @@ void asCWriter::WriteByteCode(asCScriptFunction *func)
 			int offset = *(int*)(tmp+1);
 
 			// Determine instruction number for next instruction and destination
-			int bcSeqNum = bytecodeNbrByPos[bc - startBC] + 1;
+			int bcSeqNum = bytecodeNbrByPos[asUINT(bc - startBC)] + 1;
 			asDWORD *targetBC = bc + 2 + offset;
-			int targetBcSeqNum = bytecodeNbrByPos[targetBC - startBC];
+			int targetBcSeqNum = bytecodeNbrByPos[asUINT(targetBC - startBC)];
 
 			// Set the offset in number of instructions
 			*(int*)(tmp+1) = targetBcSeqNum - bcSeqNum;
@@ -4476,7 +4619,7 @@ void asCWriter::WriteByteCode(asCScriptFunction *func)
 	}
 }
 
-asCWriter::SListAdjuster::SListAdjuster(asCObjectType *ot) : patternType(ot), repeatCount(0), entries(0), lastOffset(-1), nextTypeId(-1)
+asCWriter::SListAdjuster::SListAdjuster(asCObjectType *ot) : patternType(ot), repeatCount(0), entries(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
 { 
 	asASSERT( ot && (ot->flags & asOBJ_LIST_PATTERN) ); 
 
@@ -4498,12 +4641,16 @@ int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 	if( offset == lastOffset )
 		return entries-1;
 
+	asASSERT( offset >= nextOffset );
+
+	// Update last offset for next call
 	lastOffset = offset;
 
 	// What is being expected at this position?
-	if( patternNode->type == asLPT_REPEAT )
+	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
 	{
 		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
+		nextOffset = offset + 4;
 		return entries++;
 	}
 	else if( patternNode->type == asLPT_TYPE )
@@ -4516,6 +4663,8 @@ int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 			// we can move to the next node
 			if( nextTypeId != -1 )
 			{
+				nextOffset = offset + 4;
+
 				if( repeatCount > 0 )
 					repeatCount--;
 
@@ -4529,7 +4678,35 @@ int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 		else 
 		{
 			if( repeatCount > 0 )
+			{
+				// Was any value skipped?
+				asUINT size;
+				if( dt.IsObjectHandle() || (dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_REF)) )
+					size = AS_PTR_SIZE*4;
+				else
+					size = dt.GetSizeInMemoryBytes();
+
+				int count = 0;
+				while( nextOffset <= offset )
+				{
+					count++;
+					nextOffset += size;
+
+					// Align the offset on 4 byte boundaries
+					if( size >= 4 && (nextOffset & 0x3) )
+						nextOffset += 4 - (nextOffset & 0x3);
+				}
+
+				if( --count > 0 )
+				{
+					// Skip these values
+					repeatCount -= count;
+					entries += count;
+				}
+
+				nextOffset = offset + size;
 				repeatCount--;
+			}
 
 			// Only move the patternNode if we're not expecting any more repeated entries
 			if( repeatCount == 0 )
@@ -4575,7 +4752,7 @@ int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatter
 void asCWriter::SListAdjuster::SetRepeatCount(asUINT rc)
 {
 	// Make sure the list is expecting a repeat at this location
-	asASSERT( patternNode->type == asLPT_REPEAT );
+	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
 
 	// Now move to the next patternNode
 	patternNode = patternNode->next;
diff --git a/lib/angelscript/source/as_restore.h b/lib/angelscript/source/as_restore.h
index 3fc3f8a40..bfd2725bc 100644
--- a/lib/angelscript/source/as_restore.h
+++ b/lib/angelscript/source/as_restore.h
@@ -124,9 +124,9 @@ protected:
 	// Helper class for adjusting offsets within initialization list buffers
 	struct SListAdjuster
 	{
-		SListAdjuster(asDWORD *bc, asCObjectType *ot);
+		SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *ot);
 		void AdjustAllocMem();
-		int  AdjustOffset(int offset, asCObjectType *listPatternType);
+		int  AdjustOffset(int offset);
 		void SetRepeatCount(asUINT rc);
 		void SetNextType(int typeId);
 
@@ -137,11 +137,13 @@ protected:
 		};
 		asCArray<SInfo> stack;
 
+		asCReader          *reader;
 		asDWORD            *allocMemBC;
 		asUINT              maxOffset;
 		asCObjectType      *patternType;
 		asUINT              repeatCount;
 		int                 lastOffset;
+		int                 nextOffset;
 		asUINT              lastAdjustedOffset;
 		asSListPatternNode *patternNode;
 		int                 nextTypeId;
@@ -239,7 +241,8 @@ protected:
 		asUINT              repeatCount;
 		asSListPatternNode *patternNode;
 		asUINT              entries;
-		int                 lastOffset;
+		int                 lastOffset;  // Last offset adjusted
+		int                 nextOffset;  // next expected offset to be adjusted
 		int                 nextTypeId;
 	};
 	asCArray<SListAdjuster*> listAdjusters;
diff --git a/lib/angelscript/source/as_scriptengine.cpp b/lib/angelscript/source/as_scriptengine.cpp
index a06571a7b..85cf0cd75 100644
--- a/lib/angelscript/source/as_scriptengine.cpp
+++ b/lib/angelscript/source/as_scriptengine.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -58,7 +58,7 @@ BEGIN_AS_NAMESPACE
 
 
 #ifdef AS_PROFILE
-// Instanciate the profiler once
+// Instantiate the profiler once
 CProfiler g_profiler;
 #endif
 
@@ -109,6 +109,15 @@ AS_API const char * asGetLibraryOptions()
 #ifdef AS_NO_MEMBER_INIT
 		"AS_NO_MEMBER_INIT "
 #endif
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+		"AS_NO_THISCALL_FUNCTOR_METHOD "
+#endif
+#ifdef AS_NO_EXCEPTIONS
+		"AS_NO_EXCEPTIONS "
+#endif
+#ifdef WIP_16BYTE_ALIGN
+		"WIP_16BYTE_ALIGN "
+#endif
 
 	// Target system
 #ifdef AS_WIN
@@ -120,6 +129,9 @@ AS_API const char * asGetLibraryOptions()
 #ifdef AS_MAC
 		"AS_MAC "
 #endif
+#ifdef AS_SUN
+		"AS_SUN "
+#endif
 #ifdef AS_BSD
 		"AS_BSD "
 #endif
@@ -138,6 +150,9 @@ AS_API const char * asGetLibraryOptions()
 #ifdef AS_PS3
 		"AS_PS3 "
 #endif
+#ifdef AS_PSVITA
+		"AS_PSVITA "
+#endif
 #ifdef AS_DC
 		"AS_DC "
 #endif
@@ -197,6 +212,9 @@ AS_API const char * asGetLibraryOptions()
 #endif
 #ifdef AS_X64_MSVC
 		"AS_X64_MSVC "
+#endif
+#ifdef AS_SPARC
+		"AS_SPARC "
 #endif
 	;
 
@@ -228,15 +246,19 @@ AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version)
 
 	// Verify endianess
 #ifdef AS_BIG_ENDIAN
-	asASSERT( *(asDWORD*)"\x00\x01\x02\x03" == 0x00010203 );
-	asASSERT( *(asQWORD*)"\x00\x01\x02\x03\x04\x05\x06\x07" == ((asQWORD(0x00010203)<<32)|asQWORD(0x04050607)) );
+	asDWORD dw = 0x00010203;
+	asQWORD qw = ((asQWORD(0x00010203)<<32)|asQWORD(0x04050607));
 #else
-	asASSERT( *(asDWORD*)"\x00\x01\x02\x03" == 0x03020100 );
+	asDWORD dw = 0x03020100;
 	// C++ didn't have a standard way of declaring 64bit literal constants until C++11, so
 	// I'm forced to do it like this to avoid compilers warnings when compiling with the full
 	// C++ compliance.
-	asASSERT( *(asQWORD*)"\x00\x01\x02\x03\x04\x05\x06\x07" == ((asQWORD(0x07060504)<<32)|asQWORD(0x03020100)) );
+	asQWORD qw = ((asQWORD(0x07060504)<<32)|asQWORD(0x03020100));
 #endif
+	asASSERT( memcmp("\x00\x01\x02\x03", &dw, 4) == 0 );
+	asASSERT( memcmp("\x00\x01\x02\x03\x04\x05\x06\x07", &qw, 8) == 0 );
+	UNUSED_VAR(dw);
+	UNUSED_VAR(qw);
 
 	return asNEW(asCScriptEngine)();
 }
@@ -357,6 +379,25 @@ int asCScriptEngine::SetEngineProperty(asEEngineProp property, asPWORD value)
 		ep.disallowValueAssignForRefType = value ? true : false;
 		break;
 
+	case asEP_ALTER_SYNTAX_NAMED_ARGS:
+		if( value <= 2 )
+			ep.alterSyntaxNamedArgs = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_DISABLE_INTEGER_DIVISION:
+		ep.disableIntegerDivision = value ? true : false;
+		break;
+
+	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
+		ep.disallowEmptyListElements = value ? true : false;
+		break;
+
+	case asEP_PRIVATE_PROP_AS_PROTECTED:
+		ep.privatePropAsProtected = value ? true : false;
+		break;
+
 	default:
 		return asINVALID_ARG;
 	}
@@ -429,11 +470,23 @@ asPWORD asCScriptEngine::GetEngineProperty(asEEngineProp property) const
 	case asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE:
 		return ep.disallowValueAssignForRefType;
 
+	case asEP_ALTER_SYNTAX_NAMED_ARGS:
+		return ep.alterSyntaxNamedArgs;
+
+	case asEP_DISABLE_INTEGER_DIVISION:
+		return ep.disableIntegerDivision;
+
+	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
+		return ep.disallowEmptyListElements;
+
+	case asEP_PRIVATE_PROP_AS_PROTECTED:
+		return ep.privatePropAsProtected;
+
 	default:
 		return 0;
 	}
 
-	return 0;
+	UNREACHABLE_RETURN;
 }
 
 // interface
@@ -460,6 +513,7 @@ asCScriptEngine::asCScriptEngine()
 	asCThreadManager::Prepare(0);
 
 	shuttingDown = false;
+	inDestructor = false;
 
 	// Engine properties
 	{
@@ -471,7 +525,7 @@ asCScriptEngine::asCScriptEngine()
 		ep.allowMultilineStrings         = false;
 		ep.allowImplicitHandleTypes      = false;
 		// TODO: optimize: Maybe this should be turned off by default? If a debugger is not used
-		//                 then this is just slowing down the execution. 
+		//                 then this is just slowing down the execution.
 		ep.buildWithoutLineCues          = false;
 		ep.initGlobalVarsAfterBuild      = true;
 		ep.requireEnumScope              = false;
@@ -486,6 +540,10 @@ asCScriptEngine::asCScriptEngine()
 		ep.compilerWarnings              = 1;         // 0 = no warnings, 1 = warning, 2 = treat as error
 		// TODO: 3.0.0: disallowValueAssignForRefType should be true by default
 		ep.disallowValueAssignForRefType = false;
+		ep.alterSyntaxNamedArgs          = 0;         // 0 = no alternate syntax, 1 = accept alternate syntax but warn, 2 = accept without warning
+		ep.disableIntegerDivision        = false;
+		ep.disallowEmptyListElements     = false;
+		ep.privatePropAsProtected        = false;
 	}
 
 	gc.engine = this;
@@ -499,11 +557,6 @@ asCScriptEngine::asCScriptEngine()
 	deferValidationOfTemplateTypes = false;
 	lastModule = 0;
 
-	// User data
-	cleanModuleFunc     = 0;
-	cleanContextFunc    = 0;
-	cleanFunctionFunc   = 0;
-
 
 	initialContextStackSize = 1024;      // 4 KB (1024 * sizeof(asDWORD)
 
@@ -513,18 +566,20 @@ asCScriptEngine::asCScriptEngine()
 	defaultAccessMask = 1;
 
 	msgCallback = 0;
-    jitCompiler = 0;
+	jitCompiler = 0;
 
 	// Create the global namespace
 	defaultNamespace = AddNameSpace("");
 
+	requestCtxFunc   = 0;
+	returnCtxFunc    = 0;
+	ctxCallbackParam = 0;
+
 	// We must set the namespace in the built-in types explicitly as
 	// this wasn't done by the default constructor. If we do not do
 	// this we will get null pointer access in other parts of the code
 	scriptTypeBehaviours.nameSpace     = defaultNamespace;
 	functionBehaviours.nameSpace       = defaultNamespace;
-	objectTypeBehaviours.nameSpace     = defaultNamespace;
-	globalPropertyBehaviours.nameSpace = defaultNamespace;
 
 	// Reserve function id 0 for no function
 	scriptFunctions.PushLast(0);
@@ -549,109 +604,91 @@ asCScriptEngine::asCScriptEngine()
 
 	RegisterScriptObject(this);
 	RegisterScriptFunction(this);
-	RegisterObjectTypeGCBehaviours(this);
-	asCGlobalProperty::RegisterGCBehaviours(this);
+}
+
+void asCScriptEngine::DeleteDiscardedModules()
+{
+	// TODO: 2.30.0: redesign: Prevent more than one thread from entering this function at the same time. 
+	//                         If a thread is already doing the work for the clean-up the other thread should
+	//                         simply return, as the first thread will continue.
+
+	ACQUIRESHARED(engineRWLock);
+	asUINT maxCount = discardedModules.GetLength();
+	RELEASESHARED(engineRWLock);
+
+	for( asUINT n = 0; n < maxCount; n++ )
+	{
+		ACQUIRESHARED(engineRWLock);
+		asCModule *mod = discardedModules[n];
+		RELEASESHARED(engineRWLock);
+
+		if( !mod->HasExternalReferences(shuttingDown) )
+		{
+			asDELETE(mod, asCModule);
+			n--;
+		}
+
+		ACQUIRESHARED(engineRWLock);
+		// Determine the max count again, since another module may have been discarded during the processing
+		maxCount = discardedModules.GetLength();
+		RELEASESHARED(engineRWLock);
+	}
+
+	// Go over the list of global properties, to see if it is possible to clean
+	// up some variables that are no longer referred to by any functions
+	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
+	{
+		asCGlobalProperty *prop = globalProperties[n];
+		if( prop && prop->refCount.get() == 1 )
+			RemoveGlobalProperty(prop);
+	}
 }
 
 asCScriptEngine::~asCScriptEngine()
 {
-	shuttingDown = true;
+	// TODO: 2.30.0: redesign: Clean up redundant code
+
+	asUINT n = 0;
+	inDestructor = true;
 
 	asASSERT(refCount.get() == 0);
-	asUINT n;
 
-	// The modules must be deleted first, as they may use
-	// object types from the config groups
-	for( n = (asUINT)scriptModules.GetLength(); n-- > 0; )
-		if( scriptModules[n] )
-			scriptModules[n]->Discard();
-	scriptModules.SetLength(0);
+	// If ShutDown hasn't been called yet do it now
+	if( !shuttingDown )
+	{
+		AddRef();
+		ShutDownAndRelease();
+	}
 
-	GarbageCollect();
+	// Unravel the registered interface
+	if( defaultArrayObjectType )
+	{
+		defaultArrayObjectType->ReleaseInternal();
+		defaultArrayObjectType = 0;
+	}
 
-	// Delete the functions for template types that may references object types
+	// Delete the functions for generated template types that may references object types
 	for( n = 0; n < templateInstanceTypes.GetLength(); n++ )
 	{
+		asCObjectType *templateType = templateInstanceTypes[n];
 		if( templateInstanceTypes[n] )
-		{
-			asUINT f;
-			asCObjectType *templateType = templateInstanceTypes[n];
-
-			// Delete the factory stubs first
-			for( f = 0; f < templateType->beh.factories.GetLength(); f++ )
-				scriptFunctions[templateType->beh.factories[f]]->Release();
-			templateType->beh.factories.Allocate(0, false);
-
-			// The list factory is not stored in the list with the rest of the factories
-			if( templateType->beh.listFactory )
-			{
-				scriptFunctions[templateType->beh.listFactory]->Release();
-				templateType->beh.listFactory = 0;
-			}
-
-			// Delete the specialized functions
-			for( f = 1; f < templateType->beh.operators.GetLength(); f += 2 )
-			{
-				if( scriptFunctions[templateType->beh.operators[f]]->objectType == templateType )
-				{
-					scriptFunctions[templateType->beh.operators[f]]->Release();
-					templateType->beh.operators[f] = 0;
-				}
-			}
-			for( f = 0; f < templateType->methods.GetLength(); f++ )
-			{
-				if( scriptFunctions[templateType->methods[f]]->objectType == templateType )
-				{
-					scriptFunctions[templateType->methods[f]]->Release();
-					templateType->methods[f] = 0;
-				}
-			}
-		}
+			templateType->DestroyInternal();
 	}
-
-	// Do one more garbage collect to free gc objects that were global variables
-	GarbageCollect();
-	FreeUnusedGlobalProperties();
-	ClearUnusedTypes();
-
-	// Break all relationship between remaining class types and functions
-	for( n = 0; n < classTypes.GetLength(); n++ )
+	for( n = 0; n < listPatternTypes.GetLength(); n++ )
 	{
-		if( classTypes[n] )
-			classTypes[n]->ReleaseAllFunctions();
-
-		if( classTypes[n]->derivedFrom )
-		{
-			classTypes[n]->derivedFrom->Release();
-			classTypes[n]->derivedFrom = 0;
-		}
+		asCObjectType *type = listPatternTypes[n];
+		if( type )
+			type->ReleaseInternal();
 	}
+	listPatternTypes.SetLength(0);
 
-	GarbageCollect(asGC_FULL_CYCLE);
-	FreeUnusedGlobalProperties();
-	ClearUnusedTypes();
+	// No script types must have survived
+	asASSERT( sharedScriptTypes.GetLength() == 0 );
 
-	// Destroy internals of script functions that may still be kept alive outside of engine
-	for( n = 0; n < scriptFunctions.GetLength(); n++ )
-		if( scriptFunctions[n] && scriptFunctions[n]->funcType == asFUNC_SCRIPT )
-			scriptFunctions[n]->DestroyInternal();
-
-	// There may be instances where one more gc cycle must be run
-	GarbageCollect(asGC_FULL_CYCLE);
-	ClearUnusedTypes();
-
-	// If the application hasn't registered GC behaviours for all types
-	// that can form circular references with script types, then there
-	// may still be objects in the GC.
-	if( gc.ReportAndReleaseUndestroyedObjects() > 0 )
-	{
-		// Some items cannot be destroyed because the application is still holding on to them
-
-		// Make sure the script functions won't attempt to access the engine if they are destroyed later on
-		for( n = 0; n < scriptFunctions.GetLength(); n++ )
-			if( scriptFunctions[n] && scriptFunctions[n]->funcType == asFUNC_SCRIPT )
-				scriptFunctions[n]->engine = 0;
-	}
+	// It is allowed to create new references to the engine temporarily while destroying objects
+	// but these references must be release immediately or else something is can go wrong later on
+	if( refCount.get() > 0 )
+		WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN);
 
 	asSMapNode<int,asCDataType*> *cursor = 0;
 	while( mapTypeIdToDataType.MoveFirst(&cursor) )
@@ -675,38 +712,30 @@ asCScriptEngine::~asCScriptEngine()
 	// Remove what is remaining
 	defaultGroup.RemoveConfiguration(this);
 
-	asCSymbolTable<asCGlobalProperty>::iterator it = registeredGlobalProps.List();
-	for( ; it; it++ )
-		(*it)->Release();
-	registeredGlobalProps.Clear();
-	FreeUnusedGlobalProperties();
-
+	// Any remaining objects in templateInstanceTypes is from generated template instances
 	for( n = 0; n < templateInstanceTypes.GetLength(); n++ )
 	{
+		asCObjectType *templateType = templateInstanceTypes[n];
 		if( templateInstanceTypes[n] )
-		{
-			// Clear the sub types before deleting the template type so that the sub types aren't freed to soon
-			templateInstanceTypes[n]->templateSubTypes.SetLength(0);
-			asDELETE(templateInstanceTypes[n],asCObjectType);
-		}
+			templateType->ReleaseInternal();
 	}
 	templateInstanceTypes.SetLength(0);
 
-	asSMapNode<asSNameSpaceNamePair, asCObjectType *> *cursor2;
-	allRegisteredTypes.MoveFirst(&cursor2);
-	while( cursor2 )
+	asCSymbolTable<asCGlobalProperty>::iterator it = registeredGlobalProps.List();
+	for( ; it; it++ )
 	{
-		// Clear the sub types before deleting the template type so that the sub types aren't freed to soon
-		cursor2->value->templateSubTypes.SetLength(0);
-		asDELETE(cursor2->value, asCObjectType);
-
-		allRegisteredTypes.MoveNext(&cursor2, cursor2);
+		RemoveGlobalProperty(*it);
+		(*it)->Release();
 	}
-	allRegisteredTypes.EraseAll();
+	registeredGlobalProps.Clear();
+
 	for( n = 0; n < templateSubTypes.GetLength(); n++ )
 	{
 		if( templateSubTypes[n] )
-			asDELETE(templateSubTypes[n], asCObjectType);
+		{
+			templateSubTypes[n]->DestroyInternal();
+			templateSubTypes[n]->ReleaseInternal();
+		}
 	}
 	templateSubTypes.SetLength(0);
 	registeredTypeDefs.SetLength(0);
@@ -715,29 +744,47 @@ asCScriptEngine::~asCScriptEngine()
 
 	asCSymbolTable<asCScriptFunction>::iterator funcIt = registeredGlobalFuncs.List();
 	for( ; funcIt; funcIt++ )
-		(*funcIt)->Release();
+		(*funcIt)->ReleaseInternal();
 	registeredGlobalFuncs.Clear();
 
 	scriptTypeBehaviours.ReleaseAllFunctions();
 	functionBehaviours.ReleaseAllFunctions();
-	objectTypeBehaviours.ReleaseAllFunctions();
-	globalPropertyBehaviours.ReleaseAllFunctions();
+
+	for( n = 0; n < scriptFunctions.GetLength(); n++ )
+		if( scriptFunctions[n] )
+		{
+			scriptFunctions[n]->DestroyInternal();
+
+			// Set the engine pointer to null to signal that the function is no longer part of the engine
+			scriptFunctions[n]->engine = 0;
+		}
+	scriptFunctions.SetLength(0);
+
+	// Increase the internal ref count for these builtin object types, so the destructor is not called incorrectly
+	scriptTypeBehaviours.AddRefInternal();
+	functionBehaviours.AddRefInternal();
 
 	// Destroy the funcdefs
 	// As funcdefs are shared between modules it shouldn't be a problem to keep the objects until the engine is released
-	// TODO: refactor: This really should be done by ClearUnusedTypes() as soon as the funcdef is no longer is use.
-	//                 Perhaps to make it easier to manage the memory for funcdefs each function definition should
-	//                 have it's own object type. That would make the funcdef much more similar to the other types
-	//                 and could then be handled in much the same way. When this is done the funcdef should also be
-	//                 changed so that it doesn't take up a function id, i.e. don't keep a reference to it in scriptFunctions.
 	for( n = 0; n < funcDefs.GetLength(); n++ )
 		if( funcDefs[n] )
 		{
-			asASSERT( funcDefs[n]->GetRefCount() == 0 );
-			asDELETE(funcDefs[n], asCScriptFunction);
+			funcDefs[n]->DestroyInternal();
+			funcDefs[n]->ReleaseInternal();
 		}
 	funcDefs.SetLength(0);
 
+	// Free the global properties
+	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
+	{
+		asCGlobalProperty *prop = globalProperties[n];
+		if( prop )
+		{
+			asASSERT( prop->refCount.get() == 1 );
+			RemoveGlobalProperty(prop);
+		}
+	}
+
 	// Free string constants
 	for( n = 0; n < stringConstants.GetLength(); n++ )
 		asDELETE(stringConstants[n],asCString);
@@ -768,22 +815,114 @@ asCScriptEngine::~asCScriptEngine()
 	asCThreadManager::Unprepare();
 }
 
-// internal
-void asCScriptEngine::CleanupAfterDiscardModule()
+// interface
+int asCScriptEngine::SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param)
 {
-	// Skip this when shutting down as it will be done anyway by the engine destructor
-	if( shuttingDown ) return;
+	// Both callbacks or neither must be set
+	if( (requestCtx == 0 && returnCtx != 0) || (requestCtx != 0 && returnCtx == 0) )
+		return asINVALID_ARG;
 
-	if( ep.autoGarbageCollect )
-		GarbageCollect();
+	requestCtxFunc   = requestCtx;
+	returnCtxFunc    = returnCtx;
+	ctxCallbackParam = param;
 
-	FreeUnusedGlobalProperties();
-	ClearUnusedTypes();
+	return 0;
+}
+
+// interface
+asIScriptContext *asCScriptEngine::RequestContext()
+{
+	if( requestCtxFunc )
+	{
+		// The return callback must also exist
+		asASSERT( returnCtxFunc );
+
+		asIScriptContext *ctx = requestCtxFunc(this, ctxCallbackParam);
+		return ctx;
+	}
+
+	// As fallback we create a new context
+	return CreateContext();
+}
+
+// internal
+asCModule *asCScriptEngine::FindNewOwnerForSharedType(asCObjectType *type, asCModule *mod)
+{
+	asASSERT( type->IsShared() );
+
+	if( type->module != mod )
+		return type->module;
+
+	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
+	{
+		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
+		int foundIdx = -1;
+		asCModule *mod = scriptModules[n];
+		if( mod == type->module ) continue;
+		if( type->flags & asOBJ_ENUM )
+			foundIdx = mod->enumTypes.IndexOf(type);
+		else if( type->flags & asOBJ_TYPEDEF )
+			foundIdx = mod->typeDefs.IndexOf(type);
+		else
+			foundIdx = mod->classTypes.IndexOf(type);
+		
+		if( foundIdx >= 0 )
+		{
+			type->module = mod;
+			break;
+		}
+	}
+
+	return type->module;
+}
+
+// internal
+asCModule *asCScriptEngine::FindNewOwnerForSharedFunc(asCScriptFunction *func, asCModule *mod)
+{
+	asASSERT( func->IsShared() );
+
+	if( func->module != mod )
+		return func->module;
+
+	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
+	{
+		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
+		int foundIdx = -1;
+		asCModule *mod = scriptModules[n];
+		if( mod == func->module ) continue;
+		if( func->funcType == asFUNC_FUNCDEF )
+			foundIdx = mod->funcDefs.IndexOf(func);
+		else
+			foundIdx = mod->scriptFunctions.IndexOf(func);
+		
+		if( foundIdx >= 0 )
+		{
+			func->module = mod;
+			break;
+		}
+	}
+
+	return func->module;
+}
+
+// interface
+void asCScriptEngine::ReturnContext(asIScriptContext *ctx)
+{
+	if( returnCtxFunc )
+	{
+		returnCtxFunc(this, ctx, ctxCallbackParam);
+		return;
+	}
+
+	// As fallback we just release the context
+	if( ctx )
+		ctx->Release();
 }
 
 // interface
 int asCScriptEngine::AddRef() const
 {
+	asASSERT( refCount.get() > 0 || inDestructor );
 	return refCount.atomicInc();
 }
 
@@ -794,13 +933,56 @@ int asCScriptEngine::Release() const
 
 	if( r == 0 )
 	{
-		asDELETE(const_cast<asCScriptEngine*>(this),asCScriptEngine);
+		// It is possible that some function will temporarily increment the engine ref count
+		// during clean-up for example while destroying the objects in the garbage collector.
+		if( !inDestructor )
+			asDELETE(const_cast<asCScriptEngine*>(this),asCScriptEngine);
 		return 0;
 	}
 
 	return r;
 }
 
+// interface
+int asCScriptEngine::ShutDownAndRelease()
+{
+	// Do a full garbage collection cycle to clean up any object that may still hold on to the engine
+	GarbageCollect();
+
+	// Set the flag that the engine is being shutdown now. This will speed up
+	// the process, and will also allow the engine to warn about invalid calls
+	shuttingDown = true;
+
+	// Clear the context callbacks. If new context's are needed for the clean-up the engine will take care of this itself.
+	// Context callbacks are normally used for pooling contexts, and if we allow new contexts to be created without being
+	// immediately destroyed afterwards it means the engine's refcount will increase. This is turn may cause memory access
+	// violations later on when the pool releases its contexts.
+	SetContextCallbacks(0, 0, 0);
+
+	// The modules must be deleted first, as they may use
+	// object types from the config groups
+	for( asUINT n = (asUINT)scriptModules.GetLength(); n-- > 0; )
+		if( scriptModules[n] )
+			scriptModules[n]->Discard();
+	scriptModules.SetLength(0);
+
+	// Do another full garbage collection to destroy the object types/functions
+	// that may have been placed in the gc when destroying the modules
+	GarbageCollect();
+
+	// Do another sweep to delete discarded modules, that may not have
+	// been deleted earlier due to still having external references
+	DeleteDiscardedModules();
+
+	// If the application hasn't registered GC behaviours for all types
+	// that can form circular references with script types, then there
+	// may still be objects in the GC.
+	gc.ReportAndReleaseUndestroyedObjects();
+
+	// Release the engine reference
+	return Release();
+}
+
 // internal
 asSNameSpace *asCScriptEngine::AddNameSpace(const char *name)
 {
@@ -822,7 +1004,7 @@ asSNameSpace *asCScriptEngine::AddNameSpace(const char *name)
 }
 
 // internal
-asSNameSpace *asCScriptEngine::FindNameSpace(const char *name)
+asSNameSpace *asCScriptEngine::FindNameSpace(const char *name) const
 {
 	// TODO: optimize: Improve linear search
 	for( asUINT n = 0; n < nameSpaces.GetLength(); n++ )
@@ -930,7 +1112,7 @@ int asCScriptEngine::SetMessageCallback(const asSFuncPtr &callback, void *obj, a
 	msgCallback = true;
 	msgCallbackObj = obj;
 	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC )
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
 	{
 		msgCallback = false;
 		return asNOT_SUPPORTED;
@@ -968,6 +1150,25 @@ int asCScriptEngine::WriteMessage(const char *section, int row, int col, asEMsgT
 	if( !msgCallback )
 		return 0;
 
+	// If a pre-message has been set, then write that first
+	if( preMessage.isSet )
+	{
+		asSMessageInfo msg;
+		msg.section = preMessage.scriptname.AddressOf();
+		msg.row     = preMessage.r;
+		msg.col     = preMessage.c;
+		msg.type    = asMSGTYPE_INFORMATION;
+		msg.message = preMessage.message.AddressOf();
+
+		if( msgCallbackFunc.callConv < ICC_THISCALL )
+			CallGlobalFunction(&msg, msgCallbackObj, &msgCallbackFunc, 0);
+		else
+			CallObjectMethod(msgCallbackObj, &msg, &msgCallbackFunc, 0);
+
+		preMessage.isSet = false;
+	}
+
+	// Write the message to the callback
 	asSMessageInfo msg;
 	msg.section = section;
 	msg.row     = row;
@@ -985,17 +1186,17 @@ int asCScriptEngine::WriteMessage(const char *section, int row, int col, asEMsgT
 
 int asCScriptEngine::SetJITCompiler(asIJITCompiler *compiler)
 {
-    jitCompiler = compiler;
-    return asSUCCESS;
+	jitCompiler = compiler;
+	return asSUCCESS;
 }
 
 asIJITCompiler *asCScriptEngine::GetJITCompiler() const
 {
-    return jitCompiler;
+	return jitCompiler;
 }
 
 // interface
-asETokenClass asCScriptEngine::ParseToken(const char *string, size_t stringLength, int *tokenLength) const
+asETokenClass asCScriptEngine::ParseToken(const char *string, size_t stringLength, asUINT *tokenLength) const
 {
 	if( stringLength == 0 )
 		stringLength = strlen(string);
@@ -1005,7 +1206,7 @@ asETokenClass asCScriptEngine::ParseToken(const char *string, size_t stringLengt
 	tok.GetToken(string, stringLength, &len, &tc);
 
 	if( tokenLength )
-		*tokenLength = (int)len;
+		*tokenLength = (asUINT)len;
 
 	return tc;
 }
@@ -1043,151 +1244,32 @@ int asCScriptEngine::DiscardModule(const char *module)
 // interface
 asUINT asCScriptEngine::GetModuleCount() const
 {
-	return asUINT(scriptModules.GetLength());
+	ACQUIRESHARED(engineRWLock);
+	asUINT length = asUINT(scriptModules.GetLength());
+	RELEASESHARED(engineRWLock);
+	return length;
 }
 
 // interface
 asIScriptModule *asCScriptEngine::GetModuleByIndex(asUINT index) const
 {
-	if( index >= scriptModules.GetLength() )
-		return 0;
-
-	return scriptModules[index];
+	asIScriptModule *mod = 0;
+	ACQUIRESHARED(engineRWLock);
+	if( index < scriptModules.GetLength() )
+		mod = scriptModules[index];
+	RELEASESHARED(engineRWLock);
+	return mod;
 }
 
-// internal
-int asCScriptEngine::ClearUnusedTypes()
-{
-	int clearCount = 0;
-
-	// Build a list of all types to check for
-	asCArray<asCObjectType*> types;
-	types = classTypes;
-	types.Concatenate(generatedTemplateTypes);
-
-	// Go through all modules
-	asUINT n;
-	for( n = 0; n < scriptModules.GetLength() && types.GetLength(); n++ )
-	{
-		asCModule *mod = scriptModules[n];
-		if( mod )
-		{
-			// Functions/Methods/Globals are handled after this
-
-			// Go through all type declarations
-			asUINT m;
-			for( m = 0; m < mod->classTypes.GetLength() && types.GetLength(); m++ )
-				RemoveTypeAndRelatedFromList(types, mod->classTypes[m]);
-			for( m = 0; m < mod->enumTypes.GetLength() && types.GetLength(); m++ )
-				RemoveTypeAndRelatedFromList(types, mod->enumTypes[m]);
-			for( m = 0; m < mod->typeDefs.GetLength() && types.GetLength(); m++ )
-				RemoveTypeAndRelatedFromList(types, mod->typeDefs[m]);
-		}
-	}
-
-	// Go through all function parameters and remove used types
-	for( n = 0; n < scriptFunctions.GetLength() && types.GetLength(); n++ )
-	{
-		asCScriptFunction *func = scriptFunctions[n];
-		if( func )
-		{
-			// Ignore factory stubs
-			if( func->name == "factstub" )
-				continue;
-
-			// Ignore funcdefs because these will only be destroyed when the engine is released
-			if( func->funcType == asFUNC_FUNCDEF )
-				continue;
-
-			asCObjectType *ot = func->returnType.GetObjectType();
-			if( ot != 0 && ot != func->objectType )
-				if( func->name != ot->name )
-					RemoveTypeAndRelatedFromList(types, ot);
-
-			for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
-			{
-				ot = func->parameterTypes[p].GetObjectType();
-				if( ot != 0 && ot != func->objectType )
-					if( func->name != ot->name )
-						RemoveTypeAndRelatedFromList(types, ot);
-			}
-		}
-	}
-
-	// Go through all global properties
-	for( n = 0; n < globalProperties.GetLength() && types.GetLength(); n++ )
-	{
-		if( globalProperties[n] && globalProperties[n]->type.GetObjectType() )
-			RemoveTypeAndRelatedFromList(types, globalProperties[n]->type.GetObjectType());
-	}
-
-	// All that remains in the list after this can be discarded, since they are no longer used
-	for(;;)
-	{
-		bool didClearTemplateInstanceType = false;
-
-		for( n = 0; n < types.GetLength(); n++ )
-		{
-			int refCount = 0;
-			asCObjectType *type = types[n];
-
-			// Template types and script classes will have two references for each factory stub
-			if( (type->flags & asOBJ_TEMPLATE) )
-			{
-				refCount = 2*(int)type->beh.factories.GetLength();
-				if( type->beh.listFactory )
-					refCount += 2;
-			}
-
-			if( type->GetRefCount() == refCount )
-			{
-				if( type->flags & asOBJ_TEMPLATE )
-				{
-					didClearTemplateInstanceType = true;
-					RemoveTemplateInstanceType(type);
-					clearCount++;
-				}
-				else
-				{
-					RemoveFromTypeIdMap(type);
-					asDELETE(type,asCObjectType);
-					clearCount++;
-
-					classTypes.RemoveIndexUnordered(classTypes.IndexOf(type));
-				}
-
-				// Remove the type from the array
-				types.RemoveIndexUnordered(n);
-				n--;
-			}
-		}
-
-		if( didClearTemplateInstanceType == false )
-			break;
-	}
-
-	// Clear the list pattern types that are no longer used
-	for( n = 0; n < listPatternTypes.GetLength(); n++ )
-	{
-		if( listPatternTypes[n]->refCount.get() == 0 )
-		{
-			asDELETE(listPatternTypes[n], asCObjectType);
-			listPatternTypes.RemoveIndexUnordered(n);
-			n--;
-		}
-	}
-
-	return clearCount;
-}
-
-// internal
-void asCScriptEngine::RemoveTypeAndRelatedFromList(asCArray<asCObjectType*> &types, asCObjectType *ot)
+// Internal
+void asCScriptEngine::RemoveTypeAndRelatedFromList(asCMap<asCObjectType*,char> &types, asCObjectType *ot)
 {
 	// Remove the type from the list
-	int i = types.IndexOf(ot);
-	if( i == -1 ) return;
+	asSMapNode<asCObjectType*,char>* node;
+	if( !types.MoveTo(&node, ot) )
+		return;
 
-	types.RemoveIndexUnordered(i);
+	types.Erase(node);
 
 	// If the type is an template type then remove all sub types as well
 	for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
@@ -1204,14 +1286,13 @@ void asCScriptEngine::RemoveTypeAndRelatedFromList(asCArray<asCObjectType*> &typ
 	}
 }
 
-
 // internal
 int asCScriptEngine::GetFactoryIdByDecl(const asCObjectType *ot, const char *decl)
 {
 	asCModule *mod = 0;
 
 	// Is this a script class?
-	if( ot->flags & asOBJ_SCRIPT_OBJECT && ot->size > 0 )
+	if( (ot->flags & asOBJ_SCRIPT_OBJECT) && ot->size > 0 )
 		mod = scriptFunctions[ot->beh.factories[0]]->module;
 
 	asCBuilder bld(this, mod);
@@ -1226,7 +1307,7 @@ int asCScriptEngine::GetFactoryIdByDecl(const asCObjectType *ot, const char *dec
 
 	// Search for matching factory function
 	int id = -1;
-	for( size_t n = 0; n < ot->beh.factories.GetLength(); n++ )
+	for( asUINT n = 0; n < ot->beh.factories.GetLength(); n++ )
 	{
 		asCScriptFunction *f = scriptFunctions[ot->beh.factories[n]];
 		if( f->IsSignatureEqual(&func) )
@@ -1255,6 +1336,7 @@ int asCScriptEngine::GetMethodIdByDecl(const asCObjectType *ot, const char *decl
 	// Set the object type so that the signature can be properly compared
 	// This cast is OK, it will only be used for comparison
 	func.objectType = const_cast<asCObjectType*>(ot);
+	func.objectType->AddRefInternal();
 
 	int r = bld.ParseFunctionDeclaration(func.objectType, decl, &func, false);
 	if( r < 0 )
@@ -1262,7 +1344,7 @@ int asCScriptEngine::GetMethodIdByDecl(const asCObjectType *ot, const char *decl
 
 	// Search script functions for matching interface
 	int id = -1;
-	for( size_t n = 0; n < ot->methods.GetLength(); ++n )
+	for( asUINT n = 0; n < ot->methods.GetLength(); ++n )
 	{
 		if( func.IsSignatureEqual(scriptFunctions[ot->methods[n]]) )
 		{
@@ -1332,6 +1414,10 @@ int asCScriptEngine::RegisterObjectProperty(const char *obj, const char *declara
 	if( r < 0 )
 		return ConfigError(r, "RegisterObjectProperty", obj, declaration);
 
+	// Don't allow modifying generated template instances
+	if( dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(dt.GetObjectType()) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectProperty", obj, declaration);
+
 	// Verify that the correct config group is used
 	if( currentGroup->FindType(dt.GetObjectType()->name.AddressOf()) == 0 )
 		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterObjectProperty", obj, declaration);
@@ -1348,8 +1434,8 @@ int asCScriptEngine::RegisterObjectProperty(const char *obj, const char *declara
 
 	// The VM currently only supports 16bit offsets
 	// TODO: The VM needs to have support for 32bit offsets. Probably with a second ADDSi instruction
-	//       However, when implementing this it is necessary for the bytecode serialization to support 
-	//       the switch between the instructions upon loading bytecode as the offset may not be the 
+	//       However, when implementing this it is necessary for the bytecode serialization to support
+	//       the switch between the instructions upon loading bytecode as the offset may not be the
 	//       same on all platforms
 	if( byteOffset > 32767 || byteOffset < -32768 )
 		return ConfigError(asINVALID_ARG, "RegisterObjectProperty", obj, declaration);
@@ -1358,25 +1444,26 @@ int asCScriptEngine::RegisterObjectProperty(const char *obj, const char *declara
 	if( prop == 0 )
 		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectProperty", obj, declaration);
 
-	prop->name       = name;
-	prop->type       = type;
-	prop->byteOffset = byteOffset;
-	prop->isPrivate  = false;
-	prop->accessMask = defaultAccessMask;
+	prop->name        = name;
+	prop->type        = type;
+	prop->byteOffset  = byteOffset;
+	prop->isPrivate   = false;
+	prop->isProtected = false;
+	prop->accessMask  = defaultAccessMask;
 
 	dt.GetObjectType()->properties.PushLast(prop);
 
-	// Add references to template instances so they are not released too early
-	if( type.GetObjectType() && (type.GetObjectType()->flags & asOBJ_TEMPLATE) )
+	// Add references to types so they are not released too early
+	if( type.GetObjectType() )
 	{
-		if( !currentGroup->objTypes.Exists(type.GetObjectType()) )
-		{
-			type.GetObjectType()->AddRef();
+		type.GetObjectType()->AddRefInternal();
+
+		// Add template instances to the config group
+		if( (type.GetObjectType()->flags & asOBJ_TEMPLATE) && !currentGroup->objTypes.Exists(type.GetObjectType()) )
 			currentGroup->objTypes.PushLast(type.GetObjectType());
-		}
 	}
 
-	currentGroup->RefConfigGroup(FindConfigGroupForObjectType(type.GetObjectType()));
+	currentGroup->AddReferencesForType(this, type.GetObjectType());
 
 	return asSUCCESS;
 }
@@ -1387,7 +1474,6 @@ int asCScriptEngine::RegisterInterface(const char *name)
 	if( name == 0 ) return ConfigError(asINVALID_NAME, "RegisterInterface", 0, 0);
 
 	// Verify if the name has been registered as a type already
-	// TODO: Must check against registered funcdefs too
 	if( GetRegisteredObjectType(name, defaultNamespace) )
 		return asALREADY_REGISTERED;
 
@@ -1397,7 +1483,13 @@ int asCScriptEngine::RegisterInterface(const char *name)
 	bool oldMsgCallback = msgCallback; msgCallback = false;
 	int r = bld.ParseDataType(name, &dt, defaultNamespace);
 	msgCallback = oldMsgCallback;
-	if( r >= 0 ) return ConfigError(asERROR, "RegisterInterface", name, 0);
+	if( r >= 0 )
+	{
+		// If it is not in the defaultNamespace then the type was successfully parsed because
+		// it is declared in a parent namespace which shouldn't be treated as an error
+		if( dt.GetObjectType() && dt.GetObjectType()->nameSpace == defaultNamespace )
+			return ConfigError(asERROR, "RegisterInterface", name, 0);
+	}
 
 	// Make sure the name is not a reserved keyword
 	size_t tokenLen;
@@ -1418,16 +1510,16 @@ int asCScriptEngine::RegisterInterface(const char *name)
 		return ConfigError(asOUT_OF_MEMORY, "RegisterInterface", name, 0);
 
 	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_SHARED;
-	st->size = 0; // Cannot be instanciated
+	st->size = 0; // Cannot be instantiated
 	st->name = name;
 	st->nameSpace = defaultNamespace;
 
 	// Use the default script class behaviours
 	st->beh.factory = 0;
 	st->beh.addref = scriptTypeBehaviours.beh.addref;
-	scriptFunctions[st->beh.addref]->AddRef();
+	scriptFunctions[st->beh.addref]->AddRefInternal();
 	st->beh.release = scriptTypeBehaviours.beh.release;
-	scriptFunctions[st->beh.release]->AddRef();
+	scriptFunctions[st->beh.release]->AddRefInternal();
 	st->beh.copy = 0;
 
 	allRegisteredTypes.Insert(asSNameSpaceNamePair(st->nameSpace, st->name), st);
@@ -1456,10 +1548,12 @@ int asCScriptEngine::RegisterInterfaceMethod(const char *intf, const char *decla
 		return ConfigError(asOUT_OF_MEMORY, "RegisterInterfaceMethod", intf, declaration);
 
 	func->objectType = dt.GetObjectType();
+	func->objectType->AddRefInternal();
 
 	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, false);
 	if( r < 0 )
 	{
+		func->funcType = asFUNC_DUMMY;
 		asDELETE(func,asCScriptFunction);
 		return ConfigError(asINVALID_DECLARATION, "RegisterInterfaceMethod", intf, declaration);
 	}
@@ -1468,12 +1562,13 @@ int asCScriptEngine::RegisterInterfaceMethod(const char *intf, const char *decla
 	r = bld.CheckNameConflictMember(dt.GetObjectType(), func->name.AddressOf(), 0, 0, false);
 	if( r < 0 )
 	{
+		func->funcType = asFUNC_DUMMY;
 		asDELETE(func,asCScriptFunction);
 		return ConfigError(asNAME_TAKEN, "RegisterInterfaceMethod", intf, declaration);
 	}
 
 	func->id = GetNextScriptFunctionId();
-	SetScriptFunction(func);
+	AddScriptFunction(func);
 
 	// The index into the interface's vftable chunk should be
 	// its index in the methods array.
@@ -1483,21 +1578,7 @@ int asCScriptEngine::RegisterInterfaceMethod(const char *intf, const char *decla
 
 	func->ComputeSignatureId();
 
-	// If parameter type from other groups are used, add references
-	// TODO: The code for adding references to config groups is repeated in a lot of places
-	if( func->returnType.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(func->returnType.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
-	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( func->parameterTypes[n].GetObjectType() )
-		{
-			asCConfigGroup *group = FindConfigGroupForObjectType(func->parameterTypes[n].GetObjectType());
-			currentGroup->RefConfigGroup(group);
-		}
-	}
+	currentGroup->AddReferencesForFunc(this, func);
 
 	// Return function id as success
 	return func->id;
@@ -1514,79 +1595,85 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 	if( flags & asOBJ_REF )
 	{
 		// Can optionally have the asOBJ_GC, asOBJ_NOHANDLE, asOBJ_SCOPED, or asOBJ_TEMPLATE flag set, but nothing else
-		if( flags & ~(asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_TEMPLATE | asOBJ_NOCOUNT) )
+		if( flags & ~(asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_TEMPLATE | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 
 		// flags are exclusive
 		if( (flags & asOBJ_GC) && (flags & (asOBJ_NOHANDLE|asOBJ_SCOPED|asOBJ_NOCOUNT)) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		if( (flags & asOBJ_NOHANDLE) && (flags & (asOBJ_GC|asOBJ_SCOPED|asOBJ_NOCOUNT)) )
+		if( (flags & asOBJ_NOHANDLE) && (flags & (asOBJ_GC|asOBJ_SCOPED|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		if( (flags & asOBJ_SCOPED) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_NOCOUNT)) )
+		if( (flags & asOBJ_SCOPED) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 		if( (flags & asOBJ_NOCOUNT) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_SCOPED)) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+		// Implicit handle is only allowed if the engine property for this is turned on
+		if( !ep.allowImplicitHandleTypes && (flags & asOBJ_IMPLICIT_HANDLE) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 	}
 	else if( flags & asOBJ_VALUE )
 	{
 		// Cannot use reference flags
-		// TODO: template: Should be possible to register a value type as template type
-		if( flags & (asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_TEMPLATE | asOBJ_NOCOUNT) )
+		if( flags & (asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 
-		// flags are exclusive
-		if( (flags & asOBJ_POD) && (flags & asOBJ_ASHANDLE) )
+		// Flags are exclusive
+		if( (flags & asOBJ_POD) && (flags & (asOBJ_ASHANDLE | asOBJ_TEMPLATE)) )
 			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 
 		// If the app type is given, we must validate the flags
 		if( flags & asOBJ_APP_CLASS )
 		{
 			// Must not set the primitive or float flag
-			if( flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT) )
+			if( flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY) )
 				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 		}
-		else if( flags & asOBJ_APP_PRIMITIVE )
+		else
 		{
-			// Must not set the class flags nor the float flag
-			if( flags & (asOBJ_APP_CLASS                  |
-				         asOBJ_APP_CLASS_CONSTRUCTOR      |
+			// Must not set the class properties, without the class flag
+			if( flags & (asOBJ_APP_CLASS_CONSTRUCTOR      |
 						 asOBJ_APP_CLASS_DESTRUCTOR       |
 						 asOBJ_APP_CLASS_ASSIGNMENT       |
 						 asOBJ_APP_CLASS_COPY_CONSTRUCTOR |
-						 asOBJ_APP_FLOAT                  |
 						 asOBJ_APP_CLASS_ALLINTS          |
 						 asOBJ_APP_CLASS_ALLFLOATS) )
+			{
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+			}
+		}
+
+		if( flags & asOBJ_APP_PRIMITIVE )
+		{
+			if( flags & (asOBJ_APP_CLASS |
+						 asOBJ_APP_FLOAT |
+						 asOBJ_APP_ARRAY) )
 				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 		}
 		else if( flags & asOBJ_APP_FLOAT )
 		{
-			// Must not set the class flags nor the primitive flag
-			if( flags & (asOBJ_APP_CLASS                  |
-				         asOBJ_APP_CLASS_CONSTRUCTOR      |
-						 asOBJ_APP_CLASS_DESTRUCTOR       |
-						 asOBJ_APP_CLASS_ASSIGNMENT       |
-						 asOBJ_APP_CLASS_COPY_CONSTRUCTOR |
-						 asOBJ_APP_PRIMITIVE              |
-						 asOBJ_APP_CLASS_ALLINTS          |
-						 asOBJ_APP_CLASS_ALLFLOATS) )
+			if( flags & (asOBJ_APP_CLASS     |
+						 asOBJ_APP_PRIMITIVE |
+						 asOBJ_APP_ARRAY) )
 				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 		}
-		else if( flags & (asOBJ_APP_CLASS_CONSTRUCTOR      |
-		                  asOBJ_APP_CLASS_DESTRUCTOR       |
-		                  asOBJ_APP_CLASS_ASSIGNMENT       |
-						  asOBJ_APP_CLASS_COPY_CONSTRUCTOR |
-						  asOBJ_APP_CLASS_ALLINTS          |
-						  asOBJ_APP_CLASS_ALLFLOATS) )
+		else if( flags & asOBJ_APP_ARRAY )
 		{
-			// Must not set the class properties, without the class flag
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+			if( flags & (asOBJ_APP_CLASS     |
+						 asOBJ_APP_PRIMITIVE |
+						 asOBJ_APP_FLOAT) )
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 		}
 	}
 	else
 		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 
 	// Don't allow anything else than the defined flags
+#ifndef WIP_16BYTE_ALIGN
 	if( flags - (flags & asOBJ_MASK_VALID_FLAGS) )
+#else
+	if( flags - (flags & (asOBJ_MASK_VALID_FLAGS | asOBJ_APP_ALIGN16)) )
+#endif
 		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
 
 	// Value types must have a defined size
@@ -1610,7 +1697,6 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 			return ConfigError(r, "RegisterObjectType", name, 0);
 
 		// Verify that the template name hasn't been registered as a type already
-		// TODO: Must check against registered funcdefs too
 		if( GetRegisteredObjectType(typeName, defaultNamespace) )
 			// This is not an irrepairable error, as it may just be that the same type is registered twice
 			return asALREADY_REGISTERED;
@@ -1622,6 +1708,10 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 		type->name       = typeName;
 		type->nameSpace  = defaultNamespace;
 		type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+		// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+		type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
 		type->flags      = flags;
 		type->accessMask = defaultAccessMask;
 
@@ -1652,12 +1742,14 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 
 				subtype->name      = subtypeNames[subTypeIdx];
 				subtype->size      = 0;
+#ifdef WIP_16BYTE_ALIGN
+				type->alignment    = 0; // template subtypes cannot be instantiated and don't need alignment
+#endif
 				subtype->flags     = asOBJ_TEMPLATE_SUBTYPE;
 				templateSubTypes.PushLast(subtype);
-				subtype->AddRef();
 			}
 			type->templateSubTypes.PushLast(asCDataType::CreateObject(subtype, false));
-			subtype->AddRef();
+			subtype->AddRefInternal();
 		}
 	}
 	else
@@ -1665,7 +1757,6 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 		typeName = name;
 
 		// Verify if the name has been registered as a type already
-		// TODO: Must check against registered funcdefs too
 		if( GetRegisteredObjectType(typeName, defaultNamespace) )
 			// This is not an irrepairable error, as it may just be that the same type is registered twice
 			return asALREADY_REGISTERED;
@@ -1682,8 +1773,9 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 
 		// Keep the most recent template generated instance type, so we know what it was before parsing the datatype
 		asCObjectType *mostRecentTemplateInstanceType = 0;
-		if( generatedTemplateTypes.GetLength() )
-			mostRecentTemplateInstanceType = generatedTemplateTypes[generatedTemplateTypes.GetLength()-1];
+		asUINT originalSizeOfGeneratedTemplateTypes = (asUINT)generatedTemplateTypes.GetLength();
+		if( originalSizeOfGeneratedTemplateTypes )
+			mostRecentTemplateInstanceType = generatedTemplateTypes[originalSizeOfGeneratedTemplateTypes-1];
 
 		// Use builder to parse the datatype
 		asCDataType dt;
@@ -1716,6 +1808,10 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 			type->name       = typeName;
 			type->nameSpace  = defaultNamespace;
 			type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
 			type->flags      = flags;
 			type->accessMask = defaultAccessMask;
 
@@ -1739,14 +1835,17 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 				dt.IsReference() )
 				return ConfigError(asINVALID_TYPE, "RegisterObjectType", name, 0);
 
-			// Was the template instance type created before?
-			if( (generatedTemplateTypes.GetLength() &&
-				 generatedTemplateTypes[generatedTemplateTypes.GetLength()-1] == mostRecentTemplateInstanceType) ||
-				mostRecentTemplateInstanceType == dt.GetObjectType() )
-				// TODO: Should have a better error message
+			// Was the template instance type generated before?
+			if( generatedTemplateTypes.Exists(dt.GetObjectType()) &&
+				generatedTemplateTypes[generatedTemplateTypes.GetLength()-1] == mostRecentTemplateInstanceType )
+			{
+				asCString str;
+				str.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, typeName.AddressOf());
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
 				return ConfigError(asNOT_SUPPORTED, "RegisterObjectType", name, 0);
+			}
 
-			// If this is not a template instance type, then it means it is an  
+			// If this is not a generated template instance type, then it means it is an
 			// already registered template specialization
 			if( !generatedTemplateTypes.Exists(dt.GetObjectType()) )
 				return ConfigError(asALREADY_REGISTERED, "RegisterObjectType", name, 0);
@@ -1764,10 +1863,15 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 			type->name       = dt.GetObjectType()->name;
 			// The namespace will be the same as the original template type
 			type->nameSpace  = dt.GetObjectType()->nameSpace;
-			// TODO: template: Support multiple subtypes
 			type->templateSubTypes.PushLast(dt.GetSubType());
-			if( type->templateSubTypes[0].GetObjectType() ) type->templateSubTypes[0].GetObjectType()->AddRef();
+			for( asUINT s = 0; s < type->templateSubTypes.GetLength(); s++ )
+				if( type->templateSubTypes[s].GetObjectType() ) 
+					type->templateSubTypes[s].GetObjectType()->AddRefInternal();
 			type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
 			type->flags      = flags;
 			type->accessMask = defaultAccessMask;
 
@@ -1776,7 +1880,10 @@ int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD
 			currentGroup->objTypes.PushLast(type);
 
 			// Remove the template instance type, which will no longer be used.
-			RemoveTemplateInstanceType(dt.GetObjectType());
+			// It is possible that multiple template instances are generated if
+			// they have any relationship, so all of them must be removed
+			while( generatedTemplateTypes.GetLength() > originalSizeOfGeneratedTemplateTypes )
+				RemoveTemplateInstanceType(generatedTemplateTypes[generatedTemplateTypes.GetLength()-1]);
 		}
 	}
 
@@ -1804,49 +1911,52 @@ int asCScriptEngine::RegisterObjectBehaviour(const char *datatype, asEBehaviours
 
 	// Don't allow application to modify built-in types
 	if( type.GetObjectType() == &functionBehaviours ||
-		type.GetObjectType() == &objectTypeBehaviours ||
-		type.GetObjectType() == &globalPropertyBehaviours ||
 		type.GetObjectType() == &scriptTypeBehaviours )
 		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
 
 	if( type.IsReadOnly() || type.IsReference() )
 		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
 
+	// Don't allow modifying generated template instances
+	if( type.GetObjectType() && (type.GetObjectType()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(type.GetObjectType()) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
+
 	return RegisterBehaviourToObjectType(type.GetObjectType(), behaviour, decl, funcPointer, callConv, objForThiscall);
 }
 
 // internal
 int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall)
 {
-	asSSystemFunctionInterface internal;
-	if( behaviour == asBEHAVE_FACTORY ||
-		behaviour == asBEHAVE_LIST_FACTORY ||
-		behaviour == asBEHAVE_TEMPLATE_CALLBACK )
-	{
 #ifdef AS_MAX_PORTABILITY
-		if( callConv != asCALL_GENERIC )
-			return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-#endif
-		int r = DetectCallingConvention(false, funcPointer, callConv, objForThiscall, &internal);
-		if( r < 0 )
-			return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-	}
-	else
-	{
-#ifdef AS_MAX_PORTABILITY
-		if( callConv != asCALL_GENERIC )
-			return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-#else
-		if( callConv != asCALL_THISCALL &&
-			callConv != asCALL_CDECL_OBJLAST &&
-			callConv != asCALL_CDECL_OBJFIRST &&
-			callConv != asCALL_GENERIC )
-			return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+	if( callConv != asCALL_GENERIC )
+		return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 #endif
 
-		int r = DetectCallingConvention(true, funcPointer, callConv, objForThiscall, &internal);
-		if( r < 0 )
-			return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+	asSSystemFunctionInterface internal;
+	bool isMethod = !(behaviour == asBEHAVE_FACTORY ||
+		              behaviour == asBEHAVE_LIST_FACTORY ||
+		              behaviour == asBEHAVE_TEMPLATE_CALLBACK);
+	int r = DetectCallingConvention(isMethod, funcPointer, callConv, objForThiscall, &internal);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
+	// If the object type is a template, make sure there are no generated instances already
+	if( objectType->flags & asOBJ_TEMPLATE )
+	{
+		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
+		{
+			asCObjectType *tmpl = generatedTemplateTypes[n];
+			if( tmpl->name == objectType->name &&
+				tmpl->nameSpace == objectType->nameSpace &&
+				!(tmpl->templateSubTypes[0].GetObjectType() && (tmpl->templateSubTypes[0].GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
+			{
+				asCString msg;
+				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateObject(tmpl, false).Format(tmpl->nameSpace).AddressOf());
+				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
+				return ConfigError(asERROR, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+		}
 	}
 
 	isPrepared = false;
@@ -1859,7 +1969,7 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 	bool expectListPattern = behaviour == asBEHAVE_LIST_FACTORY || behaviour == asBEHAVE_LIST_CONSTRUCT;
 	asCScriptNode *listPattern = 0;
 	asCBuilder bld(this, 0);
-	int r = bld.ParseFunctionDeclaration(objectType, decl, &func, true, &internal.paramAutoHandles, &internal.returnAutoHandle, 0, expectListPattern ? &listPattern : 0);
+	r = bld.ParseFunctionDeclaration(objectType, decl, &func, true, &internal.paramAutoHandles, &internal.returnAutoHandle, 0, expectListPattern ? &listPattern : 0);
 	if( r < 0 )
 	{
 		if( listPattern )
@@ -1869,8 +1979,12 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 	func.name.Format("_beh_%d_", behaviour);
 
 	if( behaviour != asBEHAVE_FACTORY && behaviour != asBEHAVE_LIST_FACTORY )
+	{
 		func.objectType = objectType;
+		func.objectType->AddRefInternal();
+	}
 
+	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
 	// Check if the method restricts that use of the template to value types or reference types
 	if( objectType->flags & asOBJ_TEMPLATE )
 	{
@@ -1882,6 +1996,10 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 					objectType->acceptValueSubType = false;
 				else if( !func.returnType.IsReference() )
 					objectType->acceptRefSubType = false;
+
+				// Can't support template subtypes by value, since each type is treated differently in the ABI
+				if( !func.returnType.IsObjectHandle() && !func.returnType.IsReference() )
+					return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), decl);
 			}
 
 			for( asUINT n = 0; n < func.parameterTypes.GetLength(); n++ )
@@ -1893,6 +2011,10 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 						objectType->acceptValueSubType = false;
 					else if( !func.parameterTypes[n].IsReference() )
 						objectType->acceptRefSubType = false;
+
+					// Can't support template subtypes by value, since each type is treated differently in the ABI
+					if( !func.parameterTypes[n].IsObjectHandle() && !func.parameterTypes[n].IsReference() )
+						return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), decl);
 				}
 			}
 		}
@@ -1911,7 +2033,7 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 
 			beh->construct = AddBehaviourFunction(func, internal);
 			beh->factory   = beh->construct;
-			scriptFunctions[beh->factory]->AddRef();
+			scriptFunctions[beh->factory]->AddRefInternal();
 			beh->constructors.PushLast(beh->construct);
 			beh->factories.PushLast(beh->factory);
 			func.id = beh->construct;
@@ -1925,12 +2047,22 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 				return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 			}
 
+			// The templates take a hidden parameter with the object type
+			if( (objectType->flags & asOBJ_TEMPLATE) &&
+				(func.parameterTypes.GetLength() == 0 ||
+				 !func.parameterTypes[0].IsReference()) )
+			{
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY);
+				return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+
 			// TODO: Verify that the same constructor hasn't been registered already
 
 			// Store all constructors in a list
 			func.id = AddBehaviourFunction(func, internal);
 			beh->constructors.PushLast(func.id);
-			if( func.parameterTypes.GetLength() == 0 )
+			if( func.parameterTypes.GetLength() == 0 ||
+				(func.parameterTypes.GetLength() == 1 && (objectType->flags & asOBJ_TEMPLATE)) )
 			{
 				beh->construct = func.id;
 			}
@@ -2055,6 +2187,33 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 		}
 
+		if( behaviour == asBEHAVE_LIST_FACTORY )
+		{
+			// Make sure the factory takes a reference as its last parameter
+			if( objectType->flags & asOBJ_TEMPLATE )
+			{
+				if( func.parameterTypes.GetLength() != 2 || !func.parameterTypes[1].IsReference() )
+				{
+					if( listPattern )
+						listPattern->Destroy(this);
+
+					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS);
+					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+				}
+			}
+			else
+			{
+				if( func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference() )
+				{
+					if( listPattern )
+						listPattern->Destroy(this);
+
+					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
+					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+				}
+			}
+		}
+
 		// TODO: Verify that the same factory function hasn't been registered already
 
 		// Don't accept duplicates
@@ -2085,30 +2244,6 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 			{
 				beh->listFactory = func.id;
 
-				// Make sure the factory takes a reference as its last parameter
-				if( objectType->flags & asOBJ_TEMPLATE )
-				{
-					if( func.parameterTypes.GetLength() != 2 || !func.parameterTypes[1].IsReference() )
-					{
-						if( listPattern )
-							listPattern->Destroy(this);
-
-						WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS);
-						return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-					}
-				}
-				else
-				{
-					if( func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference() )
-					{
-						if( listPattern )
-							listPattern->Destroy(this);
-
-						WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
-						return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-					}
-				}
-
 				// Store the list pattern for this function
 				int r = scriptFunctions[func.id]->RegisterListPattern(decl, listPattern);
 
@@ -2254,26 +2389,32 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 		else if( behaviour == asBEHAVE_RELEASEREFS )
 			func.id = beh->gcReleaseAllReferences = AddBehaviourFunction(func, internal);
 	}
+#ifdef AS_DEPRECATED
+	// Deprecated since 2.30.0. 2014-10-24
 	else if( behaviour == asBEHAVE_IMPLICIT_VALUE_CAST ||
 		     behaviour == asBEHAVE_VALUE_CAST )
 	{
-		// Verify parameter count
-		if( func.parameterTypes.GetLength() != 0 )
+		// There are two allowed signatures
+		// 1. type f()
+		// 2. void f(?&out)
+
+		if( !(func.parameterTypes.GetLength() == 1 && func.parameterTypes[0].GetTokenType() == ttQuestion && func.inOutFlags[0] == asTM_OUTREF && func.returnType.GetTokenType() == ttVoid) &&
+			!(func.parameterTypes.GetLength() == 0 &&  func.returnType.GetTokenType() != ttVoid) )
 			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 
-		// Verify return type
+		// It is not allowed to implement a value cast to bool
 		if( func.returnType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, false)) )
 			return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 
-		if( func.returnType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttVoid, false)) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// TODO: verify that the same cast is not registered already (const or non-const is treated the same for the return type)
-
-		beh->operators.PushLast(behaviour);
-		func.id = AddBehaviourFunction(func, internal);
-		beh->operators.PushLast(func.id);
+		asCString decl;
+		decl += func.returnType.Format(defaultNamespace);
+		decl += behaviour == asBEHAVE_VALUE_CAST ? " opConv(" : " opImplConv(";
+		if( func.parameterTypes.GetLength() )
+			decl += "?&out";
+		decl += ")";
+		func.id = RegisterMethodToObjectType(objectType, decl.AddressOf(), funcPointer, callConv, objForThiscall);
 	}
+	// Deprecated since 2.30.0, 2014-12-30
 	else if( behaviour == asBEHAVE_REF_CAST ||
 	         behaviour == asBEHAVE_IMPLICIT_REF_CAST )
 	{
@@ -2289,41 +2430,17 @@ int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, as
 		if( func.IsReadOnly() )
 			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
 
-		// Verify that the same cast is not registered already
-		// (const or non-const is treated the same for the return type)
-		if( func.parameterTypes.GetLength() == 1 )
-		{
-			// Check for existing behaviour with ?&out
-			for( asUINT n = 0; n < beh->operators.GetLength(); n+= 2 )
-			{
-				if( beh->operators[n] == asBEHAVE_REF_CAST ||
-					beh->operators[n] == asBEHAVE_IMPLICIT_REF_CAST )
-				{
-					asCScriptFunction *f = scriptFunctions[beh->operators[n+1]];
-					if( f->parameterTypes.GetLength() == 1 )
-						return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-				}
-			}
-		}
-		else
-		{
-			// Check for existing behaviour with same return type
-			for( asUINT n = 0; n < beh->operators.GetLength(); n+= 2 )
-			{
-				if( beh->operators[n] == asBEHAVE_REF_CAST ||
-					beh->operators[n] == asBEHAVE_IMPLICIT_REF_CAST )
-				{
-					asCScriptFunction *f = scriptFunctions[beh->operators[n+1]];
-					if( f->returnType.GetObjectType() == func.returnType.GetObjectType() )
-						return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-				}
-			}
-		}
-
-		beh->operators.PushLast(behaviour);
-		func.id = AddBehaviourFunction(func, internal);
-		beh->operators.PushLast(func.id);
+		asCString decl;
+		decl += func.returnType.Format(defaultNamespace);
+		if( internal.returnAutoHandle )
+			decl += "+";
+		decl += behaviour == asBEHAVE_REF_CAST ? " opCast(" : " opImplCast(";
+		if( func.parameterTypes.GetLength() )
+			decl += "?&out";
+		decl += ")";
+		func.id = RegisterMethodToObjectType(objectType, decl.AddressOf(), funcPointer, callConv, objForThiscall);
 	}
+#endif
 	else if ( behaviour == asBEHAVE_GET_WEAKREF_FLAG )
 	{
 		// This behaviour is only allowed for reference types
@@ -2403,6 +2520,8 @@ int asCScriptEngine::AddBehaviourFunction(asCScriptFunction &func, asSSystemFunc
 	f->sysFuncIntf    = newInterface;
 	f->returnType     = func.returnType;
 	f->objectType     = func.objectType;
+	if( f->objectType )
+		f->objectType->AddRefInternal();
 	f->id             = id;
 	f->isReadOnly     = func.isReadOnly;
 	f->accessMask     = defaultAccessMask;
@@ -2414,22 +2533,10 @@ int asCScriptEngine::AddBehaviourFunction(asCScriptFunction &func, asSSystemFunc
 		else
 			f->defaultArgs.PushLast(0);
 
-	SetScriptFunction(f);
+	AddScriptFunction(f);
 
 	// If parameter type from other groups are used, add references
-	if( f->returnType.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(f->returnType.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
-	for( n = 0; n < f->parameterTypes.GetLength(); n++ )
-	{
-		if( f->parameterTypes[n].GetObjectType() )
-		{
-			asCConfigGroup *group = FindConfigGroupForObjectType(f->parameterTypes[n].GetObjectType());
-			currentGroup->RefConfigGroup(group);
-		}
-	}
+	currentGroup->AddReferencesForFunc(this, f);
 
 	return id;
 }
@@ -2464,14 +2571,10 @@ int asCScriptEngine::RegisterGlobalProperty(const char *declaration, void *point
 	varAddressMap.Insert(prop->GetAddressOfValue(), prop);
 
 	registeredGlobalProps.Put(prop);
+	prop->AddRef();
 	currentGroup->globalProps.PushLast(prop);
 
-	// If from another group add reference
-	if( type.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(type.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
+	currentGroup->AddReferencesForType(this, type.GetObjectType());
 
 	return asSUCCESS;
 }
@@ -2500,23 +2603,21 @@ asCGlobalProperty *asCScriptEngine::AllocateGlobalProperty()
 }
 
 // internal
-void asCScriptEngine::FreeUnusedGlobalProperties()
+void asCScriptEngine::RemoveGlobalProperty(asCGlobalProperty *prop)
 {
-	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
+	int index = globalProperties.IndexOf(prop);
+	if( index >= 0 )
 	{
-		if( globalProperties[n] && globalProperties[n]->GetRefCount() == 0 )
-		{
-			freeGlobalPropertyIds.PushLast(n);
+		freeGlobalPropertyIds.PushLast(index);
+		globalProperties[index] = 0;
 
-			asSMapNode<void*, asCGlobalProperty*> *node;
-			varAddressMap.MoveTo(&node, globalProperties[n]->GetAddressOfValue());
-			asASSERT(node);
-			if( node )
-				varAddressMap.Erase(node);
+		asSMapNode<void*, asCGlobalProperty*> *node;
+		varAddressMap.MoveTo(&node, prop->GetAddressOfValue());
+		asASSERT(node);
+		if( node )
+			varAddressMap.Erase(node);
 
-			asDELETE(globalProperties[n], asCGlobalProperty);
-			globalProperties[n] = 0;
-		}
+		prop->Release();
 	}
 }
 
@@ -2556,11 +2657,20 @@ int asCScriptEngine::GetGlobalPropertyByIndex(asUINT index, const char **name, c
 // interface
 int asCScriptEngine::GetGlobalPropertyIndexByName(const char *name) const
 {
-	// Find the global var id
-	int id = registeredGlobalProps.GetFirstIndex(defaultNamespace, name);
-	if( id == -1 ) return asNO_GLOBAL_VAR;
+	asSNameSpace *ns = defaultNamespace;
 
-	return id;
+	// Find the global var id
+	while( ns )
+	{
+		int id = registeredGlobalProps.GetFirstIndex(ns, name);
+		if( id >= 0 ) 
+			return id;
+
+		// Recursively search parent namespace
+		ns = GetParentNameSpace(ns);
+	}
+
+	return asNO_GLOBAL_VAR;
 }
 
 // interface
@@ -2580,15 +2690,20 @@ int asCScriptEngine::GetGlobalPropertyIndexByDecl(const char *decl) const
 		return r;
 
 	// Search for a match
-	int id = registeredGlobalProps.GetFirstIndex(ns, name, asCCompGlobPropType(dt));
-	if (id < 0)
-		return asNO_GLOBAL_VAR;
+	while( ns )
+	{
+		int id = registeredGlobalProps.GetFirstIndex(ns, name, asCCompGlobPropType(dt));
+		if( id >= 0 )
+			return id;
 
-	return id;
+		ns = GetParentNameSpace(ns);
+	}
+
+	return asNO_GLOBAL_VAR;
 }
 
 // interface
-int asCScriptEngine::RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv)
+int asCScriptEngine::RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall)
 {
 	if( obj == 0 )
 		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
@@ -2605,34 +2720,48 @@ int asCScriptEngine::RegisterObjectMethod(const char *obj, const char *declarati
 
 	// Don't allow application to modify built-in types
 	if( dt.GetObjectType() == &functionBehaviours ||
-		dt.GetObjectType() == &objectTypeBehaviours ||
-		dt.GetObjectType() == &globalPropertyBehaviours ||
 		dt.GetObjectType() == &scriptTypeBehaviours )
 		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
 
-	return RegisterMethodToObjectType(dt.GetObjectType(), declaration, funcPointer, callConv);
+	// Don't allow modifying generated template instances
+	if( dt.GetObjectType() && (dt.GetObjectType()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(dt.GetObjectType()) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectMethod", obj, declaration);
+
+	return RegisterMethodToObjectType(dt.GetObjectType(), declaration, funcPointer, callConv, objForThiscall);
 }
 
 // internal
-int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv)
+int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall)
 {
-	asSSystemFunctionInterface internal;
-	int r = DetectCallingConvention(true, funcPointer, callConv, 0, &internal);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-
-	// We only support these calling conventions for object methods
 #ifdef AS_MAX_PORTABILITY
 	if( callConv != asCALL_GENERIC )
 		return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-#else
-	if( callConv != asCALL_THISCALL &&
-		callConv != asCALL_CDECL_OBJLAST &&
-		callConv != asCALL_CDECL_OBJFIRST &&
-		callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
 #endif
 
+	asSSystemFunctionInterface internal;
+	int r = DetectCallingConvention(true, funcPointer, callConv, objForThiscall, &internal);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+
+	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
+	// If the object type is a template, make sure there are no generated instances already
+	if( objectType->flags & asOBJ_TEMPLATE )
+	{
+		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
+		{
+			asCObjectType *tmpl = generatedTemplateTypes[n];
+			if( tmpl->name == objectType->name &&
+				tmpl->nameSpace == objectType->nameSpace &&
+				!(tmpl->templateSubTypes[0].GetObjectType() && (tmpl->templateSubTypes[0].GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
+			{
+				asCString msg;
+				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateObject(tmpl, false).Format(tmpl->nameSpace).AddressOf());
+				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
+				return ConfigError(asERROR, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
+		}
+	}
+
 	isPrepared = false;
 
 	// Put the system function in the list of system functions
@@ -2649,6 +2778,7 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 
 	func->sysFuncIntf = newInterface;
 	func->objectType  = objectType;
+	func->objectType->AddRefInternal();
 
 	asCBuilder bld(this, 0);
 	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, true, &newInterface->paramAutoHandles, &newInterface->returnAutoHandle);
@@ -2671,38 +2801,43 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 
 	// Check against duplicate methods
 	asUINT n;
-	for( n = 0; n < func->objectType->methods.GetLength(); n++ )
+	if( func->name == "opConv" || func->name == "opImplConv" || func->name == "opCast" || func->name == "opImplCast" )
 	{
-		asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
-		if( f->name == func->name &&
-			f->IsSignatureExceptNameAndReturnTypeEqual(func) )
+		// opConv and opCast are special methods that the compiler differentiates between by the return type
+		for( n = 0; n < func->objectType->methods.GetLength(); n++ )
 		{
-			func->funcType = asFUNC_DUMMY;
-			asDELETE(func,asCScriptFunction);
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
+			if( f->name == func->name &&
+				f->IsSignatureExceptNameEqual(func) )
+			{
+				func->funcType = asFUNC_DUMMY;
+				asDELETE(func,asCScriptFunction);
+				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
+		}
+	}
+	else
+	{
+		for( n = 0; n < func->objectType->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
+			if( f->name == func->name &&
+				f->IsSignatureExceptNameAndReturnTypeEqual(func) )
+			{
+				func->funcType = asFUNC_DUMMY;
+				asDELETE(func,asCScriptFunction);
+				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
 		}
 	}
 
 	func->id = GetNextScriptFunctionId();
 	func->objectType->methods.PushLast(func->id);
 	func->accessMask = defaultAccessMask;
-	SetScriptFunction(func);
+	AddScriptFunction(func);
 
-	// TODO: This code is repeated in many places
 	// If parameter type from other groups are used, add references
-	if( func->returnType.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(func->returnType.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( func->parameterTypes[n].GetObjectType() )
-		{
-			asCConfigGroup *group = FindConfigGroupForObjectType(func->parameterTypes[n].GetObjectType());
-			currentGroup->RefConfigGroup(group);
-		}
-	}
+	currentGroup->AddReferencesForFunc(this, func);
 
 	// Check if the method restricts that use of the template to value types or reference types
 	if( func->objectType->flags & asOBJ_TEMPLATE )
@@ -2715,6 +2850,10 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 					func->objectType->acceptValueSubType = false;
 				else if( !func->returnType.IsReference() )
 					func->objectType->acceptRefSubType = false;
+
+				// Can't support template subtypes by value, since each type is treated differently in the ABI
+				if( !func->returnType.IsObjectHandle() && !func->returnType.IsReference() )
+					return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
 			}
 
 			for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
@@ -2726,6 +2865,10 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 						func->objectType->acceptValueSubType = false;
 					else if( !func->parameterTypes[n].IsReference() )
 						func->objectType->acceptRefSubType = false;
+
+					// Can't support template subtypes by value, since each type is treated differently in the ABI
+					if( !func->parameterTypes[n].IsObjectHandle() && !func->parameterTypes[n].IsReference() )
+						return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
 				}
 			}
 		}
@@ -2734,13 +2877,13 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 	// TODO: beh.copy member will be removed, so this is not necessary
 	// Is this the default copy behaviour?
 	if( func->name == "opAssign" && func->parameterTypes.GetLength() == 1 && func->isReadOnly == false &&
-		(objectType->flags & asOBJ_SCRIPT_OBJECT || func->parameterTypes[0].IsEqualExceptRefAndConst(asCDataType::CreateObject(func->objectType, false))) )
+		((objectType->flags & asOBJ_SCRIPT_OBJECT) || func->parameterTypes[0].IsEqualExceptRefAndConst(asCDataType::CreateObject(func->objectType, false))) )
 	{
 		if( func->objectType->beh.copy != 0 )
 			return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
 
 		func->objectType->beh.copy = func->id;
-		func->AddRef();
+		func->AddRefInternal();
 	}
 
 	// Return the function id as success
@@ -2750,22 +2893,16 @@ int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const
 // interface
 int asCScriptEngine::RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall)
 {
+#ifdef AS_MAX_PORTABILITY
+	if( callConv != asCALL_GENERIC )
+		return ConfigError(asNOT_SUPPORTED, "RegisterGlobalFunction", declaration, 0);
+#endif
+
 	asSSystemFunctionInterface internal;
 	int r = DetectCallingConvention(false, funcPointer, callConv, objForThiscall, &internal);
 	if( r < 0 )
 		return ConfigError(r, "RegisterGlobalFunction", declaration, 0);
 
-#ifdef AS_MAX_PORTABILITY
-	if( callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterGlobalFunction", declaration, 0);
-#else
-	if( callConv != asCALL_CDECL &&
-		callConv != asCALL_STDCALL &&
-		callConv != asCALL_THISCALL_ASGLOBAL &&
-		callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterGlobalFunction", declaration, 0);
-#endif
-
 	isPrepared = false;
 
 	// Put the system function in the list of system functions
@@ -2820,26 +2957,14 @@ int asCScriptEngine::RegisterGlobalFunction(const char *declaration, const asSFu
 	}
 
 	func->id = GetNextScriptFunctionId();
-	SetScriptFunction(func);
+	AddScriptFunction(func);
 
 	currentGroup->scriptFunctions.PushLast(func);
 	func->accessMask = defaultAccessMask;
 	registeredGlobalFuncs.Put(func);
 
 	// If parameter type from other groups are used, add references
-	if( func->returnType.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(func->returnType.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( func->parameterTypes[n].GetObjectType() )
-		{
-			asCConfigGroup *group = FindConfigGroupForObjectType(func->parameterTypes[n].GetObjectType());
-			currentGroup->RefConfigGroup(group);
-		}
-	}
+	currentGroup->AddReferencesForFunc(this, func);
 
 	// Return the function id as success
 	return func->id;
@@ -2877,39 +3002,49 @@ asIScriptFunction *asCScriptEngine::GetGlobalFunctionByDecl(const char *decl) co
 	if( r < 0 )
 		return 0;
 
+	asSNameSpace *ns = defaultNamespace;
 	// Search script functions for matching interface
-	asIScriptFunction *f = 0;
-	const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(defaultNamespace, func.name);
-	for( unsigned int n = 0; n < idxs.GetLength(); n++ )
+	while( ns )
 	{
-		const asCScriptFunction *funcPtr = registeredGlobalFuncs.Get(idxs[n]);
-		if( funcPtr->objectType == 0 &&
-			func.returnType                 == funcPtr->returnType &&
-			func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
-			)
+		asIScriptFunction *f = 0;
+		const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(ns, func.name);
+		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
 		{
-			bool match = true;
-			for( size_t p = 0; p < func.parameterTypes.GetLength(); ++p )
+			const asCScriptFunction *funcPtr = registeredGlobalFuncs.Get(idxs[n]);
+			if( funcPtr->objectType == 0 &&
+				func.returnType                 == funcPtr->returnType &&
+				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
+				)
 			{
-				if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+				bool match = true;
+				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
 				{
-					match = false;
-					break;
+					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if( match )
+				{
+					if( f == 0 )
+						f = const_cast<asCScriptFunction*>(funcPtr);
+					else
+						// Multiple functions
+						return 0;
 				}
 			}
-
-			if( match )
-			{
-				if( f == 0 )
-					f = const_cast<asCScriptFunction*>(funcPtr);
-				else
-					// Multiple functions
-					return 0;
-			}
 		}
+
+		if( f )
+			return f;
+
+		// Recursively search parent namespaces
+		ns = GetParentNameSpace(ns);
 	}
 
-	return f;
+	return 0;
 }
 
 
@@ -3049,7 +3184,7 @@ int asCScriptEngine::RegisterDefaultArrayType(const char *type)
 		return asINVALID_TYPE;
 
 	defaultArrayObjectType = dt.GetObjectType();
-	defaultArrayObjectType->AddRef();
+	defaultArrayObjectType->AddRefInternal();
 
 	return 0;
 }
@@ -3117,7 +3252,7 @@ int asCScriptEngine::RegisterStringFactory(const char *datatype, const asSFuncPt
 	func->parameterTypes.PushLast(parm1);
 	func->inOutFlags.PushLast(asTM_INREF);
 	func->id = GetNextScriptFunctionId();
-	SetScriptFunction(func);
+	AddScriptFunction(func);
 
 	stringFactory = func;
 
@@ -3133,49 +3268,62 @@ int asCScriptEngine::RegisterStringFactory(const char *datatype, const asSFuncPt
 }
 
 // interface
-int asCScriptEngine::GetStringFactoryReturnTypeId() const
+int asCScriptEngine::GetStringFactoryReturnTypeId(asDWORD *flags) const
 {
 	if( stringFactory == 0 )
 		return asNO_FUNCTION;
 
-	return GetTypeIdFromDataType(stringFactory->returnType);
+	return stringFactory->GetReturnTypeId(flags);
 }
 
-// interface
-asCModule *asCScriptEngine::GetModule(const char *_name, bool create)
+// internal
+asCModule *asCScriptEngine::GetModule(const char *name, bool create)
 {
 	// Accept null as well as zero-length string
-	const char *name = "";
-	if( _name != 0 ) name = _name;
+	if( name == 0 ) name = "";
 
+	asCModule *retModule = 0;
+
+	ACQUIRESHARED(engineRWLock);
 	if( lastModule && lastModule->name == name )
-		return lastModule;
+		retModule = lastModule;
+	else
+	{
+		// TODO: optimize: Improve linear search
+		for( asUINT n = 0; n < scriptModules.GetLength(); ++n )
+			if( scriptModules[n] && scriptModules[n]->name == name )
+			{
+				retModule = scriptModules[n];
+				break;
+			}
+	}
+	RELEASESHARED(engineRWLock);
 
-	// TODO: optimize: Improve linear search
-	for( asUINT n = 0; n < scriptModules.GetLength(); ++n )
-		if( scriptModules[n] && scriptModules[n]->name == name )
-		{
-			lastModule = scriptModules[n];
-			return lastModule;
-		}
+	if( retModule )
+	{
+		ACQUIREEXCLUSIVE(engineRWLock);
+		lastModule = retModule;
+		RELEASEEXCLUSIVE(engineRWLock);
+
+		return retModule;
+	}
 
 	if( create )
 	{
-		asCModule *module = asNEW(asCModule)(name, this);
-		if( module == 0 )
+		retModule = asNEW(asCModule)(name, this);
+		if( retModule == 0 )
 		{
 			// Out of memory
 			return 0;
 		}
 
-		scriptModules.PushLast(module);
-
-		lastModule = module;
-
-		return lastModule;
+		ACQUIREEXCLUSIVE(engineRWLock);
+		scriptModules.PushLast(retModule);
+		lastModule = retModule;
+		RELEASEEXCLUSIVE(engineRWLock);
 	}
 
-	return 0;
+	return retModule;
 }
 
 asCModule *asCScriptEngine::GetModuleFromFuncId(int id)
@@ -3213,110 +3361,60 @@ void asCScriptEngine::BuildCompleted()
 
 void asCScriptEngine::RemoveTemplateInstanceType(asCObjectType *t)
 {
-	int n;
+	// If there is a module that still owns the generated type, then don't remove it
+	if( t->module )
+		return;
 
-	// Destroy the factory stubs
-	for( n = 0; n < (int)t->beh.factories.GetLength(); n++ )
-	{
-		// Make sure the factory stub isn't referencing this object anymore
-		scriptFunctions[t->beh.factories[n]]->ReleaseAllHandles(this);
-		scriptFunctions[t->beh.factories[n]]->Release();
-	}
-	t->beh.factories.SetLength(0);
+	// Don't remove it if there are external refernces
+	if( t->externalRefCount.get() )
+		return;
 
-	// Destroy the stub for the list factory too
-	if( t->beh.listFactory )
-	{
-		scriptFunctions[t->beh.listFactory]->ReleaseAllHandles(this);
-		scriptFunctions[t->beh.listFactory]->Release();
-		t->beh.listFactory = 0;
-	}
+	// Only remove the template instance type if no config group is using it
+	if( defaultGroup.generatedTemplateInstances.Exists(t) )
+		return;
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+		if( configGroups[n]->generatedTemplateInstances.Exists(t) )
+			return;
 
-	// Destroy the specialized functions
-	for( n = 1; n < (int)t->beh.operators.GetLength(); n += 2 )
-	{
-		if( t->beh.operators[n] && scriptFunctions[t->beh.operators[n]]->objectType == t )
-		{
-			scriptFunctions[t->beh.operators[n]]->Release();
-		}
-	}
-	t->beh.operators.SetLength(0);
-
-	// Start searching from the end of the list, as most of
-	// the time it will be the last two types
-	for( n = (int)templateInstanceTypes.GetLength()-1; n >= 0; n-- )
-	{
-		if( templateInstanceTypes[n] == t )
-		{
-			if( n == (signed)templateInstanceTypes.GetLength()-1 )
-				templateInstanceTypes.PopLast();
-			else
-				templateInstanceTypes[n] = templateInstanceTypes.PopLast();
-		}
-	}
-
-	for( n = (int)generatedTemplateTypes.GetLength()-1; n >= 0; n-- )
-	{
-		if( generatedTemplateTypes[n] == t )
-		{
-			if( n == (signed)generatedTemplateTypes.GetLength()-1 )
-				generatedTemplateTypes.PopLast();
-			else
-				generatedTemplateTypes[n] = generatedTemplateTypes.PopLast();
-		}
-	}
-
-	asDELETE(t,asCObjectType);
+	t->DestroyInternal();
+	templateInstanceTypes.RemoveValue(t);
+	generatedTemplateTypes.RemoveValue(t);
+	t->ReleaseInternal();
 }
 
 // internal
-void asCScriptEngine::OrphanTemplateInstances(asCObjectType *subType)
-{
-	for( asUINT n = 0; n < templateInstanceTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = templateInstanceTypes[n];
-		
-		if( type == 0 )
-			continue;
-		
-		// If the template type isn't owned by any module it can't be orphaned
-		if( type->module == 0 )
-			continue;
-
-		for( asUINT subTypeIdx = 0; subTypeIdx < type->templateSubTypes.GetLength(); subTypeIdx++ )
-		{
-			if( type->templateSubTypes[subTypeIdx].GetObjectType() == subType )
-			{
-				// Tell the GC that the template type exists so it can resolve potential circular references
-				gc.AddScriptObjectToGC(type, &objectTypeBehaviours);
-
-				// Clear the module
-				type->module = 0;
-				type->Release();
-
-				// Do a recursive check for other template instances
-				OrphanTemplateInstances(type);
-
-				// Break out so we don't add the same template to
-				// the gc again if another subtype matches this one
-				break;
-			}
-		}
-	}
-}
-
-// internal
-asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes)
+asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule)
 {
 	asUINT n;
 
 	// Is there any template instance type or template specialization already with this subtype?
 	for( n = 0; n < templateInstanceTypes.GetLength(); n++ )
 	{
-		if( templateInstanceTypes[n] &&
-			templateInstanceTypes[n]->name == templateType->name &&
-			templateInstanceTypes[n]->templateSubTypes == subTypes )
+		asCObjectType *type = templateInstanceTypes[n];
+		if( type &&
+			type->name == templateType->name &&
+			type->templateSubTypes == subTypes )
+		{
+			// If the template instance is generated, then the module should hold a reference
+			// to it so the config group can determine see that the template type is in use.
+			// Template specializations will be treated as normal types
+			if( requestingModule && generatedTemplateTypes.Exists(type) )
+			{
+				if( type->module == 0 )
+				{
+					// Set the ownership of this template type
+					// It may be without ownership if it was previously created from application with for example GetObjectTypeByDecl
+					type->module = requestingModule;
+				}
+				if( !requestingModule->templateInstances.Exists(type) )
+				{
+					requestingModule->templateInstances.PushLast(type);
+					type->AddRefInternal();
+				}
+			}
+
 			return templateInstanceTypes[n];
+		}
 	}
 
 	// No previous template instance exists
@@ -3343,18 +3441,33 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 	ot->flags            = templateType->flags;
 	ot->size             = templateType->size;
 	ot->name             = templateType->name;
+	ot->nameSpace        = templateType->nameSpace;
 
-	// The template instance type will inherit the same module as the subType
-	// This will allow the module to orphan the template instance types afterwards
-	for( n = 0; n < subTypes.GetLength(); n++ )
+	// If the template is being requested from a module, then the module should hold a reference to the type
+	if( requestingModule )
 	{
-		if( subTypes[n].GetObjectType() )
+		// Set the ownership of this template type
+		ot->module = requestingModule;
+		requestingModule->templateInstances.PushLast(ot);
+		ot->AddRefInternal();
+	}
+	else
+	{
+		// If the template type is not requested directly from a module, then set the ownership
+		// of it to the same module as one of the subtypes. If none of the subtypes are owned by]
+		// any module, the template instance will be without ownership and can be removed from the
+		// engine at any time (unless the application holds an external reference).
+		for( n = 0; n < subTypes.GetLength(); n++ )
 		{
-			ot->module = subTypes[n].GetObjectType()->module;
-			if( ot->module )
+			if( subTypes[n].GetObjectType() )
 			{
-				ot->AddRef();
-				break;
+				ot->module = subTypes[n].GetObjectType()->module;
+				if( ot->module )
+				{
+					ot->module->templateInstances.PushLast(ot);
+					ot->AddRefInternal();
+					break;
+				}
 			}
 		}
 	}
@@ -3362,42 +3475,67 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 	// Before filling in the methods, call the template instance callback behaviour to validate the type
 	if( templateType->beh.templateCallback )
 	{
-		bool dontGarbageCollect = false;
-
-		asCScriptFunction *callback = scriptFunctions[templateType->beh.templateCallback];
-		if( !CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
+		// If the validation is deferred then the validation will be done later,
+		// so it is necessary to continue the preparation of the template instance type
+		if( !deferValidationOfTemplateTypes )
 		{
-			// If the validation is deferred then the validation will be done later,
-			// so it is necessary to continue the preparation of the template instance type
-			if( !deferValidationOfTemplateTypes )
+			asCScriptFunction *callback = scriptFunctions[templateType->beh.templateCallback];
+
+			bool dontGarbageCollect = false;
+			if( !CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
 			{
-				// The type cannot be instanciated
+				// The type cannot be instantiated
 				ot->templateSubTypes.SetLength(0);
-				asDELETE(ot, asCObjectType);
+				if( ot->module )
+				{
+					ot->module->templateInstances.RemoveValue(ot);
+					ot->ReleaseInternal();
+				}
+				ot->ReleaseInternal();
 				return 0;
 			}
+
+			// If the callback said this template instance won't be garbage collected then remove the flag
+			if( dontGarbageCollect )
+				ot->flags &= ~asOBJ_GC;
 		}
 
-		// If the callback said this template instance won't be garbage collected then remove the flag
-		if( dontGarbageCollect )
-			ot->flags &= ~asOBJ_GC;
-
 		ot->beh.templateCallback = templateType->beh.templateCallback;
-		scriptFunctions[ot->beh.templateCallback]->AddRef();
+		scriptFunctions[ot->beh.templateCallback]->AddRefInternal();
 	}
 
 	ot->methods = templateType->methods;
 	for( n = 0; n < ot->methods.GetLength(); n++ )
-		scriptFunctions[ot->methods[n]]->AddRef();
+		scriptFunctions[ot->methods[n]]->AddRefInternal();
 
-	// Store the real factory in the constructor. This is used by the CreateScriptObject function.
-	// Otherwise it wouldn't be necessary to store the real factory ids.
-	ot->beh.construct = templateType->beh.factory;
-	ot->beh.constructors = templateType->beh.factories;
+	if( templateType->flags & asOBJ_REF )
+	{
+		// Store the real factory in the constructor. This is used by the CreateScriptObject function.
+		// Otherwise it wouldn't be necessary to store the real factory ids.
+		ot->beh.construct = templateType->beh.factory;
+		ot->beh.constructors = templateType->beh.factories;
+	}
+	else
+	{
+		ot->beh.construct = templateType->beh.construct;
+		ot->beh.constructors = templateType->beh.constructors;
+	}
 	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
-		scriptFunctions[ot->beh.constructors[n]]->AddRef();
+		scriptFunctions[ot->beh.constructors[n]]->AddRefInternal();
 
-	// As the new template type is instanciated the engine should
+
+	// Before proceeding with the generation of the template functions for the template instance it is necessary
+	// to include the new template instance type in the list of known types, otherwise it is possible that we get
+	// a infinite recursive loop as the template instance type is requested again during the generation of the
+	// template functions.
+	templateInstanceTypes.PushLast(ot);
+
+	// Store the template instance types that have been created automatically by the engine from a template type
+	// The object types in templateInstanceTypes that are not also in generatedTemplateTypes are registered template specializations
+	generatedTemplateTypes.PushLast(ot);
+
+
+	// As the new template type is instantiated the engine should
 	// generate new functions to substitute the ones with the template subtype.
 	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
 	{
@@ -3407,7 +3545,7 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
 		{
 			// Release the old function, the new one already has its ref count set to 1
-			scriptFunctions[funcId]->Release();
+			scriptFunctions[funcId]->ReleaseInternal();
 			ot->beh.constructors[n] = func->id;
 
 			if( ot->beh.construct == funcId )
@@ -3417,17 +3555,35 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 
 	ot->beh.factory = 0;
 
-	// Generate factory stubs for each of the factories
-	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+	if( templateType->flags & asOBJ_REF )
 	{
-		asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
+		// Generate factory stubs for each of the factories
+		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+		{
+			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
 
-		// The function's refCount was already initialized to 1
-		ot->beh.factories.PushLast(func->id);
+			ot->beh.factories.PushLast(func->id);
 
-		// Set the default factory as well
-		if( ot->beh.constructors[n] == ot->beh.construct )
-			ot->beh.factory = func->id;
+			// Set the default factory as well
+			if( ot->beh.constructors[n] == ot->beh.construct )
+				ot->beh.factory = func->id;
+		}
+	}
+	else
+	{
+		// Generate factory stubs for each of the constructors
+		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+		{
+			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
+
+			if( ot->beh.constructors[n] == ot->beh.construct )
+				ot->beh.construct = func->id;
+
+			// Release previous constructor
+			scriptFunctions[ot->beh.constructors[n]]->ReleaseInternal();
+
+			ot->beh.constructors[n] = func->id;
+		}
 	}
 
 	// Generate stub for the list factory as well
@@ -3435,48 +3591,31 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 	{
 		asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, templateType->beh.listFactory);
 
-		// The function's refCount was already initialized to 1
 		ot->beh.listFactory = func->id;
 	}
 
 	ot->beh.addref = templateType->beh.addref;
-	if( scriptFunctions[ot->beh.addref] ) scriptFunctions[ot->beh.addref]->AddRef();
+	if( scriptFunctions[ot->beh.addref] ) scriptFunctions[ot->beh.addref]->AddRefInternal();
 	ot->beh.release = templateType->beh.release;
-	if( scriptFunctions[ot->beh.release] ) scriptFunctions[ot->beh.release]->AddRef();
+	if( scriptFunctions[ot->beh.release] ) scriptFunctions[ot->beh.release]->AddRefInternal();
+	ot->beh.destruct = templateType->beh.destruct;
+	if( scriptFunctions[ot->beh.destruct] ) scriptFunctions[ot->beh.destruct]->AddRefInternal();
 	ot->beh.copy = templateType->beh.copy;
-	if( scriptFunctions[ot->beh.copy] ) scriptFunctions[ot->beh.copy]->AddRef();
-	ot->beh.operators = templateType->beh.operators;
-	for( n = 1; n < ot->beh.operators.GetLength(); n += 2 )
-		scriptFunctions[ot->beh.operators[n]]->AddRef();
+	if( scriptFunctions[ot->beh.copy] ) scriptFunctions[ot->beh.copy]->AddRefInternal();
 	ot->beh.gcGetRefCount = templateType->beh.gcGetRefCount;
-	if( scriptFunctions[ot->beh.gcGetRefCount] ) scriptFunctions[ot->beh.gcGetRefCount]->AddRef();
+	if( scriptFunctions[ot->beh.gcGetRefCount] ) scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
 	ot->beh.gcSetFlag = templateType->beh.gcSetFlag;
-	if( scriptFunctions[ot->beh.gcSetFlag] ) scriptFunctions[ot->beh.gcSetFlag]->AddRef();
+	if( scriptFunctions[ot->beh.gcSetFlag] ) scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
 	ot->beh.gcGetFlag = templateType->beh.gcGetFlag;
-	if( scriptFunctions[ot->beh.gcGetFlag] ) scriptFunctions[ot->beh.gcGetFlag]->AddRef();
+	if( scriptFunctions[ot->beh.gcGetFlag] ) scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
 	ot->beh.gcEnumReferences = templateType->beh.gcEnumReferences;
-	if( scriptFunctions[ot->beh.gcEnumReferences] ) scriptFunctions[ot->beh.gcEnumReferences]->AddRef();
+	if( scriptFunctions[ot->beh.gcEnumReferences] ) scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
 	ot->beh.gcReleaseAllReferences = templateType->beh.gcReleaseAllReferences;
-	if( scriptFunctions[ot->beh.gcReleaseAllReferences] ) scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRef();
+	if( scriptFunctions[ot->beh.gcReleaseAllReferences] ) scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
 	ot->beh.getWeakRefFlag = templateType->beh.getWeakRefFlag;
-	if( scriptFunctions[ot->beh.getWeakRefFlag] ) scriptFunctions[ot->beh.getWeakRefFlag]->AddRef();
+	if( scriptFunctions[ot->beh.getWeakRefFlag] ) scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
 
-	// As the new template type is instanciated the engine should
-	// generate new functions to substitute the ones with the template subtype.
-	for( n = 1; n < ot->beh.operators.GetLength(); n += 2 )
-	{
-		int funcId = ot->beh.operators[n];
-		asCScriptFunction *func = scriptFunctions[funcId];
-
-		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
-		{
-			// Release the old function, the new one already has its ref count set to 1
-			scriptFunctions[funcId]->Release();
-			ot->beh.operators[n] = func->id;
-		}
-	}
-
-	// As the new template type is instanciated, the engine should
+	// As the new template type is instantiated, the engine should
 	// generate new functions to substitute the ones with the template subtype.
 	for( n = 0; n < ot->methods.GetLength(); n++ )
 	{
@@ -3486,7 +3625,7 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
 		{
 			// Release the old function, the new one already has its ref count set to 1
-			scriptFunctions[funcId]->Release();
+			scriptFunctions[funcId]->ReleaseInternal();
 			ot->methods[n] = func->id;
 		}
 	}
@@ -3494,13 +3633,16 @@ asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateT
 	// Increase ref counter for sub type if it is an object type
 	for( n = 0; n < ot->templateSubTypes.GetLength(); n++ )
 		if( ot->templateSubTypes[n].GetObjectType() )
-			ot->templateSubTypes[n].GetObjectType()->AddRef();
+			ot->templateSubTypes[n].GetObjectType()->AddRefInternal();
 
-	templateInstanceTypes.PushLast(ot);
-
-	// Store the template instance types that have been created automatically by the engine from a template type
-	// The object types in templateInstanceTypes that are not also in generatedTemplateTypes are registered template specializations
-	generatedTemplateTypes.PushLast(ot);
+	// Copy the properties to the template instance
+	for( n = 0; n < templateType->properties.GetLength(); n++ )
+	{
+		asCObjectProperty *prop = templateType->properties[n];
+		ot->properties.PushLast(asNEW(asCObjectProperty)(*prop));
+		if( prop->type.GetObjectType() )
+			prop->type.GetObjectType()->AddRefInternal();
+	}
 
 	return ot;
 }
@@ -3563,6 +3705,64 @@ asCDataType asCScriptEngine::DetermineTypeForTemplate(const asCDataType &orig, a
 		dt.MakeReference(orig.IsReference());
 		dt.MakeReadOnly(orig.IsReadOnly());
 	}
+	else if( orig.GetObjectType() && (orig.GetObjectType()->flags & asOBJ_TEMPLATE) )
+	{
+		// The type is itself a template, so it is necessary to find the correct template instance type
+		asCArray<asCDataType> tmplSubTypes;
+		asCObjectType *origType = orig.GetObjectType();
+		bool needInstance = true;
+
+		// Find the matching replacements for the subtypes
+		for( asUINT n = 0; n < origType->templateSubTypes.GetLength(); n++ )
+		{
+			if( origType->templateSubTypes[n].GetObjectType() == 0 || 
+				!(origType->templateSubTypes[n].GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE) )
+			{
+				// The template is already an instance so we shouldn't attempt to create another instance
+				needInstance = false;
+				break;
+			}
+
+			for( asUINT m = 0; m < tmpl->templateSubTypes.GetLength(); m++ )
+				if( origType->templateSubTypes[n].GetObjectType() == tmpl->templateSubTypes[m].GetObjectType() )
+					tmplSubTypes.PushLast(ot->templateSubTypes[m]);
+
+			if( tmplSubTypes.GetLength() != n+1 )
+			{
+				asASSERT( false );
+				return orig;
+			}
+		}
+
+		asCObjectType *ntype = origType;
+		if( needInstance )
+		{
+			// Always find the original template type when creating a new template instance otherwise the
+			// generation will fail since it will attempt to create factory stubs when they already exists, etc
+			for( asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++ )
+				if( registeredTemplateTypes[n]->name == origType->name )
+				{
+					origType = registeredTemplateTypes[n];
+					break;
+				}
+
+			ntype = GetTemplateInstanceType(origType, tmplSubTypes, ot->module);
+			if( ntype == 0 )
+			{
+				// It not possible to instantiate the subtype
+				asASSERT( false );
+				ntype = tmpl;
+			}
+		}
+
+		if( orig.IsObjectHandle() )
+			dt = asCDataType::CreateObjectHandle(ntype, false);
+		else
+			dt = asCDataType::CreateObject(ntype, false);
+
+		dt.MakeReference(orig.IsReference());
+		dt.MakeReadOnly(orig.IsReadOnly());
+	}
 	else
 		dt = orig;
 
@@ -3589,21 +3789,30 @@ asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *t
 	func->AllocateScriptFunctionData();
 	func->name             = "factstub";
 	func->id               = GetNextScriptFunctionId();
-	func->returnType       = asCDataType::CreateObjectHandle(ot, false);
+	AddScriptFunction(func);
+
 	func->isShared         = true;
+	if( templateType->flags & asOBJ_REF )
+	{
+		func->returnType   = asCDataType::CreateObjectHandle(ot, false);
+	}
+	else
+	{
+		func->returnType   = factory->returnType; // constructors return nothing
+		func->objectType   = ot;
+		func->objectType->AddRefInternal();
+	}
 
 	// Skip the first parameter as this is the object type pointer that the stub will add
 	func->parameterTypes.SetLength(factory->parameterTypes.GetLength()-1);
 	func->inOutFlags.SetLength(factory->inOutFlags.GetLength()-1);
 	for( asUINT p = 1; p < factory->parameterTypes.GetLength(); p++ )
 	{
-		func->parameterTypes[p-1] = DetermineTypeForTemplate(factory->parameterTypes[p], templateType, ot);
+		func->parameterTypes[p-1] = factory->parameterTypes[p];
 		func->inOutFlags[p-1] = factory->inOutFlags[p];
 	}
 	func->scriptData->objVariablesOnHeap = 0;
-
-	SetScriptFunction(func);
-
+	
 	// Generate the bytecode for the factory stub
 	asUINT bcLength = asBCTypeSize[asBCInfo[asBC_OBJTYPE].type] +
 	                  asBCTypeSize[asBCInfo[asBC_CALLSYS].type] +
@@ -3611,6 +3820,8 @@ asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *t
 
 	if( ep.includeJitInstructions )
 		bcLength += asBCTypeSize[asBCInfo[asBC_JitEntry].type];
+	if( templateType->flags & asOBJ_VALUE )
+		bcLength += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
 
 	func->scriptData->byteCode.SetLength(bcLength);
 	asDWORD *bc = func->scriptData->byteCode.AddressOf();
@@ -3625,11 +3836,17 @@ asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *t
 	*(asBYTE*)bc = asBC_OBJTYPE;
 	*(asPWORD*)(bc+1) = (asPWORD)ot;
 	bc += asBCTypeSize[asBCInfo[asBC_OBJTYPE].type];
+	if( templateType->flags & asOBJ_VALUE )
+	{
+		// Swap the object pointer with the object type
+		*(asBYTE*)bc = asBC_SwapPtr;
+		bc += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
+	}
 	*(asBYTE*)bc = asBC_CALLSYS;
 	*(asDWORD*)(bc+1) = factoryId;
 	bc += asBCTypeSize[asBCInfo[asBC_CALLSYS].type];
 	*(asBYTE*)bc = asBC_RET;
-	*(((asWORD*)bc)+1) = (asWORD)func->GetSpaceNeededForArguments();
+	*(((asWORD*)bc)+1) = (asWORD)func->GetSpaceNeededForArguments() + (func->objectType ? AS_PTR_SIZE : 0);
 
 	func->AddReferences();
 	func->scriptData->stackNeeded = AS_PTR_SIZE;
@@ -3667,18 +3884,31 @@ asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *t
 	return func;
 }
 
+bool asCScriptEngine::RequireTypeReplacement(asCDataType &type, asCObjectType *templateType)
+{
+	if( type.GetObjectType() == templateType ) return true;
+	if( type.GetObjectType() && (type.GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE) ) return true;
+	if( type.GetObjectType() && (type.GetObjectType()->flags & asOBJ_TEMPLATE) )
+	{
+		for( asUINT n = 0; n < type.GetObjectType()->templateSubTypes.GetLength(); n++ )
+			if( type.GetObjectType()->templateSubTypes[n].GetObjectType() &&
+				type.GetObjectType()->templateSubTypes[n].GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE )
+				return true;
+	}
+
+	return false;
+}
+
 bool asCScriptEngine::GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *ot, asCScriptFunction *func, asCScriptFunction **newFunc)
 {
 	bool needNewFunc = false;
-	if( (func->returnType.GetObjectType() && (func->returnType.GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE)) ||
-		func->returnType.GetObjectType() == templateType )
+	if( RequireTypeReplacement(func->returnType, templateType) )
 		needNewFunc = true;
 	else
 	{
 		for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
 		{
-			if( (func->parameterTypes[p].GetObjectType() && (func->parameterTypes[p].GetObjectType()->flags & asOBJ_TEMPLATE_SUBTYPE)) ||
-				func->parameterTypes[p].GetObjectType() == templateType )
+			if( RequireTypeReplacement(func->parameterTypes[p], templateType) )
 			{
 				needNewFunc = true;
 				break;
@@ -3697,25 +3927,32 @@ bool asCScriptEngine::GenerateNewTemplateFunction(asCObjectType *templateType, a
 	}
 
 	func2->name     = func->name;
-	func2->id       = GetNextScriptFunctionId();
 
 	func2->returnType = DetermineTypeForTemplate(func->returnType, templateType, ot);
-
 	func2->parameterTypes.SetLength(func->parameterTypes.GetLength());
 	for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
 		func2->parameterTypes[p] = DetermineTypeForTemplate(func->parameterTypes[p], templateType, ot);
 
-	// TODO: template: Must be careful when instanciating templates for garbage collected types
+	// TODO: template: Must be careful when instantiating templates for garbage collected types
 	//                 If the template hasn't been registered with the behaviours, it shouldn't
-	//                 permit instanciation of garbage collected types that in turn may refer to
+	//                 permit instantiation of garbage collected types that in turn may refer to
 	//                 this instance.
 
 	func2->inOutFlags = func->inOutFlags;
 	func2->isReadOnly = func->isReadOnly;
 	func2->objectType = ot;
+	func2->objectType->AddRefInternal();
 	func2->sysFuncIntf = asNEW(asSSystemFunctionInterface)(*func->sysFuncIntf);
 
-	SetScriptFunction(func2);
+	// Adjust the clean up instructions
+	if( func2->sysFuncIntf->callConv == ICC_GENERIC_FUNC ||
+		func2->sysFuncIntf->callConv == ICC_GENERIC_METHOD )
+		PrepareSystemFunctionGeneric(func2, func2->sysFuncIntf, this);
+	else
+		PrepareSystemFunction(func2, func2->sysFuncIntf, this);
+
+	func2->id       = GetNextScriptFunctionId();
+	AddScriptFunction(func2);
 
 	// Return the new function
 	*newFunc = func2;
@@ -3732,7 +3969,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, int func) const
 
 void asCScriptEngine::CallObjectMethod(void *obj, asSSystemFunctionInterface *i, asCScriptFunction *s) const
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(AS_PSVITA)
 	if( i->callConv == ICC_GENERIC_METHOD )
 	{
 		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
@@ -3752,7 +3989,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, asSSystemFunctionInterface *i,
 				asPWORD baseOffset;  // Same size as the pointer
 			} f;
 		} p;
-		p.f.func = (void (*)())(i->func);
+		p.f.func = (asFUNCTION_t)(i->func);
 		p.f.baseOffset = asPWORD(i->baseOffset);
 		void (asCSimpleDummy::*f)() = p.mthd;
 		(((asCSimpleDummy*)obj)->*f)();
@@ -3771,7 +4008,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, asSSystemFunctionInterface *i,
 			asSIMPLEMETHOD_t mthd;
 			asFUNCTION_t func;
 		} p;
-		p.func = (void (*)())(i->func);
+		p.func = (asFUNCTION_t)(i->func);
 		void (asCSimpleDummy::*f)() = p.mthd;
 		obj = (void*)(asPWORD(obj) + i->baseOffset);
 		(((asCSimpleDummy*)obj)->*f)();
@@ -3798,7 +4035,7 @@ bool asCScriptEngine::CallObjectMethodRetBool(void *obj, int func) const
 	asASSERT( s != 0 );
 	asSSystemFunctionInterface *i = s->sysFuncIntf;
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(AS_PSVITA)
 	if( i->callConv == ICC_GENERIC_METHOD )
 	{
 		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
@@ -3818,7 +4055,7 @@ bool asCScriptEngine::CallObjectMethodRetBool(void *obj, int func) const
 				asPWORD baseOffset;
 			} f;
 		} p;
-		p.f.func = (void (*)())(i->func);
+		p.f.func = (asFUNCTION_t)(i->func);
 		p.f.baseOffset = asPWORD(i->baseOffset);
 		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())(p.mthd);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -3837,7 +4074,7 @@ bool asCScriptEngine::CallObjectMethodRetBool(void *obj, int func) const
 			asSIMPLEMETHOD_t mthd;
 			asFUNCTION_t func;
 		} p;
-		p.func = (void (*)())(i->func);
+		p.func = (asFUNCTION_t)(i->func);
 		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())p.mthd;
 		obj = (void*)(asPWORD(obj) + i->baseOffset);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -3865,7 +4102,7 @@ int asCScriptEngine::CallObjectMethodRetInt(void *obj, int func) const
 	asASSERT( s != 0 );
 	asSSystemFunctionInterface *i = s->sysFuncIntf;
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(AS_PSVITA)
 	if( i->callConv == ICC_GENERIC_METHOD )
 	{
 		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
@@ -3885,7 +4122,7 @@ int asCScriptEngine::CallObjectMethodRetInt(void *obj, int func) const
 				asPWORD baseOffset;
 			} f;
 		} p;
-		p.f.func = (void (*)())(i->func);
+		p.f.func = (asFUNCTION_t)(i->func);
 		p.f.baseOffset = asPWORD(i->baseOffset);
 		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())(p.mthd);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -3904,7 +4141,7 @@ int asCScriptEngine::CallObjectMethodRetInt(void *obj, int func) const
 			asSIMPLEMETHOD_t mthd;
 			asFUNCTION_t func;
 		} p;
-		p.func = (void (*)())(i->func);
+		p.func = (asFUNCTION_t)(i->func);
 		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())p.mthd;
 		obj = (void*)(asPWORD(obj) + i->baseOffset);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -3932,7 +4169,7 @@ void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int func) const
 	asASSERT( s != 0 );
 	asSSystemFunctionInterface *i = s->sysFuncIntf;
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(AS_PSVITA)
 	if( i->callConv == ICC_GENERIC_METHOD )
 	{
 		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
@@ -3952,7 +4189,7 @@ void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int func) const
 				asPWORD baseOffset;
 			} f;
 		} p;
-		p.f.func = (void (*)())(i->func);
+		p.f.func = (asFUNCTION_t)(i->func);
 		p.f.baseOffset = asPWORD(i->baseOffset);
 		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())(p.mthd);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -3971,7 +4208,7 @@ void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int func) const
 			asSIMPLEMETHOD_t mthd;
 			asFUNCTION_t func;
 		} p;
-		p.func = (void (*)())(i->func);
+		p.func = (asFUNCTION_t)(i->func);
 		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())p.mthd;
 		obj = (void*)(asPWORD(obj) + i->baseOffset);
 		return (((asCSimpleDummy*)obj)->*f)();
@@ -4060,7 +4297,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, void *param, int func) const
 
 void asCScriptEngine::CallObjectMethod(void *obj, void *param, asSSystemFunctionInterface *i, asCScriptFunction *s) const
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(AS_PSVITA)
 	if( i->callConv == ICC_CDECL_OBJLAST )
 	{
 		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
@@ -4085,7 +4322,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, void *param, asSSystemFunction
 				asPWORD baseOffset;  // Same size as the pointer
 			} f;
 		} p;
-		p.f.func = (void (*)())(i->func);
+		p.f.func = (asFUNCTION_t)(i->func);
 		p.f.baseOffset = asPWORD(i->baseOffset);
 		void (asCSimpleDummy::*f)(void*) = (void (asCSimpleDummy::*)(void*))(p.mthd);
 		(((asCSimpleDummy*)obj)->*f)(param);
@@ -4104,7 +4341,7 @@ void asCScriptEngine::CallObjectMethod(void *obj, void *param, asSSystemFunction
 			asSIMPLEMETHOD_t mthd;
 			asFUNCTION_t func;
 		} p;
-		p.func = (void (*)())(i->func);
+		p.func = (asFUNCTION_t)(i->func);
 		void (asCSimpleDummy::*f)(void *) = (void (asCSimpleDummy::*)(void *))(p.mthd);
 		obj = (void*)(asPWORD(obj) + i->baseOffset);
 		(((asCSimpleDummy*)obj)->*f)(param);
@@ -4185,26 +4422,38 @@ bool asCScriptEngine::CallGlobalFunctionRetBool(void *param1, void *param2, asSS
 	}
 }
 
-void *asCScriptEngine::CallAlloc(asCObjectType *type) const
+void *asCScriptEngine::CallAlloc(const asCObjectType *type) const
 {
-    // Allocate 4 bytes as the smallest size. Otherwise CallSystemFunction may try to
-    // copy a DWORD onto a smaller memory block, in case the object type is return in registers.
+	// Allocate 4 bytes as the smallest size. Otherwise CallSystemFunction may try to
+	// copy a DWORD onto a smaller memory block, in case the object type is return in registers.
 
 	// Pad to the next even 4 bytes to avoid asBC_CPY writing outside of allocated buffer for registered POD types
 	asUINT size = type->size;
-	if( size & 0x3 ) 
+	if( size & 0x3 )
 		size += 4 - (size & 0x3);
 
+#ifndef WIP_16BYTE_ALIGN
 #if defined(AS_DEBUG)
-	return ((asALLOCFUNCDEBUG_t)(userAlloc))(size, __FILE__, __LINE__);
+	return ((asALLOCFUNCDEBUG_t)userAlloc)(size, __FILE__, __LINE__);
 #else
 	return userAlloc(size);
 #endif
+#else
+#if defined(AS_DEBUG)
+	return ((asALLOCALIGNEDFUNCDEBUG_t)userAllocAligned)(size, type->alignment, __FILE__, __LINE__);
+#else
+	return userAllocAligned(size, type->alignment);
+#endif
+#endif
 }
 
 void asCScriptEngine::CallFree(void *obj) const
 {
+#ifndef WIP_16BYTE_ALIGN
 	userFree(obj);
+#else
+	userFreeAligned(obj);
+#endif
 }
 
 // interface
@@ -4220,9 +4469,18 @@ int asCScriptEngine::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asIOb
 }
 
 // interface
-int asCScriptEngine::GarbageCollect(asDWORD flags)
+int asCScriptEngine::GarbageCollect(asDWORD flags, asUINT iterations)
 {
-	return gc.GarbageCollect(flags);
+	int r = gc.GarbageCollect(flags, iterations);
+
+	if( r == 0 )
+	{
+		// Delete any modules that have been discarded previously but not
+		// removed due to being referred to by objects in the garbage collector
+		DeleteDiscardedModules();
+	}
+
+	return r;
 }
 
 // interface
@@ -4258,7 +4516,7 @@ int asCScriptEngine::GetTypeIdFromDataType(const asCDataType &dtIn) const
 			int typeId = mapTypeIdToDataType.GetKey(cursor);
 			if( dtIn.GetObjectType() && !(dtIn.GetObjectType()->flags & asOBJ_ASHANDLE) )
 			{
-				// The the ASHANDLE types behave like handles, but are really
+				// The ASHANDLE types behave like handles, but are really
 				// value types so the typeId is never returned as a handle
 				if( dtIn.IsObjectHandle() )
 					typeId |= asTYPEID_OBJHANDLE;
@@ -4343,6 +4601,23 @@ void asCScriptEngine::RemoveFromTypeIdMap(asCObjectType *type)
 	}
 }
 
+// interface
+asIObjectType *asCScriptEngine::GetObjectTypeByDecl(const char *decl) const
+{
+	asCDataType dt;
+	// This cast is ok, because we are not changing anything in the engine
+	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
+	if( r < 0 )
+		return 0;
+
+	return dt.GetObjectType();
+}
+
 // interface
 int asCScriptEngine::GetTypeIdByDecl(const char *decl) const
 {
@@ -4352,7 +4627,7 @@ int asCScriptEngine::GetTypeIdByDecl(const char *decl) const
 
 	// Don't write parser errors to the message callback
 	bld.silent = true;
-	
+
 	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
 	if( r < 0 )
 		return asINVALID_TYPE;
@@ -4366,12 +4641,12 @@ const char *asCScriptEngine::GetTypeDeclaration(int typeId, bool includeNamespac
 	asCDataType dt = GetDataTypeFromTypeId(typeId);
 
 	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = dt.Format(includeNamespace);
+	*tempString = dt.Format(defaultNamespace, includeNamespace);
 
 	return tempString->AddressOf();
 }
 
-// TODO: interface: Deprecate. This function is not necessary now that all primitive types have fixed typeIds
+// interface
 int asCScriptEngine::GetSizeOfPrimitiveType(int typeId) const
 {
 	asCDataType dt = GetDataTypeFromTypeId(typeId);
@@ -4380,24 +4655,118 @@ int asCScriptEngine::GetSizeOfPrimitiveType(int typeId) const
 	return dt.GetSizeInMemoryBytes();
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-void *asCScriptEngine::CreateScriptObject(int typeId)
+// interface
+int asCScriptEngine::RefCastObject(void *obj, asIObjectType *fromType, asIObjectType *toType, void **newPtr, bool useOnlyImplicitCast)
 {
-	// Make sure the type id is for an object type, and not a primitive or a handle
-	if( (typeId & (asTYPEID_MASK_OBJECT | asTYPEID_MASK_SEQNBR)) != typeId ) return 0;
-	if( (typeId & asTYPEID_MASK_OBJECT) == 0 ) return 0;
+	if( newPtr == 0 ) return asINVALID_ARG;
+	*newPtr = 0;
 
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
+	if( fromType == 0 || toType == 0 ) return asINVALID_ARG;
 
-	// Is the type id valid?
-	if( !dt.IsValid() ) return 0;
+	// A null-pointer can always be cast to another type, so it will always be successful
+	if( obj == 0 )
+		return asSUCCESS;
 
-	asCObjectType *objType = dt.GetObjectType();
+	// This method doesn't support casting function pointers, since they cannot be described with just an object type
+	if( fromType->GetFlags() & asOBJ_SCRIPT_FUNCTION )
+		return asNOT_SUPPORTED;
 
-	return CreateScriptObject(objType);
+	if( fromType == toType )
+	{
+		*newPtr = obj;
+		AddRefScriptObject(*newPtr, toType);
+		return asSUCCESS;
+	}
+
+	// Look for ref cast behaviours
+	asCScriptFunction *universalCastFunc = 0;
+	asCObjectType *from = reinterpret_cast<asCObjectType*>(fromType);
+	for( asUINT n = 0; n < from->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = scriptFunctions[from->methods[n]];
+		if( func->name == "opImplCast" ||
+			(!useOnlyImplicitCast && func->name == "opCast") )
+		{
+			if( func->returnType.GetObjectType() == toType )
+			{
+				*newPtr = CallObjectMethodRetPtr(obj, func->id);
+				// The ref cast behaviour returns a handle with incremented
+				// ref counter, so there is no need to call AddRef explicitly
+				// unless the function is registered with autohandle
+				if( func->sysFuncIntf->returnAutoHandle )
+					AddRefScriptObject(*newPtr, toType);
+				return asSUCCESS;
+			}
+			else
+			{
+				asASSERT( func->returnType.GetTokenType() == ttVoid && 
+						  func->parameterTypes.GetLength() == 1 && 
+						  func->parameterTypes[0].GetTokenType() == ttQuestion );
+				universalCastFunc = func;
+			}
+		}
+	}
+
+	// One last chance if the object has a void opCast(?&out) behaviour
+	if( universalCastFunc )
+	{
+		// TODO: Add proper error handling
+		asIScriptContext *ctx = RequestContext();
+		ctx->Prepare(universalCastFunc);
+		ctx->SetObject(obj);
+		ctx->SetArgVarType(0, newPtr, toType->GetTypeId() | asTYPEID_OBJHANDLE);
+		ctx->Execute();
+		ReturnContext(ctx);
+
+		// The opCast(?&out) method already incremented the
+		// refCount so there is no need to do it manually
+		return asSUCCESS;
+	}
+
+	// For script classes and interfaces there is a quick route
+	if( (fromType->GetFlags() & asOBJ_SCRIPT_OBJECT) && (toType->GetFlags() & asOBJ_SCRIPT_OBJECT) )
+	{
+		if( fromType == toType )
+		{
+			*newPtr = obj;
+			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+			return asSUCCESS;
+		}
+
+		// Up casts to base class or interface can be done implicitly
+		if( fromType->DerivesFrom(toType) ||
+			fromType->Implements(toType) )
+		{
+			*newPtr = obj;
+			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+			return asSUCCESS;
+		}
+		// Down casts to derived class or from interface can only be done explicitly
+		if( !useOnlyImplicitCast )
+		{
+			if( toType->Implements(fromType) || 
+				toType->DerivesFrom(fromType) )
+			{
+				*newPtr = obj;
+				reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+				return asSUCCESS;
+			}
+
+			// Get the true type of the object so the explicit cast can evaluate all possibilities
+			asIObjectType *from = reinterpret_cast<asCScriptObject*>(obj)->GetObjectType();
+			if( from->DerivesFrom(toType) ||
+				from->Implements(toType) )
+			{
+				*newPtr = obj;
+				reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+				return asSUCCESS;
+			}
+		}
+	}
+
+	// The cast is not available, but it is still a success
+	return asSUCCESS;
 }
-#endif
 
 // interface
 void *asCScriptEngine::CreateScriptObject(const asIObjectType *type)
@@ -4425,19 +4794,42 @@ void *asCScriptEngine::CreateScriptObject(const asIObjectType *type)
 	else if( objType->flags & asOBJ_TEMPLATE )
 	{
 		// The registered factory that takes the object type is moved
-		// to the construct behaviour when the type is instanciated
+		// to the construct behaviour when the type is instantiated
+#ifdef AS_NO_EXCEPTIONS
 		ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
+#else
+		try
+		{
+			ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
+		}
+		catch(...)
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			if( ctx )
+				ctx->SetException(TXT_EXCEPTION_CAUGHT);
+		}
+#endif
 	}
 	else if( objType->flags & asOBJ_REF )
 	{
 		// Call the default factory directly
+#ifdef AS_NO_EXCEPTIONS
 		ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
+#else
+		try
+		{
+			ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
+		}
+		catch(...)
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			if( ctx )
+				ctx->SetException(TXT_EXCEPTION_CAUGHT);
+		}
+#endif
 	}
 	else
 	{
-		// TODO: Shouldn't support allocating object like this, because the
-		//       caller cannot be certain how the memory was allocated.
-
 		// Make sure there is a default constructor or that it is a POD type
 		if( objType->beh.construct == 0 && !(objType->flags & asOBJ_POD) )
 		{
@@ -4451,34 +4843,31 @@ void *asCScriptEngine::CreateScriptObject(const asIObjectType *type)
 		ptr = CallAlloc(objType);
 		int funcIndex = objType->beh.construct;
 		if( funcIndex )
+		{
+#ifdef AS_NO_EXCEPTIONS
 			CallObjectMethod(ptr, funcIndex);
+#else
+			try
+			{
+				CallObjectMethod(ptr, funcIndex);
+			}
+			catch(...)
+			{
+				asIScriptContext *ctx = asGetActiveContext();
+				if( ctx )
+					ctx->SetException(TXT_EXCEPTION_CAUGHT);
+
+				// Free the memory
+				CallFree(ptr);
+				ptr = 0;
+			}
+#endif
+		}
 	}
 
 	return ptr;
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-// interface
-void *asCScriptEngine::CreateUninitializedScriptObject(int typeId)
-{
-	// Make sure the type id is for an object type, and not a primitive or a handle.
-	// This function only works for script classes. Registered types cannot be created this way.
-	if( (typeId & (asTYPEID_MASK_OBJECT | asTYPEID_MASK_SEQNBR)) != typeId ) return 0;
-	if( (typeId & asTYPEID_MASK_OBJECT) == 0 ) return 0;
-	if( (typeId & asTYPEID_SCRIPTOBJECT) == 0 ) return 0;
-
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	// Is the type id valid?
-	if( !dt.IsValid() ) return 0;
-
-	asCObjectType *objType = dt.GetObjectType();
-
-	return CreateUninitializedScriptObject(objType);
-}
-#endif
-
 // interface
 void *asCScriptEngine::CreateUninitializedScriptObject(const asIObjectType *type)
 {
@@ -4498,31 +4887,46 @@ void *asCScriptEngine::CreateUninitializedScriptObject(const asIObjectType *type
 	return obj;
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-void *asCScriptEngine::CreateScriptObjectCopy(void *origObj, int typeId)
-{
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-	if( !dt.IsValid() ) return 0;
-	asCObjectType *objType = dt.GetObjectType();
-
-	void *newObj = CreateScriptObject(objType);
-	if( newObj == 0 ) return 0;
-
-	AssignScriptObject(newObj, origObj, typeId);
-
-	return newObj;
-}
-#endif
-
 // interface
 void *asCScriptEngine::CreateScriptObjectCopy(void *origObj, const asIObjectType *type)
 {
-	// TODO: Should use the copy constructor if available
-	void *newObj = CreateScriptObject(type);
-	if( newObj == 0 ) return 0;
+	if( origObj == 0 || type == 0 ) return 0;
 
-	AssignScriptObject(newObj, origObj, type);
+	void *newObj = 0;
+
+	const asCObjectType *ot = reinterpret_cast<const asCObjectType*>(type);
+	// TODO: runtime optimize: Should call copy factory for ref types too
+	if( ot->beh.copyconstruct )
+	{
+		// Manually allocate the memory, then call the copy constructor
+		newObj = CallAlloc(ot);
+#ifdef AS_NO_EXCEPTIONS
+		CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
+#else
+		try
+		{
+			CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
+		}
+		catch(...)
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			if( ctx )
+				ctx->SetException(TXT_EXCEPTION_CAUGHT);
+
+			// Free the memory
+			CallFree(newObj);
+			newObj = 0;
+		}
+#endif
+	}
+	else
+	{
+		// Allocate the object and then do a value assign
+		newObj = CreateScriptObject(type);
+		if( newObj == 0 ) return 0;
+
+		AssignScriptObject(newObj, origObj, type);
+	}
 
 	return newObj;
 }
@@ -4530,47 +4934,39 @@ void *asCScriptEngine::CreateScriptObjectCopy(void *origObj, const asIObjectType
 // internal
 void asCScriptEngine::ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type)
 {
+	if( type == 0 || mem == 0 || obj == 0 ) return;
+
 	// This function is only meant to be used for value types
 	asASSERT( type->flags & asOBJ_VALUE );
 
-	// TODO: runtime optimize: Should use the copy constructor when available
-	int funcIndex = type->beh.construct;
+	// Call the copy constructor if available, else call the default constructor followed by the opAssign
+	int funcIndex = type->beh.copyconstruct;
 	if( funcIndex )
-		CallObjectMethod(mem, funcIndex);
+	{
+		CallObjectMethod(mem, obj, funcIndex);
+	}
+	else
+	{
+		funcIndex = type->beh.construct;
+		if( funcIndex )
+			CallObjectMethod(mem, funcIndex);
 
-	AssignScriptObject(mem, obj, type);
+		AssignScriptObject(mem, obj, type);
+	}
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-void asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, int typeId)
-{
-	// Make sure the type id is for an object type, and not a primitive or a handle
-	if( (typeId & (asTYPEID_MASK_OBJECT | asTYPEID_MASK_SEQNBR)) != typeId ) return;
-	if( (typeId & asTYPEID_MASK_OBJECT) == 0 ) return;
-
-	// Copy the contents from the original object, using the assignment operator
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	// Is the type id valid?
-	if( !dt.IsValid() ) return;
-
-	asCObjectType *objType = dt.GetObjectType();
-
-	AssignScriptObject(dstObj, srcObj, objType);
-}
-#endif
-
 // interface
-void asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type)
+int asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type)
 {
-	if( type == 0 ) return;
+	// TODO: Warn about invalid call in message stream
+	// TODO: Should a script exception be set in case a context is active?
+	if( type == 0 || dstObj == 0 || srcObj == 0 ) return asINVALID_ARG;
 
 	const asCObjectType *objType = reinterpret_cast<const asCObjectType*>(type);
 
 	// If value assign for ref types has been disabled, then don't do anything if the type is a ref type
 	if( ep.disallowValueAssignForRefType && (objType->flags & asOBJ_REF) && !(objType->flags & asOBJ_SCOPED) )
-		return;
+		return asNOT_SUPPORTED;
 
 	// Must not copy if the opAssign is not available and the object is not a POD object
 	if( objType->beh.copy )
@@ -4589,33 +4985,10 @@ void asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, const asIOb
 	{
 		memcpy(dstObj, srcObj, objType->size);
 	}
+
+	return asSUCCESS;
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-void asCScriptEngine::AddRefScriptObject(void *obj, int typeId)
-{
-	// Make sure it is not a null pointer
-	if( obj == 0 ) return;
-
-	// Make sure the type id is for an object type or a handle
-	if( (typeId & asTYPEID_MASK_OBJECT) == 0 ) return;
-
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	// Is the type id valid?
-	if( !dt.IsValid() ) return;
-
-	asCObjectType *objType = dt.GetObjectType();
-
-	if( objType->beh.addref )
-	{
-		// Call the addref behaviour
-		CallObjectMethod(obj, objType->beh.addref);
-	}
-}
-#endif
-
 // interface
 void asCScriptEngine::AddRefScriptObject(void *obj, const asIObjectType *type)
 {
@@ -4630,27 +5003,6 @@ void asCScriptEngine::AddRefScriptObject(void *obj, const asIObjectType *type)
 	}
 }
 
-#ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-void asCScriptEngine::ReleaseScriptObject(void *obj, int typeId)
-{
-	// Make sure it is not a null pointer
-	if( obj == 0 ) return;
-
-	// Make sure the type id is for an object type or a handle
-	if( (typeId & asTYPEID_MASK_OBJECT) == 0 ) return;
-
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	// Is the type id valid?
-	if( !dt.IsValid() ) return;
-
-	asCObjectType *objType = dt.GetObjectType();
-
-	ReleaseScriptObject(obj, objType);
-}
-#endif
-
 // interface
 void asCScriptEngine::ReleaseScriptObject(void *obj, const asIObjectType *type)
 {
@@ -4669,21 +5021,22 @@ void asCScriptEngine::ReleaseScriptObject(void *obj, const asIObjectType *type)
 	}
 	else
 	{
-		// There is really only one reason why the application would want to 
-		// call this method for a value type, and that is if it is calling it
-		// as from a JIT compiled asBC_FREE instruction.
-
 		// Call the destructor
 		if( objType->beh.destruct )
 			CallObjectMethod(obj, objType->beh.destruct);
 		else if( objType->flags & asOBJ_LIST_PATTERN )
 			DestroyList((asBYTE*)obj, objType);
 
+		// We'll have to trust that the memory for the object was allocated with CallAlloc.
+		// This is true if the object was created in the context, or with CreateScriptObject.
+
 		// Then free the memory
 		CallFree(obj);
 	}
 }
 
+#ifdef AS_DEPRECATED
+// Deprecated since 2.30.0, 2014-11-04
 // interface
 bool asCScriptEngine::IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const
 {
@@ -4718,6 +5071,7 @@ bool asCScriptEngine::IsHandleCompatibleWithObject(void *obj, int objTypeId, int
 
 	return false;
 }
+#endif
 
 // interface
 int asCScriptEngine::BeginConfigGroup(const char *groupName)
@@ -4774,6 +5128,12 @@ int asCScriptEngine::RemoveConfigGroup(const char *groupName)
 		{
 			asCConfigGroup *group = configGroups[n];
 
+			// Remove any unused generated template instances 
+			// before verifying if the config group is still in use.
+			// RemoveTemplateInstanceType() checks if the instance is in use
+			for( asUINT g = generatedTemplateTypes.GetLength(); g-- > 0; )
+				RemoveTemplateInstanceType(generatedTemplateTypes[g]);
+
 			// Make sure the group isn't referenced by anyone
 			if( group->refCount > 0 )
 				return asCONFIG_GROUP_IS_IN_USE;
@@ -4873,7 +5233,7 @@ int asCScriptEngine::GetNextScriptFunctionId()
 	return (int)scriptFunctions.GetLength();
 }
 
-void asCScriptEngine::SetScriptFunction(asCScriptFunction *func)
+void asCScriptEngine::AddScriptFunction(asCScriptFunction *func)
 {
 	// Update the internal arrays with the function id that is now used
 	if( freeScriptFunctionIds.GetLength() && freeScriptFunctionIds[freeScriptFunctionIds.GetLength()-1] == func->id )
@@ -4889,52 +5249,79 @@ void asCScriptEngine::SetScriptFunction(asCScriptFunction *func)
 	}
 }
 
-void asCScriptEngine::FreeScriptFunctionId(int id)
+void asCScriptEngine::RemoveScriptFunction(asCScriptFunction *func)
 {
-	if( id < 0 ) return;
-	id &= ~FUNC_IMPORTED;
-	if( id >= (int)scriptFunctions.GetLength() ) return;
-
-	if( scriptFunctions[id] )
+	if( func == 0 || func->id < 0 ) return;
+	int id = func->id & ~FUNC_IMPORTED;
+	if( func->funcType == asFUNC_IMPORTED )
 	{
-		asCScriptFunction *func = scriptFunctions[id];
+		if( id >= (int)importedFunctions.GetLength() ) return;
 
-		// Remove the function from the list of script functions
-		if( id == (int)scriptFunctions.GetLength() - 1 )
+		if( importedFunctions[id] )
 		{
-			scriptFunctions.PopLast();
-		}
-		else
-		{
-			scriptFunctions[id] = 0;
-			freeScriptFunctionIds.PushLast(id);
-		}
-
-		// Is the function used as signature id?
-		if( func->signatureId == id )
-		{
-			// Remove the signature id
-			signatureIds.RemoveValue(func);
-
-			// Update all functions using the signature id
-			int newSigId = 0;
-			for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
+			// Remove the function from the list of script functions
+			if( id == (int)importedFunctions.GetLength() - 1 )
 			{
-				if( scriptFunctions[n] && scriptFunctions[n]->signatureId == id )
-				{
-					if( newSigId == 0 )
-					{
-						newSigId = scriptFunctions[n]->id;
-						signatureIds.PushLast(scriptFunctions[n]);
-					}
+				importedFunctions.PopLast();
+			}
+			else
+			{
+				importedFunctions[id] = 0;
+				freeImportedFunctionIdxs.PushLast(id);
+			}
+		}
+	}
+	else
+	{
+		if( id >= (int)scriptFunctions.GetLength() ) return;
+		asASSERT( func == scriptFunctions[id] );
 
-					scriptFunctions[n]->signatureId = newSigId;
+		if( scriptFunctions[id] )
+		{
+			// Remove the function from the list of script functions
+			if( id == (int)scriptFunctions.GetLength() - 1 )
+			{
+				scriptFunctions.PopLast();
+			}
+			else
+			{
+				scriptFunctions[id] = 0;
+				freeScriptFunctionIds.PushLast(id);
+			}
+
+			// Is the function used as signature id?
+			if( func->signatureId == id )
+			{
+				// Remove the signature id
+				signatureIds.RemoveValue(func);
+
+				// Update all functions using the signature id
+				int newSigId = 0;
+				for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
+				{
+					if( scriptFunctions[n] && scriptFunctions[n]->signatureId == id )
+					{
+						if( newSigId == 0 )
+						{
+							newSigId = scriptFunctions[n]->id;
+							signatureIds.PushLast(scriptFunctions[n]);
+						}
+
+						scriptFunctions[n]->signatureId = newSigId;
+					}
 				}
 			}
 		}
 	}
 }
 
+// internal
+void asCScriptEngine::RemoveFuncdef(asCScriptFunction *funcdef)
+{
+	// TODO: 2.30.0: redesign: How to avoid removing a funcdef that is shared by multiple modules?
+	funcDefs.RemoveValue(funcdef);
+}
+
 // interface
 int asCScriptEngine::RegisterFuncdef(const char *decl)
 {
@@ -4964,26 +5351,15 @@ int asCScriptEngine::RegisterFuncdef(const char *decl)
 	}
 
 	func->id = GetNextScriptFunctionId();
-	SetScriptFunction(func);
+	AddScriptFunction(func);
 
 	funcDefs.PushLast(func);
+	func->AddRefInternal();
 	registeredFuncDefs.PushLast(func);
 	currentGroup->funcDefs.PushLast(func);
 
 	// If parameter type from other groups are used, add references
-	if( func->returnType.GetObjectType() )
-	{
-		asCConfigGroup *group = FindConfigGroupForObjectType(func->returnType.GetObjectType());
-		currentGroup->RefConfigGroup(group);
-	}
-	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( func->parameterTypes[n].GetObjectType() )
-		{
-			asCConfigGroup *group = FindConfigGroupForObjectType(func->parameterTypes[n].GetObjectType());
-			currentGroup->RefConfigGroup(group);
-		}
-	}
+	currentGroup->AddReferencesForFunc(this, func);
 
 	// Return the function id as success
 	return func->id;
@@ -5121,7 +5497,6 @@ int asCScriptEngine::RegisterEnum(const char *name)
 		return ConfigError(asINVALID_NAME, "RegisterEnum", name, 0);
 
 	// Verify if the name has been registered as a type already
-	// TODO: Must check for registered funcdefs too
 	if( GetRegisteredObjectType(name, defaultNamespace) )
 		return asALREADY_REGISTERED;
 
@@ -5132,7 +5507,12 @@ int asCScriptEngine::RegisterEnum(const char *name)
 	int r = bld.ParseDataType(name, &dt, defaultNamespace);
 	msgCallback = oldMsgCallback;
 	if( r >= 0 )
-		return ConfigError(asERROR, "RegisterEnum", name, 0);
+	{
+		// If it is not in the defaultNamespace then the type was successfully parsed because
+		// it is declared in a parent namespace which shouldn't be treated as an error
+		if( dt.GetObjectType() && dt.GetObjectType()->nameSpace == defaultNamespace )
+			return ConfigError(asERROR, "RegisterEnum", name, 0);
+	}
 
 	// Make sure the name is not a reserved keyword
 	size_t tokenLen;
@@ -5186,9 +5566,9 @@ int asCScriptEngine::RegisterEnumValue(const char *typeName, const char *valueNa
 	if( NULL == valueName )
 		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
 
-	int tokenLen;
+	asUINT tokenLen = 0;
 	asETokenClass tokenClass = ParseToken(valueName, 0, &tokenLen);
-	if( tokenClass != asTC_IDENTIFIER || tokenLen != (int)strlen(valueName) )
+	if( tokenClass != asTC_IDENTIFIER || tokenLen != strlen(valueName) )
 		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
 
 	for( unsigned int n = 0; n < ot->enumValues.GetLength(); n++ )
@@ -5289,21 +5669,28 @@ asIObjectType *asCScriptEngine::GetObjectTypeByIndex(asUINT index) const
 // interface
 asIObjectType *asCScriptEngine::GetObjectTypeByName(const char *name) const
 {
-	// Check the object types
-	for( asUINT n = 0; n < registeredObjTypes.GetLength(); n++ )
+	asSNameSpace *ns = defaultNamespace;
+	while( ns )
 	{
-		if( registeredObjTypes[n]->name == name &&
-			registeredObjTypes[n]->nameSpace == defaultNamespace )
-			return registeredObjTypes[n];
-	}
+		// Check the object types
+		for( asUINT n = 0; n < registeredObjTypes.GetLength(); n++ )
+		{
+			if( registeredObjTypes[n]->name == name &&
+				registeredObjTypes[n]->nameSpace == ns )
+				return registeredObjTypes[n];
+		}
 
-	// Perhaps it is a template type? In this case
-	// the returned type will be the generic type
-	for( asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++ )
-	{
-		if( registeredTemplateTypes[n]->name == name &&
-			registeredTemplateTypes[n]->nameSpace == defaultNamespace )
-			return registeredTemplateTypes[n];
+		// Perhaps it is a template type? In this case
+		// the returned type will be the generic type
+		for( asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++ )
+		{
+			if( registeredTemplateTypes[n]->name == name &&
+				registeredTemplateTypes[n]->nameSpace == ns )
+				return registeredTemplateTypes[n];
+		}
+
+		// Recursively search parent namespace
+		ns = GetParentNameSpace(ns);
 	}
 
 	return 0;
@@ -5439,21 +5826,69 @@ void asCScriptEngine::SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callb
 }
 
 // interface
-void asCScriptEngine::SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback)
+void asCScriptEngine::SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type)
 {
-	cleanModuleFunc = callback;
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanModuleFuncs.GetLength(); n++ )
+	{
+		if( cleanModuleFuncs[n].type == type )
+		{
+			cleanModuleFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SModuleClean otc = {type, callback};
+	cleanModuleFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
 }
 
 // interface
-void asCScriptEngine::SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback)
+void asCScriptEngine::SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type)
 {
-	cleanContextFunc = callback;
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanContextFuncs.GetLength(); n++ )
+	{
+		if( cleanContextFuncs[n].type == type )
+		{
+			cleanContextFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SContextClean otc = {type, callback};
+	cleanContextFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
 }
 
 // interface
-void asCScriptEngine::SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback)
+void asCScriptEngine::SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type)
 {
-	cleanFunctionFunc = callback;
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanFunctionFuncs.GetLength(); n++ )
+	{
+		if( cleanFunctionFuncs[n].type == type )
+		{
+			cleanFunctionFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SFunctionClean otc = {type, callback};
+	cleanFunctionFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
 }
 
 // interface
@@ -5478,6 +5913,28 @@ void asCScriptEngine::SetObjectTypeUserDataCleanupCallback(asCLEANOBJECTTYPEFUNC
 	RELEASEEXCLUSIVE(engineRWLock);
 }
 
+// interface
+void asCScriptEngine::SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanScriptObjectFuncs.GetLength(); n++ )
+	{
+		if( cleanScriptObjectFuncs[n].type == type )
+		{
+			cleanScriptObjectFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SScriptObjClean soc = {type, callback};
+	cleanScriptObjectFuncs.PushLast(soc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
 // internal
 asCObjectType *asCScriptEngine::GetListPatternType(int listPatternFuncId)
 {
@@ -5532,7 +5989,7 @@ void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
 	node = node->next;
 	while( node )
 	{
-		if( node->type == asLPT_REPEAT )
+		if( node->type == asLPT_REPEAT || node->type == asLPT_REPEAT_SAME )
 		{
 			// Align the offset to 4 bytes boundary
 			if( (asPWORD(buffer) & 0x3) )
@@ -5541,6 +5998,26 @@ void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
 			// Determine how many times the pattern repeat
 			count = *(asUINT*)buffer;
 			buffer += 4;
+
+			if( count == 0 )
+			{
+				// Skip the sub pattern that was expected to be repeated, otherwise
+				// we'll try to delete things that don't exist in the buffer
+				node = node->next;
+				if( node->type == asLPT_START )
+				{
+					int subCount = 1;
+					do
+					{
+						node = node->next;
+						if( node->type == asLPT_START )
+							subCount++;
+						else if( node->type == asLPT_END )
+							subCount--;
+					} while( subCount > 0 );
+					return;
+				}
+			}
 		}
 		else if( node->type == asLPT_TYPE )
 		{
@@ -5582,11 +6059,11 @@ void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
 							// We'll assume the object has been created if any byte in
 							// the memory is different from 0.
 							// TODO: This is not really correct, as bytes may have been
-							//       modified by the constructor, but then an exception 
+							//       modified by the constructor, but then an exception
 							//       thrown aborting the initialization. The engine
 							//       really should be keeping track of which objects has
 							//       been successfully initialized.
-						
+
 							for( asUINT n = 0; n < size; n++ )
 							{
 								if( buffer[n] != 0 )
@@ -5606,7 +6083,7 @@ void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
 						// Align the offset to 4 bytes boundary
 						if( asPWORD(buffer) & 0x3 )
 							buffer += 4 - (asPWORD(buffer) & 0x3);
-						
+
 						// Call the release behaviour
 						void *ptr = *(void**)buffer;
 						if( ptr )
@@ -5657,5 +6134,22 @@ void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
 	}
 }
 
+// internal
+asSNameSpace *asCScriptEngine::GetParentNameSpace(asSNameSpace *ns) const
+{
+	if( ns == 0 ) return 0;
+	if( ns == nameSpaces[0] ) return 0;
+
+	asCString scope = ns->name;
+	int pos = scope.FindLast("::");
+	if( pos >= 0 )
+	{
+		scope = scope.SubString(0, pos);
+		return FindNameSpace(scope.AddressOf());
+	}
+
+	return nameSpaces[0];
+}
+
 END_AS_NAMESPACE
 
diff --git a/lib/angelscript/source/as_scriptengine.h b/lib/angelscript/source/as_scriptengine.h
index e40b48a99..161d22781 100644
--- a/lib/angelscript/source/as_scriptengine.h
+++ b/lib/angelscript/source/as_scriptengine.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -70,6 +70,7 @@ public:
 	// Memory management
 	virtual int AddRef() const;
 	virtual int Release() const;
+	virtual int ShutDownAndRelease();
 
 	// Engine properties
 	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value);
@@ -100,17 +101,18 @@ public:
 	// Type registration
 	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags);
 	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset);
-	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv);
+	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0);
 	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0);
 	virtual int            RegisterInterface(const char *name);
 	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration);
 	virtual asUINT         GetObjectTypeCount() const;
 	virtual asIObjectType *GetObjectTypeByIndex(asUINT index) const;
 	virtual asIObjectType *GetObjectTypeByName(const char *name) const;
+	virtual asIObjectType *GetObjectTypeByDecl(const char *decl) const;
 
 	// String factory
 	virtual int RegisterStringFactory(const char *datatype, const asSFuncPtr &factoryFunc, asDWORD callConv, void *objForThiscall = 0);
-	virtual int GetStringFactoryReturnTypeId() const;
+	virtual int GetStringFactoryReturnTypeId(asDWORD *flags) const;
 
 	// Default array type
 	virtual int RegisterDefaultArrayType(const char *type);
@@ -160,48 +162,45 @@ public:
 	virtual int            GetSizeOfPrimitiveType(int typeId) const;
 
 	// Script execution
-	virtual asIScriptContext  *CreateContext();
+	virtual asIScriptContext      *CreateContext();
+	virtual void                  *CreateScriptObject(const asIObjectType *type);
+	virtual void                  *CreateScriptObjectCopy(void *obj, const asIObjectType *type);
+	virtual void                  *CreateUninitializedScriptObject(const asIObjectType *type);
+	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj);
+	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type);
+	virtual void                   ReleaseScriptObject(void *obj, const asIObjectType *type);
+	virtual void                   AddRefScriptObject(void *obj, const asIObjectType *type);
+	virtual int                    RefCastObject(void *obj, asIObjectType *fromType, asIObjectType *toType, void **newPtr, bool useOnlyImplicitCast = false);
 #ifdef AS_DEPRECATED
-// Deprecated since 2.27.0, 2013-07-18
-	virtual void              *CreateScriptObject(int typeId);
-	virtual void              *CreateScriptObjectCopy(void *obj, int typeId);
-	virtual void              *CreateUninitializedScriptObject(int typeId);
-	virtual void               AssignScriptObject(void *dstObj, void *srcObj, int typeId);
-	virtual void               ReleaseScriptObject(void *obj, int typeId);
-	virtual void               AddRefScriptObject(void *obj, int typeId);
+	// Deprecated since 2.30.0, 2014-11-04
+	virtual bool                   IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const;
 #endif
-	virtual void              *CreateScriptObject(const asIObjectType *type);
-	virtual void              *CreateScriptObjectCopy(void *obj, const asIObjectType *type);
-	virtual void              *CreateUninitializedScriptObject(const asIObjectType *type);
-	virtual asIScriptFunction *CreateDelegate(asIScriptFunction *func, void *obj);
-	virtual void               AssignScriptObject(void *dstObj, void *srcObj, const asIObjectType *type);
-	virtual void               ReleaseScriptObject(void *obj, const asIObjectType *type);
-	virtual void               AddRefScriptObject(void *obj, const asIObjectType *type);
-	// TODO: interface: Should have a method void *CastObject(void *obj, asIObjectType *fromType, asIObjectType *toType); 
-	//                  For script objects it should simply check if the object implements or derives from the toType
-	//                  For application objects it should look for ref cast behaviours and call the matching one
-	//                  Once implemented the IsHandleCompatibleWithObject should be removed from the engine
-	virtual bool               IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const;
-	asILockableSharedBool     *GetWeakRefFlagOfScriptObject(void *obj, const asIObjectType *type) const;
+	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asIObjectType *type) const;
+
+	// Context pooling
+	virtual asIScriptContext *RequestContext();
+	virtual void              ReturnContext(asIScriptContext *ctx);
+	virtual int               SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0);
 
 	// String interpretation
-	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, int *tokenLength = 0) const;
+	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const;
 
 	// Garbage collection
-	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE);
+	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1);
 	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
 	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asIObjectType *type);
 	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj = 0, asIObjectType **type = 0);
 	virtual void GCEnumCallback(void *reference);
 
 	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0);
-	virtual void *GetUserData(asPWORD type = 0) const;
-	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type = 0);
-	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback);
-	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback);
-	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback);
+	virtual void *SetUserData(void *data, asPWORD type);
+	virtual void *GetUserData(asPWORD type) const;
+	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type);
+	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type);
+	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type);
+	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type);
 	virtual void  SetObjectTypeUserDataCleanupCallback(asCLEANOBJECTTYPEFUNC_t callback, asPWORD type);
+	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type);
 
 //===========================================================
 // internal methods
@@ -220,12 +219,12 @@ public:
 	friend class asCByteCode;
 	friend int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
 
-	int RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv);
+	int RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall = 0);
 	int RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *objForThiscall);
 
 	int VerifyVarTypeNotInFunction(asCScriptFunction *func);
 
-	void *CallAlloc(asCObjectType *objType) const;
+	void *CallAlloc(const asCObjectType *objType) const;
 	void  CallFree(void *obj) const;
 
 	void *CallGlobalFunctionRetPtr(int func) const;
@@ -244,11 +243,10 @@ public:
 
 	void ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type);
 
-	void CleanupAfterDiscardModule();
+	void DeleteDiscardedModules();
 
-	int  ClearUnusedTypes();
 	void RemoveTemplateInstanceType(asCObjectType *t);
-	void RemoveTypeAndRelatedFromList(asCArray<asCObjectType*> &types, asCObjectType *ot);
+	void RemoveTypeAndRelatedFromList(asCMap<asCObjectType*,char> &types, asCObjectType *ot);
 
 	asCConfigGroup *FindConfigGroupForFunction(int funcId) const;
 	asCConfigGroup *FindConfigGroupForGlobalVar(int gvarId) const;
@@ -282,8 +280,9 @@ public:
 	int  GetFactoryIdByDecl(const asCObjectType *ot, const char *decl);
 
 	int  GetNextScriptFunctionId();
-	void SetScriptFunction(asCScriptFunction *func);
-	void FreeScriptFunctionId(int id);
+	void AddScriptFunction(asCScriptFunction *func);
+	void RemoveScriptFunction(asCScriptFunction *func);
+	void RemoveFuncdef(asCScriptFunction *func);
 
 	int ConfigError(int err, const char *funcName, const char *arg1, const char *arg2);
 
@@ -293,11 +292,14 @@ public:
 	void               RemoveFromTypeIdMap(asCObjectType *type);
 
 	bool               IsTemplateType(const char *name) const;
-	asCObjectType     *GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes);
+	asCObjectType     *GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule);
 	asCScriptFunction *GenerateTemplateFactoryStub(asCObjectType *templateType, asCObjectType *templateInstanceType, int origFactoryId);
 	bool               GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *templateInstanceType, asCScriptFunction *templateFunc, asCScriptFunction **newFunc);
-	void               OrphanTemplateInstances(asCObjectType *subType);
 	asCDataType        DetermineTypeForTemplate(const asCDataType &orig, asCObjectType *tmpl, asCObjectType *ot);
+	bool               RequireTypeReplacement(asCDataType &type, asCObjectType *templateType);
+
+	asCModule         *FindNewOwnerForSharedType(asCObjectType *type, asCModule *mod);
+	asCModule         *FindNewOwnerForSharedFunc(asCScriptFunction *func, asCModule *mod);
 
 	// String constants
 	// TODO: Must free unused string constants, thus the ref count for each must be tracked
@@ -306,13 +308,14 @@ public:
 
 	// Global property management
 	asCGlobalProperty *AllocateGlobalProperty();
-	void FreeUnusedGlobalProperties();
+	void RemoveGlobalProperty(asCGlobalProperty *prop);
 
 	int GetScriptSectionNameIndex(const char *name);
 
 	// Namespace management
 	asSNameSpace *AddNameSpace(const char *name);
-	asSNameSpace *FindNameSpace(const char *name);
+	asSNameSpace *FindNameSpace(const char *name) const;
+	asSNameSpace *GetParentNameSpace(asSNameSpace *ns) const;
 
 //===========================================================
 // internal properties
@@ -324,14 +327,12 @@ public:
 	asCObjectType   *defaultArrayObjectType;
 	asCObjectType    scriptTypeBehaviours;
 	asCObjectType    functionBehaviours;
-	asCObjectType    objectTypeBehaviours;
-	asCObjectType    globalPropertyBehaviours;
 
 	// Registered interface
 	asCArray<asCObjectType *>         registeredObjTypes;
 	asCArray<asCObjectType *>         registeredTypeDefs;
 	asCArray<asCObjectType *>         registeredEnums;
-	asCSymbolTable<asCGlobalProperty> registeredGlobalProps; // TODO: memory savings: Since there can be only one property with the same name a simpler symbol table should be used
+	asCSymbolTable<asCGlobalProperty> registeredGlobalProps; // increases ref count // TODO: memory savings: Since there can be only one property with the same name a simpler symbol table should be used
 	asCSymbolTable<asCScriptFunction> registeredGlobalFuncs;
 	asCArray<asCScriptFunction *>     registeredFuncDefs;
 	asCArray<asCObjectType *>         registeredTemplateTypes;
@@ -339,54 +340,69 @@ public:
 	bool configFailed;
 
 	// Stores all registered types except funcdefs
-	asCMap<asSNameSpaceNamePair, asCObjectType*> allRegisteredTypes;  
+	asCMap<asSNameSpaceNamePair, asCObjectType*> allRegisteredTypes; // increases ref count
 
 	// Dummy types used to name the subtypes in the template objects 
 	asCArray<asCObjectType *>      templateSubTypes;
 
 	// Store information about template types
 	// This list will contain all instances of templates, both registered specialized 
-	// types and those automacially instanciated from scripts
-	asCArray<asCObjectType *>      templateInstanceTypes;
+	// types and those automacially instantiated from scripts
+	asCArray<asCObjectType *>      templateInstanceTypes; // increases ref count
 
 	// Store information about list patterns
-	asCArray<asCObjectType *>      listPatternTypes;
+	asCArray<asCObjectType *>      listPatternTypes; // increases ref count
 
 	// Stores all global properties, both those registered by application, and those declared by scripts.
 	// The id of a global property is the index in this array.
-	asCArray<asCGlobalProperty *> globalProperties;
+	asCArray<asCGlobalProperty *> globalProperties; // increases ref count
+	asCArray<int>                 freeGlobalPropertyIds;
 
 	// This map is used to quickly find a property by its memory address
 	// It is used principally during building, cleanup, and garbage detection for script functions
-	asCMap<void*, asCGlobalProperty*> varAddressMap;
-
-	asCArray<int>                 freeGlobalPropertyIds;
+	asCMap<void*, asCGlobalProperty*> varAddressMap; // doesn't increase ref count
 
 	// Stores all functions, i.e. registered functions, script functions, class methods, behaviours, etc.
-	asCArray<asCScriptFunction *> scriptFunctions;
+	asCArray<asCScriptFunction *> scriptFunctions;       // doesn't increase ref count
 	asCArray<int>                 freeScriptFunctionIds;
 	asCArray<asCScriptFunction *> signatureIds;
 
 	// An array with all module imported functions
-	asCArray<sBindInfo *>  importedFunctions;
+	asCArray<sBindInfo *>  importedFunctions; // doesn't increase ref count
 	asCArray<int>          freeImportedFunctionIdxs;
 
-	// These resources must be protected for multiple accesses
+	// Synchronized
 	mutable asCAtomic      refCount;
+	// Synchronized with engineRWLock
+	// This array holds all live script modules
 	asCArray<asCModule *>  scriptModules;
+	// Synchronized with engineRWLock
+	// This is a pointer to the last module that was requested. It is used for performance 
+	// improvement, since it is common that the same module is accessed many times in a row
 	asCModule             *lastModule;
+	// Synchronized with engineRWLock
+	// This flag is true if a script is currently being compiled. It is used to prevent multiple
+	// threads from requesting builds at the same time (without blocking)
 	bool                   isBuilding;
+	// Synchronized with engineRWLock
+	// This array holds modules that have been discard (thus are no longer visible to the application)
+	// but cannot yet be deleted due to having external references to some of the entities in them
+	asCArray<asCModule *>  discardedModules;
+	// This flag is set to true during compilations of scripts (or loading pre-compiled scripts) 
+	// to delay the validation of template types until the subtypes have been fully declared 
 	bool                   deferValidationOfTemplateTypes;
 
-	// Tokenizer is instanciated once to share resources
+	// Tokenizer is instantiated once to share resources
 	asCTokenizer tok;
 
-	// Stores script declared object types
-	asCArray<asCObjectType *> classTypes;
+	// Stores shared script declared types (classes, interfaces, enums)
+	asCArray<asCObjectType *> sharedScriptTypes; // increases ref count
 	// This array stores the template instances types that have been automatically generated from template types
 	asCArray<asCObjectType *> generatedTemplateTypes;
 	// Stores the funcdefs
-	asCArray<asCScriptFunction *> funcDefs;
+	// TODO: 2.30.0: redesign: Only shared funcdefs should be stored here
+	//                         a funcdef becomes shared if all arguments and the return type are shared (or application registered)
+	asCArray<asCScriptFunction *> funcDefs; // doesn't increase ref count
 
 	// Stores the names of the script sections for debugging purposes
 	asCArray<asCString *> scriptSectionNames;
@@ -409,7 +425,17 @@ public:
 	bool                        msgCallback;
 	asSSystemFunctionInterface  msgCallbackFunc;
 	void                       *msgCallbackObj;
+	struct preMessage_t
+	{
+		preMessage_t() { isSet = false; }
+		bool      isSet;
+		asCString message;
+		asCString scriptname;
+		int       r;
+		int       c;
+	} preMessage;
 
+	// JIt compilation
 	asIJITCompiler             *jitCompiler;
 
 	// Namespaces
@@ -423,16 +449,26 @@ public:
 	asCArray<asCString*>          stringConstants;
 	asCMap<asCStringPointer, int> stringToIdMap;
 
+	// Callbacks for context pooling
+	asREQUESTCONTEXTFUNC_t  requestCtxFunc;
+	asRETURNCONTEXTFUNC_t   returnCtxFunc;
+	void                   *ctxCallbackParam;
+
 	// User data
 	asCArray<asPWORD>       userData;
 
-	struct SEngineClean { asPWORD type; asCLEANENGINEFUNC_t cleanFunc; };
-	asCArray<SEngineClean>  cleanEngineFuncs;
-	asCLEANMODULEFUNC_t     cleanModuleFunc;
-	asCLEANCONTEXTFUNC_t    cleanContextFunc;
-	asCLEANFUNCTIONFUNC_t   cleanFunctionFunc;
-	struct SObjTypeClean { asPWORD type; asCLEANOBJECTTYPEFUNC_t cleanFunc; };
-	asCArray<SObjTypeClean> cleanObjectTypeFuncs;
+	struct SEngineClean    { asPWORD type; asCLEANENGINEFUNC_t      cleanFunc; };
+	asCArray<SEngineClean>    cleanEngineFuncs;
+	struct SModuleClean    { asPWORD type; asCLEANMODULEFUNC_t      cleanFunc; };
+	asCArray<SModuleClean>    cleanModuleFuncs;
+	struct SContextClean   { asPWORD type; asCLEANCONTEXTFUNC_t     cleanFunc; };
+	asCArray<SContextClean>   cleanContextFuncs;
+	struct SFunctionClean  { asPWORD type; asCLEANFUNCTIONFUNC_t    cleanFunc; };
+	asCArray<SFunctionClean>  cleanFunctionFuncs;
+	struct SObjTypeClean   { asPWORD type; asCLEANOBJECTTYPEFUNC_t  cleanFunc; };
+	asCArray<SObjTypeClean>   cleanObjectTypeFuncs;
+	struct SScriptObjClean { asPWORD type; asCLEANSCRIPTOBJECTFUNC_t cleanFunc; };
+	asCArray<SScriptObjClean> cleanScriptObjectFuncs;
 
 	// Synchronization for threads
 	DECLAREREADWRITELOCK(mutable engineRWLock)
@@ -460,10 +496,21 @@ public:
 		bool   alwaysImplDefaultConstruct;
 		int    compilerWarnings;
 		bool   disallowValueAssignForRefType;
+		// TODO: 3.0.0: Remove the alterSyntaxNamedArgs
+		int    alterSyntaxNamedArgs;
+		bool   disableIntegerDivision;
+		bool   disallowEmptyListElements;
+		// TODO: 3.0.0: Remove the privatePropAsProtected
+		bool   privatePropAsProtected;
 	} ep;
 
 	// This flag is to allow a quicker shutdown when releasing the engine
 	bool shuttingDown;
+
+	// This flag is set when the engine's destructor is called, this is to 
+	// avoid recursive calls if an object happens to increment/decrement
+	// the ref counter during shutdown
+	bool inDestructor;
 };
 
 END_AS_NAMESPACE
diff --git a/lib/angelscript/source/as_scriptfunction.cpp b/lib/angelscript/source/as_scriptfunction.cpp
index 8b084fbce..874cab558 100644
--- a/lib/angelscript/source/as_scriptfunction.cpp
+++ b/lib/angelscript/source/as_scriptfunction.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -105,6 +105,15 @@ static void ScriptFunction_CreateDelegate_Generic(asIScriptGeneric *gen)
 	gen->SetReturnAddress(CreateDelegate(func, obj));
 }
 
+// TODO: 2.29.0: operator==
+/*static void ScriptFunction_opEquals_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *funcSelf = (asCScriptFunction*)gen->GetObject();
+	asCScriptFunction *funcOther = (asCScriptFunction*)gen->GetArgAddress(0);
+	*(bool*)gen->GetAddressOfReturnLocation() = *funcSelf == *funcOther;
+}
+*/
+
 #endif
 
 
@@ -124,6 +133,8 @@ void RegisterScriptFunction(asCScriptEngine *engine)
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCScriptFunction,GetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCScriptFunction,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCScriptFunction,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	// TODO: 2.29.0: Need some way to allow the arg type to adapt when the funcdefs are instantiated
+//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asMETHOD(asCScriptFunction,operator==), asCALL_THISCALL); asASSERT( r >= 0 );
 #else
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptFunction_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptFunction_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
@@ -132,6 +143,7 @@ void RegisterScriptFunction(asCScriptEngine *engine)
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptFunction_GetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptFunction_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
 	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptFunction_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asFUNCTION(ScriptFunction_opEquals_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
 #endif
 
 	// Register the builtin function for creating delegates
@@ -214,6 +226,24 @@ asIScriptFunction *asCScriptFunction::GetDelegateFunction() const
 	return funcForDelegate;
 }
 
+// TODO: 2.29.0: operator==
+/*
+// internal
+bool asCScriptFunction::operator==(const asCScriptFunction &other) const
+{
+	if( this == &other ) return true;
+
+	if( this->funcType == asFUNC_DELEGATE && other.funcType == asFUNC_DELEGATE )
+	{
+		if( this->objForDelegate == other.objForDelegate &&
+			this->funcForDelegate == other.funcForDelegate )
+			return true;
+	}
+
+	return false;
+}
+*/
+
 // internal
 int asCScriptFunction::RegisterListPattern(const char *decl, asCScriptNode *listNodes)
 {
@@ -243,8 +273,23 @@ int asCScriptFunction::ParseListPattern(asSListPatternNode *&target, const char
 	{
 		if( listNodes->nodeType == snIdentifier )
 		{
-			node->next = asNEW(asSListPatternNode)(asLPT_REPEAT);
-			node = node->next;
+			asCString token(&decl[listNodes->tokenPos], listNodes->tokenLength);
+			if( token == "repeat" )
+			{
+				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT);
+				node = node->next;
+			}
+			else if( token == "repeat_same" )
+			{
+				// TODO: list: Should make sure this is a sub-list
+				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT_SAME);
+				node = node->next;
+			}
+			else
+			{
+				// Shouldn't happen as the parser already reported the error
+				asASSERT(false);
+			}
 		}
 		else if( listNodes->nodeType == snDataType )
 		{
@@ -287,15 +332,27 @@ int asCScriptFunction::ParseListPattern(asSListPatternNode *&target, const char
 // internal
 asCScriptFunction::asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType _funcType)
 {
-	refCount.set(1);
+	funcType               = _funcType;
+	if( funcType == asFUNC_DELEGATE )
+	{
+		// Delegates behave like object instances, rather than script code
+		externalRefCount.set(1);
+		internalRefCount.set(0);
+	}
+	else
+	{
+		internalRefCount.set(1);
+		externalRefCount.set(0);
+	}
+
 	this->engine           = engine;
 	this->scriptData       = 0;
-	funcType               = _funcType;
 	module                 = mod;
 	objectType             = 0;
 	name                   = "";
 	isReadOnly             = false;
 	isPrivate              = false;
+	isProtected            = false;
 	isFinal                = false;
 	isOverride             = false;
 	sysFuncIntf            = 0;
@@ -315,8 +372,8 @@ asCScriptFunction::asCScriptFunction(asCScriptEngine *engine, asCModule *mod, as
 	if( funcType == asFUNC_SCRIPT )
 		AllocateScriptFunctionData();
 
-	// Notify the GC of script functions
-	if( (funcType == asFUNC_SCRIPT && mod == 0) || (funcType == asFUNC_DELEGATE) )
+	// Notify the GC of delegates
+	if( funcType == asFUNC_DELEGATE )
 		engine->gc.AddScriptObjectToGC(this, &engine->functionBehaviours);
 }
 
@@ -348,35 +405,58 @@ void asCScriptFunction::DeallocateScriptFunctionData()
 // internal
 asCScriptFunction::~asCScriptFunction()
 {
-	// Imported functions are not reference counted, nor are dummy
-	// functions that are allocated on the stack
+	// Dummy functions that are allocated on the stack are not reference counted
 	asASSERT( funcType == asFUNC_DUMMY    ||
-		      funcType == asFUNC_IMPORTED ||
-		      refCount.get() == 0         );
+		      (externalRefCount.get() == 0 && internalRefCount.get() == 0) );
+
+	// Remove the script function from the engine's scriptFunctions array here
+	// Don't remove it before, because there may still be functions referring to it
+	// by index until now. If it was removed in DestroyInternal, those would not
+	// be able to release the refcount, thus causing memory leak.
+	if( engine && id != 0 && funcType != asFUNC_DUMMY )
+		engine->RemoveScriptFunction(this);
 
 	// If the engine pointer is 0, then DestroyInternal has already been called and there is nothing more to do
 	if( engine == 0 ) return;
 
+	// TODO: 2.30.0: redesign: Shouldn't this have been done already?
 	DestroyInternal();
 
-	// Tell engine to free the function id. This will make it impossible to
-	// refer to the function by id. Where this is done, it is quite possible
-	// they will leak.
-	if( funcType != -1 && funcType != asFUNC_IMPORTED && id )
-		engine->FreeScriptFunctionId(id);
-	id = 0;
-
 	// Finally set the engine pointer to 0 because it must not be accessed again
 	engine = 0;
 }
 
+// internal
+void asCScriptFunction::DestroyHalfCreated()
+{
+	asASSERT( externalRefCount.get() == 0 && internalRefCount.get() == 1 );
+
+	// Set the funcType to dummy so the destructor won't complain
+	funcType = asFUNC_DUMMY;
+
+	// If the bytecode exist remove it before destroying, otherwise it
+	// will fail when the destructor releases the references as the bytecode
+	// is not fully constructed.
+	if( scriptData )
+		scriptData->byteCode.SetLength(0);
+
+	asDELETE(this, asCScriptFunction);
+}
+
 // internal
 void asCScriptFunction::DestroyInternal()
 {
 	// Clean up user data
-	if( userData && engine->cleanFunctionFunc )
-		engine->cleanFunctionFunc(this);
-	userData = 0;
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n+1] )
+		{
+			for( asUINT c = 0; c < engine->cleanFunctionFuncs.GetLength(); c++ )
+				if( engine->cleanFunctionFuncs[c].type == userData[n] )
+					engine->cleanFunctionFuncs[c].cleanFunc(this);
+		}
+	}
+	userData.SetLength(0);
 
 	// Release all references the function holds to other objects
 	ReleaseReferences();
@@ -392,6 +472,12 @@ void asCScriptFunction::DestroyInternal()
 		asDELETE(sysFuncIntf,asSSystemFunctionInterface);
 	sysFuncIntf = 0;
 
+	if( objectType )
+	{
+		objectType->ReleaseInternal();
+		objectType = 0;
+	}
+
 	DeallocateScriptFunctionData();
 
 	// Deallocate list pattern data
@@ -413,38 +499,54 @@ int asCScriptFunction::GetId() const
 int asCScriptFunction::AddRef() const
 {
 	gcFlag = false;
-	asASSERT( funcType != asFUNC_IMPORTED );
-	return refCount.atomicInc();
+	return externalRefCount.atomicInc();
 }
 
 // interface
 int asCScriptFunction::Release() const
 {
 	gcFlag = false;
-	asASSERT( funcType != asFUNC_IMPORTED );
-	int r = refCount.atomicDec();
+	int r = externalRefCount.atomicDec();
 	if( r == 0 &&
-		funcType != asFUNC_FUNCDEF && // Funcdefs are treated as object types and will be deleted by ClearUnusedTypes()
 		funcType != asFUNC_DUMMY )    // Dummy functions are allocated on the stack and cannot be deleted
-		asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
+	{
+		// There are no more external references, if there are also no
+		// internal references then it is time to delete the function
+		if( internalRefCount.get() == 0 )
+		{
+			// If there are no internal references, then no module is owning the function
+			// For example if the function was dynamically compiled without adding it to the scope of the module
+			asASSERT( module == 0 );
+
+			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
+		}
+	}
 
 	return r;
 }
 
 // internal
-void asCScriptFunction::Orphan(asIScriptModule *mod)
+int asCScriptFunction::AddRefInternal()
 {
-	if( mod && module == mod )
+	return internalRefCount.atomicInc();
+}
+
+// internal
+int asCScriptFunction::ReleaseInternal()
+{
+	int r = internalRefCount.atomicDec();
+	if( r == 0 &&
+		funcType != asFUNC_DUMMY )
 	{
-		module = 0;
-		if( funcType == asFUNC_SCRIPT && refCount.get() > 1 )
+		// There are no more internal references, if there are also no
+		// external references then it is time to delete the function
+		if( externalRefCount.get() == 0 )
 		{
-			// This function is being orphaned, so notify the GC so it can check for circular references
-			engine->gc.AddScriptObjectToGC(this, &engine->functionBehaviours);
+			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
 		}
 	}
 
-	Release();
+	return r;
 }
 
 // interface
@@ -531,6 +633,12 @@ bool asCScriptFunction::IsPrivate() const
 	return isPrivate;
 }
 
+// interface
+bool asCScriptFunction::IsProtected() const
+{
+	return isProtected;
+}
+
 // internal
 int asCScriptFunction::GetSpaceNeededForArguments()
 {
@@ -560,7 +668,7 @@ bool asCScriptFunction::DoesReturnOnStack() const
 }
 
 // internal
-asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool includeNamespace) const
+asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
 {
 	asCString str;
 
@@ -572,12 +680,12 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 		  (name == objectType->name || (name.GetLength() > 0 && name[0] == '~') ||
 		   name == "_beh_0_" || name == "_beh_2_")) )
 	{
-		str = returnType.Format();
+		str = returnType.Format(nameSpace, includeNamespace);
 		str += " ";
 	}
 	if( objectType && includeObjectName )
 	{
-		if( includeNamespace )
+		if( includeNamespace && objectType->nameSpace->name != "" )
 			str += objectType->nameSpace->name + "::";
 
 		if( objectType->name != "" )
@@ -585,7 +693,7 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 		else
 			str += "_unnamed_type_::";
 	}
-	else if( includeNamespace )
+	else if( includeNamespace && nameSpace->name != "" )
 	{
 		str += nameSpace->name + "::";
 	}
@@ -610,7 +718,7 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 		asUINT n;
 		for( n = 0; n < parameterTypes.GetLength() - 1; n++ )
 		{
-			str += parameterTypes[n].Format();
+			str += parameterTypes[n].Format(nameSpace, includeNamespace);
 			if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
 			{
 				if( inOutFlags[n] == asTM_INREF ) str += "in";
@@ -618,6 +726,12 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 				else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
 			}
 
+			if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
+			{
+				str += " ";
+				str += parameterNames[n];
+			}
+
 			if( defaultArgs.GetLength() > n && defaultArgs[n] )
 			{
 				asCString tmp;
@@ -629,7 +743,7 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 		}
 
 		// Add the last parameter
-		str += parameterTypes[n].Format();
+		str += parameterTypes[n].Format(nameSpace, includeNamespace);
 		if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
 		{
 			if( inOutFlags[n] == asTM_INREF ) str += "in";
@@ -637,6 +751,12 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 			else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
 		}
 
+		if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
+		{
+			str += " ";
+			str += parameterNames[n];
+		}
+
 		if( defaultArgs.GetLength() > n && defaultArgs[n] )
 		{
 			asCString tmp;
@@ -654,18 +774,33 @@ asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool incl
 	if( listPattern )
 	{
 		asSListPatternNode *n = listPattern;
+		bool first = true;
 		while( n )
 		{
 			if( n->type == asLPT_START )
+			{
 				str += " {";
+				first = true;
+			}
 			else if( n->type == asLPT_END )
+			{
 				str += " }";
+				first = false;
+			}
 			else if( n->type == asLPT_REPEAT )
 				str += " repeat";
+			else if( n->type == asLPT_REPEAT_SAME )
+				str += " repeat_same";
 			else if( n->type == asLPT_TYPE )
 			{
-				str += " ";
-				str += reinterpret_cast<asSListPatternDataTypeNode*>(n)->dataType.Format();
+				if( first )
+				{
+					str += " ";
+					first = false;
+				}
+				else
+					str += ", ";
+				str += reinterpret_cast<asSListPatternDataTypeNode*>(n)->dataType.Format(nameSpace, includeNamespace);
 			}
 
 			n = n->next;
@@ -694,7 +829,7 @@ int asCScriptFunction::FindNextLineWithCode(int line) const
 		{
 			static int cmp(const void *a, const void *b) { return *(int*)a - *(int*)b; }
 		};
-		qsort(&lineNbrs[0], lineNbrs.GetLength(), sizeof(int), C::cmp);
+		std::qsort(&lineNbrs[0], lineNbrs.GetLength(), sizeof(int), C::cmp);
 
 		if( line < lineNbrs[0] && line < (scriptData->declaredAt&0xFFFFF)) return -1;
 		if( line > lineNbrs[lineNbrs.GetLength()-1] ) return -1;
@@ -811,7 +946,7 @@ const char *asCScriptFunction::GetVarDecl(asUINT index, bool includeNamespace) c
 		return 0;
 
 	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = scriptData->variables[index]->type.Format(includeNamespace);
+	*tempString = scriptData->variables[index]->type.Format(nameSpace, includeNamespace);
 	*tempString += " " + scriptData->variables[index]->name;
 
 	return tempString->AddressOf();
@@ -928,15 +1063,31 @@ void asCScriptFunction::AddReferences()
 	// Only count references if there is any bytecode
 	if( scriptData && scriptData->byteCode.GetLength() )
 	{
-		if( returnType.IsObject() )
-			returnType.GetObjectType()->AddRef();
+		if( returnType.GetObjectType() )
+		{
+			returnType.GetObjectType()->AddRefInternal();
+
+			asCConfigGroup *group = engine->FindConfigGroupForObjectType(returnType.GetObjectType());
+			if( group != 0 ) group->AddRef();
+		}
 
 		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-			if( parameterTypes[p].IsObject() )
-				parameterTypes[p].GetObjectType()->AddRef();
+			if( parameterTypes[p].GetObjectType() )
+			{
+				parameterTypes[p].GetObjectType()->AddRefInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForObjectType(parameterTypes[p].GetObjectType());
+				if( group != 0 ) group->AddRef();
+			}
 
 		for( asUINT v = 0; v < scriptData->objVariableTypes.GetLength(); v++ )
-			scriptData->objVariableTypes[v]->AddRef();
+			if( scriptData->objVariableTypes[v] ) // The null handle is also stored, but it doesn't have an object type
+			{
+				scriptData->objVariableTypes[v]->AddRefInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForObjectType(scriptData->objVariableTypes[v]);
+				if( group != 0 ) group->AddRef();
+			}
 
 		// Go through the byte code and add references to all resources used by the function
 		asCArray<asDWORD> &bc = scriptData->byteCode;
@@ -951,7 +1102,9 @@ void asCScriptFunction::AddReferences()
 			case asBC_RefCpyV:
 				{
 					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					objType->AddRef();
+					asASSERT( objType );
+					if( objType )
+						objType->AddRefInternal();
 				}
 				break;
 
@@ -959,11 +1112,13 @@ void asCScriptFunction::AddReferences()
 			case asBC_ALLOC:
 				{
 					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					objType->AddRef();
+					asASSERT( objType );
+					if( objType )
+						objType->AddRefInternal();
 
-					int func = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( func )
-						engine->scriptFunctions[func]->AddRef();
+					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
+					if( funcId )
+						engine->scriptFunctions[funcId]->AddRefInternal();
 				}
 				break;
 
@@ -1002,7 +1157,9 @@ void asCScriptFunction::AddReferences()
 					asCConfigGroup *group = engine->FindConfigGroupForFunction(funcId);
 					if( group != 0 ) group->AddRef();
 
-					engine->scriptFunctions[funcId]->AddRef();
+					asASSERT( funcId > 0 );
+					if( funcId > 0 )
+						engine->scriptFunctions[funcId]->AddRefInternal();
 				}
 				break;
 
@@ -1010,8 +1167,10 @@ void asCScriptFunction::AddReferences()
 			case asBC_CALL:
 			case asBC_CALLINTF:
 				{
-					int func = asBC_INTARG(&bc[n]);
-					engine->scriptFunctions[func]->AddRef();
+					int funcId = asBC_INTARG(&bc[n]);
+					asASSERT( funcId > 0 );
+					if( funcId > 0 )
+						engine->scriptFunctions[funcId]->AddRefInternal();
 				}
 				break;
 
@@ -1019,7 +1178,9 @@ void asCScriptFunction::AddReferences()
 			case asBC_FuncPtr:
 				{
 					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
-					func->AddRef();
+					asASSERT( func );
+					if( func )
+						func->AddRefInternal();
 				}
 				break;
 			}
@@ -1035,16 +1196,31 @@ void asCScriptFunction::ReleaseReferences()
 	// Only count references if there is any bytecode
 	if( scriptData && scriptData->byteCode.GetLength() )
 	{
-		if( returnType.IsObject() )
-			returnType.GetObjectType()->Release();
+		if( returnType.GetObjectType() )
+		{
+			returnType.GetObjectType()->ReleaseInternal();
+
+			asCConfigGroup *group = engine->FindConfigGroupForObjectType(returnType.GetObjectType());
+			if( group != 0 ) group->Release();
+		}
 
 		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-			if( parameterTypes[p].IsObject() )
-				parameterTypes[p].GetObjectType()->Release();
+			if( parameterTypes[p].GetObjectType() )
+			{
+				parameterTypes[p].GetObjectType()->ReleaseInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForObjectType(parameterTypes[p].GetObjectType());
+				if( group != 0 ) group->Release();
+			}
 
 		for( asUINT v = 0; v < scriptData->objVariableTypes.GetLength(); v++ )
-			if( scriptData->objVariableTypes[v] )
-				scriptData->objVariableTypes[v]->Release();
+			if( scriptData->objVariableTypes[v] ) // The null handle is also stored, but it doesn't have an object type
+			{
+				scriptData->objVariableTypes[v]->ReleaseInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForObjectType(scriptData->objVariableTypes[v]);
+				if( group != 0 ) group->Release();
+			}
 
 		// Go through the byte code and release references to all resources used by the function
 		asCArray<asDWORD> &bc = scriptData->byteCode;
@@ -1060,7 +1236,7 @@ void asCScriptFunction::ReleaseReferences()
 				{
 					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
 					if( objType )
-						objType->Release();
+						objType->ReleaseInternal();
 				}
 				break;
 
@@ -1069,14 +1245,14 @@ void asCScriptFunction::ReleaseReferences()
 				{
 					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
 					if( objType )
-						objType->Release();
+						objType->ReleaseInternal();
 
-					int func = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( func )
+					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
+					if( funcId > 0 )
 					{
-						asCScriptFunction *fptr = engine->scriptFunctions[func];
+						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
 						if( fptr )
-							fptr->Release();
+							fptr->ReleaseInternal();
 
 						// The engine may have been forced to destroy the function internals early
 						// and this may will make it impossible to find the function by id anymore.
@@ -1123,7 +1299,7 @@ void asCScriptFunction::ReleaseReferences()
 					if( group != 0 ) group->Release();
 
 					if( funcId )
-						engine->scriptFunctions[funcId]->Release();
+						engine->scriptFunctions[funcId]->ReleaseInternal();
 				}
 				break;
 
@@ -1131,12 +1307,12 @@ void asCScriptFunction::ReleaseReferences()
 			case asBC_CALL:
 			case asBC_CALLINTF:
 				{
-					int func = asBC_INTARG(&bc[n]);
-					if( func )
+					int funcId = asBC_INTARG(&bc[n]);
+					if( funcId )
 					{
-						asCScriptFunction *fptr = engine->scriptFunctions[func];
+						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
 						if( fptr )
-							fptr->Release();
+							fptr->ReleaseInternal();
 
 						// The engine may have been forced to destroy the function internals early
 						// and this may will make it impossible to find the function by id anymore.
@@ -1152,7 +1328,7 @@ void asCScriptFunction::ReleaseReferences()
 				{
 					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
 					if( func )
-						func->Release();
+						func->ReleaseInternal();
 				}
 				break;
 			}
@@ -1197,6 +1373,42 @@ asUINT asCScriptFunction::GetParamCount() const
 }
 
 // interface
+int asCScriptFunction::GetParam(asUINT index, int *typeId, asDWORD *flags, const char **name, const char **defaultArg) const
+{
+	if( index >= parameterTypes.GetLength() )
+		return asINVALID_ARG;
+
+	if( typeId )
+		*typeId = engine->GetTypeIdFromDataType(parameterTypes[index]);
+
+	if( flags )
+	{
+		*flags = inOutFlags[index];
+		*flags |= parameterTypes[index].IsReadOnly() ? asTM_CONST : 0;
+	}
+
+	if( name )
+	{
+		// The parameter names are not stored if loading from bytecode without debug information
+		if( index < parameterNames.GetLength() )
+			*name = parameterNames[index].AddressOf();
+		else
+			*name = 0;
+	}
+
+	if( defaultArg )
+	{
+		if( index < defaultArgs.GetLength() && defaultArgs[index] )
+			*defaultArg = defaultArgs[index]->AddressOf();
+		else
+			*defaultArg = 0;
+	}
+
+	return asSUCCESS;
+}
+
+#ifdef AS_DEPRECATED
+// Deprecated since 2014-04-06, 2.29.0
 int asCScriptFunction::GetParamTypeId(asUINT index, asDWORD *flags) const
 {
 	if( index >= parameterTypes.GetLength() )
@@ -1210,6 +1422,7 @@ int asCScriptFunction::GetParamTypeId(asUINT index, asDWORD *flags) const
 
 	return engine->GetTypeIdFromDataType(parameterTypes[index]);
 }
+#endif
 
 // interface
 asIScriptEngine *asCScriptFunction::GetEngine() const
@@ -1218,10 +1431,10 @@ asIScriptEngine *asCScriptFunction::GetEngine() const
 }
 
 // interface
-const char *asCScriptFunction::GetDeclaration(bool includeObjectName, bool includeNamespace) const
+const char *asCScriptFunction::GetDeclaration(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
 {
 	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = GetDeclarationStr(includeObjectName, includeNamespace);
+	*tempString = GetDeclarationStr(includeObjectName, includeNamespace, includeParamNames);
 	return tempString->AddressOf();
 }
 
@@ -1267,6 +1480,33 @@ void asCScriptFunction::JITCompile()
 	if( !jit )
 		return;
 
+	// Make sure the function has been compiled with JitEntry instructions
+	// For functions that has JitEntry this will be a quick test
+	asUINT length;
+	asDWORD *byteCode = GetByteCode(&length);
+	asDWORD *end = byteCode + length;
+	bool foundJitEntry = false;
+	while( byteCode < end )
+	{
+		// Determine the instruction
+		asEBCInstr op = asEBCInstr(*(asBYTE*)byteCode);
+		if( op == asBC_JitEntry )
+		{
+			foundJitEntry = true;
+			break;
+		}
+
+		// Move to next instruction
+		byteCode += asBCTypeSize[asBCInfo[op].type];
+	}
+
+	if( !foundJitEntry )
+	{
+		asCString msg;
+		msg.Format(TXT_NO_JIT_IN_FUNC_s, GetDeclaration());
+		engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+	}
+
 	// Release the previous function, if any
 	if( scriptData->jitFunction )
 	{
@@ -1277,9 +1517,7 @@ void asCScriptFunction::JITCompile()
 	// Compile for native system
 	int r = jit->CompileFunction(this, &scriptData->jitFunction);
 	if( r < 0 )
-	{
 		asASSERT( scriptData->jitFunction == 0 );
-	}
 }
 
 // interface
@@ -1297,17 +1535,55 @@ asDWORD *asCScriptFunction::GetByteCode(asUINT *length)
 }
 
 // interface
-void *asCScriptFunction::SetUserData(void *data)
+void *asCScriptFunction::SetUserData(void *data, asPWORD type)
 {
-	void *oldData = userData;
-	userData = data;
-	return oldData;
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(userData[n+1]);
+			userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	userData.PushLast(type);
+	userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(engine->engineRWLock);
+
+	return 0;
 }
 
 // interface
-void *asCScriptFunction::GetUserData() const
+void *asCScriptFunction::GetUserData(asPWORD type) const
 {
-	return userData;
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(engine->engineRWLock);
+
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			RELEASESHARED(engine->engineRWLock);
+			return reinterpret_cast<void*>(userData[n+1]);
+		}
+	}
+
+	RELEASESHARED(engine->engineRWLock);
+
+	return 0;
 }
 
 // internal
@@ -1326,7 +1602,9 @@ asCGlobalProperty *asCScriptFunction::GetPropertyByGlobalVarPtr(void *gvarPtr)
 // internal
 int asCScriptFunction::GetRefCount()
 {
-	return refCount.get();
+	asASSERT( funcType == asFUNC_DELEGATE );
+
+	return externalRefCount.get();
 }
 
 // internal
@@ -1344,192 +1622,24 @@ bool asCScriptFunction::GetFlag()
 // internal
 void asCScriptFunction::EnumReferences(asIScriptEngine *)
 {
-	// Notify the GC of all object types used
-	if( returnType.IsObject() )
-		engine->GCEnumCallback(returnType.GetObjectType());
-
-	for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-		if( parameterTypes[p].IsObject() )
-			engine->GCEnumCallback(parameterTypes[p].GetObjectType());
-
-	if( scriptData )
-	{
-		for( asUINT t = 0; t < scriptData->objVariableTypes.GetLength(); t++ )
-			engine->GCEnumCallback(scriptData->objVariableTypes[t]);
-
-		// Notify the GC of all script functions that is accessed
-		asCArray<asDWORD> &bc = scriptData->byteCode;
-		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
-		{
-			switch( *(asBYTE*)&bc[n] )
-			{
-			case asBC_OBJTYPE:
-			case asBC_FREE:
-			case asBC_REFCPY:
-			case asBC_RefCpyV:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					engine->GCEnumCallback(objType);
-				}
-				break;
-
-			case asBC_ALLOC:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					engine->GCEnumCallback(objType);
-
-					int func = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( func )
-						engine->GCEnumCallback(engine->scriptFunctions[func]);
-				}
-				break;
-
-			case asBC_CALL:
-			case asBC_CALLINTF:
-				{
-					int func = asBC_INTARG(&bc[n]);
-					if( func )
-						engine->GCEnumCallback(engine->scriptFunctions[func]);
-				}
-				break;
-
-			// Function pointers
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
-					if( func )
-						engine->GCEnumCallback(func);
-				}
-				break;
-
-			// Global variables
-			case asBC_PGA:
-			case asBC_PshGPtr:
-			case asBC_LDG:
-			case asBC_PshG4:
-			case asBC_LdGRdR4:
-			case asBC_CpyGtoV4:
-			case asBC_CpyVtoG4:
-			case asBC_SetG4:
-				// Need to enumerate the reference for each global variable
-				{
-					// TODO: optimize: Keep an array of accessed global properties
-					void *gvarPtr = (void*)asBC_PTRARG(&bc[n]);
-					asCGlobalProperty *prop = GetPropertyByGlobalVarPtr(gvarPtr);
-
-					engine->GCEnumCallback(prop);
-				}
-				break;
-			}
-		}
-	}
+	asASSERT( funcType == asFUNC_DELEGATE );
 
 	// Delegate
 	if( objForDelegate )
 		engine->GCEnumCallback(objForDelegate);
-	if( funcForDelegate )
-		engine->GCEnumCallback(funcForDelegate);
 }
 
 // internal
 void asCScriptFunction::ReleaseAllHandles(asIScriptEngine *)
 {
+	asASSERT( funcType == asFUNC_DELEGATE );
+
 	// Release paramaters
-	if( scriptData && scriptData->byteCode.GetLength() )
-	{
-		if( returnType.IsObject() )
-		{
-			returnType.GetObjectType()->Release();
-			returnType = asCDataType::CreatePrimitive(ttVoid, false);
-		}
-
-		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-			if( parameterTypes[p].IsObject() )
-			{
-				parameterTypes[p].GetObjectType()->Release();
-				parameterTypes[p] = asCDataType::CreatePrimitive(ttInt, false);
-			}
-
-		for( asUINT n = 0; n < scriptData->objVariableTypes.GetLength(); n++ )
-			scriptData->objVariableTypes[n]->Release();
-		scriptData->objVariableTypes.SetLength(0);
-
-		// Release all script functions
-		asCArray<asDWORD> &bc = scriptData->byteCode;
-		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
-		{
-			switch( *(asBYTE*)&bc[n] )
-			{
-			// Object types
-			case asBC_OBJTYPE:
-			case asBC_FREE:
-			case asBC_REFCPY:
-			case asBC_RefCpyV:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					if( objType )
-					{
-						objType->Release();
-						*(asPWORD*)&bc[n+1] = 0;
-					}
-				}
-				break;
-
-			case asBC_ALLOC:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					if( objType )
-					{
-						objType->Release();
-						*(asPWORD*)&bc[n+1] = 0;
-					}
-
-					int func = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( func )
-					{
-						engine->scriptFunctions[func]->Release();
-						bc[n+AS_PTR_SIZE+1] = 0;
-					}
-				}
-				break;
-
-			case asBC_CALL:
-			case asBC_CALLINTF:
-				{
-					int func = asBC_INTARG(&bc[n]);
-					if( func )
-					{
-						engine->scriptFunctions[func]->Release();
-						bc[n+1] = 0;
-					}
-				}
-				break;
-
-			// Function pointers
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
-					if( func )
-					{
-						func->Release();
-						*(asPWORD*)&bc[n+1] = 0;
-					}
-				}
-				break;
-
-			// The global variables are not released here. It is enough that the global
-			// variable itself release the function to break the circle
-			}
-		}
-	}
 
 	// Delegate
 	if( objForDelegate )
 		engine->ReleaseScriptObject(objForDelegate, funcForDelegate->GetObjectType());
 	objForDelegate = 0;
-	if( funcForDelegate )
-		funcForDelegate->Release();
-	funcForDelegate = 0;
 }
 
 // internal
@@ -1539,6 +1649,7 @@ bool asCScriptFunction::IsShared() const
 	if( funcType == asFUNC_SYSTEM ) return true;
 
 	// All class methods for shared classes are also shared
+	asASSERT( objectType == 0 || objectType->engine == engine || objectType->engine == 0 );
 	if( objectType && (objectType->flags & asOBJ_SHARED) ) return true;
 
 	// Functions that have been specifically marked as shared are shared
diff --git a/lib/angelscript/source/as_scriptfunction.h b/lib/angelscript/source/as_scriptfunction.h
index 1bc2a8736..a5044d859 100644
--- a/lib/angelscript/source/as_scriptfunction.h
+++ b/lib/angelscript/source/as_scriptfunction.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -66,6 +66,7 @@ struct asSScriptVariable
 enum asEListPatternNodeType
 {
 	asLPT_REPEAT,
+	asLPT_REPEAT_SAME,
 	asLPT_START,
 	asLPT_END,
 	asLPT_TYPE
@@ -134,14 +135,19 @@ public:
 	const char          *GetObjectName() const;
 	const char          *GetName() const;
 	const char          *GetNamespace() const;
-	const char          *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false) const;
+	const char          *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
 	bool                 IsReadOnly() const;
 	bool                 IsPrivate() const;
+	bool                 IsProtected() const;
 	bool                 IsFinal() const;
 	bool                 IsOverride() const;
 	bool                 IsShared() const;
 	asUINT               GetParamCount() const;
+	int                  GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const;
+#ifdef AS_DEPRECATED
+	// Deprecated, since 2.29.0, 2014-04-06
 	int                  GetParamTypeId(asUINT index, asDWORD *flags = 0) const;
+#endif
 	int                  GetReturnTypeId(asDWORD *flags = 0) const;
 
 	// Type id for function pointers 
@@ -163,8 +169,8 @@ public:
 	asDWORD             *GetByteCode(asUINT *length = 0);
 
 	// User data
-	void                *SetUserData(void *userData);
-	void                *GetUserData() const;
+	void                *SetUserData(void *userData, asPWORD type);
+	void                *GetUserData(asPWORD type) const;
 
 public:
 	//-----------------------------------
@@ -173,14 +179,28 @@ public:
 	asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType funcType);
 	~asCScriptFunction();
 
+	// Keep an internal reference counter to separate references coming from 
+	// application or script objects and references coming from the script code
+	int AddRefInternal();
+	int ReleaseInternal();
+
+	void     DestroyHalfCreated();
+
+	// TODO: 2.29.0: operator==
+	// TODO: 2.29.0: The asIScriptFunction should provide operator== and operator!= that should do a
+	//               a value comparison. Two delegate objects that point to the same object and class method should compare as equal
+	// TODO: 2.29.0: The operator== should also be provided in script as opEquals to allow the same comparison in script
+	//               To do this we'll need some way to adapt the argtype for opEquals for each funcdef, preferrably without instantiating lots of different methods
+	//               Perhaps reusing 'auto' to mean the same type as the object
+	//bool      operator==(const asCScriptFunction &other) const;
+
 	void      DestroyInternal();
-	void      Orphan(asIScriptModule *mod);
 
 	void      AddVariable(asCString &name, asCDataType &type, int stackOffset);
 
 	int       GetSpaceNeededForArguments();
 	int       GetSpaceNeededForReturnValue();
-	asCString GetDeclarationStr(bool includeObjectName = true, bool includeNamespace = false) const;
+	asCString GetDeclarationStr(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
 	int       GetLineNumber(int programPosition, int *sectionIdx);
 	void      ComputeSignatureId();
 	bool      IsSignatureEqual(const asCScriptFunction *func) const;
@@ -209,7 +229,7 @@ public:
 
 	asCGlobalProperty *GetPropertyByGlobalVarPtr(void *gvarPtr);
 
-	// GC methods
+	// GC methods (for delegates)
 	int  GetRefCount();
 	void SetFlag();
 	bool GetFlag();
@@ -220,21 +240,24 @@ public:
 	//-----------------------------------
 	// Properties
 
-	mutable asCAtomic            refCount;
+	mutable asCAtomic            externalRefCount; // Used for external referneces
+	        asCAtomic            internalRefCount; // Used for internal references
 	mutable bool                 gcFlag;
 	asCScriptEngine             *engine;
 	asCModule                   *module;
 
-	void                        *userData;
+	asCArray<asPWORD>            userData;
 
 	// Function signature
 	asCString                    name;
 	asCDataType                  returnType;
 	asCArray<asCDataType>        parameterTypes;
+	asCArray<asCString>          parameterNames;
 	asCArray<asETypeModifiers>   inOutFlags;
 	asCArray<asCString *>        defaultArgs;
 	bool                         isReadOnly;
 	bool                         isPrivate;
+	bool                         isProtected;
 	bool                         isFinal;
 	bool                         isOverride;
 	asCObjectType               *objectType;
@@ -264,7 +287,7 @@ public:
 		// The stack space needed for the local variables
 		asDWORD                         variableSpace;
 
-		// These hold information objects and function pointers, including temporary
+		// These hold information on objects and function pointers, including temporary
 		// variables used by exception handler and when saving bytecode
 		asCArray<asCObjectType*>        objVariableTypes;
 		asCArray<asCScriptFunction*>    funcVariableTypes;
@@ -289,7 +312,7 @@ public:
 		asCArray<int>                   lineNumbers;
 		// Store the script section where the code was declared
 		int                             scriptSectionIdx;
-		// Store the location where the function was declared
+		// Store the location where the function was declared  (row in the lower 20 bits, and column in the upper 12)
 		int                             declaredAt;
 		// Store position/index pairs if the bytecode is compiled from multiple script sections
 		asCArray<int>                   sectionIdxs;
diff --git a/lib/angelscript/source/as_scriptnode.h b/lib/angelscript/source/as_scriptnode.h
index e66a639be..66f7bac03 100644
--- a/lib/angelscript/source/as_scriptnode.h
+++ b/lib/angelscript/source/as_scriptnode.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -88,7 +88,8 @@ enum eScriptNode
 	snVirtualProperty,
 	snNamespace,
 	snMixin,
-	snListPattern
+	snListPattern,
+	snNamedArgument
 };
 
 struct sToken
diff --git a/lib/angelscript/source/as_scriptobject.cpp b/lib/angelscript/source/as_scriptobject.cpp
index fa07188ca..89cc4d16e 100644
--- a/lib/angelscript/source/as_scriptobject.cpp
+++ b/lib/angelscript/source/as_scriptobject.cpp
@@ -44,11 +44,6 @@ asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngi
 	int r = 0;
 	bool isNested = false;
 
-	// TODO: runtime optimize: There should be a pool for the context so it doesn't 
-	//                         have to be allocated just for creating the script object
-
-	// TODO: It must be possible for the application to debug the creation of the object too
-
 	// Use nested call in the context if there is an active context
 	ctx = asGetActiveContext();
 	if( ctx )
@@ -63,9 +58,13 @@ asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngi
 	
 	if( ctx == 0 )
 	{
-		r = engine->CreateContext(&ctx, true);
-		if( r < 0 )
+		// Request a context from the engine
+		ctx = engine->RequestContext();
+		if( ctx == 0 )
+		{
+			// TODO: How to best report this failure?
 			return 0;
+		}
 	}
 
 	r = ctx->Prepare(engine->scriptFunctions[objType->beh.factory]);
@@ -74,7 +73,7 @@ asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngi
 		if( isNested )
 			ctx->PopState();
 		else
-			ctx->Release();
+			engine->ReturnContext(ctx);
 		return 0;
 	}
 
@@ -105,7 +104,7 @@ asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngi
 				ctx->Abort();
 		}
 		else
-			ctx->Release();
+			engine->ReturnContext(ctx);
 		return 0;
 	}
 
@@ -117,7 +116,7 @@ asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngi
 	if( isNested )
 		ctx->PopState();
 	else
-		ctx->Release();
+		engine->ReturnContext(ctx);
 
 	return ptr;
 }
@@ -241,7 +240,7 @@ asCScriptObject::asCScriptObject(asCObjectType *ot, bool doInitialize)
 	objType = ot;
 	objType->AddRef();
 	isDestructCalled = false;
-	weakRefFlag = 0;
+	extra = 0;
 	hasRefCountReachedZero = false;
 
 	// Notify the garbage collector of this object
@@ -250,7 +249,7 @@ asCScriptObject::asCScriptObject(asCObjectType *ot, bool doInitialize)
 
 	// Initialize members to zero. Technically we only need to zero the pointer
 	// members, but just the memset is faster than having to loop and check the datatypes
-	memset(this+1, 0, objType->size - sizeof(asCScriptObject));
+	memset((void*)(this+1), 0, objType->size - sizeof(asCScriptObject));
 
 	if( doInitialize )
 	{
@@ -299,15 +298,40 @@ void asCScriptObject::Destruct()
 	this->~asCScriptObject();
 
 	// Free the memory
+#ifndef WIP_16BYTE_ALIGN
 	userFree(this);
+#else
+	// Script object memory is allocated through asCScriptEngine::CallAlloc()
+	// This free call must match the allocator used in CallAlloc().
+	userFreeAligned(this);
+#endif
 }
 
 asCScriptObject::~asCScriptObject()
 {
-	if( weakRefFlag )
+	if( extra )
 	{
-		weakRefFlag->Release();
-		weakRefFlag = 0;
+		if( extra->weakRefFlag )
+		{
+			extra->weakRefFlag->Release();
+			extra->weakRefFlag = 0;
+		}
+
+		if( objType->engine )
+		{
+			// Clean the user data
+			for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+			{
+				if( extra->userData[n+1] )
+				{
+					for( asUINT c = 0; c < objType->engine->cleanScriptObjectFuncs.GetLength(); c++ )
+						if( objType->engine->cleanScriptObjectFuncs[c].type == extra->userData[n] )
+							objType->engine->cleanScriptObjectFuncs[c].cleanFunc(this);
+				}
+			}
+		}
+
+		asDELETE(extra, SExtra);
 	}
 
 	// The engine pointer should be available from the objectType
@@ -361,8 +385,8 @@ asILockableSharedBool *asCScriptObject::GetWeakRefFlag() const
 	// If the object's refCount has already reached zero then the object is already
 	// about to be destroyed so it's ok to return null if the weakRefFlag doesn't already
 	// exist
-	if( weakRefFlag || hasRefCountReachedZero )
-		return weakRefFlag;
+	if( (extra && extra->weakRefFlag) || hasRefCountReachedZero )
+		return extra->weakRefFlag;
 
 	// Lock globally so no other thread can attempt
 	// to create a shared bool at the same time.
@@ -373,12 +397,77 @@ asILockableSharedBool *asCScriptObject::GetWeakRefFlag() const
 
 	// Make sure another thread didn't create the 
 	// flag while we waited for the lock
-	if( !weakRefFlag )
-		weakRefFlag = asNEW(asCLockableSharedBool);
+	if( !extra )
+		extra = asNEW(SExtra);
+	if( !extra->weakRefFlag )
+		extra->weakRefFlag = asNEW(asCLockableSharedBool);
 
 	asReleaseExclusiveLock();
 
-	return weakRefFlag;
+	return extra->weakRefFlag;
+}
+
+void *asCScriptObject::GetUserData(asPWORD type) const
+{
+	if( !extra )
+		return 0;
+
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	// TODO: runtime optimize: Would it be worth it to have a rwlock per object type?
+	asAcquireSharedLock();
+
+	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+	{
+		if( extra->userData[n] == type )
+		{
+			void *userData = reinterpret_cast<void*>(extra->userData[n+1]);
+			asReleaseSharedLock();
+			return userData;
+		}
+	}
+
+	asReleaseSharedLock();
+
+	return 0;
+}
+
+void *asCScriptObject::SetUserData(void *data, asPWORD type)
+{
+	// Lock globally so no other thread can attempt
+	// to manipulate the extra data at the same time.
+	// TODO: runtime optimize: Instead of locking globally, it would be possible to have 
+	//                         a critical section per object type. This would reduce the 
+	//                         chances of two threads lock on the same critical section.
+	asAcquireExclusiveLock();
+
+	// Make sure another thread didn't create the 
+	// flag while we waited for the lock
+	if( !extra )
+		extra = asNEW(SExtra);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+	{
+		if( extra->userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(extra->userData[n+1]);
+			extra->userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			asReleaseExclusiveLock();
+
+			return oldData;
+		}
+	}
+
+	extra->userData.PushLast(type);
+	extra->userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	asReleaseExclusiveLock();
+
+	return 0;
 }
 
 asIScriptEngine *asCScriptObject::GetEngine() const
@@ -417,14 +506,14 @@ int asCScriptObject::Release() const
 	// is ok to check the existance of the weakRefFlag without locking here
 	// because if the refCount is 1 then no other thread is currently 
 	// creating the weakRefFlag.
-	if( refCount.get() == 1 && weakRefFlag )
+	if( refCount.get() == 1 && extra && extra->weakRefFlag )
 	{
 		// Set the flag to tell others that the object is no longer alive
 		// We must do this before decreasing the refCount to 0 so we don't
 		// end up with a race condition between this thread attempting to 
 		// destroy the object and the other that temporary added a strong
 		// ref from the weak ref.
-		weakRefFlag->Set(true);
+		extra->weakRefFlag->Set(true);
 	}
 
 	// Call the script destructor behaviour if the reference counter is 1.
@@ -491,10 +580,13 @@ void asCScriptObject::CallDestructor()
 
 				if( ctx == 0 )
 				{
-					// Setup a context for calling the default constructor
-					asCScriptEngine *engine = objType->engine;
-					int r = engine->CreateContext(&ctx, true);
-					if( r < 0 ) return;
+					// Request a context from the engine
+					ctx = objType->engine->RequestContext();
+					if( ctx == 0 )
+					{
+						// TODO: How to best report this failure?
+						return;
+					}
 				}
 			}
 
@@ -538,7 +630,10 @@ void asCScriptObject::CallDestructor()
 				ctx->Abort();
 		}
 		else
-			ctx->Release();
+		{
+			// Return the context to engine
+			objType->engine->ReturnContext(ctx);
+		}
 	}
 }
 
@@ -726,9 +821,13 @@ asCScriptObject &asCScriptObject::operator=(const asCScriptObject &other)
 
 			if( ctx == 0 )
 			{
-				r = engine->CreateContext(&ctx, true);
-				if( r < 0 )
+				// Request a context from the engine
+				ctx = engine->RequestContext();
+				if( ctx == 0 )
+				{
+					// TODO: How to best report this failure?
 					return *this;
+				}
 			}
 
 			r = ctx->Prepare(engine->scriptFunctions[objType->beh.copy]);
@@ -737,7 +836,8 @@ asCScriptObject &asCScriptObject::operator=(const asCScriptObject &other)
 				if( isNested )
 					ctx->PopState();
 				else
-					ctx->Release();
+					engine->ReturnContext(ctx);
+				// TODO: How to best report this failure?
 				return *this;
 			}
 
@@ -773,14 +873,20 @@ asCScriptObject &asCScriptObject::operator=(const asCScriptObject &other)
 						ctx->Abort();
 				}
 				else
-					ctx->Release();
+				{
+					// Return the context to the engine
+					engine->ReturnContext(ctx);
+				}
 				return *this;
 			}
 
 			if( isNested )
 				ctx->PopState();
 			else
-				ctx->Release();
+			{
+				// Return the context to the engine
+				engine->ReturnContext(ctx);
+			}
 		}
 	}
 
diff --git a/lib/angelscript/source/as_scriptobject.h b/lib/angelscript/source/as_scriptobject.h
index 7e3d98aad..eab7ca64b 100644
--- a/lib/angelscript/source/as_scriptobject.h
+++ b/lib/angelscript/source/as_scriptobject.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -76,11 +76,11 @@ public:
 //===================================
 // From asIScriptObject
 //===================================
-	asIScriptEngine *GetEngine() const;
 
 	// Memory management
-	int AddRef() const;
-	int Release() const;
+	int                    AddRef() const;
+	int                    Release() const;
+	asILockableSharedBool *GetWeakRefFlag() const;
 
 	// Type info
 	int            GetTypeId() const;
@@ -92,7 +92,13 @@ public:
 	const char *GetPropertyName(asUINT prop) const;
 	void       *GetAddressOfProperty(asUINT prop);
 
-	int         CopyFrom(asIScriptObject *other);
+	// Miscellaneous
+	asIScriptEngine *GetEngine() const;
+	int              CopyFrom(asIScriptObject *other);
+
+	// User data
+	void *SetUserData(void *data, asPWORD type = 0);
+	void *GetUserData(asPWORD type = 0) const;
 
 //====================================
 // Internal
@@ -110,9 +116,6 @@ public:
 	void EnumReferences(asIScriptEngine *engine);
 	void ReleaseAllHandles(asIScriptEngine *engine);
 
-	// Weakref methods
-	asILockableSharedBool *GetWeakRefFlag() const;
-
 	// Used for properties
 	void *AllocateUninitializedObject(asCObjectType *objType, asCScriptEngine *engine);
 	void FreeObject(void *ptr, asCObjectType *objType, asCScriptEngine *engine);
@@ -124,15 +127,26 @@ public:
 //=============================================
 // Properties
 //=============================================
-public:
-	asCObjectType *objType;
-
 protected:
+	friend class asCContext;
+	asCObjectType    *objType;
+
 	mutable asCAtomic refCount;
-	mutable asBYTE gcFlag:1;
-	mutable asBYTE hasRefCountReachedZero:1;
-	bool isDestructCalled;
-	mutable asCLockableSharedBool *weakRefFlag;
+	mutable asBYTE    gcFlag:1;
+	mutable asBYTE    hasRefCountReachedZero:1;
+	bool              isDestructCalled;
+
+	// Most script classes instances won't have neither the weakRefFlags nor
+	// userData so we only allocate this if requested. Even when used it is 
+	// not something that will be accessed all the time so having the extra
+	// indirection will not affect the performance significantly.
+	struct SExtra
+	{
+		SExtra() : weakRefFlag(0) {};
+		asCLockableSharedBool *weakRefFlag;
+		asCArray<asPWORD>      userData;
+	};
+	mutable SExtra *extra;
 };
 
 void ScriptObject_Construct(asCObjectType *objType, asCScriptObject *self);
diff --git a/lib/angelscript/source/as_string.cpp b/lib/angelscript/source/as_string.cpp
index fcbffe14b..aaa280c23 100644
--- a/lib/angelscript/source/as_string.cpp
+++ b/lib/angelscript/source/as_string.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -31,8 +31,8 @@
 #include "as_config.h"
 
 #include <stdarg.h>		// va_list, va_start(), etc
-#include <stdlib.h>     // strtod(), strtol()
-#include <string.h> // some compilers declare memcpy() here
+#include <stdlib.h>		// strtod(), strtol()
+#include <string.h>		// some compilers declare memcpy() here
 
 #if !defined(AS_NO_MEMORY_H)
 #include <memory.h>
@@ -56,6 +56,26 @@ asCString::asCString(const asCString &str)
 	Assign(str.AddressOf(), str.length);
 }
 
+#ifdef AS_CAN_USE_CPP11
+asCString::asCString(asCString &&str)
+{
+	if( str.length <= 11 )
+	{
+		length = str.length;
+		memcpy(local, str.local, length);
+		local[length] = 0;
+	}
+	else
+	{
+		dynamic = str.dynamic;
+		length = str.length;
+	}
+
+	str.dynamic = 0;
+	str.length = 0;
+}
+#endif // c++11
+
 asCString::asCString(const char *str, size_t len)
 {
 	length = 0;
@@ -183,6 +203,37 @@ asCString &asCString::operator =(const asCString &str)
 	return *this;
 }
 
+#ifdef AS_CAN_USE_CPP11
+asCString &asCString::operator =(asCString &&str)
+{
+	if( this != &str )
+	{
+		if( length > 11 && dynamic )
+		{
+			asDELETEARRAY(dynamic);
+		}
+
+		if ( str.length <= 11 )
+		{
+			length = str.length;
+
+			memcpy(local, str.local, length);
+			local[length] = 0;
+		}
+		else
+		{
+			dynamic = str.dynamic;
+			length = str.length;
+		}
+
+		str.dynamic = 0;
+		str.length = 0;
+	}
+
+	return *this;
+}
+#endif // c++11
+
 asCString &asCString::operator =(char ch)
 {
 	Assign(&ch, 1);
diff --git a/lib/angelscript/source/as_string.h b/lib/angelscript/source/as_string.h
index 05e677e3e..0ee7469c0 100644
--- a/lib/angelscript/source/as_string.h
+++ b/lib/angelscript/source/as_string.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -38,14 +38,17 @@
 #include <stdio.h>
 #include <string.h>
 
-// TODO: optimize: On compilers with C++11 support the string class should take advantage of the move operator &&
-
 class asCString
 {
 public:
 	asCString();
 	~asCString();
 
+#ifdef AS_CAN_USE_CPP11
+	asCString(asCString &&);
+	asCString &operator =(asCString &&);
+#endif // c++11
+
 	asCString(const asCString &);
 	asCString(const char *);
 	asCString(const char *, size_t length);
diff --git a/lib/angelscript/source/as_string_util.cpp b/lib/angelscript/source/as_string_util.cpp
index 9a5d692a9..8ee210dc5 100644
--- a/lib/angelscript/source/as_string_util.cpp
+++ b/lib/angelscript/source/as_string_util.cpp
@@ -78,7 +78,7 @@ double asStringScanDouble(const char *string, size_t *numScanned)
 {
 	// I decided to do my own implementation of strtod() because this function
 	// doesn't seem to be present on all systems. iOS 5 for example doesn't appear 
-	// to include the function in the standard lib. 
+	// to include the function in the standard lib.
 	
 	// Another reason is that the standard implementation of strtod() is dependent
 	// on the locale on some systems, i.e. it may use comma instead of dot for 
diff --git a/lib/angelscript/source/as_symboltable.h b/lib/angelscript/source/as_symboltable.h
index 114a127f6..11a7115c0 100644
--- a/lib/angelscript/source/as_symboltable.h
+++ b/lib/angelscript/source/as_symboltable.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2012-2013 Andreas Jonsson
+   Copyright (c) 2012-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -59,6 +59,7 @@ BEGIN_AS_NAMESPACE
 struct asIFilter
 {
 	virtual bool operator()(const void*) const = 0;
+	virtual ~asIFilter() {};
 };
 
 
@@ -107,7 +108,7 @@ public:
 	typedef asCSymbolTableIterator<T, T> iterator;
 	typedef asCSymbolTableIterator<T, const T> const_iterator;
 
-	asCSymbolTable(unsigned int initialCapacity = 0);
+	asCSymbolTable(asUINT initialCapacity = 0);
 
 	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
 	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name) const;
@@ -118,22 +119,22 @@ public:
 	T*       GetFirst(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
 	T*       GetFirst(const asSNameSpace *ns, const asCString &name);
 	const T* GetFirst(const asSNameSpace *ns, const asCString &name) const;
-	T*       Get(unsigned int index);
-	const T* Get(unsigned int index) const;
+	T*       Get(asUINT index);
+	const T* Get(asUINT index) const;
 	T*       GetLast();
 	const T* GetLast() const;
 
-	const asCArray<unsigned int> &GetIndexes(const asSNameSpace *ns, const asCString &name) const;
+	const asCArray<asUINT> &GetIndexes(const asSNameSpace *ns, const asCString &name) const;
 
-	int          Put(T* entry);
+	asUINT   Put(T* entry);
 
-	unsigned int GetSize() const;
+	asUINT   GetSize() const;
 
 	void SwapWith(asCSymbolTable<T> &other);
 
 	void Clear();
-	bool Erase(unsigned int idx);
-	void Allocate(unsigned int elem_cnt, bool keep_data);
+	bool Erase(asUINT idx);
+	void Allocate(asUINT elem_cnt, bool keep_data);
 
 	iterator List();
 	const_iterator List() const;
@@ -146,11 +147,11 @@ private:
 	friend class asCSymbolTableIterator<T, const T>;
 
 	void GetKey(const T *entry, asSNameSpaceNamePair &key) const;
-	bool CheckIdx(unsigned idx) const;
+	bool CheckIdx(asUINT idx) const;
 
-	asCMap<asSNameSpaceNamePair, asCArray<unsigned int> > m_map;
-	asCArray<T*>                                          m_entries;
-	unsigned int                                          m_size;
+	asCMap<asSNameSpaceNamePair, asCArray<asUINT> > m_map;
+	asCArray<T*>                                    m_entries;
+	unsigned int                                    m_size;
 };
 
 
@@ -162,7 +163,7 @@ void asCSymbolTable<T>::SwapWith(asCSymbolTable<T> &other)
 	m_map.SwapWith(other.m_map);
 	m_entries.SwapWith(other.m_entries);
 
-	unsigned int tmp = m_size;
+	asUINT tmp = m_size;
 	m_size = other.m_size;
 	other.m_size = tmp;
 }
@@ -173,7 +174,7 @@ void asCSymbolTable<T>::SwapWith(asCSymbolTable<T> &other)
 // Constructor
 // initialCapacity gives the number of entries to allocate in advance
 template<class T>
-asCSymbolTable<T>::asCSymbolTable(unsigned initialCapacity) : m_entries(initialCapacity)
+asCSymbolTable<T>::asCSymbolTable(asUINT initialCapacity) : m_entries(initialCapacity)
 {
 	m_size = 0;
 }
@@ -188,11 +189,11 @@ int asCSymbolTable<T>::GetFirstIndex(
 {
 	asSNameSpaceNamePair key(ns, name);
 
-	asSMapNode<asSNameSpaceNamePair, asCArray<unsigned int> > *cursor;
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
 	if( m_map.MoveTo(&cursor, key) )
 	{
-		const asCArray<unsigned int> &arr = m_map.GetValue(cursor);
-		for( unsigned int n = 0; n < arr.GetLength(); n++ )
+		const asCArray<asUINT> &arr = m_map.GetValue(cursor);
+		for( asUINT n = 0; n < arr.GetLength(); n++ )
 		{
 			T *entry = m_entries[arr[n]];
 			if( entry && filter(entry) )
@@ -206,15 +207,15 @@ int asCSymbolTable<T>::GetFirstIndex(
 
 
 template<class T>
-const asCArray<unsigned int> &asCSymbolTable<T>::GetIndexes(const asSNameSpace *ns, const asCString &name) const
+const asCArray<asUINT> &asCSymbolTable<T>::GetIndexes(const asSNameSpace *ns, const asCString &name) const
 {
 	asSNameSpaceNamePair key(ns, name);
 
-	asSMapNode<asSNameSpaceNamePair, asCArray<unsigned int> > *cursor;
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
 	if( m_map.MoveTo(&cursor, key) )
 		return m_map.GetValue(cursor);
 
-	static asCArray<unsigned int> dummy;
+	static asCArray<asUINT> dummy;
 	return dummy;
 }
 
@@ -237,7 +238,7 @@ int asCSymbolTable<T>::GetFirstIndex(const asSNameSpace *ns, const asCString &na
 {
 	asSNameSpaceNamePair key(ns, name);
 
-	asSMapNode<asSNameSpaceNamePair, asCArray<unsigned int> > *cursor;
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
 	if( m_map.MoveTo(&cursor, key) )
 		return m_map.GetValue(cursor)[0];
 
@@ -252,7 +253,7 @@ int asCSymbolTable<T>::GetFirstIndex(const asSNameSpace *ns, const asCString &na
 template<class T>
 int asCSymbolTable<T>::GetIndex(const T* entry) const
 {
-	for( unsigned int n = 0; n < m_entries.GetLength(); n++ )
+	for( asUINT n = 0; n < m_entries.GetLength(); n++ )
 		if( m_entries[n] == entry )
 			return n;
 
@@ -265,7 +266,7 @@ int asCSymbolTable<T>::GetIndex(const T* entry) const
 
 
 template<class T>
-T* asCSymbolTable<T>::Get(unsigned idx)
+T* asCSymbolTable<T>::Get(asUINT idx)
 {
 	if( !CheckIdx(idx) )
 		return 0;
@@ -274,7 +275,7 @@ T* asCSymbolTable<T>::Get(unsigned idx)
 }
 
 template<class T>
-const T* asCSymbolTable<T>::Get(unsigned idx) const
+const T* asCSymbolTable<T>::Get(asUINT idx) const
 {
 	return const_cast< asCSymbolTable<T>* >(this)->Get(idx);
 }
@@ -331,7 +332,7 @@ void asCSymbolTable<T>::Clear()
 
 // Pre-allocate slots for elemCnt entries
 template<class T>
-void asCSymbolTable<T>::Allocate(unsigned elemCnt, bool keepData)
+void asCSymbolTable<T>::Allocate(asUINT elemCnt, bool keepData)
 {
 	asASSERT( elemCnt >= m_entries.GetLength() );
 	m_entries.Allocate(elemCnt, keepData);
@@ -342,7 +343,7 @@ void asCSymbolTable<T>::Allocate(unsigned elemCnt, bool keepData)
 
 
 template<class T>
-bool asCSymbolTable<T>::Erase(unsigned idx)
+bool asCSymbolTable<T>::Erase(asUINT idx)
 {
 	if( !CheckIdx(idx) )
 	{
@@ -355,26 +356,14 @@ bool asCSymbolTable<T>::Erase(unsigned idx)
 	if( !entry )
 		return false;
 
-	if( idx == m_entries.GetLength() - 1 )
-	{
-		m_entries.PopLast();
-
-		// TODO: Should remove all trailing empty slots
-	}
-	else
-	{
-		// TODO: Must pack or reuse empty slots
-		m_entries[idx] = 0;
-	}
-	m_size--;
-
+	// Remove the symbol from the lookup map
 	asSNameSpaceNamePair key;
 	GetKey(entry, key);
 
-	asSMapNode<asSNameSpaceNamePair, asCArray<unsigned int> > *cursor;
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
 	if( m_map.MoveTo(&cursor, key) )
 	{
-		asCArray<unsigned int> &arr = m_map.GetValue(cursor);
+		asCArray<asUINT> &arr = m_map.GetValue(cursor);
 		arr.RemoveValue(idx);
 		if( arr.GetLength() == 0 )
 			m_map.Erase(cursor);
@@ -382,6 +371,28 @@ bool asCSymbolTable<T>::Erase(unsigned idx)
 	else
 		asASSERT(false);
 
+	// Remove the symbol from the indexed array
+	if( idx == m_entries.GetLength() - 1 )
+		m_entries.PopLast();
+	else
+	{
+		// Must keep the array packed
+		int prevIdx = int(m_entries.GetLength()-1);
+		m_entries[idx] = m_entries.PopLast();
+		
+		// Update the index in the lookup map
+		entry = m_entries[idx];
+		GetKey(entry, key);
+		if( m_map.MoveTo(&cursor, key) )
+		{
+			asCArray<asUINT> &arr = m_map.GetValue(cursor);
+			arr[arr.IndexOf(prevIdx)] = idx;
+		}
+		else
+			asASSERT(false);
+	}
+	m_size--;
+
 	return true;
 }
 
@@ -389,18 +400,18 @@ bool asCSymbolTable<T>::Erase(unsigned idx)
 
 
 template<class T>
-int asCSymbolTable<T>::Put(T *entry)
+asUINT asCSymbolTable<T>::Put(T *entry)
 {
-	unsigned int idx = (unsigned int)(m_entries.GetLength());
+	asUINT idx = m_entries.GetLength();
 	asSNameSpaceNamePair key;
 	GetKey(entry, key);
 
-	asSMapNode<asSNameSpaceNamePair, asCArray<unsigned int> > *cursor;
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
 	if( m_map.MoveTo(&cursor, key) )
 		m_map.GetValue(cursor).PushLast(idx);
 	else
 	{
-		asCArray<unsigned int> arr(1);
+		asCArray<asUINT> arr(1);
 		arr.PushLast(idx);
 		m_map.Insert(key, arr);
 	}
@@ -424,7 +435,7 @@ void asCSymbolTable<T>::GetKey(const T *entry, asSNameSpaceNamePair &key) const
 
 
 template<class T>
-unsigned int asCSymbolTable<T>::GetSize() const
+asUINT asCSymbolTable<T>::GetSize() const
 {
 	return m_size;
 }
@@ -433,7 +444,7 @@ unsigned int asCSymbolTable<T>::GetSize() const
 
 
 template<class T>
-bool asCSymbolTable<T>::CheckIdx(unsigned int idx) const
+bool asCSymbolTable<T>::CheckIdx(asUINT idx) const
 {
 	return idx < m_entries.GetLength();
 }
@@ -444,9 +455,9 @@ bool asCSymbolTable<T>::CheckIdx(unsigned int idx) const
 template<class T>
 int asCSymbolTable<T>::GetLastIndex() const
 {
-	unsigned int idx = (unsigned int)(m_entries.GetLength()) - 1;
-	asASSERT( idx == asUINT(-1) || m_entries[idx] );
-	return int(idx);
+	int idx = int(m_entries.GetLength()) - 1;
+	asASSERT( idx == -1 || m_entries[idx] );
+	return idx;
 }
 
 
@@ -475,7 +486,7 @@ typename asCSymbolTable<T>::const_iterator asCSymbolTable<T>::List() const
 template<class T, class T2>
 asCSymbolTableIterator<T, T2>::asCSymbolTableIterator(asCSymbolTable<T> *table) : m_table(table), m_idx(0)
 {
-	unsigned int sz = (unsigned int)(m_table->m_entries.GetLength());
+	asUINT sz = m_table->m_entries.GetLength();
 	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
 		m_idx++;
 }
@@ -523,7 +534,7 @@ asCSymbolTableIterator<T, T2>::operator bool() const
 template<class T, class T2>
 void asCSymbolTableIterator<T, T2>::Next()
 {
-	unsigned int sz = (unsigned int)(m_table->m_entries.GetLength());
+	asUINT sz = m_table->m_entries.GetLength();
 	m_idx++;
 	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
 		m_idx++;
@@ -535,7 +546,7 @@ template<class T, class T2>
 void asCSymbolTableIterator<T, T2>::Previous()
 {
 	// overflow on stepping over first element
-	unsigned int sz = (unsigned int)(m_table->m_entries.GetLength());
+	asUINT sz = m_table->m_entries.GetLength();
 	m_idx--;
 	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
 		m_idx--;
diff --git a/lib/angelscript/source/as_texts.h b/lib/angelscript/source/as_texts.h
index 7a1923a53..808e1644c 100644
--- a/lib/angelscript/source/as_texts.h
+++ b/lib/angelscript/source/as_texts.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
+   Copyright (c) 2003-2015 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -41,59 +41,70 @@
 
 // Compiler messages
 
-#define TXT_s_ALREADY_DECLARED            "'%s' is already declared"
-#define TXT_ARG_NOT_LVALUE                "Argument cannot be assigned. Output will be discarded."
+#define TXT_s_ALREADY_DECLARED                      "'%s' is already declared"
+#define TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED "Abstract class '%s' cannot be instantiated"
+#define TXT_ACCESSING_PRIVATE_PROP_s                "Accessing private property '%s' of parent class"
+#define TXT_ARG_NOT_LVALUE                          "Output argument expression is not assignable"
+#define TXT_ATTR_s_INFORMED_MULTIPLE_TIMES          "Attribute '%s' informed multiple times"
+#define TXT_AUTO_NOT_ALLOWED                        "Auto is not allowed here"
 
 #define TXT_BOTH_MUST_BE_SAME                     "Both expressions must have the same type"
 #define TXT_BOTH_CONDITIONS_MUST_CALL_CONSTRUCTOR "Both conditions must call constructor"
 #define TEXT_BASE_DOESNT_HAVE_DEF_CONSTR          "Base class doesn't have default constructor. Make explicit call to base constructor"
 
-#define TXT_CANDIDATES_ARE                       "Candidates are:"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS     "Can't call a constructor in loops"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH    "Can't call a constructor in switch"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_TWICE        "Can't call a constructor multiple times"
+#define TXT_CANDIDATES_ARE                         "Candidates are:"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS       "Can't call a constructor in loops"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH      "Can't call a constructor in switch"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_TWICE          "Can't call a constructor multiple times"
 #define TXT_CANNOT_CREATE_DELEGATE_FOR_NOREF_TYPES "Can't create delegate for types that do not support handles"
-#define TXT_CANNOT_IMPLEMENT_SELF                "Can't implement itself, or another interface that implements this interface"
-#define TXT_CANNOT_INHERIT_FROM_s_FINAL          "Can't inherit from class '%s' marked as final"
-#define TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES "Can't inherit from multiple classes"
-#define TXT_CANNOT_INHERIT_FROM_SELF             "Can't inherit from itself, or another class that inherits from this class"
-#define TXT_CANNOT_INSTANCIATE_TEMPLATE_s_WITH_s "Can't instanciate template '%s' with subtype '%s'"
-#define TXT_CANNOT_RETURN_REF_TO_LOCAL           "Can't return reference to local value."
-#define TXT_CANT_IMPLICITLY_CONVERT_s_TO_s       "Can't implicitly convert from '%s' to '%s'."
-#define TXT_CANT_RETURN_VALUE                    "Can't return value when return type is 'void'"
-#define TXT_CHANGE_SIGN                          "Implicit conversion changed sign of value"
-#define TXT_COMPILING_s                          "Compiling %s"
-#define TXT_COMPOUND_ASGN_WITH_PROP              "Compound assignments with property accessors are not allowed"
-#define TXT_CONSTRUCTOR_NAME_ERROR               "The name of constructors and destructors must be the same as the class"
+#define TXT_CANNOT_IMPLEMENT_SELF                  "Can't implement itself, or another interface that implements this interface"
+#define TXT_CANNOT_INHERIT_FROM_s_FINAL            "Can't inherit from class '%s' marked as final"
+#define TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES   "Can't inherit from multiple classes"
+#define TXT_CANNOT_INHERIT_FROM_SELF               "Can't inherit from itself, or another class that inherits from this class"
+#define TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG        "Can't pass class method as arg directly. Use a delegate object instead"
+#define TXT_CANNOT_RESOLVE_AUTO                     "Unable to resolve auto type"
+#define TXT_CANNOT_RETURN_REF_TO_LOCAL             "Can't return reference to local value."
+#define TXT_CANT_CONSTRUCT_s_USE_REF_CAST          "Can't construct handle '%s'. Use ref cast instead"
+#define TXT_CANT_IMPLICITLY_CONVERT_s_TO_s         "Can't implicitly convert from '%s' to '%s'."
+#define TXT_CANT_RETURN_VALUE                      "Can't return value when return type is 'void'"
+#define TXT_CHANGE_SIGN                            "Implicit conversion changed sign of value"
+#define TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT       "A class cannot be both abstract and final"
+#define TXT_COMPILING_s                            "Compiling %s"
+#define TXT_COMPOUND_ASGN_ON_VALUE_TYPE            "Compound assignments with property accessors on value types are not supported"
+#define TXT_COMPOUND_ASGN_WITH_IDX_PROP            "Compound assignments with indexed property accessors are not supported"
+#define TXT_COMPOUND_ASGN_REQUIRE_GET_SET          "Compound assignments with property accessors require both get and set accessors"
 
-#define TXT_DATA_TYPE_CANT_BE_s           "Data type can't be '%s'"
-#define TXT_DECL_IN_SWITCH                "Variables cannot be declared in switch cases, except inside statement blocks"
-#define TXT_DEFAULT_MUST_BE_LAST          "The default case must be the last one"
-#define TXT_DEF_ARG_MISSING_IN_FUNC_s     "All subsequent parameters after the first default value must have default values in function '%s'"
-#define TXT_DEF_ARG_TYPE_DOESNT_MATCH     "The type of the default argument expression doesn't match the function parameter type"
+#define TXT_DATA_TYPE_CANT_BE_s                     "Data type can't be '%s'"
+#define TXT_DECL_IN_SWITCH                          "Variables cannot be declared in switch cases, except inside statement blocks"
+#define TXT_DEFAULT_MUST_BE_LAST                    "The default case must be the last one"
+#define TXT_DEF_ARG_MISSING_IN_FUNC_s               "All subsequent parameters after the first default value must have default values in function '%s'"
+#define TXT_DEF_ARG_TYPE_DOESNT_MATCH               "The type of the default argument expression doesn't match the function parameter type"
+#define TXT_DUPLICATE_NAMED_ARG                     "Duplicate named argument"
 #define TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s "The method in the derived class must have the same return type as in the base class: '%s'"
-#define TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM  "The destructor must not have any parameters"
-#define TXT_DISALLOW_ASSIGN_ON_REF_TYPE   "Value assignment on reference types is not allowed. Did you mean to do a handle assignment?"
-#define TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE "Compound assignment on reference types is not allowed"
-#define TXT_DUPLICATE_SWITCH_CASE         "Duplicate switch case"
+#define TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM            "The destructor must not have any parameters"
+#define TXT_DESTRUCTOR_s_s_NAME_ERROR              "The name of the destructor '%s::~%s' must be the same as the class"
+#define TXT_DISALLOW_ASSIGN_ON_REF_TYPE             "Value assignment on reference types is not allowed. Did you mean to do a handle assignment?"
+#define TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE    "Compound assignment on reference types is not allowed"
+#define TXT_DUPLICATE_SWITCH_CASE                   "Duplicate switch case"
 
-#define TXT_ELSE_WITH_EMPTY_STATEMENT     "Else with empty statement"
-#define TXT_EMPTY_SWITCH                  "Empty switch statement"
-#define TXT_EXPECTED_s                    "Expected '%s'"
-#define TXT_EXPECTED_CONSTANT             "Expected constant"
-#define TXT_EXPECTED_DATA_TYPE            "Expected data type"
-#define TXT_EXPECTED_EXPRESSION_VALUE     "Expected expression value"
-#define TXT_EXPECTED_IDENTIFIER           "Expected identifier"
-#define TXT_EXPECTED_LIST                 "Expected a list enclosed by { } to match pattern"
-#define TXT_EXPECTED_METHOD_OR_PROPERTY   "Expected method or property"
-#define TXT_EXPECTED_ONE_OF               "Expected one of: "
-#define TXT_EXPECTED_OPERATOR             "Expected operator"
-#define TXT_EXPECTED_s_OR_s               "Expected '%s' or '%s'"
-#define TXT_EXPECTED_POST_OPERATOR        "Expected post operator"
-#define TXT_EXPECTED_PRE_OPERATOR         "Expected pre operator"
-#define TXT_EXPECTED_STRING               "Expected string"
-#define TXT_EXPR_DOESNT_EVAL_TO_FUNC      "Expression doesn't evaluate to a function"
-#define TXT_EXPR_MUST_BE_BOOL             "Expression must be of boolean type"
+#define TXT_ELSE_WITH_EMPTY_STATEMENT         "Else with empty statement"
+#define TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED "Empty list element is not allowed"
+#define TXT_EMPTY_SWITCH                      "Empty switch statement"
+#define TXT_EXPECTED_s                        "Expected '%s'"
+#define TXT_EXPECTED_CONSTANT                 "Expected constant"
+#define TXT_EXPECTED_DATA_TYPE                "Expected data type"
+#define TXT_EXPECTED_EXPRESSION_VALUE         "Expected expression value"
+#define TXT_EXPECTED_IDENTIFIER               "Expected identifier"
+#define TXT_EXPECTED_LIST                     "Expected a list enclosed by { } to match pattern"
+#define TXT_EXPECTED_METHOD_OR_PROPERTY       "Expected method or property"
+#define TXT_EXPECTED_ONE_OF                   "Expected one of: "
+#define TXT_EXPECTED_OPERATOR                 "Expected operator"
+#define TXT_EXPECTED_s_OR_s                   "Expected '%s' or '%s'"
+#define TXT_EXPECTED_POST_OPERATOR            "Expected post operator"
+#define TXT_EXPECTED_PRE_OPERATOR             "Expected pre operator"
+#define TXT_EXPECTED_STRING                   "Expected string"
+#define TXT_EXPR_DOESNT_EVAL_TO_FUNC          "Expression doesn't evaluate to a function"
+#define TXT_EXPR_MUST_BE_BOOL                 "Expression must be of boolean type"
 
 #define TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s "Failed while compiling default arg for parameter %d in function '%s'"
 #define TXT_FAILED_TO_CREATE_TEMP_OBJ             "Previous error occurred while attempting to create a temporary copy of object"
@@ -107,32 +118,42 @@
 
 #define TXT_HANDLE_ASSIGN_ON_NON_HANDLE_PROP     "It is not allowed to perform a handle assignment on a non-handle property"
 #define TXT_HANDLE_COMPARISON                    "The operand is implicitly converted to handle in order to compare them"
+#define TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED      "Handle to handle is not allowed"
+#define TXT_s_HIDES_VAR_IN_OUTER_SCOPE           "Variable '%s' hides another variable of same name in outer scope"
 
-#define TXT_IDENTIFIER_s_NOT_DATA_TYPE          "Identifier '%s' is not a data type"
-#define TXT_IF_WITH_EMPTY_STATEMENT             "If with empty statement"
-#define TXT_ILLEGAL_MEMBER_TYPE                 "Illegal member type"
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE             "Identifier '%s' is not a data type"
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS "Identifier '%s' is not a data type in global namespace"
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s     "Identifier '%s' is not a data type in namespace '%s' or parent"
+#define TXT_IF_WITH_EMPTY_STATEMENT                "If with empty statement"
+#define TXT_ILLEGAL_MEMBER_TYPE                    "Illegal member type"
 // TODO: Should be TXT_ILLEGAL_OPERATION_ON_s
-#define TXT_ILLEGAL_OPERATION                   "Illegal operation on this datatype"
-#define TXT_ILLEGAL_OPERATION_ON_s              "Illegal operation on '%s'"
-#define TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST    "Illegal target type for reference cast"
-#define TXT_ILLEGAL_VARIABLE_NAME_s             "Illegal variable name '%s'."
-#define TXT_INIT_LIST_CANNOT_BE_USED_WITH_s     "Initialization lists cannot be used with '%s'"
+#define TXT_ILLEGAL_OPERATION                      "Illegal operation on this datatype"
+#define TXT_ILLEGAL_OPERATION_ON_s                 "Illegal operation on '%s'"
+#define TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST       "Illegal target type for reference cast"
+#define TXT_ILLEGAL_VARIABLE_NAME_s                "Illegal variable name '%s'."
+#define TXT_INHERITED_PRIVATE_PROP_ACCESS_s        "Illegal access to inherited private property '%s'"
+#define TXT_INIT_LIST_CANNOT_BE_USED_WITH_s        "Initialization lists cannot be used with '%s'"
+#define TXT_INSTANCING_INVLD_TMPL_TYPE_s_s         "Attempting to instantiate invalid template type '%s<%s>'"
+#define TXT_INSTEAD_FOUND_s                        "Instead found '%s'"
+#define TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED     "Interface '%s' cannot be instantiated"
 #define TXT_INTERFACE_CAN_ONLY_IMPLEMENT_INTERFACE "Interfaces can only implement other interfaces"
-#define TXT_INVALID_BREAK                       "Invalid 'break'"
-#define TXT_INVALID_CHAR_LITERAL                "Invalid character literal"
-#define TXT_INVALID_CONTINUE                    "Invalid 'continue'"
-#define TXT_INVALID_ESCAPE_SEQUENCE             "Invalid escape sequence"
-#define TXT_INVALID_OP_ON_METHOD                "Invalid operation on method"
-#define TXT_INVALID_REF_PROP_ACCESS             "Invalid reference. Property accessors cannot be used in combined read/write operations"
-#define TXT_INVALID_SCOPE                       "Invalid scope resolution"
-#define TXT_INVALID_TYPE                        "Invalid type"
-#define TXT_INVALID_UNICODE_FORMAT_EXPECTED_d   "Invalid unicode escape sequence, expected %d hex digits"
-#define TXT_INVALID_UNICODE_VALUE               "Invalid unicode code point"
-#define TXT_INVALID_UNICODE_SEQUENCE_IN_SRC     "Invalid unicode sequence in source"
+#define TXT_INVALID_BREAK                          "Invalid 'break'"
+#define TXT_INVALID_CHAR_LITERAL                   "Invalid character literal"
+#define TXT_INVALID_CONTINUE                       "Invalid 'continue'"
+#define TXT_INVALID_ESCAPE_SEQUENCE                "Invalid escape sequence"
+#define TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME      "Invalid expression: ambiguous name"
+#define TXT_INVALID_OP_ON_METHOD                   "Invalid operation on method"
+#define TXT_INVALID_REF_PROP_ACCESS                "Invalid reference. Property accessors cannot be used in combined read/write operations"
+#define TXT_INVALID_SCOPE                          "Invalid scope resolution"
+#define TXT_INVALID_TYPE                           "Invalid type"
+#define TXT_INVALID_UNICODE_FORMAT_EXPECTED_d      "Invalid unicode escape sequence, expected %d hex digits"
+#define TXT_INVALID_UNICODE_VALUE                  "Invalid unicode code point"
+#define TXT_INVALID_UNICODE_SEQUENCE_IN_SRC        "Invalid unicode sequence in source"
 
 #define TXT_METHOD_CANNOT_OVERRIDE_s                "Method '%s' declared as final and cannot be overridden"
 #define TXT_METHOD_CANT_HAVE_NAME_OF_CLASS          "The method cannot be named with the class name"
 #define TXT_METHOD_s_DOES_NOT_OVERRIDE              "Method '%s' marked as override but does not replace any base class or interface method"
+#define TXT_METHOD_s_s_HAS_NO_RETURN_TYPE           "Method '%s::%s' is missing the return type, nor is it the same name as object to be a constructor"
 #define TXT_MISSING_IMPLEMENTATION_OF_s             "Missing implementation of '%s'"
 #define TXT_MIXIN_CANNOT_BE_DECLARED_AS_s           "Mixin class cannot be declared as '%s'"
 #define TXT_MIXIN_CANNOT_HAVE_CONSTRUCTOR           "Mixin classes cannot have constructors or destructors"
@@ -155,14 +176,15 @@
 #define TXT_NAME_CONFLICT_s_OBJ_PROPERTY           "Name conflict. '%s' is an object property."
 #define TXT_NAME_CONFLICT_s_METHOD                 "Name conflict. '%s' is a class method."
 #define TXT_NAME_CONFLICT_s_ALREADY_USED           "Name conflict. '%s' is already used."
+#define TXT_NAMED_ARGS_WITH_OLD_SYNTAX             "Detected named argument with old syntax"
 #define TXT_NO_APPROPRIATE_INDEX_OPERATOR          "No appropriate indexing operator found"
-#define TXT_NO_APPROPRIATE_OPASSIGN                "No appropriate opAssign method found"
+#define TXT_NO_APPROPRIATE_OPHNDLASSIGN_s          "No appropriate opHndlAssign method found in '%s' for handle assignment"
 #define TXT_NO_APPROPRIATE_OPEQUALS                "No appropriate opEquals method found"
 #define TXT_NO_CONVERSION_s_TO_s                   "No conversion from '%s' to '%s' available."
 #define TXT_NO_CONVERSION_s_TO_MATH_TYPE           "No conversion from '%s' to math type available."
 #define TXT_NO_DEFAULT_ARRAY_TYPE                  "The application doesn't support the default array type."
 #define TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s           "No default constructor for object of type '%s'."
-#define TXT_NO_DEFAULT_COPY_OP_FOR_s               "There is no copy operator for the type '%s' available."
+#define TXT_NO_DEFAULT_COPY_OP_FOR_s               "No appropriate opAssign method found in '%s' for value assignment"
 #define TXT_NO_COPY_CONSTRUCTOR_FOR_s              "No copy constructor for object of type '%s'."
 #define TXT_NO_MATCHING_SIGNATURES_TO_s            "No matching signatures to '%s'"
 #define TXT_NO_MATCHING_OP_FOUND_FOR_TYPE_s        "No matching operator that takes the type '%s' found"
@@ -181,18 +203,22 @@
 #define TXT_NOT_VALID_LVALUE                       "Not a valid lvalue"
 #define TXT_NOTHING_WAS_BUILT                      "Nothing was built in the module"
 
-#define TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP "Type '%s' doesn't support the indexing operator"
-#define TXT_OBJECT_HANDLE_NOT_SUPPORTED    "Object handle is not supported for this type"
-#define TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT "Only object types that support object handles can use &inout. Use &in or &out instead"
-#define TXT_ONLY_ONE_ARGUMENT_IN_CAST      "A cast operator has one argument"
-#define TXT_ONLY_ONE_FUNCTION_ALLOWED      "The code must contain one and only one function"
-#define TXT_ONLY_ONE_VARIABLE_ALLOWED      "The code must contain one and only one global variable"
-#define TXT_OPERANDS_MUST_BE_HANDLES       "Both operands must be handles when comparing identity"
+#define TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP          "Type '%s' doesn't support the indexing operator"
+#define TXT_OBJECT_HANDLE_NOT_SUPPORTED             "Object handle is not supported for this type"
+#define TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT          "Only object types that support object handles can use &inout. Use &in or &out instead"
+#define TXT_ONLY_ONE_ARGUMENT_IN_CAST               "A cast operator has one argument"
+#define TXT_ONLY_ONE_FUNCTION_ALLOWED               "The code must contain one and only one function"
+#define TXT_ONLY_ONE_VARIABLE_ALLOWED               "The code must contain one and only one global variable"
+#define TXT_OPERANDS_MUST_BE_HANDLES                "Both operands must be handles when comparing identity"
+#define TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS  "The overloaded functions are identical on initial parameters without default arguments"
 
 #define TXT_PARAMETER_ALREADY_DECLARED            "Parameter already declared"
-#define TXT_PARAMETER_CANT_BE_s                   "Parameter type can't be '%s', because the type cannot be instanciated."
+#define TXT_PARAMETER_CANT_BE_s                   "Parameter type can't be '%s', because the type cannot be instantiated."
+#define TXT_POS_ARG_AFTER_NAMED_ARG               "Positional arguments cannot be passed after named arguments"
 #define TXT_PRIVATE_METHOD_CALL_s                 "Illegal call to private method '%s'"
 #define TXT_PRIVATE_PROP_ACCESS_s                 "Illegal access to private property '%s'"
+#define TXT_PROTECTED_METHOD_CALL_s               "Illegal call to protected method '%s'"
+#define TXT_PROTECTED_PROP_ACCESS_s               "Illegal access to protected property '%s'"
 #define TXT_PROPERTY_ACCESSOR_DISABLED            "Property accessors have been disabled by the application"
 #define TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED "Property accessor must be implemented"
 #define TXT_PROPERTY_CANT_BE_CONST                "Class properties cannot be declared as const"
@@ -200,6 +226,7 @@
 #define TXT_PROPERTY_HAS_NO_SET_ACCESSOR          "The property has no set accessor"
 #define TXT_PROPERTY_WITHOUT_ACCESSOR             "Virtual property must have at least one get or set accessor"
 
+#define TXT_REF_CANT_BE_TO_LOCAL_VAR            "Resulting reference cannot be returned. Returned references must not refer to local variables."
 #define TXT_REF_CANT_BE_RETURNED_DEFERRED_PARAM "Resulting reference cannot be returned. There are deferred arguments that may invalidate it."
 #define TXT_REF_CANT_BE_RETURNED_LOCAL_VARS     "Resulting reference cannot be returned. The expression uses objects that during cleanup may invalidate it."
 #define TXT_REF_IS_READ_ONLY                    "Reference is read-only"
@@ -226,13 +253,14 @@
 #define TXT_TOO_MANY_VALUES_FOR_LIST           "Too many values to match pattern"
 #define TXT_TYPE_s_NOT_AVAILABLE_FOR_MODULE    "Type '%s' is not available for this module"
 
-#define TXT_UNEXPECTED_END_OF_FILE        "Unexpected end of file"
-#define TXT_UNEXPECTED_TOKEN_s            "Unexpected token '%s'"
-#define TXT_UNINITIALIZED_GLOBAL_VAR_s    "Use of uninitialized global variable '%s'."
-#define TXT_UNKNOWN_SCOPE_s               "Unknown scope '%s'"
-#define TXT_UNREACHABLE_CODE              "Unreachable code"
+#define TXT_UNEXPECTED_END_OF_FILE             "Unexpected end of file"
+#define TXT_UNEXPECTED_TOKEN_s                 "Unexpected token '%s'"
+#define TXT_UNEXPECTED_VAR_DECL                "Unexpected variable declaration"
+#define TXT_UNINITIALIZED_GLOBAL_VAR_s         "Use of uninitialized global variable '%s'."
+#define TXT_UNKNOWN_SCOPE_s                    "Unknown scope '%s'"
+#define TXT_UNREACHABLE_CODE                   "Unreachable code"
 #define TXT_UNRECOGNIZED_VIRTUAL_PROPERTY_NODE "Virtual property contains unrecognized aspect"
-#define TXT_UNUSED_SCRIPT_NODE            "Unused script node"
+#define TXT_UNUSED_SCRIPT_NODE                 "Unused script node"
 
 #define TXT_VALUE_TOO_LARGE_FOR_TYPE      "Value is too large for data type"
 #define TXT_VOID_CANT_BE_OPERAND          "Void cannot be an operand in expressions"
@@ -247,7 +275,7 @@
 
 // Global variable initialization
 
-#define TXT_FAILED_TO_INITIALIZE_s		"Failed to initialize global variable '%s'"
+#define TXT_FAILED_TO_INITIALIZE_s      "Failed to initialize global variable '%s'"
 #define TXT_EXCEPTION_s_IN_s            "Exception '%s' in '%s'"
 
 // Engine message
@@ -271,12 +299,12 @@
 #define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s               "Object {%d}. GC cannot destroy an object of type '%s' as it doesn't know how many references to there are."
 #define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s_REF_COUNT_d   "Object {%d}. GC cannot destroy an object of type '%s' as it can't see all references. Current ref count is %d."
 #define TXT_OBJECT_TYPE_s_DOESNT_EXIST                   "Object type '%s' doesn't exist"
+#define TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER   "Cannot register. The template type instance '%s' has already been generated."
 #define TXT_TEMPLATE_TYPE_s_DOESNT_EXIST                 "Template type '%s' doesn't exist"
 #define TXT_TEMPLATE_SUBTYPE_s_DOESNT_EXIST              "Template subtype '%s' doesn't exist"
 #define TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS   "Template list factory expects two reference parameters. The last is the pointer to the initialization buffer"
 #define TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM             "List factory expects only one reference parameter. The pointer to the initialization buffer will be passed in this parameter"
 #define TXT_FAILED_READ_SUBTYPE_OF_TEMPLATE_s            "Failed to read subtype of template type '%s'"
-#define TXT_INSTANCING_INVLD_TMPL_TYPE_s_s               "Attempting to instanciate invalid template type '%s<%s>'"
 #define TXT_FAILED_IN_FUNC_s_d                           "Failed in call to function '%s' (Code: %d)"
 #define TXT_FAILED_IN_FUNC_s_WITH_s_d                    "Failed in call to function '%s' with '%s' (Code: %d)"
 #define TXT_FAILED_IN_FUNC_s_WITH_s_AND_s_d              "Failed in call to function '%s' with '%s' and '%s' (Code: %d)"
@@ -287,6 +315,10 @@
 #define TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d               "The function in previous message is named '%s'. The func type is %d"
 #define TXT_RESURRECTING_SCRIPTOBJECT_s                  "The script object of type '%s' is being resurrected illegally during destruction"
 #define TXT_INVALID_BYTECODE_d                           "LoadByteCode failed. The bytecode is invalid. Number of bytes read from stream: %d"
+#define TXT_NO_JIT_IN_FUNC_s                             "Function '%s' appears to have been compiled without JIT entry points"
+#define TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN       "Uh oh! The engine's reference count is increasing while it is being destroyed. Make sure references needed for clean-up are immediately released"
+#define TXT_MODULE_IS_IN_USE                             "The module is still in use and cannot be rebuilt. Discard it and request another module"
+#define TXT_EXTRNL_REF_TO_MODULE_s                       "There is an external reference to an object in module '%s', preventing it from being deleted"
 
 // Internal names
 
diff --git a/lib/angelscript/source/as_thread.cpp b/lib/angelscript/source/as_thread.cpp
index 480be8355..63ab15e1d 100644
--- a/lib/angelscript/source/as_thread.cpp
+++ b/lib/angelscript/source/as_thread.cpp
@@ -109,7 +109,7 @@ AS_API void asReleaseSharedLock()
 
 //======================================================================
 
-#if !defined(AS_NO_THREADS) && defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+#if !defined(AS_NO_THREADS) && defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 __declspec(thread) asCThreadLocalData *asCThreadManager::tld = 0;
 #endif
 
@@ -126,7 +126,7 @@ asCThreadManager::asCThreadManager()
 		pthread_key_create(&pKey, 0);
 		tlsKey = (asDWORD)pKey;
 	#elif defined AS_WINDOWS_THREADS
-		#if defined(_MSC_VER) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 			tld = 0;
 		#else
 			tlsKey = (asDWORD)TlsAlloc();
@@ -211,7 +211,7 @@ asCThreadManager::~asCThreadManager()
 	#if defined AS_POSIX_THREADS
 		pthread_key_delete((pthread_key_t)tlsKey);
 	#elif defined AS_WINDOWS_THREADS
-		#if defined(_MSC_VER) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 			tld = 0;
 		#else
 			TlsFree((DWORD)tlsKey);
@@ -235,7 +235,7 @@ int asCThreadManager::CleanupLocalData()
 #if defined AS_POSIX_THREADS
 	asCThreadLocalData *tld = (asCThreadLocalData*)pthread_getspecific((pthread_key_t)threadManager->tlsKey);
 #elif defined AS_WINDOWS_THREADS
-	#if !defined(_MSC_VER) || (WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+	#if !defined(_MSC_VER) || !(WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 		asCThreadLocalData *tld = (asCThreadLocalData*)TlsGetValue((DWORD)threadManager->tlsKey);
 	#endif
 #endif
@@ -249,7 +249,7 @@ int asCThreadManager::CleanupLocalData()
 		#if defined AS_POSIX_THREADS
 			pthread_setspecific((pthread_key_t)threadManager->tlsKey, 0);
 		#elif defined AS_WINDOWS_THREADS
-			#if defined(_MSC_VER) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+			#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 				tld = 0;
 			#else
 				TlsSetValue((DWORD)threadManager->tlsKey, 0);
@@ -289,7 +289,7 @@ asCThreadLocalData *asCThreadManager::GetLocalData()
 		pthread_setspecific((pthread_key_t)threadManager->tlsKey, tld);
 	}
 #elif defined AS_WINDOWS_THREADS
-	#if defined(_MSC_VER) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+	#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 		if( tld == 0 )
 			tld = asNEW(asCThreadLocalData)();
 	#else
@@ -329,10 +329,13 @@ asCThreadCriticalSection::asCThreadCriticalSection()
 #if defined AS_POSIX_THREADS
 	pthread_mutex_init(&cs, 0);
 #elif defined AS_WINDOWS_THREADS
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+	// Only the Ex version is available on Windows Store
 	InitializeCriticalSectionEx(&cs, 4000, 0);
 #else
-    InitializeCriticalSection(&cs);
+	// Only the non-Ex version is available on WinXP and older
+	// MinGW also only defines this version
+	InitializeCriticalSection(&cs);
 #endif
 #endif
 }
@@ -382,7 +385,9 @@ asCThreadReadWriteLock::asCThreadReadWriteLock()
 	asASSERT( r == 0 );
 	UNUSED_VAR(r);
 #elif defined AS_WINDOWS_THREADS
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+	// Only the Ex versions are available on Windows Store
+
 	// Create a semaphore to allow up to maxReaders simultaneous readers
 	readLocks = CreateSemaphoreExW(NULL, maxReaders, maxReaders, 0, 0, 0);
 	// Create a critical section to synchronize writers
diff --git a/lib/angelscript/source/as_thread.h b/lib/angelscript/source/as_thread.h
index 1f39f47a2..f4abf88a1 100644
--- a/lib/angelscript/source/as_thread.h
+++ b/lib/angelscript/source/as_thread.h
@@ -70,7 +70,7 @@ protected:
 	int refCount;
 
 #ifndef AS_NO_THREADS
-#if defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && !(WINAPI_FAMILY & WINAPI_PARTITION_DESKTOP)
+#if defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
 	// On Windows Store we must use MSVC specific thread variables for thread
 	// local storage, as the TLS API isn't available. On desktop we can't use
 	// this as it may cause problems if the library is used in a dll.
diff --git a/lib/angelscript/source/as_tokendef.h b/lib/angelscript/source/as_tokendef.h
index b3c8dd9d8..6e08650a3 100644
--- a/lib/angelscript/source/as_tokendef.h
+++ b/lib/angelscript/source/as_tokendef.h
@@ -171,8 +171,10 @@ enum eTokenType
 	ttEnum,                // enum
 	ttCast,                // cast
 	ttPrivate,             // private
+	ttProtected,           // protected
 	ttNamespace,           // namespace
-	ttMixin                // mixin
+	ttMixin,               // mixin
+	ttAuto                 // auto
 };
 
 struct sTokenWord
@@ -239,6 +241,7 @@ sTokenWord const tokenWords[] =
 	asTokenDef("!is"       , ttNotIs),
 	asTokenDef("@"         , ttHandle),
 	asTokenDef("and"       , ttAnd),
+	asTokenDef("auto"      , ttAuto),
 	asTokenDef("bool"      , ttBool),
 	asTokenDef("break"     , ttBreak),
 	asTokenDef("case"      , ttCase), 
@@ -277,6 +280,7 @@ sTokenWord const tokenWords[] =
 	asTokenDef("or"        , ttOr),
 	asTokenDef("out"       , ttOut),
 	asTokenDef("private"   , ttPrivate),
+	asTokenDef("protected" , ttProtected),
 	asTokenDef("return"    , ttReturn),
 	asTokenDef("switch"    , ttSwitch),
 	asTokenDef("true"      , ttTrue),
@@ -306,6 +310,7 @@ const char * const FINAL_TOKEN    = "final";
 const char * const OVERRIDE_TOKEN = "override";
 const char * const GET_TOKEN      = "get";
 const char * const SET_TOKEN      = "set";
+const char * const ABSTRACT_TOKEN = "abstract";
 
 END_AS_NAMESPACE
 
diff --git a/lib/angelscript/source/as_tokenizer.cpp b/lib/angelscript/source/as_tokenizer.cpp
index 2830d979f..82c1b80e0 100644
--- a/lib/angelscript/source/as_tokenizer.cpp
+++ b/lib/angelscript/source/as_tokenizer.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied 
    warranty. In no event will the authors be held liable for any 
@@ -223,7 +223,7 @@ bool asCTokenizer::IsComment(const char *source, size_t sourceLength, size_t &to
 		}
 
 		tokenType   = ttOnelineComment;
-		tokenLength = n+1;
+		tokenLength = n < sourceLength ? n+1 : n;
 
 		return true;
 	}
@@ -443,7 +443,8 @@ bool asCTokenizer::IsKeyWord(const char *source, size_t sourceLength, size_t &to
 			// and the tokens "!" and "isTrue" in the "!isTrue" expression.
 			if( wlen < sourceLength &&
 				((source[wlen-1] >= 'a' && source[wlen-1] <= 'z') ||
-				 (source[wlen-1] >= 'A' && source[wlen-1] <= 'Z')) &&
+				 (source[wlen-1] >= 'A' && source[wlen-1] <= 'Z') ||
+				 (source[wlen-1] >= '0' && source[wlen-1] <= '9')) &&
 				((source[wlen] >= 'a' && source[wlen] <= 'z') ||
 				 (source[wlen] >= 'A' && source[wlen] <= 'Z') ||
 				 (source[wlen] >= '0' && source[wlen] <= '9') ||
diff --git a/lib/angelscript/source/as_typeinfo.cpp b/lib/angelscript/source/as_typeinfo.cpp
index 16ac4b010..534ac0b53 100644
--- a/lib/angelscript/source/as_typeinfo.cpp
+++ b/lib/angelscript/source/as_typeinfo.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -54,6 +54,7 @@ asCTypeInfo::asCTypeInfo()
 	qwordValue            = 0;
 	isLValue              = false;
 	isVoidExpression      = false;
+	isRefToLocal          = false;
 }
 
 void asCTypeInfo::Set(const asCDataType &dt)
@@ -68,6 +69,7 @@ void asCTypeInfo::Set(const asCDataType &dt)
 	qwordValue       = 0;
 	isLValue         = false;
 	isVoidExpression = false;
+	isRefToLocal     = false;
 }
 
 void asCTypeInfo::SetVariable(const asCDataType &dt, int stackOffset, bool isTemporary)
diff --git a/lib/angelscript/source/as_typeinfo.h b/lib/angelscript/source/as_typeinfo.h
index b551fddae..aa8ad528c 100644
--- a/lib/angelscript/source/as_typeinfo.h
+++ b/lib/angelscript/source/as_typeinfo.h
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
+   Copyright (c) 2003-2014 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
@@ -74,7 +74,8 @@ struct asCTypeInfo
 	bool  isVariable       :  1;
 	bool  isExplicitHandle :  1;
 	bool  isVoidExpression :  1;
-	short dummy            : 10;
+	bool  isRefToLocal     :  1; // The reference may be to a local variable
+	short dummy            :  9;
 	short stackOffset;
 	union
 	{
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 138658e36..eb3a7af6b 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -59,7 +59,7 @@ ScriptEngine::ScriptEngine()
     m_engine = asCreateScriptEngine(ANGELSCRIPT_VERSION);
     if (m_engine == NULL)
     {
-        Log::error("Scripting", "Failed to create script engine.");
+        Log::fatal("Scripting", "Failed to create script engine.");
     }
 
     // The script compiler will write any compiler messages to the callback.
diff --git a/src/scriptengine/scriptarray.cpp b/src/scriptengine/scriptarray.cpp
index edb2bcd1c..7689f2b95 100644
--- a/src/scriptengine/scriptarray.cpp
+++ b/src/scriptengine/scriptarray.cpp
@@ -1,19 +1,32 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+/*
+AngelCode Scripting Library
+Copyright (c) 2003-2015 Andreas Jonsson
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+must not claim that you wrote the original software. If you use
+this software in a product, an acknowledgment in the product
+documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+The original version of this library can be located at:
+http://www.angelcode.com/angelscript/
+
+Andreas Jonsson
+andreas@angelcode.com
+*/
 
 #include <new>
 #include <stdlib.h>
@@ -27,6 +40,22 @@ using namespace std;
 
 BEGIN_AS_NAMESPACE
 
+// This macro is used to avoid warnings about unused variables.
+// Usually where the variables are only used in debug mode.
+#define UNUSED_VAR(x) (void)(x)
+
+// Set the default memory routines
+// Use the angelscript engine's memory routines by default
+static asALLOCFUNC_t userAlloc = asAllocMem;
+static asFREEFUNC_t  userFree  = asFreeMem;
+
+// Allows the application to set which memory routines should be used by the array object
+void CScriptArray::SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
+{
+	userAlloc = allocFunc;
+	userFree = freeFunc;
+}
+
 static void RegisterScriptArray_Native(asIScriptEngine *engine);
 static void RegisterScriptArray_Generic(asIScriptEngine *engine);
 
@@ -42,7 +71,7 @@ struct SArrayCache
 	asIScriptFunction *cmpFunc;
 	asIScriptFunction *eqFunc;
 	int cmpFuncReturnCode; // To allow better error message in case of multiple matches
-    int eqFuncReturnCode;
+	int eqFuncReturnCode;
 };
 
 // We just define a number here that we assume nobody else is using for
@@ -54,16 +83,31 @@ static void CleanupObjectTypeArrayCache(asIObjectType *type)
 {
 	SArrayCache *cache = reinterpret_cast<SArrayCache*>(type->GetUserData(ARRAY_CACHE));
 	if( cache )
-		delete cache;
+	{
+		cache->~SArrayCache();
+		userFree(cache);
+	}
 }
 
-static CScriptArray* ScriptArrayFactory2(asIObjectType *ot, asUINT length)
+CScriptArray* CScriptArray::Create(asIObjectType *ot, asUINT length)
 {
-	CScriptArray *a = new CScriptArray(length, ot);
+	asIScriptContext *ctx = asGetActiveContext();
+
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(length, ot);
 
 	// It's possible the constructor raised a script exception, in which case we
 	// need to free the memory and return null instead, else we get a memory leak.
-	asIScriptContext *ctx = asGetActiveContext();
 	if( ctx && ctx->GetState() == asEXECUTION_EXCEPTION )
 	{
 		a->Release();
@@ -73,13 +117,25 @@ static CScriptArray* ScriptArrayFactory2(asIObjectType *ot, asUINT length)
 	return a;
 }
 
-static CScriptArray* ScriptArrayListFactory(asIObjectType *ot, void *initList)
+CScriptArray* CScriptArray::Create(asIObjectType *ot, void *initList)
 {
-	CScriptArray *a = new CScriptArray(ot, initList);
+	asIScriptContext *ctx = asGetActiveContext();
+
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(ot, initList);
 
 	// It's possible the constructor raised a script exception, in which case we
 	// need to free the memory and return null instead, else we get a memory leak.
-	asIScriptContext *ctx = asGetActiveContext();
 	if( ctx && ctx->GetState() == asEXECUTION_EXCEPTION )
 	{
 		a->Release();
@@ -89,13 +145,25 @@ static CScriptArray* ScriptArrayListFactory(asIObjectType *ot, void *initList)
 	return a;
 }
 
-static CScriptArray* ScriptArrayFactoryDefVal(asIObjectType *ot, asUINT length, void *defVal)
+CScriptArray* CScriptArray::Create(asIObjectType *ot, asUINT length, void *defVal)
 {
-	CScriptArray *a = new CScriptArray(length, defVal, ot);
+	asIScriptContext *ctx = asGetActiveContext();
+
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(length, defVal, ot);
 
 	// It's possible the constructor raised a script exception, in which case we
 	// need to free the memory and return null instead, else we get a memory leak.
-	asIScriptContext *ctx = asGetActiveContext();
 	if( ctx && ctx->GetState() == asEXECUTION_EXCEPTION )
 	{
 		a->Release();
@@ -105,20 +173,20 @@ static CScriptArray* ScriptArrayFactoryDefVal(asIObjectType *ot, asUINT length,
 	return a;
 }
 
-static CScriptArray* ScriptArrayFactory(asIObjectType *ot)
+CScriptArray* CScriptArray::Create(asIObjectType *ot)
 {
-	return ScriptArrayFactory2(ot, asUINT(0));
+	return CScriptArray::Create(ot, asUINT(0));
 }
 
 // This optional callback is called when the template type is first used by the compiler.
-// It allows the application to validate if the template can be instanciated for the requested
+// It allows the application to validate if the template can be instantiated for the requested
 // subtype at compile time, instead of at runtime. The output argument dontGarbageCollect
 // allow the callback to tell the engine if the template instance type shouldn't be garbage collected,
 // i.e. no asOBJ_GC flag.
 static bool ScriptArrayTemplateCallback(asIObjectType *ot, bool &dontGarbageCollect)
 {
-	// Make sure the subtype can be instanciated with a default factory/constructor,
-	// otherwise we won't be able to instanciate the elements.
+	// Make sure the subtype can be instantiated with a default factory/constructor,
+	// otherwise we won't be able to instantiate the elements.
 	int typeId = ot->GetSubTypeId();
 	if( typeId == asTYPEID_VOID )
 		return false;
@@ -147,6 +215,7 @@ static bool ScriptArrayTemplateCallback(asIObjectType *ot, bool &dontGarbageColl
 			if( !found )
 			{
 				// There is no default constructor
+				ot->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default constructor");
 				return false;
 			}
 		}
@@ -174,6 +243,7 @@ static bool ScriptArrayTemplateCallback(asIObjectType *ot, bool &dontGarbageColl
 			if( !found )
 			{
 				// No default factory
+				ot->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default factory");
 				return false;
 			}
 		}
@@ -188,6 +258,39 @@ static bool ScriptArrayTemplateCallback(asIObjectType *ot, bool &dontGarbageColl
 		// thus there is no need to garbage collect them
 		dontGarbageCollect = true;
 	}
+	else
+	{
+		assert( typeId & asTYPEID_OBJHANDLE );
+
+		// It is not necessary to set the array as garbage collected for all handle types.
+		// If it is possible to determine that the handle cannot refer to an object type
+		// that can potentially form a circular reference with the array then it is not 
+		// necessary to make the array garbage collected.
+		asIObjectType *subtype = ot->GetEngine()->GetObjectTypeById(typeId);
+		asDWORD flags = subtype->GetFlags();
+		if( !(flags & asOBJ_GC) )
+		{
+			if( (flags & asOBJ_SCRIPT_OBJECT) )
+			{
+				// Even if a script class is by itself not garbage collected, it is possible
+				// that classes that derive from it may be, so it is not possible to know 
+				// that no circular reference can occur.
+				if( (flags & asOBJ_NOINHERIT) )
+				{
+					// A script class declared as final cannot be inherited from, thus
+					// we can be certain that the object cannot be garbage collected.
+					dontGarbageCollect = true;
+				}
+			}
+			else
+			{
+				// For application registered classes we assume the application knows
+				// what it is doing and don't mark the array as garbage collected unless
+				// the type is also garbage collected.
+				dontGarbageCollect = true;
+			}
+		}
+	}
 
 	// The type is ok
 	return true;
@@ -204,12 +307,14 @@ void RegisterScriptArray(asIScriptEngine *engine, bool defaultArray)
 	if( defaultArray )
 	{
 		int r = engine->RegisterDefaultArrayType("array<T>"); assert( r >= 0 );
+		UNUSED_VAR(r);
 	}
 }
 
 static void RegisterScriptArray_Native(asIScriptEngine *engine)
 {
-	int r;
+	int r = 0;
+	UNUSED_VAR(r);
 
 	// Register the object type user data clean up
 	engine->SetObjectTypeUserDataCleanupCallback(CleanupObjectTypeArrayCache, ARRAY_CACHE);
@@ -221,12 +326,12 @@ static void RegisterScriptArray_Native(asIScriptEngine *engine)
 	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptArrayTemplateCallback), asCALL_CDECL); assert( r >= 0 );
 
 	// Templates receive the object type as the first parameter. To the script writer this is hidden
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTIONPR(ScriptArrayFactory, (asIObjectType*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint)", asFUNCTIONPR(ScriptArrayFactory2, (asIObjectType*, asUINT), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint, const T &in)", asFUNCTIONPR(ScriptArrayFactoryDefVal, (asIObjectType*, asUINT, void *), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTIONPR(CScriptArray::Create, (asIObjectType*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint)", asFUNCTIONPR(CScriptArray::Create, (asIObjectType*, asUINT), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint, const T &in)", asFUNCTIONPR(CScriptArray::Create, (asIObjectType*, asUINT, void *), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
 
 	// Register the factory that will be used for initialization lists
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in type, int&in list) {repeat T}", asFUNCTIONPR(ScriptArrayListFactory, (asIObjectType*, void*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in type, int&in list) {repeat T}", asFUNCTIONPR(CScriptArray::Create, (asIObjectType*, void*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
 
 	// The memory management methods
 	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptArray,AddRef), asCALL_THISCALL); assert( r >= 0 );
@@ -337,14 +442,16 @@ CScriptArray::CScriptArray(asIObjectType *ot, void *buf)
 		CreateBuffer(&buffer, length);
 
 		// Copy the values of the primitive type into the internal buffer
-		memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
+		if( length > 0 )
+			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
 	}
 	else if( ot->GetSubTypeId() & asTYPEID_OBJHANDLE )
 	{
 		CreateBuffer(&buffer, length);
 
 		// Copy the handles into the internal buffer
-		memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
+		if( length > 0 )
+			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
 
 		// With object handles it is safe to clear the memory in the received buffer
 		// instead of increasing the ref count. It will save time both by avoiding the
@@ -360,7 +467,8 @@ CScriptArray::CScriptArray(asIObjectType *ot, void *buf)
 		subTypeId &= ~asTYPEID_OBJHANDLE;
 
 		// Copy the handles into the internal buffer
-		memcpy(buffer->data, (((asUINT*)buf)+1), length * elementSize);
+		if( length > 0 )
+			memcpy(buffer->data, (((asUINT*)buf)+1), length * elementSize);
 
 		// For ref types we can do the same as for handles, as they are
 		// implicitly stored as handles.
@@ -539,12 +647,7 @@ void CScriptArray::Reserve(asUINT maxElements)
 		return;
 
 	// Allocate memory for the buffer
-	SArrayBuffer *newBuffer;
-	#if defined(__S3E__) // Marmalade doesn't understand (nothrow)
-	newBuffer = (SArrayBuffer*)new asBYTE[sizeof(SArrayBuffer)-1 + elementSize*maxElements];
-	#else
-	newBuffer = (SArrayBuffer*)new (nothrow) asBYTE[sizeof(SArrayBuffer)-1 + elementSize*maxElements];
-	#endif
+	SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*maxElements));
 	if( newBuffer )
 	{
 		newBuffer->numElements = buffer->numElements;
@@ -559,10 +662,13 @@ void CScriptArray::Reserve(asUINT maxElements)
 		return;
 	}
 
+	// TODO: memcpy assumes the objects in the array doesn't hold pointers to themselves
+	//       This should really be using the objects copy/move constructor to copy each object
+	//       to the new location. It would most likely be a hit on the performance though.
 	memcpy(newBuffer->data, buffer->data, buffer->numElements*elementSize);
 
 	// Release the old buffer
-	delete[] (asBYTE*)buffer;
+	userFree(buffer);
 
 	buffer = newBuffer;
 }
@@ -600,12 +706,7 @@ void CScriptArray::Resize(int delta, asUINT at)
 	if( buffer->maxElements < buffer->numElements + delta )
 	{
 		// Allocate memory for the buffer
-		SArrayBuffer *newBuffer;
-		#if defined(__S3E__) // Marmalade doesn't understand (nothrow)
-		newBuffer = (SArrayBuffer*)new asBYTE[sizeof(SArrayBuffer)-1 + elementSize*(buffer->numElements + delta)];
-		#else
-		newBuffer = (SArrayBuffer*)new (nothrow) asBYTE[sizeof(SArrayBuffer)-1 + elementSize*(buffer->numElements + delta)];
-		#endif
+		SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*(buffer->numElements + delta)));
 		if( newBuffer )
 		{
 			newBuffer->numElements = buffer->numElements + delta;
@@ -621,17 +722,17 @@ void CScriptArray::Resize(int delta, asUINT at)
 		}
 
 		// TODO: memcpy assumes the objects in the array doesn't hold pointers to themselves
-		//       This should really be using the objects copy constructor to copy each object
+		//       This should really be using the objects copy/move constructor to copy each object
 		//       to the new location. It would most likely be a hit on the performance though.
 		memcpy(newBuffer->data, buffer->data, at*elementSize);
 		if( at < buffer->numElements )
 			memcpy(newBuffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements-at)*elementSize);
 
-		if( subTypeId & asTYPEID_MASK_OBJECT )
-			Construct(newBuffer, at, at+delta);
+		// Initialize the new elements with default values
+		Construct(newBuffer, at, at+delta);
 
 		// Release the old buffer
-		delete[] (asBYTE*)buffer;
+		userFree(buffer);
 
 		buffer = newBuffer;
 	}
@@ -639,7 +740,7 @@ void CScriptArray::Resize(int delta, asUINT at)
 	{
 		Destruct(buffer, at, at-delta);
 		// TODO: memmove assumes the objects in the array doesn't hold pointers to themselves
-		//       This should really be using the objects copy constructor to copy each object
+		//       This should really be using the objects copy/move constructor to copy each object
 		//       to the new location. It would most likely be a hit on the performance though.
 		memmove(buffer->data + at*elementSize, buffer->data + (at-delta)*elementSize, (buffer->numElements - (at-delta))*elementSize);
 		buffer->numElements += delta;
@@ -647,7 +748,7 @@ void CScriptArray::Resize(int delta, asUINT at)
 	else
 	{
 		// TODO: memmove assumes the objects in the array doesn't hold pointers to themselves
-		//       This should really be using the objects copy constructor to copy each object
+		//       This should really be using the objects copy/move constructor to copy each object
 		//       to the new location. It would most likely be a hit on the performance though.
 		memmove(buffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements - at)*elementSize);
 		Construct(buffer, at, at+delta);
@@ -662,19 +763,14 @@ bool CScriptArray::CheckMaxSize(asUINT numElements)
 	// for the array doesn't overflow and becomes smaller than requested
 
 	asUINT maxSize = 0xFFFFFFFFul - sizeof(SArrayBuffer) + 1;
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-		maxSize /= sizeof(void*);
-	else if( elementSize > 0 )
+	if( elementSize > 0 )
 		maxSize /= elementSize;
 
 	if( numElements > maxSize )
 	{
 		asIScriptContext *ctx = asGetActiveContext();
 		if( ctx )
-		{
-			// Set a script exception
 			ctx->SetException("Too large array size");
-		}
 
 		return false;
 	}
@@ -754,7 +850,7 @@ const void *CScriptArray::At(asUINT index) const
 	}
 
 	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
-		return (void*)((size_t*)buffer->data)[index];
+		return *(void**)(buffer->data + elementSize*index);
 	else
 		return buffer->data + elementSize*index;
 }
@@ -767,22 +863,7 @@ void *CScriptArray::At(asUINT index)
 // internal
 void CScriptArray::CreateBuffer(SArrayBuffer **buf, asUINT numElements)
 {
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-	{
-		#if defined(__S3E__) // Marmalade doesn't understand (nothrow)
-		*buf = (SArrayBuffer*)new asBYTE[sizeof(SArrayBuffer)-1+sizeof(void*)*numElements];
-		#else
-		*buf = (SArrayBuffer*)new (nothrow) asBYTE[sizeof(SArrayBuffer)-1+sizeof(void*)*numElements];
-		#endif
-	}
-	else
-	{
-		#if defined(__S3E__)
-		*buf = (SArrayBuffer*)new asBYTE[sizeof(SArrayBuffer)-1+elementSize*numElements];
-		#else
-		*buf = (SArrayBuffer*)new (nothrow) asBYTE[sizeof(SArrayBuffer)-1+elementSize*numElements];
-		#endif
-	}
+	*buf = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1+elementSize*numElements));
 
 	if( *buf )
 	{
@@ -805,20 +886,15 @@ void CScriptArray::DeleteBuffer(SArrayBuffer *buf)
 	Destruct(buf, 0, buf->numElements);
 
 	// Free the buffer
-	delete[] (asBYTE*)buf;
+	userFree(buf);
 }
 
 // internal
 void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
 {
-	if( subTypeId & asTYPEID_OBJHANDLE )
-	{
-		// Set all object handles to null
-		void *d = (void*)(buf->data + start * sizeof(void*));
-		memset(d, 0, (end-start)*sizeof(void*));
-	}
-	else if( subTypeId & asTYPEID_MASK_OBJECT )
+	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
 	{
+		// Create an object using the default constructor/factory for each element
 		void **max = (void**)(buf->data + end * sizeof(void*));
 		void **d = (void**)(buf->data + start * sizeof(void*));
 
@@ -826,7 +902,25 @@ void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
 		asIObjectType *subType = objType->GetSubType();
 
 		for( ; d < max; d++ )
+		{
 			*d = (void*)engine->CreateScriptObject(subType);
+			if( *d == 0 )
+			{
+				// Set the remaining entries to null so the destructor 
+				// won't attempt to destroy invalid objects later
+				memset(d, 0, sizeof(void*)*(max-d));
+
+				// There is no need to set an exception on the context,
+				// as CreateScriptObject has already done that
+				return;
+			}
+		}
+	}
+	else
+	{
+		// Set all elements to zero whether they are handles or primitives
+		void *d = (void*)(buf->data + start * elementSize);
+		memset(d, 0, (end-start)*elementSize);
 	}
 }
 
@@ -978,7 +1072,7 @@ bool CScriptArray::operator==(const CScriptArray &other) const
 		}
 
 	if( cmpContext )
-    {
+	{
 		if( isNested )
 		{
 			asEContextState state = cmpContext->GetState();
@@ -988,7 +1082,7 @@ bool CScriptArray::operator==(const CScriptArray &other) const
 		}
 		else
 			cmpContext->Release();
-    }
+	}
 
 	return isEqual;
 }
@@ -1366,7 +1460,7 @@ void CScriptArray::Sort(asUINT startAt, asUINT count, bool asc)
 	}
 
 	if( cmpContext )
-    {
+	{
 		if( isNested )
 		{
 			asEContextState state = cmpContext->GetState();
@@ -1376,7 +1470,7 @@ void CScriptArray::Sort(asUINT startAt, asUINT count, bool asc)
 		}
 		else
 			cmpContext->Release();
-    }
+	}
 }
 
 // internal
@@ -1447,7 +1541,7 @@ void CScriptArray::Precache()
 
 	// First check if a cache already exists for this array type
 	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-	if( cache )	return;
+	if( cache ) return;
 
 	// We need to make sure the cache is created only once, even
 	// if multiple threads reach the same point at the same time
@@ -1463,7 +1557,7 @@ void CScriptArray::Precache()
 	}
 
 	// Create the cache
-	cache = new SArrayCache();
+	cache = reinterpret_cast<SArrayCache*>(userAlloc(sizeof(SArrayCache)));
 	memset(cache, 0, sizeof(SArrayCache));
 
 	// If the sub type is a handle to const, then the methods must be const too
@@ -1496,7 +1590,8 @@ void CScriptArray::Precache()
 					continue;
 
 				// The parameter must either be a reference to the subtype or a handle to the subtype
-				int paramTypeId = func->GetParamTypeId(0, &flags);
+				int paramTypeId;
+				func->GetParam(0, &paramTypeId, &flags);
 
 				if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId &  ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
 					continue;
@@ -1552,6 +1647,9 @@ void CScriptArray::Precache()
 // GC behaviour
 void CScriptArray::EnumReferences(asIScriptEngine *engine)
 {
+	// TODO: If garbage collection can be done from a separate thread, then this method must be
+	//       protected so that it doesn't get lost during the iteration if the array is modified
+
 	// If the array is holding handles, then we need to notify the GC of them
 	if( subTypeId & asTYPEID_MASK_OBJECT )
 	{
@@ -1565,7 +1663,7 @@ void CScriptArray::EnumReferences(asIScriptEngine *engine)
 }
 
 // GC behaviour
-void CScriptArray::ReleaseAllHandles(asIScriptEngine *engine)
+void CScriptArray::ReleaseAllHandles(asIScriptEngine *)
 {
 	// Resizing to zero will release everything
 	Resize(0);
@@ -1586,7 +1684,8 @@ void CScriptArray::Release() const
 	{
 		// When reaching 0 no more references to this instance
 		// exists and the object should be destroyed
-		delete this;
+		this->~CScriptArray();
+		userFree(const_cast<CScriptArray*>(this));
 	}
 }
 
@@ -1615,7 +1714,7 @@ static void ScriptArrayFactory_Generic(asIScriptGeneric *gen)
 {
 	asIObjectType *ot = *(asIObjectType**)gen->GetAddressOfArg(0);
 
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = ScriptArrayFactory(ot);
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ot);
 }
 
 static void ScriptArrayFactory2_Generic(asIScriptGeneric *gen)
@@ -1623,7 +1722,7 @@ static void ScriptArrayFactory2_Generic(asIScriptGeneric *gen)
 	asIObjectType *ot = *(asIObjectType**)gen->GetAddressOfArg(0);
 	asUINT length = gen->GetArgDWord(1);
 
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = ScriptArrayFactory2(ot, length);
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ot, length);
 }
 
 static void ScriptArrayListFactory_Generic(asIScriptGeneric *gen)
@@ -1631,7 +1730,7 @@ static void ScriptArrayListFactory_Generic(asIScriptGeneric *gen)
 	asIObjectType *ot = *(asIObjectType**)gen->GetAddressOfArg(0);
 	void *buf = gen->GetArgAddress(1);
 
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = ScriptArrayListFactory(ot, buf);
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ot, buf);
 }
 
 static void ScriptArrayFactoryDefVal_Generic(asIScriptGeneric *gen)
@@ -1640,14 +1739,14 @@ static void ScriptArrayFactoryDefVal_Generic(asIScriptGeneric *gen)
 	asUINT length = gen->GetArgDWord(1);
 	void *defVal = gen->GetArgAddress(2);
 
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = ScriptArrayFactoryDefVal(ot, length, defVal);
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ot, length, defVal);
 }
 
 static void ScriptArrayTemplateCallback_Generic(asIScriptGeneric *gen)
 {
 	asIObjectType *ot = *(asIObjectType**)gen->GetAddressOfArg(0);
 	bool *dontGarbageCollect = *(bool**)gen->GetAddressOfArg(1);
-	*(bool*)gen->GetAddressOfReturnLocation() = ScriptArrayTemplateCallback(ot, *dontGarbageCollect);
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = ScriptArrayTemplateCallback(ot, *dontGarbageCollect);
 }
 
 static void ScriptArrayAssignment_Generic(asIScriptGeneric *gen)
@@ -1768,7 +1867,7 @@ static void ScriptArrayReverse_Generic(asIScriptGeneric *gen)
 static void ScriptArrayIsEmpty_Generic(asIScriptGeneric *gen)
 {
 	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->IsEmpty();
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->IsEmpty();
 }
 
 static void ScriptArraySortAsc2_Generic(asIScriptGeneric *gen)
@@ -1808,7 +1907,7 @@ static void ScriptArrayRelease_Generic(asIScriptGeneric *gen)
 static void ScriptArrayGetRefCount_Generic(asIScriptGeneric *gen)
 {
 	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
+	*reinterpret_cast<int*>(gen->GetAddressOfReturnLocation()) = self->GetRefCount();
 }
 
 static void ScriptArraySetFlag_Generic(asIScriptGeneric *gen)
@@ -1820,7 +1919,7 @@ static void ScriptArraySetFlag_Generic(asIScriptGeneric *gen)
 static void ScriptArrayGetFlag_Generic(asIScriptGeneric *gen)
 {
 	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->GetFlag();
 }
 
 static void ScriptArrayEnumReferences_Generic(asIScriptGeneric *gen)
@@ -1839,7 +1938,8 @@ static void ScriptArrayReleaseAllHandles_Generic(asIScriptGeneric *gen)
 
 static void RegisterScriptArray_Generic(asIScriptEngine *engine)
 {
-	int r;
+	int r = 0;
+	UNUSED_VAR(r);
 
 	engine->SetObjectTypeUserDataCleanupCallback(CleanupObjectTypeArrayCache, ARRAY_CACHE);
 
diff --git a/src/scriptengine/scriptarray.hpp b/src/scriptengine/scriptarray.hpp
index 42a13510f..a1c0a0a1d 100644
--- a/src/scriptengine/scriptarray.hpp
+++ b/src/scriptengine/scriptarray.hpp
@@ -1,26 +1,9 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SCRIPTARRAY_H
 #define SCRIPTARRAY_H
 
 #ifndef ANGELSCRIPT_H 
 // Avoid having to inform include path if header is already include before
-#include "angelscript.h"
+#include <angelscript.h>
 #endif
 
 // Sometimes it may be desired to use the same method names as used by C++ STL.
@@ -42,12 +25,16 @@ struct SArrayCache;
 class CScriptArray
 {
 public:
-	CScriptArray(asIObjectType *ot, void *initBuf); // Called from script when initialized with list
-	CScriptArray(asUINT length, asIObjectType *ot);
-	CScriptArray(asUINT length, void *defVal, asIObjectType *ot);
-	CScriptArray(const CScriptArray &other);
-	virtual ~CScriptArray();
+	// Set the memory functions that should be used by all CScriptArrays
+	static void SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
 
+	// Factory functions
+	static CScriptArray *Create(asIObjectType *ot);
+	static CScriptArray *Create(asIObjectType *ot, asUINT length);
+	static CScriptArray *Create(asIObjectType *ot, asUINT length, void *defaultValue);
+	static CScriptArray *Create(asIObjectType *ot, void *listBuffer);
+
+	// Memory management
 	void AddRef() const;
 	void Release() const;
 
@@ -56,21 +43,35 @@ public:
 	int            GetArrayTypeId() const;
 	int            GetElementTypeId() const;
 
-	void   Reserve(asUINT maxElements);
-	void   Resize(asUINT numElements);
+	// Get the current size
 	asUINT GetSize() const;
+
+	// Returns true if the array is empty
 	bool   IsEmpty() const;
 
+	// Pre-allocates memory for elements
+	void   Reserve(asUINT maxElements);
+
+	// Resize the array
+	void   Resize(asUINT numElements);
+
 	// Get a pointer to an element. Returns 0 if out of bounds
 	void       *At(asUINT index);
 	const void *At(asUINT index) const;
 
-	// Set value of an element
+	// Set value of an element. 
+	// The value arg should be a pointer to the value that will be copied to the element.
+	// Remember, if the array holds handles the value parameter should be the 
+	// address of the handle. The refCount of the object will also be incremented
 	void  SetValue(asUINT index, void *value);
 
+	// Copy the contents of one array to another (only if the types are the same)
 	CScriptArray &operator=(const CScriptArray&);
+
+	// Compare two arrays
 	bool operator==(const CScriptArray &) const;
 
+	// Array manipulation
 	void InsertAt(asUINT index, void *value);
 	void RemoveAt(asUINT index);
 	void InsertLast(void *value);
@@ -101,6 +102,13 @@ protected:
 	int               elementSize;
 	int               subTypeId;
 
+	// Constructors
+	CScriptArray(asIObjectType *ot, void *initBuf); // Called from script when initialized with list
+	CScriptArray(asUINT length, asIObjectType *ot);
+	CScriptArray(asUINT length, void *defVal, asIObjectType *ot);
+	CScriptArray(const CScriptArray &other);
+	virtual ~CScriptArray();
+
 	bool  Less(const void *a, const void *b, bool asc, asIScriptContext *ctx, SArrayCache *cache);
 	void *GetArrayItemPointer(int index);
 	void *GetDataPointer(void *buffer);
diff --git a/src/scriptengine/scriptstdstring.cpp b/src/scriptengine/scriptstdstring.cpp
index 1cd595867..381a78cc1 100644
--- a/src/scriptengine/scriptstdstring.cpp
+++ b/src/scriptengine/scriptstdstring.cpp
@@ -1,19 +1,32 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+/*
+AngelCode Scripting Library
+Copyright (c) 2003-2015 Andreas Jonsson
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+must not claim that you wrote the original software. If you use
+this software in a product, an acknowledgment in the product
+documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+The original version of this library can be located at:
+http://www.angelcode.com/angelscript/
+
+Andreas Jonsson
+andreas@angelcode.com
+*/
 
 #include "scriptstdstring.hpp"
 #include <assert.h> // assert()
@@ -21,13 +34,19 @@
 #include <string.h> // strstr()
 #include <stdio.h>	// sprintf()
 #include <stdlib.h> // strtod()
-#include <locale.h> // setlocale()
+#ifndef __psp2__
+	#include <locale.h> // setlocale()
+#endif
 #include <map>      // std::map
 
 using namespace std;
 
 BEGIN_AS_NAMESPACE
 
+// This macro is used to avoid warnings about unused variables.
+// Usually where the variables are only used in debug mode.
+#define UNUSED_VAR(x) (void)(x)
+
 #if AS_USE_STRINGPOOL == 1
 
 // By keeping the literal strings in a pool the application
@@ -168,7 +187,7 @@ static bool StringIsEmpty(const string &str)
 	return str.empty();
 }
 
-static string &AssignUIntToString(unsigned int i, string &dest)
+static string &AssignUInt64ToString(asQWORD i, string &dest)
 {
 	ostringstream stream;
 	stream << i;
@@ -176,7 +195,7 @@ static string &AssignUIntToString(unsigned int i, string &dest)
 	return dest;
 }
 
-static string &AddAssignUIntToString(unsigned int i, string &dest)
+static string &AddAssignUInt64ToString(asQWORD i, string &dest)
 {
 	ostringstream stream;
 	stream << i;
@@ -184,21 +203,21 @@ static string &AddAssignUIntToString(unsigned int i, string &dest)
 	return dest;
 }
 
-static string AddStringUInt(const string &str, unsigned int i)
+static string AddStringUInt64(const string &str, asQWORD i)
 {
 	ostringstream stream;
 	stream << i;
 	return str + stream.str();
 }
 
-static string AddIntString(int i, const string &str)
+static string AddInt64String(asINT64 i, const string &str)
 {
 	ostringstream stream;
 	stream << i;
 	return stream.str() + str;
 }
 
-static string &AssignIntToString(int i, string &dest)
+static string &AssignInt64ToString(asINT64 i, string &dest)
 {
 	ostringstream stream;
 	stream << i;
@@ -206,7 +225,7 @@ static string &AssignIntToString(int i, string &dest)
 	return dest;
 }
 
-static string &AddAssignIntToString(int i, string &dest)
+static string &AddAssignInt64ToString(asINT64 i, string &dest)
 {
 	ostringstream stream;
 	stream << i;
@@ -214,14 +233,14 @@ static string &AddAssignIntToString(int i, string &dest)
 	return dest;
 }
 
-static string AddStringInt(const string &str, int i)
+static string AddStringInt64(const string &str, asINT64 i)
 {
 	ostringstream stream;
 	stream << i;
 	return str + stream.str();
 }
 
-static string AddUIntString(unsigned int i, const string &str)
+static string AddUInt64String(asQWORD i, const string &str)
 {
 	ostringstream stream;
 	stream << i;
@@ -244,6 +263,22 @@ static string &AddAssignDoubleToString(double f, string &dest)
 	return dest;
 }
 
+static string &AssignFloatToString(float f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignFloatToString(float f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest += stream.str();
+	return dest;
+}
+
 static string &AssignBoolToString(bool b, string &dest)
 {
 	ostringstream stream;
@@ -274,6 +309,20 @@ static string AddDoubleString(double f, const string &str)
 	return stream.str() + str;
 }
 
+static string AddStringFloat(const string &str, float f)
+{
+	ostringstream stream;
+	stream << f;
+	return str + stream.str();
+}
+
+static string AddFloatString(float f, const string &str)
+{
+	ostringstream stream;
+	stream << f;
+	return stream.str() + str;
+}
+
 static string AddStringBool(const string &str, bool b)
 {
 	ostringstream stream;
@@ -371,14 +420,14 @@ static string formatInt(asINT64 value, const string &options, asUINT width)
 	if( spaceOnSign ) fmt += " ";
 	if( padWithZero ) fmt += "0";
 
-#ifdef __GNUC__
+#ifdef _WIN32
+	fmt += "*I64";
+#else
 #ifdef _LP64
 	fmt += "*l";
 #else
 	fmt += "*ll";
 #endif
-#else
-	fmt += "*I64";
 #endif
 
 	if( hexSmall ) fmt += "x";
@@ -386,7 +435,7 @@ static string formatInt(asINT64 value, const string &options, asUINT width)
 	else fmt += "d";
 
 	string buf;
-	buf.resize(width+20);
+	buf.resize(width+30);
 #if _MSC_VER >= 1400 && !defined(__S3E__)
 	// MSVC 8.0 / 2005 or newer
 	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, value);
@@ -500,7 +549,7 @@ double parseFloat(const string &val, asUINT *byteCount)
     // WinCE doesn't have setlocale. Some quick testing on my current platform
     // still manages to parse the numbers such as "3.14" even if the decimal for the
     // locale is ",".
-#if !defined(_WIN32_WCE) && !defined(ANDROID)
+#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
 	// Set the locale to C so that we are guaranteed to parse the float value correctly
 	char *orig = setlocale(LC_NUMERIC, 0);
 	setlocale(LC_NUMERIC, "C");
@@ -508,7 +557,7 @@ double parseFloat(const string &val, asUINT *byteCount)
 
 	double res = strtod(val.c_str(), &end);
 
-#if !defined(_WIN32_WCE) && !defined(ANDROID)
+#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
 	// Restore the locale
 	setlocale(LC_NUMERIC, orig);
 #endif
@@ -547,11 +596,16 @@ static bool StringEquals(const std::string& lhs, const std::string& rhs)
 
 void RegisterStdString_Native(asIScriptEngine *engine)
 {
-	int r;
-
+	int r = 0;
+	UNUSED_VAR(r);
 
 	// Register the string type
+#if AS_CAN_USE_CPP11
+	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags to use
+	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asGetTypeTraits<string>()); assert( r >= 0 );
+#else
 	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
+#endif
 
 #if AS_USE_STRINGPOOL == 1
 	// Register the string factory
@@ -598,15 +652,20 @@ void RegisterStdString_Native(asIScriptEngine *engine)
 	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddStringDouble), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
 	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDoubleString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
 
-	r = engine->RegisterObjectMethod("string", "string &opAssign(int)", asFUNCTION(AssignIntToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int)", asFUNCTION(AddAssignIntToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(int) const", asFUNCTION(AddStringInt), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(int) const", asFUNCTION(AddIntString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddStringFloat), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloatString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
 
-	r = engine->RegisterObjectMethod("string", "string &opAssign(uint)", asFUNCTION(AssignUIntToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint)", asFUNCTION(AddAssignUIntToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(uint) const", asFUNCTION(AddStringUInt), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint) const", asFUNCTION(AddUIntString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddStringInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddStringUInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
 
 	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
 	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
@@ -812,7 +871,7 @@ static void StringCharAtGeneric(asIScriptGeneric * gen)
 
 static void AssignInt2StringGeneric(asIScriptGeneric *gen)
 {
-	int *a = static_cast<int*>(gen->GetAddressOfArg(0));
+	asINT64 *a = static_cast<asINT64*>(gen->GetAddressOfArg(0));
 	string *self = static_cast<string*>(gen->GetObject());
 	std::stringstream sstr;
 	sstr << *a;
@@ -822,7 +881,7 @@ static void AssignInt2StringGeneric(asIScriptGeneric *gen)
 
 static void AssignUInt2StringGeneric(asIScriptGeneric *gen)
 {
-	unsigned int *a = static_cast<unsigned int*>(gen->GetAddressOfArg(0));
+	asQWORD *a = static_cast<asQWORD*>(gen->GetAddressOfArg(0));
 	string *self = static_cast<string*>(gen->GetObject());
 	std::stringstream sstr;
 	sstr << *a;
@@ -840,6 +899,16 @@ static void AssignDouble2StringGeneric(asIScriptGeneric *gen)
 	gen->SetReturnAddress(self);
 }
 
+static void AssignFloat2StringGeneric(asIScriptGeneric *gen)
+{
+	float *a = static_cast<float*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
 static void AssignBool2StringGeneric(asIScriptGeneric *gen)
 {
 	bool *a = static_cast<bool*>(gen->GetAddressOfArg(0));
@@ -860,9 +929,19 @@ static void AddAssignDouble2StringGeneric(asIScriptGeneric * gen)
   gen->SetReturnAddress(self);
 }
 
+static void AddAssignFloat2StringGeneric(asIScriptGeneric * gen)
+{
+  float * a = static_cast<float *>(gen->GetAddressOfArg(0));
+  string * self = static_cast<string *>(gen->GetObject());
+  std::stringstream sstr;
+  sstr << *a;
+  *self += sstr.str();
+  gen->SetReturnAddress(self);
+}
+
 static void AddAssignInt2StringGeneric(asIScriptGeneric * gen)
 {
-  int * a = static_cast<int *>(gen->GetAddressOfArg(0));
+  asINT64 * a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
   string * self = static_cast<string *>(gen->GetObject());
   std::stringstream sstr;
   sstr << *a;
@@ -872,7 +951,7 @@ static void AddAssignInt2StringGeneric(asIScriptGeneric * gen)
 
 static void AddAssignUInt2StringGeneric(asIScriptGeneric * gen)
 {
-  unsigned int * a = static_cast<unsigned int *>(gen->GetAddressOfArg(0));
+  asQWORD * a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
   string * self = static_cast<string *>(gen->GetObject());
   std::stringstream sstr;
   sstr << *a;
@@ -900,10 +979,20 @@ static void AddString2DoubleGeneric(asIScriptGeneric * gen)
   gen->SetReturnObject(&ret_val);
 }
 
+static void AddString2FloatGeneric(asIScriptGeneric * gen)
+{
+  string * a = static_cast<string *>(gen->GetObject());
+  float * b = static_cast<float *>(gen->GetAddressOfArg(0));
+  std::stringstream sstr;
+  sstr << *a << *b;
+  std::string ret_val = sstr.str();
+  gen->SetReturnObject(&ret_val);
+}
+
 static void AddString2IntGeneric(asIScriptGeneric * gen)
 {
   string * a = static_cast<string *>(gen->GetObject());
-  int * b = static_cast<int *>(gen->GetAddressOfArg(0));
+  asINT64 * b = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
   std::stringstream sstr;
   sstr << *a << *b;
   std::string ret_val = sstr.str();
@@ -913,7 +1002,7 @@ static void AddString2IntGeneric(asIScriptGeneric * gen)
 static void AddString2UIntGeneric(asIScriptGeneric * gen)
 {
   string * a = static_cast<string *>(gen->GetObject());
-  unsigned int * b = static_cast<unsigned int *>(gen->GetAddressOfArg(0));
+  asQWORD * b = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
   std::stringstream sstr;
   sstr << *a << *b;
   std::string ret_val = sstr.str();
@@ -940,9 +1029,19 @@ static void AddDouble2StringGeneric(asIScriptGeneric * gen)
   gen->SetReturnObject(&ret_val);
 }
 
+static void AddFloat2StringGeneric(asIScriptGeneric * gen)
+{
+  float* a = static_cast<float *>(gen->GetAddressOfArg(0));
+  string * b = static_cast<string *>(gen->GetObject());
+  std::stringstream sstr;
+  sstr << *a << *b;
+  std::string ret_val = sstr.str();
+  gen->SetReturnObject(&ret_val);
+}
+
 static void AddInt2StringGeneric(asIScriptGeneric * gen)
 {
-  int* a = static_cast<int *>(gen->GetAddressOfArg(0));
+  asINT64* a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
   string * b = static_cast<string *>(gen->GetObject());
   std::stringstream sstr;
   sstr << *a << *b;
@@ -952,7 +1051,7 @@ static void AddInt2StringGeneric(asIScriptGeneric * gen)
 
 static void AddUInt2StringGeneric(asIScriptGeneric * gen)
 {
-  unsigned int* a = static_cast<unsigned int *>(gen->GetAddressOfArg(0));
+  asQWORD* a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
   string * b = static_cast<string *>(gen->GetObject());
   std::stringstream sstr;
   sstr << *a << *b;
@@ -983,7 +1082,8 @@ static void StringSubString_Generic(asIScriptGeneric *gen)
 
 void RegisterStdString_Generic(asIScriptEngine *engine)
 {
-	int r;
+	int r = 0;
+	UNUSED_VAR(r);
 
 	// Register the string type
 	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
@@ -1027,15 +1127,20 @@ void RegisterStdString_Generic(asIScriptEngine *engine)
 	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddString2DoubleGeneric), asCALL_GENERIC); assert( r >= 0 );
 	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
 
-	r = engine->RegisterObjectMethod("string", "string &opAssign(int)", asFUNCTION(AssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int)", asFUNCTION(AddAssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(int) const", asFUNCTION(AddString2IntGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(int) const", asFUNCTION(AddInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddString2FloatGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
 
-	r = engine->RegisterObjectMethod("string", "string &opAssign(uint)", asFUNCTION(AssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint)", asFUNCTION(AddAssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(uint) const", asFUNCTION(AddString2UIntGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint) const", asFUNCTION(AddUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddString2IntGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddString2UIntGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
 
 	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
 	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
diff --git a/src/scriptengine/scriptstdstring.hpp b/src/scriptengine/scriptstdstring.hpp
index 5bf26ae8f..11181a0fb 100644
--- a/src/scriptengine/scriptstdstring.hpp
+++ b/src/scriptengine/scriptstdstring.hpp
@@ -1,20 +1,3 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 //
 // Script std::string
 //
@@ -30,7 +13,7 @@
 
 #ifndef ANGELSCRIPT_H 
 // Avoid having to inform include path if header is already include before
-#include "angelscript.h"
+#include <angelscript.h>
 #endif
 
 #include <string>
diff --git a/src/scriptengine/scriptstdstring_utils.cpp b/src/scriptengine/scriptstdstring_utils.cpp
index fe8986b31..d46fea751 100644
--- a/src/scriptengine/scriptstdstring_utils.cpp
+++ b/src/scriptengine/scriptstdstring_utils.cpp
@@ -1,20 +1,3 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2014-2015 SuperTuxKart-Team
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 3
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #include <assert.h>
 #include "scriptstdstring.hpp"
 #include "scriptarray.hpp"
@@ -39,45 +22,45 @@ BEGIN_AS_NAMESPACE
 // array<string>@ string::split(const string &in delim) const
 static CScriptArray *StringSplit(const string &delim, const string &str)
 {
-    // Obtain a pointer to the engine
-    asIScriptContext *ctx = asGetActiveContext();
-    asIScriptEngine *engine = ctx->GetEngine();
+	// Obtain a pointer to the engine
+	asIScriptContext *ctx = asGetActiveContext();
+	asIScriptEngine *engine = ctx->GetEngine();
 
-    // TODO: This should only be done once
-    // TODO: This assumes that CScriptArray was already registered
-    asIObjectType *arrayType = engine->GetObjectTypeById(engine->GetTypeIdByDecl("array<string>"));
+	// TODO: This should only be done once
+	// TODO: This assumes that CScriptArray was already registered
+	asIObjectType *arrayType = engine->GetObjectTypeByDecl("array<string>");
 
-    // Create the array object
-    CScriptArray *array = new CScriptArray(0, arrayType);
+	// Create the array object
+	CScriptArray *array = CScriptArray::Create(arrayType);
 
-    // Find the existence of the delimiter in the input string
-    int pos = 0, prev = 0, count = 0;
-    while ((pos = (int)str.find(delim, prev)) != (int)string::npos)
-    {
-        // Add the part to the array
-        array->Resize(array->GetSize() + 1);
-        ((string*)array->At(count))->assign(&str[prev], pos - prev);
+	// Find the existence of the delimiter in the input string
+	int pos = 0, prev = 0, count = 0;
+	while( (pos = (int)str.find(delim, prev)) != (int)string::npos )
+	{
+		// Add the part to the array
+		array->Resize(array->GetSize()+1);
+		((string*)array->At(count))->assign(&str[prev], pos-prev);
 
-        // Find the next part
-        count++;
-        prev = pos + (int)delim.length();
-    }
+		// Find the next part
+		count++;
+		prev = pos + (int)delim.length();
+	}
 
-    // Add the remaining part
-    array->Resize(array->GetSize() + 1);
-    ((string*)array->At(count))->assign(&str[prev]);
+	// Add the remaining part
+	array->Resize(array->GetSize()+1);
+	((string*)array->At(count))->assign(&str[prev]);
 
-    return array;
+	return array;
 }
 
 static void StringSplit_Generic(asIScriptGeneric *gen)
 {
-    // Get the arguments
-    string *str = (string*)gen->GetObject();
-    string *delim = *(string**)gen->GetAddressOfArg(0);
+	// Get the arguments
+	string *str   = (string*)gen->GetObject();
+	string *delim = *(string**)gen->GetAddressOfArg(0);
 
-    // Return the array by handle
-    *(CScriptArray**)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str);
+	// Return the array by handle
+	*(CScriptArray**)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str);
 }
 
 
@@ -97,50 +80,50 @@ static void StringSplit_Generic(asIScriptGeneric *gen)
 // string join(const array<string> &in array, const string &in delim)
 static string StringJoin(const CScriptArray &array, const string &delim)
 {
-    // Create the new string
-    string str = "";
-    if (array.GetSize())
-    {
-        int n;
-        for (n = 0; n < (int)array.GetSize() - 1; n++)
-        {
-            str += *(string*)array.At(n);
-            str += delim;
-        }
+	// Create the new string
+	string str = "";
+	if( array.GetSize() )
+	{
+		int n;
+		for( n = 0; n < (int)array.GetSize() - 1; n++ )
+		{
+			str += *(string*)array.At(n);
+			str += delim;
+		}
 
-        // Add the last part
-        str += *(string*)array.At(n);
-    }
+		// Add the last part
+		str += *(string*)array.At(n);
+	}
 
-    return str;
+	return str;
 }
 
 static void StringJoin_Generic(asIScriptGeneric *gen)
 {
-    // Get the arguments
-    CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(0);
-    string *delim = *(string**)gen->GetAddressOfArg(1);
+	// Get the arguments
+	CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(0);
+	string *delim = *(string**)gen->GetAddressOfArg(1);
 
-    // Return the string
-    new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
+	// Return the string
+	new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
 }
 
 // This is where the utility functions are registered.
 // The string type must have been registered first.
 void RegisterStdStringUtils(asIScriptEngine *engine)
 {
-    int r;
+	int r;
 
-    if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
-    {
-        r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
-    }
-    else
-    {
-        r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
-        r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
-    }
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+	{
+		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
+	}
+	else
+	{
+		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
+	}
 }
 
-END_AS_NAMESPACE
\ No newline at end of file
+END_AS_NAMESPACE

From f4cf41e4664eef72dde6b3cd4e097accece892a9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 12 May 2015 09:50:18 +1000
Subject: [PATCH 184/331] Moved more shaders into render_gemoetry.

---
 src/graphics/render_geometry.cpp | 343 +++++++++++++++++++++++++++++--
 src/graphics/shaders.cpp         | 179 ----------------
 src/graphics/shaders.hpp         | 102 ---------
 3 files changed, 327 insertions(+), 297 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 26f26934d..c45b61142 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -94,10 +94,59 @@ public:
     }   // InstancedObjectPass1Shader
 };   // class InstancedObjectPass1Shader
 
+// ============================================================================
+class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedObjectRefPass1Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
+
+        assignUniforms();
+        assignSamplerNames(m_program,
+                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }
+
+};   // InstancedObjectRefPass1Shader
+
+// ============================================================================
+class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4,
+                                           core::matrix4>,
+                       public TextureReadNew<ST_NEAREST_FILTERED,
+                                             ST_NEAREST_FILTERED, 
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    ObjectRefPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "objectref_pass2.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // ObjectRefPass2Shader
+};   // ObjectRefPass2Shader
+
 // ============================================================================
 class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>,
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-    ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
+                       public TextureReadNew<ST_NEAREST_FILTERED, 
+                                             ST_NEAREST_FILTERED, 
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
 {
 public:
     InstancedObjectPass2Shader()
@@ -115,6 +164,31 @@ public:
     }   // InstancedObjectPass2Shader
 };   // InstancedObjectPass2Shader
 
+// ============================================================================
+class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, 
+                      public TextureReadNew<ST_NEAREST_FILTERED,
+                                            ST_NEAREST_FILTERED,
+                                            ST_BILINEAR_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    InstancedObjectRefPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }    // InstancedObjectRefPass2Shader
+};   // InstancedObjectRefPass2Shader
+
 // ============================================================================
 class ShadowShader : public Shader<ShadowShader, int, core::matrix4>,
                      public TextureReadNew<>
@@ -139,6 +213,7 @@ public:
         assignUniforms("layer", "ModelMatrix");
     }   // ShadowShader
 };   // ShadowShader
+
 // ============================================================================
 class InstancedShadowShader : public Shader<InstancedShadowShader, int>,
                               public TextureReadNew<>
@@ -228,6 +303,85 @@ public:
     }   // CInstancedRSMShader
 };   // CInstancedRSMShader
 
+// ============================================================================
+class SphereMapShader : public Shader<SphereMapShader, core::matrix4,
+                                      core::matrix4>,
+                       public TextureReadNew<ST_NEAREST_FILTERED, 
+                                             ST_NEAREST_FILTERED, 
+                                             ST_BILINEAR_FILTERED, 
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    SphereMapShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix");
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // SphereMapShader
+};   // SphereMapShader
+
+// ============================================================================
+class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>,
+                       public TextureReadNew<ST_NEAREST_FILTERED,
+                                             ST_NEAREST_FILTERED,
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedSphereMapShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                    GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                    GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                    GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                    GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
+        assignUniforms();
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedSphereMapShader
+};   // InstancedSphereMapShader
+
+// ============================================================================
+class SplattingShader : public Shader<SplattingShader, core::matrix4>, 
+                       public TextureReadNew<ST_NEAREST_FILTERED,
+                                             ST_NEAREST_FILTERED,
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED, 
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    SplattingShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "splatting.frag");
+        assignUniforms("ModelMatrix");
+
+        assignSamplerNames(m_program,
+                         0, "DiffuseMap", ST_NEAREST_FILTERED,
+                         1, "SpecularMap", ST_NEAREST_FILTERED,
+                         2, "SSAO", ST_BILINEAR_FILTERED,
+                         3, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                         4, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                         5, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                         6, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                         7, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // SplattingShader
+};   // SplattingShader
+
 // ============================================================================
 class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4,
                                            core::matrix4, core::matrix4>,
@@ -248,6 +402,89 @@ public:
 };  // ObjectRefPass1Shader
 
 
+// ============================================================================
+class NormalMapShader : public Shader<NormalMapShader, core::matrix4, 
+                                      core::matrix4>,
+                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    NormalMapShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "normalmap.frag");
+        assignUniforms("ModelMatrix", "InverseModelMatrix");
+        assignSamplerNames(m_program, 
+                           1, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           0, "DiffuseForAlpha", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // NormalMapShader
+
+};   // NormalMapShader
+
+// ============================================================================
+class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>,
+                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedNormalMapShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
+        assignUniforms();
+        assignSamplerNames(m_program,
+                           0, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "glossMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedNormalMapShader
+};   // InstancedNormalMapShader
+
+// ============================================================================
+class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, 
+                                        core::matrix4>,
+                          public TextureReadNew<ST_NEAREST_FILTERED,
+                                                ST_NEAREST_FILTERED,
+                                                ST_BILINEAR_FILTERED,
+                                                ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    ObjectUnlitShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "object_unlit.frag");
+        assignUniforms("ModelMatrix", "TextureMatrix");
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // ObjectUnlitShader
+};   // ObjectUnlitShader
+
+// ============================================================================
+class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>,
+                       public TextureReadNew<ST_NEAREST_FILTERED, 
+                                             ST_NEAREST_FILTERED, 
+                                             ST_BILINEAR_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    InstancedObjectUnlitShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedObjectUnlitShader
+};   // InstancedObjectUnlitShader
+
 // ============================================================================
 struct DefaultMaterial
 {
@@ -281,13 +518,13 @@ const STK::Tuple<size_t> DefaultMaterial::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct AlphaRef
 {
-    typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedObjectRefPass2Shader InstancedSecondPassShader;
+    typedef InstancedObjectRefPass1Shader InstancedFirstPassShader;
+    typedef InstancedObjectRefPass2Shader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatAlphaRef InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
-    typedef MeshShader::ObjectRefPass2Shader SecondPassShader;
+    typedef ObjectRefPass2Shader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatAlphaRef List;
@@ -312,12 +549,12 @@ const STK::Tuple<size_t> AlphaRef::RSMTextures = STK::Tuple<size_t>(0);
 struct SphereMap
 {
     typedef InstancedObjectPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedSphereMapShader InstancedSecondPassShader;
+    typedef InstancedSphereMapShader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatSphereMap InstancedList;
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
-    typedef MeshShader::SphereMapShader SecondPassShader;
+    typedef SphereMapShader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatSphereMap List;
@@ -340,13 +577,13 @@ const STK::Tuple<size_t> SphereMap::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct UnlitMat
 {
-    typedef MeshShader::InstancedObjectRefPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedObjectUnlitShader InstancedSecondPassShader;
+    typedef InstancedObjectRefPass1Shader InstancedFirstPassShader;
+    typedef InstancedObjectUnlitShader InstancedSecondPassShader;
     typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatUnlit InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
-    typedef MeshShader::ObjectUnlitShader SecondPassShader;
+    typedef ObjectUnlitShader SecondPassShader;
     typedef MeshShader::RefShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatUnlit List;
@@ -387,6 +624,26 @@ public:
 
 };   // class GrassPass1Shader
 
+// ============================================================================
+class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader,
+                                                core::vector3df>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    InstancedGrassPass1Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_grass.vert",
+                            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
+        assignUniforms("windDir");
+        assignSamplerNames(m_program, 
+                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedGrassPass1Shader
+};   // InstancedGrassPass1Shader
+
 // ============================================================================
 class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4,
                                         core::vector3df>,
@@ -446,6 +703,60 @@ public:
     }   // InstancedGrassShadowShader
 };   // InstancedGrassShadowShader
 
+
+// ============================================================================
+class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4,
+                                       core::vector3df>,
+                      public TextureReadNew<ST_NEAREST_FILTERED, 
+                                            ST_NEAREST_FILTERED,
+                                            ST_BILINEAR_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    GrassPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "grass_pass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "grass_pass2.frag");
+        assignUniforms("ModelMatrix", "windDir");
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // GrassPass2Shader
+};   // GrassPass2Shader
+
+// ============================================================================
+class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader,
+                                             core::vector3df, core::vector3df>,
+                       public TextureReadNew<ST_NEAREST_FILTERED,
+                                             ST_NEAREST_FILTERED,
+                                             ST_BILINEAR_FILTERED,
+                                             ST_NEAREST_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+{
+public:
+    InstancedGrassPass2Shader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_grass.vert",
+                            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                            GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
+        assignUniforms("windDir", "SunDir");
+        assignSamplerNames(m_program,
+                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "dtex", ST_NEAREST_FILTERED,
+                           4, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedGrassPass2Shader
+};   // InstancedGrassPass2Shader
+
 // ============================================================================
 class DetailedObjectPass2Shader : public Shader<DetailedObjectPass2Shader,
                                                  core::matrix4>,
@@ -503,13 +814,13 @@ public:
 // ----------------------------------------------------------------------------
 struct GrassMat
 {
-    typedef MeshShader::InstancedGrassPass1Shader InstancedFirstPassShader;
-    typedef MeshShader::InstancedGrassPass2Shader InstancedSecondPassShader;
+    typedef InstancedGrassPass1Shader InstancedFirstPassShader;
+    typedef InstancedGrassPass2Shader InstancedSecondPassShader;
     typedef InstancedGrassShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatGrass InstancedList;
     typedef GrassPass1Shader FirstPassShader;
-    typedef MeshShader::GrassPass2Shader SecondPassShader;
+    typedef GrassPass2Shader SecondPassShader;
     typedef GrassShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatGrass List;
@@ -534,12 +845,12 @@ const STK::Tuple<size_t> GrassMat::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct NormalMat
 {
-    typedef MeshShader::InstancedNormalMapShader InstancedFirstPassShader;
+    typedef InstancedNormalMapShader InstancedFirstPassShader;
     typedef InstancedObjectPass2Shader InstancedSecondPassShader;
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatNormalMap InstancedList;
-    typedef MeshShader::NormalMapShader FirstPassShader;
+    typedef NormalMapShader FirstPassShader;
     typedef MeshShader::ObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
@@ -596,7 +907,7 @@ const STK::Tuple<size_t> DetailMat::RSMTextures = STK::Tuple<size_t>(0);
 struct SplattingMat
 {
     typedef MeshShader::ObjectPass1Shader FirstPassShader;
-    typedef MeshShader::SplattingShader SecondPassShader;
+    typedef SplattingShader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef SplattingRSMShader RSMShader;
     typedef ListMatSplatting List;
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 85377cbf1..efa3e429b 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -555,54 +555,6 @@ namespace MeshShader
     }
 
 
-    NormalMapShader::NormalMapShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "normalmap.frag");
-        assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 1, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      0, "DiffuseForAlpha", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedObjectRefPass1Shader::InstancedObjectRefPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
-
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedGrassPass1Shader::InstancedGrassPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_grass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
-        assignUniforms("windDir");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedNormalMapShader::InstancedNormalMapShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "glossMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
     // Solid Lit pass shaders
     ObjectPass2Shader::ObjectPass2Shader()
     {
@@ -618,139 +570,8 @@ namespace MeshShader
                                           4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    InstancedObjectRefPass2Shader::InstancedObjectRefPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
 
 
-    ObjectUnlitShader::ObjectUnlitShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "object_unlit.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedObjectUnlitShader::InstancedObjectUnlitShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    ObjectRefPass2Shader::ObjectRefPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "objectref_pass2.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    GrassPass2Shader::GrassPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "grass_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "grass_pass2.frag");
-        assignUniforms("ModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedGrassPass2Shader::InstancedGrassPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_grass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
-        assignUniforms("windDir", "SunDir");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "dtex", ST_NEAREST_FILTERED,
-                                      4, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      5, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    SphereMapShader::SphereMapShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
-        assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedSphereMapShader::InstancedSphereMapShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                      1, "SpecularMap", ST_NEAREST_FILTERED,
-                                      2, "SSAO", ST_BILINEAR_FILTERED,
-                                      3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    SplattingShader::SplattingShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "splatting.frag");
-        assignUniforms("ModelMatrix");
-
-        assignSamplerNames(m_program,
-            0, "DiffuseMap", ST_NEAREST_FILTERED,
-            1, "SpecularMap", ST_NEAREST_FILTERED,
-            2, "SSAO", ST_BILINEAR_FILTERED,
-            3, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-            4, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-            5, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-            6, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-            7, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);            
-    }
-
     TransparentShader::TransparentShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 77d26422f..302591dac 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -52,35 +52,6 @@ public:
 
 
 
-class NormalMapShader : public Shader<NormalMapShader, core::matrix4, core::matrix4>,
-                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    NormalMapShader();
-};
-
-
-class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>,
-                                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedObjectRefPass1Shader();
-};
-
-class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader, core::vector3df>,
-                                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedGrassPass1Shader();
-};
-
-class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>,
-    public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedNormalMapShader();
-};
-
 class ObjectPass2Shader : public Shader<ObjectPass2Shader, core::matrix4, core::matrix4>,
     public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
                         ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
@@ -90,80 +61,7 @@ public:
 };
 
 
-class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, 
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                          ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedObjectRefPass2Shader();
-};
 
-class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, core::matrix4>,
-                          public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
-                                                ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED >
-{
-public:
-    ObjectUnlitShader();
-};
-
-class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>,
-                                   public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
-                                                         ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedObjectUnlitShader();
-};
-
-class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4, core::matrix4>,
-                             public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                                                   ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    ObjectRefPass2Shader();
-};
-
-class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4, core::vector3df>,
-                         public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                                               ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    GrassPass2Shader();
-};
-
-class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader, core::vector3df, core::vector3df>,
-                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                                                        ST_NEAREST_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED, 
-                                                        ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedGrassPass2Shader();
-};
-
-class SphereMapShader : public Shader<SphereMapShader, core::matrix4, core::matrix4>,
-                        public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
-                                              ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    SphereMapShader();
-};
-
-class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>,
-                                 public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
-                                                       ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    InstancedSphereMapShader();
-};
-
-class SplattingShader : public Shader<SplattingShader, core::matrix4>, 
-                        public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                                              ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                              ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    SplattingShader();
-};
 
 class TransparentShader : public Shader<TransparentShader, core::matrix4, core::matrix4>,
                           public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>

From ee2661175987d343cb46dd6a277cdd36702e15ea Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 12 May 2015 10:01:24 +1000
Subject: [PATCH 185/331] Moved billboard shader into stkbillboard, cleaned up
 coding style somewhat.

---
 src/graphics/shaders.cpp      |  9 -----
 src/graphics/shaders.hpp      |  8 -----
 src/graphics/stkbillboard.cpp | 66 ++++++++++++++++++++++++++---------
 src/graphics/stkbillboard.hpp | 11 +++---
 4 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index efa3e429b..8d9426564 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -591,15 +591,6 @@ namespace MeshShader
         assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    BillboardShader::BillboardShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "billboard.vert",
-            GL_FRAGMENT_SHADER, "billboard.frag");
-
-        assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position", "Size");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
 
     ColorizeShader::ColorizeShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 302591dac..58349cf6a 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -78,14 +78,6 @@ public:
     TransparentFogShader();
 };
 
-class BillboardShader : public Shader<BillboardShader, core::matrix4, core::matrix4,
-                                      core::vector3df, core::dimension2df>, 
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
-{
-public:
-    BillboardShader();
-};
-
 
 class ColorizeShader : public Shader<ColorizeShader, core::matrix4, video::SColorf>
 {
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 7b8c336b5..4902e2590 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -23,9 +23,31 @@
 
 using namespace irr;
 
+
 static GLuint billboardvao = 0;
 
-static void createbillboardvao()
+
+class BillboardShader : public Shader<BillboardShader, core::matrix4,
+                                      core::matrix4, core::vector3df,
+                                      core::dimension2df>,
+                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+{
+public:
+    BillboardShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "billboard.vert",
+                            GL_FRAGMENT_SHADER, "billboard.frag");
+
+        assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position",
+                       "Size");
+        assignSamplerNames(m_program, 
+                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // BillboardShader
+};   // BillboardShader
+
+// ============================================================================
+
+static void createBillboardVAO()
 {
     glGenVertexArrays(1, &billboardvao);
     glBindVertexArray(billboardvao);
@@ -33,19 +55,27 @@ static void createbillboardvao()
     glEnableVertexAttribArray(0);
     glEnableVertexAttribArray(3);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
-    glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (GLvoid*) (2 * sizeof(float)));
+    glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 
+                          (GLvoid*) (2 * sizeof(float)));
     glBindVertexArray(0);
-}
+}   // createBillboardVAO
 
-STKBillboard::STKBillboard(irr::scene::ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
-    const irr::core::vector3df& position, const irr::core::dimension2d<irr::f32>& size,
-    irr::video::SColor colorTop,    irr::video::SColor colorBottom) :
-    IBillboardSceneNode(parent, mgr, id, position), CBillboardSceneNode(parent, mgr, id, position, size, colorTop, colorBottom)
+// ----------------------------------------------------------------------------
+STKBillboard::STKBillboard(irr::scene::ISceneNode* parent,
+                           irr::scene::ISceneManager* mgr, irr::s32 id,
+                           const irr::core::vector3df& position,
+                           const irr::core::dimension2d<irr::f32>& size,
+                           irr::video::SColor colorTop, 
+                           irr::video::SColor colorBottom)
+            : IBillboardSceneNode(parent, mgr, id, position),
+              CBillboardSceneNode(parent, mgr, id, position, size, 
+                                  colorTop, colorBottom)
 {
     if (!billboardvao)
-        createbillboardvao();
-}
+        createBillboardVAO();
+}   // STKBillboard
 
+// ----------------------------------------------------------------------------
 void STKBillboard::OnRegisterSceneNode()
 {
     if (IsVisible)
@@ -54,9 +84,9 @@ void STKBillboard::OnRegisterSceneNode()
     }
 
     ISceneNode::OnRegisterSceneNode();
-}
-
+}   // OnRegisterSceneNode
 
+// ----------------------------------------------------------------------------
 void STKBillboard::render()
 {
     if (irr_driver->getPhase() != TRANSPARENT_PASS)
@@ -64,14 +94,16 @@ void STKBillboard::render()
     core::vector3df pos = getAbsolutePosition();
     glBindVertexArray(billboardvao);
     video::ITexture *tex = Material.getTexture(0);
-    if (tex == NULL)
+    if (!tex )
         return;
+
     compressTexture(tex, true, true);
     GLuint texid = getTextureGLuint(tex);
-    MeshShader::BillboardShader::getInstance()->use();
-    MeshShader::BillboardShader::getInstance()->setTextureUnits(texid);
-    MeshShader::BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), pos, Size);
+    BillboardShader::getInstance()->use();
+    BillboardShader::getInstance()->setTextureUnits(texid);
+    BillboardShader::getInstance()->setUniforms(irr_driver->getViewMatrix(), 
+                                                irr_driver->getProjMatrix(),
+                                                pos, Size);
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
-    return;
-}
+}   // render
diff --git a/src/graphics/stkbillboard.hpp b/src/graphics/stkbillboard.hpp
index f4f2cbdd2..63ef48d4d 100644
--- a/src/graphics/stkbillboard.hpp
+++ b/src/graphics/stkbillboard.hpp
@@ -26,14 +26,15 @@
 class STKBillboard : public irr::scene::CBillboardSceneNode
 {
 public:
-    STKBillboard(irr::scene::ISceneNode* parent, irr::scene::ISceneManager* mgr, irr::s32 id,
-        const irr::core::vector3df& position, const irr::core::dimension2d<irr::f32>& size,
-        irr::video::SColor colorTop = irr::video::SColor(0xFFFFFFFF),
-        irr::video::SColor colorBottom = irr::video::SColor(0xFFFFFFFF));
+    STKBillboard(irr::scene::ISceneNode* parent, irr::scene::ISceneManager* mgr,
+                 irr::s32 id, const irr::core::vector3df& position, 
+                 const irr::core::dimension2d<irr::f32>& size,
+                 irr::video::SColor colorTop = irr::video::SColor(0xFFFFFFFF),
+                 irr::video::SColor colorBottom = irr::video::SColor(0xFFFFFFFF));
 
     virtual void OnRegisterSceneNode() OVERRIDE;
 
     virtual void render() OVERRIDE;
-};
+};   // STKBillboard
 
 #endif

From 6ccebd09b62417f5b69734b4d8154c76569315f9 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 11 May 2015 21:49:13 -0400
Subject: [PATCH 186/331] Improve scripting compatibility with Linux/GCC

---
 src/scriptengine/script_kart.cpp | 13 +++++++------
 src/scriptengine/scriptvec3.cpp  | 19 ++++++++++---------
 src/scriptengine/scriptvec3.hpp  | 16 +++++++++++++++-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index d950b2ccf..2b2a8aacd 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -21,6 +21,7 @@
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
 #include "script_kart.hpp"
+#include "scriptvec3.hpp"
 
 //debug
 #include <iostream>
@@ -47,12 +48,11 @@ namespace Scripting
         }
 
         /** Teleports the kart to the specified Vec3 location */
-        void teleport(int idKart, Vec3* position)
+        void teleport(int idKart, SimpleVec3* position)
         {
-            // TODO: must we delete "position" ?
-
             AbstractKart* kart = World::getWorld()->getKart(idKart);
-            kart->setXYZ(*position);
+            Vec3 v(position->getX(), position->getY(), position->getZ());
+            kart->setXYZ(v);
             unsigned int index = World::getWorld()->getRescuePositionIndex(kart);
             btTransform s = World::getWorld()->getRescueTransform(index);
             const btVector3 &xyz = s.getOrigin();
@@ -92,10 +92,11 @@ namespace Scripting
         //}
         
         /** Returns the location of the corresponding kart. */
-        Vec3 getLocation(int idKart)
+        SimpleVec3 getLocation(int idKart)
         {
             AbstractKart* kart = World::getWorld()->getKart(idKart);
-            return kart->getXYZ();
+            Vec3 v = kart->getXYZ();
+            return SimpleVec3(v.getX(), v.getY(), v.getZ());
         }
 
         /** Sets the kart's velocity to the specified value. */
diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index 1be851d6f..b67c82a39 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -20,6 +20,7 @@
 #include <angelscript.h>
 #include "karts/kart.hpp"
 #include "script_kart.hpp"
+#include "scriptvec3.hpp"
 
 //debug
 #include <iostream>
@@ -31,40 +32,40 @@ namespace Scripting
     {
         // Initialize the pre-allocated memory by calling the
         // object constructor with the placement-new operator
-        new(memory)Vec3();
+        new(memory)SimpleVec3();
     }
 
     void Destructor(void *memory)
     {
         // Uninitialize the memory by calling the object destructor
-        ((Vec3*)memory)->~Vec3();
+        ((SimpleVec3*)memory)->~SimpleVec3();
     }
 
     void ConstructVector3FromFloats(float a, float b, float c, void *memory)
     {
         //Constructor using 3 floats
-        new (memory)(Vec3)(Vec3(a, b, c));
+        new (memory)(SimpleVec3)(SimpleVec3(a, b, c));
     }
 
     //Print for debugging purposes
     void printVec3(asIScriptGeneric *gen)
     {
-        Vec3 *script_vec3 = (Vec3*)gen->GetArgObject(0);
+        SimpleVec3 *script_vec3 = (SimpleVec3*)gen->GetArgObject(0);
         std::cout << script_vec3->getX() << "," << script_vec3->getY() << "," << script_vec3->getZ() << std::endl;
     }
 
     void RegisterVec3(asIScriptEngine *engine)
     {
         int r;
-        r = engine->RegisterObjectType("Vec3", sizeof(Vec3), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert(r >= 0);
+        r = engine->RegisterObjectType("Vec3", sizeof(SimpleVec3), asOBJ_VALUE | asOBJ_APP_CLASS_ALLFLOATS | asGetTypeTraits<SimpleVec3>()); assert(r >= 0);
         // Register the behaviours
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(Constructor), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(Destructor), asCALL_CDECL_OBJLAST); assert(r >= 0);
-        r = engine->RegisterObjectMethod("Vec3", "Vec3 &opAssign(const Vec3 &in)", asMETHODPR(Vec3, operator =, (const Vec3&), Vec3&), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "Vec3 &opAssign(const Vec3 &in)", asMETHODPR(SimpleVec3, operator =, (const SimpleVec3&), SimpleVec3&), asCALL_THISCALL); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f(float, float, float)", asFUNCTION(ConstructVector3FromFloats), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterGlobalFunction("void printVec3(Vec3 a)", asFUNCTION(printVec3), asCALL_GENERIC); assert(r >= 0);   
-        r = engine->RegisterObjectMethod("Vec3", "float &getX()", asMETHOD(Vec3, getX), asCALL_THISCALL); assert(r >= 0);
-        r = engine->RegisterObjectMethod("Vec3", "float &getY()", asMETHOD(Vec3, getY), asCALL_THISCALL); assert(r >= 0);
-        r = engine->RegisterObjectMethod("Vec3", "float &getZ()", asMETHOD(Vec3, getZ), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float &getX()", asMETHOD(SimpleVec3, getX), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float &getY()", asMETHOD(SimpleVec3, getY), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float &getZ()", asMETHOD(SimpleVec3, getZ), asCALL_THISCALL); assert(r >= 0);
     }
 }
diff --git a/src/scriptengine/scriptvec3.hpp b/src/scriptengine/scriptvec3.hpp
index 0aae113e9..5de506dd3 100644
--- a/src/scriptengine/scriptvec3.hpp
+++ b/src/scriptengine/scriptvec3.hpp
@@ -23,8 +23,22 @@
 
 namespace Scripting
 {
-
     void RegisterVec3(asIScriptEngine *engine);
 
+    struct SimpleVec3
+    {
+        float x;
+        float y;
+        float z;
+
+        float getX() { return x; }
+        float getY() { return y; }
+        float getZ() { return z; }
+
+        SimpleVec3() : x(0), y(0), z(0) { }
+        SimpleVec3(float p_x, float p_y, float p_z) : x(p_x), y(p_y), z(p_z) { }
+        SimpleVec3(const SimpleVec3& other) : x(other.x), y(other.y), z(other.z) { }
+        ~SimpleVec3() { }
+    };
 }
 #endif

From fbad97a4a76c40f1ea9984d253ebe616292095fa Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 12 May 2015 16:24:40 +1000
Subject: [PATCH 187/331] Moved Primitive2DList into 2dutils, fixed coding
 style of 2dutils.

---
 src/graphics/2dutils.cpp | 267 ++++++++++++++++++++++++---------------
 src/graphics/2dutils.hpp |  38 ++++--
 src/graphics/shaders.cpp |   8 --
 src/graphics/shaders.hpp |   6 -
 4 files changed, 191 insertions(+), 128 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index e2443fcc6..e16cb0a09 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -24,9 +24,27 @@
 
 #include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
 
-static void drawTexColoredQuad(const video::ITexture *texture, const video::SColor *col, float width, float height,
-    float center_pos_x, float center_pos_y, float tex_center_pos_x, float tex_center_pos_y,
-    float tex_width, float tex_height)
+// ============================================================================
+class Primitive2DList : public Shader<Primitive2DList>,
+                        public TextureReadNew<ST_BILINEAR_FILTERED >
+{
+public:
+    Primitive2DList()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "primitive2dlist.vert",
+                            GL_FRAGMENT_SHADER, "transparent.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+    }   // Primitive2DList
+};   //Primitive2DList
+
+// ============================================================================
+static void drawTexColoredQuad(const video::ITexture *texture,
+                               const video::SColor *col, float width,
+                               float height, float center_pos_x,
+                               float center_pos_y, float tex_center_pos_x,
+                               float tex_center_pos_y, float tex_width,
+                               float tex_height)
 {
     unsigned colors[] = {
         col[0].getRed(), col[0].getGreen(), col[0].getBlue(), col[0].getAlpha(),
@@ -51,38 +69,40 @@ static void drawTexColoredQuad(const video::ITexture *texture, const video::SCol
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
     glGetError();
-}
+}   // drawTexColoredQuad
 
-static
-void drawTexQuad(GLuint texture, float width, float height,
-float center_pos_x, float center_pos_y, float tex_center_pos_x, float tex_center_pos_y,
-float tex_width, float tex_height)
+// ----------------------------------------------------------------------------
+static void drawTexQuad(GLuint texture, float width, float height,
+                        float center_pos_x, float center_pos_y, 
+                        float tex_center_pos_x, float tex_center_pos_y,
+                        float tex_width, float tex_height)
 {
     UIShader::TextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
     UIShader::TextureRectShader::getInstance()->setTextureUnits(texture);
     UIShader::TextureRectShader::getInstance()->setUniforms(
-        core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
-        core::vector2df(tex_center_pos_x, tex_center_pos_y),
-        core::vector2df(tex_width, tex_height));
+                    core::vector2df(center_pos_x, center_pos_y), 
+                    core::vector2df(width, height),
+                    core::vector2df(tex_center_pos_x, tex_center_pos_y),
+                    core::vector2df(tex_width, tex_height)                );
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
     glGetError();
-}
+}   // drawTexQuad
 
-static void
-getSize(unsigned texture_width, unsigned texture_height, bool textureisRTT,
-const core::rect<s32>& destRect,
-const core::rect<s32>& sourceRect,
-float &width, float &height,
-float &center_pos_x, float &center_pos_y,
-float &tex_width, float &tex_height,
-float &tex_center_pos_x, float &tex_center_pos_y
-)
+
+// ----------------------------------------------------------------------------
+static void getSize(unsigned texture_width, unsigned texture_height,
+                    bool textureisRTT, const core::rect<s32>& destRect,
+                    const core::rect<s32>& sourceRect,
+                    float &width, float &height,
+                    float &center_pos_x, float &center_pos_y,
+                    float &tex_width, float &tex_height,
+                    float &tex_center_pos_x, float &tex_center_pos_y   )
 {
     core::dimension2d<u32> frame_size = irr_driver->getActualScreenSize();
     const int screen_w = frame_size.Width;
@@ -112,35 +132,36 @@ float &tex_center_pos_x, float &tex_center_pos_y
 
     const f32 invW = 1.f / static_cast<f32>(texture_width);
     const f32 invH = 1.f / static_cast<f32>(texture_height);
-    const core::rect<f32> tcoords(
-        sourceRect.UpperLeftCorner.X * invW,
-        sourceRect.UpperLeftCorner.Y * invH,
-        sourceRect.LowerRightCorner.X * invW,
-        sourceRect.LowerRightCorner.Y *invH);
-}
+    const core::rect<f32> tcoords(sourceRect.UpperLeftCorner.X  * invW,
+                                  sourceRect.UpperLeftCorner.Y  * invH,
+                                  sourceRect.LowerRightCorner.X * invW,
+                                  sourceRect.LowerRightCorner.Y * invH);
+}   // getSize
 
-void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
-    const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-    const video::SColor &colors, bool useAlphaChannelOfTexture)
+// ----------------------------------------------------------------------------
+void draw2DImage(const video::ITexture* texture, 
+                 const core::rect<s32>& destRect,
+                 const core::rect<s32>& sourceRect,
+                 const core::rect<s32>* clip_rect,
+                 const video::SColor &colors, bool use_alpha_channel_of_texture)
 {
-    if (!CVS->isGLSL()) {
-        video::SColor duplicatedArray[4] = {
-            colors, colors, colors, colors
-        };
-        draw2DImage(texture, destRect, sourceRect, clipRect, duplicatedArray, useAlphaChannelOfTexture);
+    if (!CVS->isGLSL())
+    {
+        video::SColor duplicatedArray[4] = { colors, colors, colors, colors };
+        draw2DImage(texture, destRect, sourceRect, clip_rect, duplicatedArray,
+                    use_alpha_channel_of_texture);
         return;
     }
 
-    float width, height,
-        center_pos_x, center_pos_y,
-        tex_width, tex_height,
-        tex_center_pos_x, tex_center_pos_y;
+    float width, height, center_pos_x, center_pos_y;
+    float tex_width, tex_height, tex_center_pos_x, tex_center_pos_y;
 
-    getSize(texture->getSize().Width, texture->getSize().Height, texture->isRenderTarget(),
-        destRect, sourceRect, width, height, center_pos_x, center_pos_y,
-        tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
+    getSize(texture->getSize().Width, texture->getSize().Height, 
+            texture->isRenderTarget(), destRect, sourceRect, width, height,
+            center_pos_x, center_pos_y, tex_width, tex_height,
+            tex_center_pos_x, tex_center_pos_y);
 
-    if (useAlphaChannelOfTexture)
+    if (use_alpha_channel_of_texture)
     {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -149,40 +170,54 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
     {
         glDisable(GL_BLEND);
     }
-    if (clipRect)
+
+    if (clip_rect)
     {
-        if (!clipRect->isValid())
+        if (!clip_rect->isValid())
             return;
 
         glEnable(GL_SCISSOR_TEST);
-        const core::dimension2d<u32>& renderTargetSize = irr_driver->getActualScreenSize();
-        glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
-            clipRect->getWidth(), clipRect->getHeight());
+        const core::dimension2d<u32>& render_target_size = 
+                           irr_driver->getActualScreenSize();
+        glScissor(clip_rect->UpperLeftCorner.X, 
+                  render_target_size.Height - clip_rect->LowerRightCorner.Y,
+                  clip_rect->getWidth(), clip_rect->getHeight());
     }
 
     UIShader::UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
-    UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
-        core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height), colors);
+    const video::COpenGLTexture *c_texture = 
+        static_cast<const video::COpenGLTexture*>(texture);
+    UIShader::UniformColoredTextureRectShader::getInstance()
+        ->setTextureUnits(c_texture->getOpenGLTextureName());
+
+    UIShader::UniformColoredTextureRectShader::getInstance()
+        ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
+                      core::vector2df(width, height),
+                      core::vector2df(tex_center_pos_x, tex_center_pos_y),
+                      core::vector2df(tex_width, tex_height),
+                      colors);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-    if (clipRect)
+    if (clip_rect)
         glDisable(GL_SCISSOR_TEST);
     glUseProgram(0);
 
     glGetError();
-}
+}   // draw2DImage
 
+// ----------------------------------------------------------------------------
 void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
-    const core::rect<s32>& destRect,
-    const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-    const video::SColor &colors, bool useAlphaChannelOfTexture)
+                        const core::rect<s32>& destRect,
+                        const core::rect<s32>& sourceRect,
+                        const core::rect<s32>* clip_rect,
+                        const video::SColor &colors,
+                        bool use_alpha_channel_of_texture)
 {
-    if (useAlphaChannelOfTexture)
+    if (use_alpha_channel_of_texture)
     {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -200,36 +235,42 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
     glBindVertexArray(SharedObject::UIVAO);
 
     UIShader::UniformColoredTextureRectShader::getInstance()->setTextureUnits(texture);
-    UIShader::UniformColoredTextureRectShader::getInstance()->setUniforms(
-        core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
-        core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height),
-        colors);
+    UIShader::UniformColoredTextureRectShader::getInstance()
+        ->setUniforms(core::vector2df(center_pos_x, center_pos_y), 
+                      core::vector2df(width, height),
+                      core::vector2df(tex_center_pos_x, tex_center_pos_y),
+                      core::vector2df(tex_width, tex_height), colors        );
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-}
+}   // draw2DImageFromRTT
 
-void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect,
-    const core::rect<s32>& sourceRect, const core::rect<s32>* clipRect,
-    const video::SColor* const colors, bool useAlphaChannelOfTexture)
+// ----------------------------------------------------------------------------
+void draw2DImage(const video::ITexture* texture, 
+                 const core::rect<s32>& destRect,
+                 const core::rect<s32>& sourceRect,
+                 const core::rect<s32>* clip_rect,
+                 const video::SColor* const colors,
+                 bool use_alpha_channel_of_texture)
 {
     if (!CVS->isGLSL())
     {
-        irr_driver->getVideoDriver()->draw2DImage(texture, destRect, sourceRect, clipRect, colors, useAlphaChannelOfTexture);
+        irr_driver->getVideoDriver()->draw2DImage(texture, destRect, sourceRect,
+                                                  clip_rect, colors,
+                                                  use_alpha_channel_of_texture);
         return;
     }
 
-    float width, height,
-        center_pos_x, center_pos_y,
-        tex_width, tex_height,
-        tex_center_pos_x, tex_center_pos_y;
+    float width, height, center_pos_x, center_pos_y, tex_width, tex_height;
+    float tex_center_pos_x, tex_center_pos_y;
 
-    getSize(texture->getSize().Width, texture->getSize().Height, texture->isRenderTarget(),
-        destRect, sourceRect, width, height, center_pos_x, center_pos_y,
-        tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
+    getSize(texture->getSize().Width, texture->getSize().Height,
+            texture->isRenderTarget(), destRect, sourceRect, width, height, 
+            center_pos_x, center_pos_y, tex_width, tex_height,
+            tex_center_pos_x, tex_center_pos_y);
 
-    if (useAlphaChannelOfTexture)
+    if (use_alpha_channel_of_texture)
     {
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -238,66 +279,86 @@ void draw2DImage(const video::ITexture* texture, const core::rect<s32>& destRect
     {
         glDisable(GL_BLEND);
     }
-    if (clipRect)
+    if (clip_rect)
     {
-        if (!clipRect->isValid())
+        if (!clip_rect->isValid())
             return;
 
         glEnable(GL_SCISSOR_TEST);
-        const core::dimension2d<u32>& renderTargetSize = irr_driver->getActualScreenSize();
-        glScissor(clipRect->UpperLeftCorner.X, renderTargetSize.Height - clipRect->LowerRightCorner.Y,
-            clipRect->getWidth(), clipRect->getHeight());
+        const core::dimension2d<u32>& render_target_size =
+                            irr_driver->getActualScreenSize();
+        glScissor(clip_rect->UpperLeftCorner.X, 
+                  render_target_size.Height - clip_rect->LowerRightCorner.Y,
+                  clip_rect->getWidth(), clip_rect->getHeight());
     }
     if (colors)
-        drawTexColoredQuad(texture, colors, width, height, center_pos_x, center_pos_y,
-        tex_center_pos_x, tex_center_pos_y, tex_width, tex_height);
+    {
+        drawTexColoredQuad(texture, colors, width, height, center_pos_x,
+                           center_pos_y, tex_center_pos_x, tex_center_pos_y,
+                           tex_width, tex_height);
+    }
     else
-        drawTexQuad(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName(), width, height, center_pos_x, center_pos_y,
-        tex_center_pos_x, tex_center_pos_y, tex_width, tex_height);
-    if (clipRect)
+    {
+        const video::COpenGLTexture *c_texture = 
+                            static_cast<const video::COpenGLTexture*>(texture);
+        drawTexQuad(c_texture->getOpenGLTextureName(), width, height,
+                    center_pos_x, center_pos_y, tex_center_pos_x,
+                    tex_center_pos_y, tex_width, tex_height);
+    }
+    if (clip_rect)
         glDisable(GL_SCISSOR_TEST);
     glUseProgram(0);
 
     glGetError();
-}
+}   // draw2DImage
 
+// ----------------------------------------------------------------------------
 void draw2DVertexPrimitiveList(video::ITexture *tex, const void* vertices,
-    u32 vertexCount, const void* indexList, u32 primitiveCount,
-    video::E_VERTEX_TYPE vType, scene::E_PRIMITIVE_TYPE pType, video::E_INDEX_TYPE iType)
+                               u32 vertexCount, const void* indexList, 
+                               u32 primitiveCount, video::E_VERTEX_TYPE vType,
+                               scene::E_PRIMITIVE_TYPE pType,
+                               video::E_INDEX_TYPE iType)
 {
     if (!CVS->isGLSL())
     {
-        irr_driver->getVideoDriver()->draw2DVertexPrimitiveList(vertices, vertexCount, indexList, primitiveCount, vType, pType, iType);
+        irr_driver->getVideoDriver()
+            ->draw2DVertexPrimitiveList(vertices, vertexCount, indexList,
+                                        primitiveCount, vType, pType, iType);
         return;
     }
+
     GLuint tmpvao, tmpvbo, tmpibo;
     primitiveCount += 2;
     glGenVertexArrays(1, &tmpvao);
     glBindVertexArray(tmpvao);
     glGenBuffers(1, &tmpvbo);
     glBindBuffer(GL_ARRAY_BUFFER, tmpvbo);
-    glBufferData(GL_ARRAY_BUFFER, vertexCount * getVertexPitchFromType(vType), vertices, GL_STREAM_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, vertexCount * getVertexPitchFromType(vType),
+                 vertices, GL_STREAM_DRAW);
     glGenBuffers(1, &tmpibo);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tmpibo);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, primitiveCount * sizeof(u16), indexList, GL_STREAM_DRAW);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, primitiveCount * sizeof(u16),
+                 indexList, GL_STREAM_DRAW);
 
     VertexUtils::bindVertexArrayAttrib(vType);
 
-    UIShader::Primitive2DList::getInstance()->use();
-    UIShader::Primitive2DList::getInstance()->setUniforms();
-    const video::SOverrideMaterial &m = irr_driver->getVideoDriver()->getOverrideMaterial();
+    Primitive2DList::getInstance()->use();
+    Primitive2DList::getInstance()->setUniforms();
+    const video::SOverrideMaterial &m = irr_driver->getVideoDriver()
+                                                  ->getOverrideMaterial();
     compressTexture(tex, false);
-    UIShader::Primitive2DList::getInstance()->setTextureUnits(getTextureGLuint(tex));
+    Primitive2DList::getInstance()->setTextureUnits(getTextureGLuint(tex));
     glDrawElements(GL_TRIANGLE_FAN, primitiveCount, GL_UNSIGNED_SHORT, 0);
 
     glDeleteVertexArrays(1, &tmpvao);
     glDeleteBuffers(1, &tmpvbo);
     glDeleteBuffers(1, &tmpibo);
 
-}
+}   // draw2DVertexPrimitiveList
 
+// ----------------------------------------------------------------------------
 void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
-    const core::rect<s32>* clip)
+                          const core::rect<s32>* clip)
 {
 
     if (!CVS->isGLSL())
@@ -336,14 +397,18 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
             return;
 
         glEnable(GL_SCISSOR_TEST);
-        const core::dimension2d<u32>& renderTargetSize = irr_driver->getActualScreenSize();
-        glScissor(clip->UpperLeftCorner.X, renderTargetSize.Height - clip->LowerRightCorner.Y,
-            clip->getWidth(), clip->getHeight());
+        const core::dimension2d<u32>& render_target_size = 
+                                            irr_driver->getActualScreenSize();
+        glScissor(clip->UpperLeftCorner.X,
+                  render_target_size.Height - clip->LowerRightCorner.Y,
+                  clip->getWidth(), clip->getHeight());
     }
 
     UIShader::ColoredRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
-    UIShader::ColoredRectShader::getInstance()->setUniforms(core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height), color);
+    UIShader::ColoredRectShader::getInstance()
+        ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
+                      core::vector2df(width, height), color        );
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -353,4 +418,4 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
     glUseProgram(0);
 
     glGetError();
-}
+}   // GL32_draw2DRectangle
diff --git a/src/graphics/2dutils.hpp b/src/graphics/2dutils.hpp
index 52f65f819..88c81fbcb 100644
--- a/src/graphics/2dutils.hpp
+++ b/src/graphics/2dutils.hpp
@@ -28,23 +28,35 @@
 #include <irrTypes.h>
 
 void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
-    const irr::core::rect<irr::s32>& destRect,
-    const irr::core::rect<irr::s32>& sourceRect, const irr::core::rect<irr::s32>* clipRect,
-    const irr::video::SColor &colors, bool useAlphaChannelOfTexture);
+                        const irr::core::rect<irr::s32>& destRect,
+                        const irr::core::rect<irr::s32>& sourceRect,
+                        const irr::core::rect<irr::s32>* clipRect,
+                        const irr::video::SColor &colors,
+                        bool useAlphaChannelOfTexture);
 
-void draw2DImage(const irr::video::ITexture* texture, const irr::core::rect<irr::s32>& destRect,
-    const irr::core::rect<irr::s32>& sourceRect, const irr::core::rect<irr::s32>* clipRect,
-    const irr::video::SColor &color, bool useAlphaChannelOfTexture);
+void draw2DImage(const irr::video::ITexture* texture,
+                 const irr::core::rect<irr::s32>& destRect,
+                 const irr::core::rect<irr::s32>& sourceRect,
+                 const irr::core::rect<irr::s32>* clipRect,
+                 const irr::video::SColor &color,
+                 bool useAlphaChannelOfTexture);
 
-void draw2DImage(const irr::video::ITexture* texture, const irr::core::rect<irr::s32>& destRect,
-    const irr::core::rect<irr::s32>& sourceRect, const irr::core::rect<irr::s32>* clipRect,
-    const irr::video::SColor* const colors, bool useAlphaChannelOfTexture);
+void draw2DImage(const irr::video::ITexture* texture,
+                 const irr::core::rect<irr::s32>& destRect,
+                 const irr::core::rect<irr::s32>& sourceRect,
+                 const irr::core::rect<irr::s32>* clipRect,
+                 const irr::video::SColor* const colors,
+                 bool useAlphaChannelOfTexture);
 
 void draw2DVertexPrimitiveList(irr::video::ITexture *t, const void* vertices,
-    irr::u32 vertexCount, const void* indexList, irr::u32 primitiveCount,
-    irr::video::E_VERTEX_TYPE vType = irr::video::EVT_STANDARD, irr::scene::E_PRIMITIVE_TYPE pType = irr::scene::EPT_TRIANGLES, irr::video::E_INDEX_TYPE iType = irr::video::EIT_16BIT);
+                  irr::u32 vertexCount, const void* indexList,
+                  irr::u32 primitiveCount,
+                  irr::video::E_VERTEX_TYPE vType = irr::video::EVT_STANDARD,
+                  irr::scene::E_PRIMITIVE_TYPE pType = irr::scene::EPT_TRIANGLES,
+                  irr::video::E_INDEX_TYPE iType = irr::video::EIT_16BIT        );
 
-void GL32_draw2DRectangle(irr::video::SColor color, const irr::core::rect<irr::s32>& position,
-    const irr::core::rect<irr::s32>* clip = 0);
+void GL32_draw2DRectangle(irr::video::SColor color,
+                          const irr::core::rect<irr::s32>& position,
+                          const irr::core::rect<irr::s32>* clip = 0);
 
 #endif
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 8d9426564..d45029c4e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1326,14 +1326,6 @@ namespace FullScreenShader
 namespace UIShader
 {
 
-    Primitive2DList::Primitive2DList()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "primitive2dlist.vert",
-            GL_FRAGMENT_SHADER, "transparent.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
-    }
 
     TextureRectShader::TextureRectShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 58349cf6a..bb8812ac4 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -524,12 +524,6 @@ public:
 namespace UIShader
 {
 
-class Primitive2DList : public Shader<Primitive2DList>,
-                        public TextureReadNew<ST_BILINEAR_FILTERED >
-{
-public:
-    Primitive2DList();
-};
 
 class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
                                         core::vector2df, core::vector2df,

From 320dd6d1df9a7169b8c003def6f87546ff99983e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 12 May 2015 16:43:03 +1000
Subject: [PATCH 188/331] Moved more shaders into 2dutils.

---
 src/graphics/2dutils.cpp | 107 +++++++++++++++++++++++++++++++++++----
 src/graphics/shaders.cpp |  65 +-----------------------
 src/graphics/shaders.hpp |  21 --------
 3 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index e16cb0a09..ec1dc254f 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -38,6 +38,91 @@ public:
     }   // Primitive2DList
 };   //Primitive2DList
 
+// ============================================================================
+class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader,
+                                                      core::vector2df, core::vector2df,
+                                                      core::vector2df, core::vector2df,
+                                                      video::SColor>,
+                                        public TextureReadNew<ST_BILINEAR_FILTERED>
+{
+public:
+    UniformColoredTextureRectShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "texturedquad.vert",
+                    GL_FRAGMENT_SHADER, "uniformcolortexturedquad.frag");
+
+        assignUniforms("center", "size", "texcenter", "texsize", "color");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+    }   // UniformColoredTextureRectShader
+};   // UniformColoredTextureRectShader
+
+// ============================================================================
+class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
+                                               core::vector2df, core::vector2df,
+                                               core::vector2df, core::vector2df>,
+                                 public TextureReadNew<ST_BILINEAR_FILTERED>
+{
+private:
+    GLuint m_quad_buffer = -1;
+
+    void initQuadBuffer()
+    {
+        const float quad_vertex[] = { -1., -1., -1.,  1.,   // UpperLeft
+                                      -1.,  1., -1., -1.,   // LowerLeft
+                                       1., -1.,  1.,  1.,   // UpperRight
+                                       1.,  1.,  1., -1. }; // LowerRight 
+        glGenBuffers(1, &m_quad_buffer);
+        glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+        glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), quad_vertex,
+                     GL_STATIC_DRAW);
+
+        glGenVertexArrays(1, &SharedObject::UIVAO);
+        glBindVertexArray(SharedObject::UIVAO);
+        glEnableVertexAttribArray(0);
+        glEnableVertexAttribArray(3);
+        glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
+        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 
+                              (GLvoid *)(2 * sizeof(float)));
+        glBindVertexArray(0);
+    }   // initQuadBuffer
+
+public:
+    GLuint m_color_vbo;
+    GLuint m_vao;
+
+    ColoredTextureRectShader()
+    {
+        initQuadBuffer();
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "colortexturedquad.vert",
+                            GL_FRAGMENT_SHADER, "colortexturedquad.frag");
+        assignUniforms("center", "size", "texcenter", "texsize");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+
+        glGenVertexArrays(1, &m_vao);
+        glBindVertexArray(m_vao);
+        glEnableVertexAttribArray(0);
+        glEnableVertexAttribArray(3);
+        glEnableVertexAttribArray(2);
+        glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
+        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 
+                              (GLvoid *)(2 * sizeof(float)));
+        const unsigned quad_color[] = {   0,   0,   0, 255,
+                                        255,   0,   0, 255,
+                                          0, 255,   0, 255,
+                                          0,   0, 255, 255 };
+        glGenBuffers(1, &m_color_vbo);
+        glBindBuffer(GL_ARRAY_BUFFER, m_color_vbo);
+        glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(unsigned), quad_color,
+                     GL_DYNAMIC_DRAW);
+        glVertexAttribIPointer(2, 4, GL_UNSIGNED_INT, 4 * sizeof(unsigned), 0);
+        glBindVertexArray(0);
+    }   // ColoredTextureRectShader
+};   // ColoredTextureRectShader
+
 // ============================================================================
 static void drawTexColoredQuad(const video::ITexture *texture,
                                const video::SColor *col, float width,
@@ -53,14 +138,14 @@ static void drawTexColoredQuad(const video::ITexture *texture,
         col[3].getRed(), col[3].getGreen(), col[3].getBlue(), col[3].getAlpha(),
     };
 
-    glBindBuffer(GL_ARRAY_BUFFER, UIShader::ColoredTextureRectShader::getInstance()->colorvbo);
+    glBindBuffer(GL_ARRAY_BUFFER, ColoredTextureRectShader::getInstance()->m_color_vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, 16 * sizeof(unsigned), colors);
 
-    UIShader::ColoredTextureRectShader::getInstance()->use();
-    glBindVertexArray(UIShader::ColoredTextureRectShader::getInstance()->vao);
+    ColoredTextureRectShader::getInstance()->use();
+    glBindVertexArray(ColoredTextureRectShader::getInstance()->m_vao);
 
-    UIShader::ColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
-    UIShader::ColoredTextureRectShader::getInstance()->setUniforms(
+    ColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
+    ColoredTextureRectShader::getInstance()->setUniforms(
         core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
         core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height));
 
@@ -184,15 +269,15 @@ void draw2DImage(const video::ITexture* texture,
                   clip_rect->getWidth(), clip_rect->getHeight());
     }
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->use();
+    UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
     const video::COpenGLTexture *c_texture = 
         static_cast<const video::COpenGLTexture*>(texture);
-    UIShader::UniformColoredTextureRectShader::getInstance()
+    UniformColoredTextureRectShader::getInstance()
         ->setTextureUnits(c_texture->getOpenGLTextureName());
 
-    UIShader::UniformColoredTextureRectShader::getInstance()
+    UniformColoredTextureRectShader::getInstance()
         ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
                       core::vector2df(width, height),
                       core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -231,11 +316,11 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
         destRect, sourceRect, width, height, center_pos_x, center_pos_y,
         tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->use();
+    UniformColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::UniformColoredTextureRectShader::getInstance()->setTextureUnits(texture);
-    UIShader::UniformColoredTextureRectShader::getInstance()
+    UniformColoredTextureRectShader::getInstance()->setTextureUnits(texture);
+    UniformColoredTextureRectShader::getInstance()
         ->setUniforms(core::vector2df(center_pos_x, center_pos_y), 
                       core::vector2df(width, height),
                       core::vector2df(tex_center_pos_x, tex_center_pos_y),
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index d45029c4e..5c4f5a48b 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -281,30 +281,7 @@ static void initQuadVBO()
     glBindVertexArray(0);
 }
 
-// It should be possible to merge it with previous one...
-GLuint quad_buffer;
 
-static void initQuadBuffer()
-{
-    const float quad_vertex[] = {
-        -1., -1., -1., 1., // UpperLeft
-        -1., 1., -1., -1., // LowerLeft
-        1., -1., 1., 1., // UpperRight
-        1., 1., 1., -1., // LowerRight
-    };
-    glGenBuffers(1, &quad_buffer);
-    glBindBuffer(GL_ARRAY_BUFFER, quad_buffer);
-    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), quad_vertex, GL_STATIC_DRAW);
-
-    glGenVertexArrays(1, &SharedObject::UIVAO);
-    glBindVertexArray(SharedObject::UIVAO);
-    glEnableVertexAttribArray(0);
-    glEnableVertexAttribArray(3);
-    glBindBuffer(GL_ARRAY_BUFFER, quad_buffer);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
-    glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (GLvoid *)(2 * sizeof(float)));
-    glBindVertexArray(0);
-}
 
 GLuint SharedObject::billboardvbo = 0;
 
@@ -471,7 +448,6 @@ void Shaders::loadShaders()
     initGL();
     CleanTable.clear();
     initQuadVBO();
-    initQuadBuffer();
     initBillboardVBO();
     initSkyTriVBO();
     initFrustrumVBO();
@@ -1337,47 +1313,8 @@ namespace UIShader
         assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
     }
 
-    UniformColoredTextureRectShader::UniformColoredTextureRectShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "texturedquad.vert",
-            GL_FRAGMENT_SHADER, "uniformcolortexturedquad.frag");
-
-        assignUniforms("center", "size", "texcenter", "texsize", "color");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
-    }
-
-    ColoredTextureRectShader::ColoredTextureRectShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "colortexturedquad.vert",
-            GL_FRAGMENT_SHADER, "colortexturedquad.frag");
-        assignUniforms("center", "size", "texcenter", "texsize");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
-
-        glGenVertexArrays(1, &vao);
-        glBindVertexArray(vao);
-        glEnableVertexAttribArray(0);
-        glEnableVertexAttribArray(3);
-        glEnableVertexAttribArray(2);
-        glBindBuffer(GL_ARRAY_BUFFER, quad_buffer);
-        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
-        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (GLvoid *)(2 * sizeof(float)));
-        const unsigned quad_color[] = {
-            0, 0, 0, 255,
-            255, 0, 0, 255,
-            0, 255, 0, 255,
-            0, 0, 255, 255,
-        };
-        glGenBuffers(1, &colorvbo);
-        glBindBuffer(GL_ARRAY_BUFFER, colorvbo);
-        glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(unsigned), quad_color, GL_DYNAMIC_DRAW);
-        glVertexAttribIPointer(2, 4, GL_UNSIGNED_INT, 4 * sizeof(unsigned), 0);
-        glBindVertexArray(0);
-    }
 
+    
     ColoredRectShader::ColoredRectShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index bb8812ac4..f7d15760e 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -534,27 +534,6 @@ public:
     TextureRectShader();
 };
 
-class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader,
-                                                      core::vector2df, core::vector2df,
-                                                      core::vector2df, core::vector2df,
-                                                      video::SColor>,
-                                        public TextureReadNew<ST_BILINEAR_FILTERED>
-{
-public:
-    UniformColoredTextureRectShader();
-};
-
-class ColoredTextureRectShader : public Shader<ColoredTextureRectShader, core::vector2df, 
-                                               core::vector2df, core::vector2df,
-                                               core::vector2df>,
-                                 public TextureReadNew<ST_BILINEAR_FILTERED>
-{
-public:
-    GLuint colorvbo;
-    GLuint vao;
-
-    ColoredTextureRectShader();
-};
 
 class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
                                         core::vector2df, video::SColor>

From 827b9adce2c8c755b0742733629920bb02ec7ec1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 12 May 2015 16:48:12 +1000
Subject: [PATCH 189/331] Moved more shaders into 2dutils.

---
 src/graphics/2dutils.cpp | 40 +++++++++++++++++++++++++++++++++++-----
 src/graphics/shaders.cpp | 25 -------------------------
 src/graphics/shaders.hpp | 22 ----------------------
 3 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index ec1dc254f..7f33a8121 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -57,6 +57,36 @@ public:
     }   // UniformColoredTextureRectShader
 };   // UniformColoredTextureRectShader
 
+// ============================================================================
+class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
+                                        core::vector2df, core::vector2df,
+                                        core::vector2df>,
+                          public TextureReadNew<ST_BILINEAR_FILTERED>
+{
+public:
+    TextureRectShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "texturedquad.vert",
+                            GL_FRAGMENT_SHADER, "texturedquad.frag");
+        assignUniforms("center", "size", "texcenter", "texsize");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+    }   // TextureRectShader
+};   // TextureRectShader
+
+// ============================================================================
+class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
+                                        core::vector2df, video::SColor>
+{
+public:
+    ColoredRectShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "coloredquad.vert",
+                            GL_FRAGMENT_SHADER, "coloredquad.frag");
+        assignUniforms("center", "size", "color");
+    }   // ColoredRectShader
+};   // ColoredRectShader
+
 // ============================================================================
 class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
                                                core::vector2df, core::vector2df,
@@ -162,11 +192,11 @@ static void drawTexQuad(GLuint texture, float width, float height,
                         float tex_center_pos_x, float tex_center_pos_y,
                         float tex_width, float tex_height)
 {
-    UIShader::TextureRectShader::getInstance()->use();
+    TextureRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
 
-    UIShader::TextureRectShader::getInstance()->setTextureUnits(texture);
-    UIShader::TextureRectShader::getInstance()->setUniforms(
+    TextureRectShader::getInstance()->setTextureUnits(texture);
+    TextureRectShader::getInstance()->setUniforms(
                     core::vector2df(center_pos_x, center_pos_y), 
                     core::vector2df(width, height),
                     core::vector2df(tex_center_pos_x, tex_center_pos_y),
@@ -489,9 +519,9 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
                   clip->getWidth(), clip->getHeight());
     }
 
-    UIShader::ColoredRectShader::getInstance()->use();
+    ColoredRectShader::getInstance()->use();
     glBindVertexArray(SharedObject::UIVAO);
-    UIShader::ColoredRectShader::getInstance()
+    ColoredRectShader::getInstance()
         ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
                       core::vector2df(width, height), color        );
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 5c4f5a48b..a4d867e6e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1298,28 +1298,3 @@ namespace FullScreenShader
                                       1, "colorMap", ST_NEAREST_FILTERED);
     }
 }
-
-namespace UIShader
-{
-
-
-    TextureRectShader::TextureRectShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "texturedquad.vert",
-            GL_FRAGMENT_SHADER, "texturedquad.frag");
-        assignUniforms("center", "size", "texcenter", "texsize");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
-    }
-
-
-    
-    ColoredRectShader::ColoredRectShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "coloredquad.vert",
-            GL_FRAGMENT_SHADER, "coloredquad.frag");
-        assignUniforms("center", "size", "color");
-    }
-}
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index f7d15760e..a5dd9abc8 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -521,28 +521,6 @@ public:
 
 }
 
-namespace UIShader
-{
-
-
-class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
-                                        core::vector2df, core::vector2df,
-                                        core::vector2df>,
-                          public TextureReadNew<ST_BILINEAR_FILTERED>
-{
-public:
-    TextureRectShader();
-};
-
-
-class ColoredRectShader : public Shader<ColoredRectShader, core::vector2df,
-                                        core::vector2df, video::SColor>
-{
-public:
-    ColoredRectShader();
-};
-}
-
 #define FOREACH_SHADER(ACT) \
     ACT(ES_NORMAL_MAP) \
     ACT(ES_NORMAL_MAP_LIGHTMAP) \

From 465130a4a27160656834ca065909c68a41c7089c Mon Sep 17 00:00:00 2001
From: Karl Ove Hufthammer <karl@huftis.org>
Date: Tue, 12 May 2015 18:04:15 +0200
Subject: [PATCH 190/331] =?UTF-8?q?Added=20=E2=80=98=C3=86=E2=80=99=20glyp?=
 =?UTF-8?q?h=20to=20the=20title=20font?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The glyph was created by combining the existing
‘A’ glyph and ‘E’ glyph, and then retouching the
result to make it look good (both the glyph heights
and the gradients differed for the two letters).
---
 data/fonts/title_font.xml   | Bin 17520 -> 17754 bytes
 data/fonts/title_font_2.png | Bin 164907 -> 157745 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/fonts/title_font.xml b/data/fonts/title_font.xml
index f7abb3e2ed2371861cf140305a8f0d7a3b08736d..c183b565f2aa836b5ec7d8bafdd179782addc098 100644
GIT binary patch
delta 123
zcmey+!Fa2Saf6G+<O?DqjK?Mm@`>`AGgvSfGUzZU07>J?6J<0fD;Nt+j+0^A>}Mgs
wGnvnsLy(Jslfi}|8K@+g!InXZ;Tdj?5?l-rXv3h-kj9YDkjGHMU<VWf0Op_<@Bjb+

delta 35
qcmccB#rUCvaf6EmBj@JL7Lq(dTnsi0`V46d`3!jsB@A{9Tnqrhmk3?}

diff --git a/data/fonts/title_font_2.png b/data/fonts/title_font_2.png
index 720cea071befc2de14e73f2d53d683a8d88c51f3..edf2ff31e104727ee19bdb22f11d12d4f66ffa38 100644
GIT binary patch
literal 157745
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

literal 164907
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


From 6106ed3ec6b3308ed9cc509d3df242dc996f090d Mon Sep 17 00:00:00 2001
From: Karl Ove Hufthammer <karl@huftis.org>
Date: Sun, 10 May 2015 12:09:01 +0200
Subject: [PATCH 191/331] =?UTF-8?q?Don=E2=80=99t=20sort=20strings=20alphab?=
 =?UTF-8?q?etically=20(makes=20the=20translators=E2=80=99=20work=20much=20?=
 =?UTF-8?q?easier).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/po/update_pot.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/po/update_pot.sh b/data/po/update_pot.sh
index 848ee1ede..e1e75a72d 100755
--- a/data/po/update_pot.sh
+++ b/data/po/update_pot.sh
@@ -37,13 +37,13 @@ echo "---------------------------"
 echo "    Generating .pot file..."
 
 # XML Files
-xgettext  -d supertuxkart -s --keyword=_ --add-comments="I18N:" \
+xgettext  -d supertuxkart --keyword=_ --add-comments="I18N:" \
                                -p ./data/po -o supertuxkart.pot \
                                --no-location --from-code=UTF-8 ./data/po/gui_strings.h \
                                --package-name=supertuxkart
 
 # C++ Files
-xgettext  -j  -d supertuxkart -s --keyword=_ --keyword=N_ --keyword=_LTR \
+xgettext  -j  -d supertuxkart --keyword=_ --keyword=N_ --keyword=_LTR \
                                --keyword=_C:1c,2 --keyword=_P:1,2 \
                                --keyword=_CP:1c,2,3 --add-comments="I18N:" \
                                -p ./data/po -o supertuxkart.pot $CPP_FILE_LIST \

From 26d63ce844bbbd60b8223c49b4ffa4ee9b537971 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 13 May 2015 08:14:39 +1000
Subject: [PATCH 192/331] Fixed linux compilation, and some more coding style
 issues.

---
 src/graphics/2dutils.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 7f33a8121..51af339b7 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -94,7 +94,7 @@ class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
                                  public TextureReadNew<ST_BILINEAR_FILTERED>
 {
 private:
-    GLuint m_quad_buffer = -1;
+    GLuint m_quad_buffer;
 
     void initQuadBuffer()
     {
@@ -168,16 +168,22 @@ static void drawTexColoredQuad(const video::ITexture *texture,
         col[3].getRed(), col[3].getGreen(), col[3].getBlue(), col[3].getAlpha(),
     };
 
-    glBindBuffer(GL_ARRAY_BUFFER, ColoredTextureRectShader::getInstance()->m_color_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER,
+                 ColoredTextureRectShader::getInstance()->m_color_vbo);
     glBufferSubData(GL_ARRAY_BUFFER, 0, 16 * sizeof(unsigned), colors);
 
     ColoredTextureRectShader::getInstance()->use();
     glBindVertexArray(ColoredTextureRectShader::getInstance()->m_vao);
 
-    ColoredTextureRectShader::getInstance()->setTextureUnits(static_cast<const irr::video::COpenGLTexture*>(texture)->getOpenGLTextureName());
-    ColoredTextureRectShader::getInstance()->setUniforms(
-        core::vector2df(center_pos_x, center_pos_y), core::vector2df(width, height),
-        core::vector2df(tex_center_pos_x, tex_center_pos_y), core::vector2df(tex_width, tex_height));
+    const irr::video::COpenGLTexture *t = 
+                       static_cast<const irr::video::COpenGLTexture*>(texture);
+    ColoredTextureRectShader::getInstance()
+        ->setTextureUnits(t->getOpenGLTextureName());
+    ColoredTextureRectShader::getInstance()
+        ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
+                      core::vector2df(width, height),
+                      core::vector2df(tex_center_pos_x, tex_center_pos_y),
+                      core::vector2df(tex_width, tex_height));
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     glBindVertexArray(0);

From ea69eb3178dd9b5c77c7f93bfecdc10f1cdb35b0 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 13 May 2015 08:22:58 +1000
Subject: [PATCH 193/331] Minor style changes.

---
 src/graphics/2dutils.cpp |  2 ++
 src/graphics/2dutils.hpp | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 51af339b7..f01f43741 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -18,7 +18,9 @@
 #include "2dutils.hpp"
 
 #include "graphics/central_settings.hpp"
+#include "graphics/shader.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/texture_read.hpp"
 #include "glwrap.hpp"
 #include "utils/cpp2011.hpp"
 
diff --git a/src/graphics/2dutils.hpp b/src/graphics/2dutils.hpp
index 88c81fbcb..aafc9b442 100644
--- a/src/graphics/2dutils.hpp
+++ b/src/graphics/2dutils.hpp
@@ -19,13 +19,14 @@
 #define UTILS2D_HPP
 
 #include "gl_headers.hpp"
-#include <rect.h>
-#include <SColor.h>
-#include <S3DVertex.h>
-#include <SVertexIndex.h>
+
 #include <EPrimitiveTypes.h>
-#include <ITexture.h>
 #include <irrTypes.h>
+#include <ITexture.h>
+#include <rect.h>
+#include <S3DVertex.h>
+#include <SColor.h>
+#include <SVertexIndex.h>
 
 void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
                         const irr::core::rect<irr::s32>& destRect,

From 0ea991adee4ce24401310e9ae6d16506de4cc3ce Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 12 May 2015 18:31:08 -0400
Subject: [PATCH 194/331] More work for scripting compatibility on Linux/GCC

---
 src/scriptengine/scriptvec3.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index b67c82a39..c5c96a0de 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -54,6 +54,10 @@ namespace Scripting
         std::cout << script_vec3->getX() << "," << script_vec3->getY() << "," << script_vec3->getZ() << std::endl;
     }
 
+    float getX(SimpleVec3* v) { return v->getX(); }
+    float getY(SimpleVec3* v) { return v->getY(); }
+    float getZ(SimpleVec3* v) { return v->getZ(); }
+
     void RegisterVec3(asIScriptEngine *engine)
     {
         int r;
@@ -64,8 +68,8 @@ namespace Scripting
         r = engine->RegisterObjectMethod("Vec3", "Vec3 &opAssign(const Vec3 &in)", asMETHODPR(SimpleVec3, operator =, (const SimpleVec3&), SimpleVec3&), asCALL_THISCALL); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f(float, float, float)", asFUNCTION(ConstructVector3FromFloats), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterGlobalFunction("void printVec3(Vec3 a)", asFUNCTION(printVec3), asCALL_GENERIC); assert(r >= 0);   
-        r = engine->RegisterObjectMethod("Vec3", "float &getX()", asMETHOD(SimpleVec3, getX), asCALL_THISCALL); assert(r >= 0);
-        r = engine->RegisterObjectMethod("Vec3", "float &getY()", asMETHOD(SimpleVec3, getY), asCALL_THISCALL); assert(r >= 0);
-        r = engine->RegisterObjectMethod("Vec3", "float &getZ()", asMETHOD(SimpleVec3, getZ), asCALL_THISCALL); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float getX()", asFUNCTION(getX), asCALL_CDECL_OBJLAST); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float getY()", asFUNCTION(getY), asCALL_CDECL_OBJLAST); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float getZ()", asFUNCTION(getZ), asCALL_CDECL_OBJLAST); assert(r >= 0);
     }
 }

From 56bc14ff31fa92d7b2ad1a4eda58ea71ec12d6b1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 13 May 2015 08:55:59 +1000
Subject: [PATCH 195/331] Moved more shaders into PostProcessing.

---
 src/graphics/post_processing.cpp | 295 ++++++++++++++++++++++++++-----
 src/graphics/post_processing.hpp |  28 ++-
 src/graphics/shaders.cpp         | 111 ------------
 src/graphics/shaders.hpp         |  85 ---------
 4 files changed, 266 insertions(+), 253 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index db4212be0..4a1024868 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -41,6 +41,205 @@
 using namespace video;
 using namespace scene;
 
+// ============================================================================
+class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader,
+                                               core::vector2df,
+                                               std::vector<float> >,
+                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+    ComputeShadowBlurVShader()
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "blurshadowV.comp");
+        m_dest_tu = 1;
+        assignUniforms("pixel", "weights");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeShadowBlurVShader
+
+};   // ComputeShadowBlurVShader
+
+// ============================================================================
+class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader,
+                                           core::vector2df, float>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian6VBlurShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "gaussian6v.frag");
+        assignUniforms("pixel", "sigma");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian6VBlurShader
+};   // Gaussian6VBlurShader
+
+// ============================================================================
+class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader,
+                                           core::vector2df>,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian3VBlurShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "gaussian3v.frag");
+        assignUniforms("pixel");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian3VBlurShader
+};   // Gaussian3VBlurShader
+
+// ============================================================================
+class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader,
+                                                  core::vector2df,
+                                                  std::vector<float> >,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+    ComputeGaussian6VBlurShader()
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "gaussian6v.comp");
+        m_dest_tu = 1;
+        assignUniforms("pixel", "weights");
+        assignSamplerNames(m_program, 0, "source", 
+                           ST_BILINEAR_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeGaussian6VBlurShader
+};   // ComputeGaussian6VBlurShader
+
+// ============================================================================
+class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader,
+                                                  core::vector2df, 
+                                                  std::vector<float> >,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+    ComputeGaussian6HBlurShader()
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "gaussian6h.comp");
+        m_dest_tu = 1;
+        assignUniforms("pixel", "weights");
+        assignSamplerNames(m_program, 0, "source", 
+                          ST_BILINEAR_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeGaussian6HBlurShader
+};   // ComputeGaussian6HBlurShader
+
+// ============================================================================
+class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader,
+                                               core::vector2df,
+                                               std::vector<float> >,
+                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+    ComputeShadowBlurHShader()
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "blurshadowH.comp");
+        m_dest_tu = 1;
+        assignUniforms("pixel", "weights");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeShadowBlurHShader
+};   // ComputeShadowBlurHShader
+
+// ============================================================================
+class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader,
+                                           core::vector2df, float>,
+                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian6HBlurShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "gaussian6h.frag");
+        assignUniforms("pixel", "sigma");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian6HBlurShader
+};   // Gaussian6HBlurShader
+
+// ============================================================================
+class Gaussian17TapHShader : public Shader<Gaussian17TapHShader,
+                                           core::vector2df>,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
+                                                  ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian17TapHShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "bilateralH.frag");
+        assignUniforms("pixel");
+        assignSamplerNames(m_program,0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                                     1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian17TapHShader
+};   // Gaussian17TapHShader
+
+// ============================================================================
+class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader,
+                                                  core::vector2df>,
+                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
+                                                    ST_NEARED_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+    ComputeGaussian17TapHShader()
+    {
+        loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
+        m_dest_tu = 2;
+        assignUniforms("pixel");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
+                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeGaussian17TapHShader
+};   // ComputeGaussian17TapHShader
+
+
+// ============================================================================
+class Gaussian17TapVShader : public Shader<Gaussian17TapVShader,
+                                           core::vector2df>,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
+                                                  ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian17TapVShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "bilateralV.frag");
+        assignUniforms("pixel");
+
+        assignSamplerNames(m_program,0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                                     1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian17TapVShader
+};   // Gaussian17TapVShader
+
+// ============================================================================
+class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, 
+                                                  core::vector2df>,
+                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
+                                                    ST_NEARED_CLAMPED_FILTERED>
+{
+public:
+    GLuint m_dest_tu;
+
+    ComputeGaussian17TapVShader()
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "bilateralV.comp");
+        m_dest_tu = 2;
+        assignUniforms("pixel");
+        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
+                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
+        assignTextureUnit(m_dest_tu, "dest");
+    }   // ComputeGaussian17TapVShader
+};   // ComputeGaussian17TapVShader
+
+// ============================================================================
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
 {
     // Initialization
@@ -311,8 +510,8 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian3VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
+        Gaussian3VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
@@ -331,30 +530,30 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
     {
         // Used as temp
         irr_driver->getFBO(FBO_SCALAR_1024).Bind();
-        FullScreenShader::Gaussian6VBlurShader::getInstance()->setTextureUnits(LayerTex);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaV);
+        Gaussian6VBlurShader::getInstance()->setTextureUnits(LayerTex);
+        DrawFullScreenEffect<Gaussian6VBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaV);
         in_fbo.BindLayer(layer);
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaH);
+        Gaussian6HBlurShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaH);
     }
     else
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-        FullScreenShader::ComputeShadowBlurVShader::getInstance()->use();
-        FullScreenShader::ComputeShadowBlurVShader::getInstance()->setTextureUnits(LayerTex);
-        glBindSampler(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, 0);
-        glBindImageTexture(FullScreenShader::ComputeShadowBlurVShader::getInstance()->TU_dest, irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R32F);
-        FullScreenShader::ComputeShadowBlurVShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsV);
+        ComputeShadowBlurVShader::getInstance()->use();
+        ComputeShadowBlurVShader::getInstance()->setTextureUnits(LayerTex);
+        glBindSampler(ComputeShadowBlurVShader::getInstance()->m_dest_tu, 0);
+        glBindImageTexture(ComputeShadowBlurVShader::getInstance()->m_dest_tu, irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R32F);
+        ComputeShadowBlurVShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsV);
         glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1, (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
-        FullScreenShader::ComputeShadowBlurHShader::getInstance()->use();
-        FullScreenShader::ComputeShadowBlurHShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
-        glBindSampler(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, 0);
-        glBindImageTexture(FullScreenShader::ComputeShadowBlurHShader::getInstance()->TU_dest, LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
-        FullScreenShader::ComputeShadowBlurHShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsH);
+        ComputeShadowBlurHShader::getInstance()->use();
+        ComputeShadowBlurHShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        glBindSampler(ComputeShadowBlurHShader::getInstance()->m_dest_tu, 0);
+        glBindImageTexture(ComputeShadowBlurHShader::getInstance()->m_dest_tu, LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
+        ComputeShadowBlurHShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsH);
         glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1, (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
@@ -370,32 +569,32 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height), sigmaV);
+        Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height), sigmaV);
 
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), sigmaH);
+        Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), sigmaH);
     }
     else
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->use();
-        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        glBindSampler(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, 0);
-        glBindImageTexture(FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
-        FullScreenShader::ComputeGaussian6VBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsV);
+        ComputeGaussian6VBlurShader::getInstance()->use();
+        ComputeGaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
+        glBindSampler(ComputeGaussian6VBlurShader::getInstance()->m_dest_tu, 0);
+        glBindImageTexture(ComputeGaussian6VBlurShader::getInstance()->m_dest_tu, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
+        ComputeGaussian6VBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsV);
         glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
-        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->use();
-        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        glBindSampler(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, 0);
-        glBindImageTexture(FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
-        FullScreenShader::ComputeGaussian6HBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsH);
+        ComputeGaussian6HBlurShader::getInstance()->use();
+        ComputeGaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
+        glBindSampler(ComputeGaussian6HBlurShader::getInstance()->m_dest_tu, 0);
+        glBindImageTexture(ComputeGaussian6HBlurShader::getInstance()->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
+        ComputeGaussian6HBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsH);
         glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
@@ -409,14 +608,14 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxi
     {
         auxiliary.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
+        Gaussian6HBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
     }
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
+        Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
     }
 }
 
@@ -431,16 +630,16 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         if (!CVS->supportsComputeShadersFiltering())
         {
             auxiliary.Bind();
-            FullScreenShader::Gaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<FullScreenShader::Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
+            Gaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            DrawFullScreenEffect<Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
         }
         else
         {
-            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->use();
-            glBindSampler(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, 0);
-            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(FullScreenShader::ComputeGaussian17TapHShader::getInstance()->TU_dest, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
-            FullScreenShader::ComputeGaussian17TapHShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
+            ComputeGaussian17TapHShader::getInstance()->use();
+            glBindSampler(ComputeGaussian17TapHShader::getInstance()->m_dest_tu, 0);
+            ComputeGaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            glBindImageTexture(ComputeGaussian17TapHShader::getInstance()->m_dest_tu, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
+            ComputeGaussian17TapHShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
             glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
         }
     }
@@ -451,16 +650,16 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         {
             in_fbo.Bind();
 
-            FullScreenShader::Gaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<FullScreenShader::Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
+            Gaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            DrawFullScreenEffect<Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
         }
         else
         {
-            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->use();
-            glBindSampler(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, 0);
-            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(FullScreenShader::ComputeGaussian17TapVShader::getInstance()->TU_dest, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
-            FullScreenShader::ComputeGaussian17TapVShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
+            ComputeGaussian17TapVShader::getInstance()->use();
+            glBindSampler(ComputeGaussian17TapVShader::getInstance()->m_dest_tu, 0);
+            ComputeGaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            glBindImageTexture(ComputeGaussian17TapVShader::getInstance()->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
+            ComputeGaussian17TapVShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
             glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
         }
     }
diff --git a/src/graphics/post_processing.hpp b/src/graphics/post_processing.hpp
index c5df89ff9..4a0539cb9 100644
--- a/src/graphics/post_processing.hpp
+++ b/src/graphics/post_processing.hpp
@@ -69,25 +69,34 @@ public:
     virtual     ~PostProcessing();
 
     void         reset();
-    /** Those should be called around the part where we render the scene to be post-processed */
+    /** Those should be called around the part where we render the scene to be
+     *  post-processed */
     void         begin();
     void         update(float dt);
 
     /** Generate diffuse and specular map */
-    void         renderSunlight(const core::vector3df &direction, const video::SColorf &col);
+    void         renderSunlight(const core::vector3df &direction,
+                                const video::SColorf &col);
 
     void renderSSAO();
-    void renderEnvMap(const float *bSHCoeff, const float *gSHCoeff, const float *rSHCoeff, unsigned skycubemap);
-    void renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, const core::matrix4 &rh_matrix, const core::vector3df &rh_extend);
-    void renderGI(const core::matrix4 &RHMatrix, const core::vector3df &rh_extend, unsigned shr, unsigned shg, unsigned shb);
+    void renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
+                      const float *rSHCoeff, unsigned skycubemap);
+    void renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, 
+                       const core::matrix4 &rh_matrix,
+                       const core::vector3df &rh_extend);
+    void renderGI(const core::matrix4 &RHMatrix,
+                  const core::vector3df &rh_extend, unsigned shr,
+                  unsigned shg, unsigned shb);
 
     /** Blur the in texture */
     void renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
 
-    void renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary, float sigmaV, float sigmaH);
+    void renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary,
+                              float sigmaV, float sigmaH);
 	void renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
 
-    void renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer, float sigmaH, float sigmaV);
+    void renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
+                                  float sigmaH, float sigmaV);
     void renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
 
     /** Render tex. Used for blit/texture resize */
@@ -95,7 +104,8 @@ public:
     void renderTextureLayer(unsigned tex, unsigned layer);
     void applyMLAA();
 
-    void renderMotionBlur(unsigned cam, FrameBuffer &in_fbo, FrameBuffer &out_fbo);
+    void renderMotionBlur(unsigned cam, FrameBuffer &in_fbo,
+                          FrameBuffer &out_fbo);
     void renderGlow(unsigned tex);
 
     /** Render the post-processed scene */
@@ -103,6 +113,6 @@ public:
 
     /** Use motion blur for a short time */
     void         giveBoost(unsigned int cam_index);
-};
+};   // class PostProcessing
 
 #endif // HEADER_POST_PROCESSING_HPP
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index a4d867e6e..a6bb022d4 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1004,56 +1004,6 @@ namespace FullScreenShader
                                       4, "SHB", ST_VOLUME_LINEAR_FILTERED);
     }
 
-    Gaussian17TapHShader::Gaussian17TapHShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "bilateralH.frag");
-        assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
-                                      1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-
-    ComputeGaussian17TapHShader::ComputeGaussian17TapHShader()
-    {
-        loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
-        TU_dest = 2;
-        assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
-                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    ComputeGaussian6HBlurShader::ComputeGaussian6HBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "gaussian6h.comp");
-        TU_dest = 1;
-        assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_BILINEAR_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    ComputeShadowBlurHShader::ComputeShadowBlurHShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "blurshadowH.comp");
-        TU_dest = 1;
-        assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    Gaussian6HBlurShader::Gaussian6HBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "gaussian6h.frag");
-        assignUniforms("pixel", "sigma");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-	
 	HorizontalBlurShader::HorizontalBlurShader()
     {
         loadProgram(OBJECT,
@@ -1074,67 +1024,6 @@ namespace FullScreenShader
         assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
-    Gaussian17TapVShader::Gaussian17TapVShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "bilateralV.frag");
-        assignUniforms("pixel");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
-                                      1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-
-    ComputeGaussian17TapVShader::ComputeGaussian17TapVShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "bilateralV.comp");
-        TU_dest = 2;
-        assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
-                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    ComputeGaussian6VBlurShader::ComputeGaussian6VBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "gaussian6v.comp");
-        TU_dest = 1;
-        assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_BILINEAR_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    ComputeShadowBlurVShader::ComputeShadowBlurVShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "blurshadowV.comp");
-        TU_dest = 1;
-        assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
-        assignTextureUnit(TU_dest, "dest");
-    }
-
-    Gaussian6VBlurShader::Gaussian6VBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "gaussian6v.frag");
-        assignUniforms("pixel", "sigma");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-
-    Gaussian3VBlurShader::Gaussian3VBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "gaussian3v.frag");
-        assignUniforms("pixel");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
-    }
 
     PassThroughShader::PassThroughShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index a5dd9abc8..69b9a540b 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -309,46 +309,6 @@ public:
     GlobalIlluminationReconstructionShader();
 };
 
-class Gaussian17TapHShader : public Shader<Gaussian17TapHShader, core::vector2df>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
-                                                   ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian17TapHShader();
-};
-
-class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader, core::vector2df>,
-                                    public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
-                                                          ST_NEARED_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-    ComputeGaussian17TapHShader();
-};
-
-class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader, core::vector2df, std::vector<float> >,
-                                    public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-    ComputeGaussian6HBlurShader();
-};
-
-class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader, core::vector2df, std::vector<float> >,
-                                public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-    ComputeShadowBlurHShader();
-};
-
-class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader, core::vector2df, float>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian6HBlurShader();
-};
-
 class HorizontalBlurShader : public Shader<HorizontalBlurShader, core::vector2df>,
                              public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
 {
@@ -363,51 +323,6 @@ public:
     Gaussian3HBlurShader();
 };
 
-class Gaussian17TapVShader : public Shader<Gaussian17TapVShader, core::vector2df>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED, ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian17TapVShader();
-};
-
-class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, core::vector2df>,
-                                    public TextureReadNew<ST_NEARED_CLAMPED_FILTERED, ST_NEARED_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-
-    ComputeGaussian17TapVShader();
-};
-
-class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader, core::vector2df, std::vector<float> >,
-                                    public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-    ComputeGaussian6VBlurShader();
-};
-
-class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader, core::vector2df, std::vector<float> >,
-                                 public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
-{
-public:
-    GLuint TU_dest;
-    ComputeShadowBlurVShader();
-};
-
-class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader, core::vector2df, float>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian6VBlurShader();
-};
-
-class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader, core::vector2df>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian3VBlurShader();
-};
 
 class PassThroughShader : public Shader<PassThroughShader, int, int>,
                           public TextureReadNew<ST_BILINEAR_FILTERED>

From 7d66dfec0e41aa4e98a77e8fc4e161234574b545 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 12 May 2015 19:49:14 -0400
Subject: [PATCH 196/331] Make scripting work on OS X, hoping this doesn't
 break windows or linux

---
 src/scriptengine/scriptvec3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index c5c96a0de..29e4d1818 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -61,7 +61,7 @@ namespace Scripting
     void RegisterVec3(asIScriptEngine *engine)
     {
         int r;
-        r = engine->RegisterObjectType("Vec3", sizeof(SimpleVec3), asOBJ_VALUE | asOBJ_APP_CLASS_ALLFLOATS | asGetTypeTraits<SimpleVec3>()); assert(r >= 0);
+        r = engine->RegisterObjectType("Vec3", sizeof(SimpleVec3), asOBJ_VALUE | asOBJ_APP_CLASS_ALLFLOATS | asOBJ_APP_CLASS_CDA); assert(r >= 0);
         // Register the behaviours
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(Constructor), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectBehaviour("Vec3", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(Destructor), asCALL_CDECL_OBJLAST); assert(r >= 0);

From 3b682ff084f01abad109cc6e4eca57ac5ddb10b5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 13 May 2015 09:57:53 +1000
Subject: [PATCH 197/331] Moved more shaders into PostProcessing.

---
 src/graphics/post_processing.cpp | 20 ++++++++++++++++++--
 src/graphics/shaders.cpp         | 11 -----------
 src/graphics/shaders.hpp         |  7 -------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 4a1024868..d194c2a70 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -41,6 +41,22 @@
 using namespace video;
 using namespace scene;
 
+// ============================================================================
+class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader,
+                                           core::vector2df>,
+                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+{
+public:
+    Gaussian3HBlurShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "gaussian3h.frag");
+        assignUniforms("pixel");
+
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+    }   // Gaussian3HBlurShader
+};   // Gaussian3HBlurShader
+
 // ============================================================================
 class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader,
                                                core::vector2df,
@@ -516,8 +532,8 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxil
     {
         in_fbo.Bind();
 
-        FullScreenShader::Gaussian3HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<FullScreenShader::Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
+        Gaussian3HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
     }
 }
 
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index a6bb022d4..75dda2821 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -1014,17 +1014,6 @@ namespace FullScreenShader
         assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
-    Gaussian3HBlurShader::Gaussian3HBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "gaussian3h.frag");
-        assignUniforms("pixel");
-
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-
-
     PassThroughShader::PassThroughShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 69b9a540b..47c884fc9 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -316,13 +316,6 @@ public:
     HorizontalBlurShader();
 };
 
-class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader, core::vector2df>,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
-{
-public:
-    Gaussian3HBlurShader();
-};
-
 
 class PassThroughShader : public Shader<PassThroughShader, int, int>,
                           public TextureReadNew<ST_BILINEAR_FILTERED>

From f0d0e7e601e96f1893304fe30c1fadacf2117847 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 14 May 2015 16:27:32 +1000
Subject: [PATCH 198/331] Moved SharedObjects into separate file
 shared_gpu_object. This also fixes the missing loading screen (likely caused
 by not initialising all objects, or not in the right order).

---
 sources.cmake                       |   2 +-
 src/graphics/2dutils.cpp            |  18 ++-
 src/graphics/IBL.cpp                |  13 +-
 src/graphics/gpuparticles.cpp       |   3 +-
 src/graphics/post_processing.cpp    |   5 +-
 src/graphics/render.cpp             |  13 +-
 src/graphics/render_lighting.cpp    |   5 +-
 src/graphics/shaders.cpp            | 137 +------------------
 src/graphics/shaders.hpp            |  13 +-
 src/graphics/shadow_matrixes.cpp    |  22 ++--
 src/graphics/shared_gpu_objects.cpp | 198 ++++++++++++++++++++++++++++
 src/graphics/shared_gpu_objects.hpp | 115 ++++++++++++++++
 src/graphics/stkbillboard.cpp       |   7 +-
 13 files changed, 376 insertions(+), 175 deletions(-)
 create mode 100644 src/graphics/shared_gpu_objects.cpp
 create mode 100644 src/graphics/shared_gpu_objects.hpp

diff --git a/sources.cmake b/sources.cmake
index 5b3d0c21e..0837c5629 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.   
+# This will then trigger a new cmake run automatically.    
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index f01f43741..657ea5e9b 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -20,12 +20,14 @@
 #include "graphics/central_settings.hpp"
 #include "graphics/shader.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "graphics/texture_read.hpp"
 #include "glwrap.hpp"
 #include "utils/cpp2011.hpp"
 
 #include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
 
+
 // ============================================================================
 class Primitive2DList : public Shader<Primitive2DList>,
                         public TextureReadNew<ST_BILINEAR_FILTERED >
@@ -90,11 +92,13 @@ public:
 };   // ColoredRectShader
 
 // ============================================================================
+
 class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
                                                core::vector2df, core::vector2df,
                                                core::vector2df, core::vector2df>,
                                  public TextureReadNew<ST_BILINEAR_FILTERED>
 {
+#ifdef XX
 private:
     GLuint m_quad_buffer;
 
@@ -119,14 +123,16 @@ private:
                               (GLvoid *)(2 * sizeof(float)));
         glBindVertexArray(0);
     }   // initQuadBuffer
-
+#endif
 public:
     GLuint m_color_vbo;
     GLuint m_vao;
 
     ColoredTextureRectShader()
     {
+#ifdef XX
         initQuadBuffer();
+#endif
         loadProgram(OBJECT, GL_VERTEX_SHADER, "colortexturedquad.vert",
                             GL_FRAGMENT_SHADER, "colortexturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
@@ -138,7 +144,7 @@ public:
         glEnableVertexAttribArray(0);
         glEnableVertexAttribArray(3);
         glEnableVertexAttribArray(2);
-        glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getQuadBuffer());
         glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
         glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 
                               (GLvoid *)(2 * sizeof(float)));
@@ -201,7 +207,7 @@ static void drawTexQuad(GLuint texture, float width, float height,
                         float tex_width, float tex_height)
 {
     TextureRectShader::getInstance()->use();
-    glBindVertexArray(SharedObject::UIVAO);
+    glBindVertexArray(SharedGPUObjects::getUI_VAO());
 
     TextureRectShader::getInstance()->setTextureUnits(texture);
     TextureRectShader::getInstance()->setUniforms(
@@ -308,7 +314,7 @@ void draw2DImage(const video::ITexture* texture,
     }
 
     UniformColoredTextureRectShader::getInstance()->use();
-    glBindVertexArray(SharedObject::UIVAO);
+    glBindVertexArray(SharedGPUObjects::getUI_VAO());
 
     const video::COpenGLTexture *c_texture = 
         static_cast<const video::COpenGLTexture*>(texture);
@@ -355,7 +361,7 @@ void draw2DImageFromRTT(GLuint texture, size_t texture_w, size_t texture_h,
         tex_width, tex_height, tex_center_pos_x, tex_center_pos_y);
 
     UniformColoredTextureRectShader::getInstance()->use();
-    glBindVertexArray(SharedObject::UIVAO);
+    glBindVertexArray(SharedGPUObjects::getUI_VAO());
 
     UniformColoredTextureRectShader::getInstance()->setTextureUnits(texture);
     UniformColoredTextureRectShader::getInstance()
@@ -528,7 +534,7 @@ void GL32_draw2DRectangle(video::SColor color, const core::rect<s32>& position,
     }
 
     ColoredRectShader::getInstance()->use();
-    glBindVertexArray(SharedObject::UIVAO);
+    glBindVertexArray(SharedGPUObjects::getUI_VAO());
     ColoredRectShader::getInstance()
         ->setUniforms(core::vector2df(center_pos_x, center_pos_y),
                       core::vector2df(width, height), color        );
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 3f37d068a..ce2de3bd5 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -15,12 +15,15 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "IBL.hpp"
-#include "gl_headers.hpp"
-#include "shaders.hpp"
+#include "graphics/IBL.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/gl_headers.hpp"
+#include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
+
 #include <cmath>
 #include <set>
-#include "central_settings.hpp"
 
 
 class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4,
@@ -410,7 +413,7 @@ GLuint generateSpecularCubemap(GLuint probe)
         glGenTextures(1, &sampleTex);
         glBindTexture(GL_TEXTURE_BUFFER, sampleTex);
         glTexBuffer(GL_TEXTURE_BUFFER, GL_RG32F, sampleBuffer);
-        glBindVertexArray(SharedObject::FullScreenQuadVAO);
+        glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
         for (unsigned face = 0; face < 6; face++)
         {
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index f4bdc5969..82cdce6a4 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -22,6 +22,7 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/particle_emitter.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "graphics/texture_read.hpp"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
@@ -414,7 +415,7 @@ void ParticleSystemProxy::cleanGL()
 
 void ParticleSystemProxy::CommonRenderingVAO(GLuint PositionBuffer)
 {
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::ParticleQuadVBO);
+    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getParticleQuadVBO());
     glEnableVertexAttribArray(4);
     glVertexAttribPointer(4, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
     glEnableVertexAttribArray(3);
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index d194c2a70..1d8f57305 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -25,6 +25,7 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/mlaa_areamap.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "graphics/stkmeshscenenode.hpp"
 #include "io/file_manager.hpp"
 #include "karts/abstract_kart.hpp"
@@ -438,7 +439,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
     if (UserConfigParams::m_degraded_IBL)
     {
         FullScreenShader::DegradedIBLShader::getInstance()->use();
-        glBindVertexArray(SharedObject::FullScreenQuadVAO);
+        glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
         FullScreenShader::DegradedIBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
         FullScreenShader::DegradedIBLShader::getInstance()->setUniforms();
@@ -446,7 +447,7 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
     else
     {
         FullScreenShader::IBLShader::getInstance()->use();
-        glBindVertexArray(SharedObject::FullScreenQuadVAO);
+        glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
         FullScreenShader::IBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
         FullScreenShader::IBLShader::getInstance()->setUniforms();
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 7f86bb48e..7316e9636 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -20,6 +20,7 @@
 
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/graphics_restrictions.hpp"
@@ -288,8 +289,10 @@ void IrrDriver::renderGLSL(float dt)
     float tmp[2];
     tmp[0] = float(m_actual_screen_size.Width);
     tmp[1] = float(m_actual_screen_size.Height);
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferSubData(GL_UNIFORM_BUFFER, (16 * 9) * sizeof(float), 2 * sizeof(float), tmp);
+    glBindBuffer(GL_UNIFORM_BUFFER, 
+                 SharedGPUObjects::getViewProjectionMatricesUBO());
+    glBufferSubData(GL_UNIFORM_BUFFER, (16 * 9) * sizeof(float),
+                    2 * sizeof(float), tmp);
 
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -342,8 +345,8 @@ void IrrDriver::renderGLSL(float dt)
 
 void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned pointlightcount, std::vector<GlowData>& glows, float dt, bool hasShadow, bool forceRTT)
 {
-    glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO);
-    glBindBufferBase(GL_UNIFORM_BUFFER, 1, SharedObject::LightingDataUBO);
+    glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedGPUObjects::getViewProjectionMatricesUBO());
+    glBindBufferBase(GL_UNIFORM_BUFFER, 1, SharedGPUObjects::getLightingDataUBO());
     m_scene_manager->setActiveCamera(camnode);
 
     PROFILER_PUSH_CPU_MARKER("- Draw Call Generation", 0xFF, 0xFF, 0xFF);
@@ -629,7 +632,7 @@ static void renderWireFrameFrustrum(float *tmp, unsigned i)
 {
     MeshShader::ViewFrustrumShader::getInstance()->use();
     glBindVertexArray(MeshShader::ViewFrustrumShader::getInstance()->frustrumvao);
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
+    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
 
     glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * 3 * sizeof(float), (void *)tmp);
     MeshShader::ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 4a8e23f5e..9b43148be 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -24,6 +24,7 @@
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "utils/profiler.hpp"
@@ -141,7 +142,7 @@ void IrrDriver::uploadLightingData()
     memcpy(&Lighting[17], greenSHCoeff, 9 * sizeof(float));
     memcpy(&Lighting[26], redSHCoeff, 9 * sizeof(float));
 
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::LightingDataUBO);
+    glBindBuffer(GL_UNIFORM_BUFFER, SharedGPUObjects::getLightingDataUBO());
     glBufferSubData(GL_UNIFORM_BUFFER, 0, 36 * sizeof(float), Lighting);
 }
 
@@ -155,7 +156,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_RH));
         glDisable(GL_BLEND);
         m_rtts->getRH().Bind();
-        glBindVertexArray(SharedObject::FullScreenQuadVAO);
+        glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
         if (CVS->needRHWorkaround())
         {
             FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->use();
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 75dda2821..b00a951f4 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -98,6 +98,7 @@
 #include "graphics/central_settings.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/gpuparticles.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 #include "graphics/glwrap.hpp"
@@ -247,127 +248,6 @@ Shaders::ColoredLine::ColoredLine()
 
 GLuint quad_vbo, tri_vbo;
 
-GLuint SharedObject::FullScreenQuadVAO = 0;
-GLuint SharedObject::UIVAO = 0;
-
-static void initQuadVBO()
-{
-    const float quad_vertex[] = {
-        -1., -1., 0., 0., // UpperLeft
-        -1., 1., 0., 1., // LowerLeft
-        1., -1., 1., 0., // UpperRight
-        1., 1., 1., 1., // LowerRight
-    };
-    glGenBuffers(1, &quad_vbo);
-    glBindBuffer(GL_ARRAY_BUFFER, quad_vbo);
-    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), quad_vertex, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-    const float tri_vertex[] = {
-        -1., -1.,
-        -1., 3.,
-        3., -1.,
-    };
-    glGenBuffers(1, &tri_vbo);
-    glBindBuffer(GL_ARRAY_BUFFER, tri_vbo);
-    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(float), tri_vertex, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-    glGenVertexArrays(1, &SharedObject::FullScreenQuadVAO);
-    glBindVertexArray(SharedObject::FullScreenQuadVAO);
-    glBindBuffer(GL_ARRAY_BUFFER, tri_vbo);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), 0);
-    glBindVertexArray(0);
-}
-
-
-
-GLuint SharedObject::billboardvbo = 0;
-
-static void initBillboardVBO()
-{
-    float quad[] = {
-        -.5, -.5, 0., 1.,
-        -.5, .5, 0., 0.,
-        .5, -.5, 1., 1.,
-        .5, .5, 1., 0.,
-    };
-    glGenBuffers(1, &(SharedObject::billboardvbo));
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::billboardvbo);
-    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), quad, GL_STATIC_DRAW);
-}
-
-GLuint SharedObject::skytrivbo = 0;
-
-static void initSkyTriVBO()
-{
-  const float tri_vertex[] = {
-      -1., -1., 1.,
-      -1., 3., 1.,
-      3., -1., 1.,
-  };
-
-    glGenBuffers(1, &SharedObject::skytrivbo);
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::skytrivbo);
-    glBufferData(GL_ARRAY_BUFFER, 3 * 3 * sizeof(float), tri_vertex, GL_STATIC_DRAW);
-}
-
-GLuint SharedObject::frustrumvbo = 0;
-GLuint SharedObject::frustrumindexes = 0;
-
-static void initFrustrumVBO()
-{
-    glGenBuffers(1, &SharedObject::frustrumvbo);
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
-    glBufferData(GL_ARRAY_BUFFER, 8 * 3 * sizeof(float), 0, GL_DYNAMIC_DRAW);
-
-    int indices[24] = {
-        0, 1, 1, 3, 3, 2, 2, 0,
-        4, 5, 5, 7, 7, 6, 6, 4,
-        0, 4, 1, 5, 2, 6, 3, 7,
-    };
-
-    glGenBuffers(1, &SharedObject::frustrumindexes);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedObject::frustrumindexes);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, 12 * 2 * sizeof(int), indices, GL_STATIC_DRAW);
-}
-
-GLuint SharedObject::ViewProjectionMatrixesUBO;
-
-static void initShadowVPMUBO()
-{
-    glGenBuffers(1, &SharedObject::ViewProjectionMatrixesUBO);
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glBufferData(GL_UNIFORM_BUFFER, (16 * 9 + 2) * sizeof(float), 0, GL_STREAM_DRAW);
-    glBindBuffer(GL_UNIFORM_BUFFER, 0);
-}
-
-GLuint SharedObject::LightingDataUBO;
-
-static void initLightingDataUBO()
-{
-    glGenBuffers(1, &SharedObject::LightingDataUBO);
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::LightingDataUBO);
-    glBufferData(GL_UNIFORM_BUFFER, 36 * sizeof(float), 0, GL_STREAM_DRAW);
-    glBindBuffer(GL_UNIFORM_BUFFER, 0);
-}
-
-GLuint SharedObject::ParticleQuadVBO = 0;
-
-static void initParticleQuadVBO()
-{
-    static const GLfloat quad_vertex[] = {
-        -.5, -.5, 0., 0.,
-        .5, -.5, 1., 0.,
-        -.5, .5, 0., 1.,
-        .5, .5, 1., 1.,
-    };
-    glGenBuffers(1, &SharedObject::ParticleQuadVBO);
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::ParticleQuadVBO);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(quad_vertex), quad_vertex, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-}
 
 void Shaders::loadShaders()
 {
@@ -447,13 +327,7 @@ void Shaders::loadShaders()
 
     initGL();
     CleanTable.clear();
-    initQuadVBO();
-    initBillboardVBO();
-    initSkyTriVBO();
-    initFrustrumVBO();
-    initShadowVPMUBO();
-    initLightingDataUBO();
-    initParticleQuadVBO();
+    SharedGPUObjects::init();
 }
 
 // ----------------------------------------------------------------------------
@@ -668,7 +542,7 @@ namespace MeshShader
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
-        glBindBuffer(GL_ARRAY_BUFFER, SharedObject::skytrivbo);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getSkyTriVBO());
         glEnableVertexAttribArray(0);
         glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
         glBindVertexArray(0);
@@ -694,10 +568,11 @@ namespace MeshShader
 
         glGenVertexArrays(1, &frustrumvao);
         glBindVertexArray(frustrumvao);
-        glBindBuffer(GL_ARRAY_BUFFER, SharedObject::frustrumvbo);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
         glEnableVertexAttribArray(0);
         glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedObject::frustrumindexes);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
+                     SharedGPUObjects::getFrustrumIndices());
         glBindVertexArray(0);
     }
 }
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 47c884fc9..7c6f989c9 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -20,6 +20,7 @@
 
 #include "config/user_config.hpp"
 #include "graphics/shader.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "graphics/texture_read.hpp"
 
 #include <IMeshSceneNode.h>
@@ -30,16 +31,6 @@
 using namespace irr;
 class ParticleSystemProxy;
 
-class SharedObject
-{
-public:
-    static GLuint billboardvbo;
-    static GLuint skytrivbo, frustrumvbo, frustrumindexes, ParticleQuadVBO;
-    static GLuint ViewProjectionMatrixesUBO, LightingDataUBO;
-    static GLuint FullScreenQuadVAO;
-    static GLuint UIVAO;
-};
-
 
 namespace MeshShader
 {
@@ -187,7 +178,7 @@ template<typename T, typename... Args>
 static void DrawFullScreenEffect(Args...args)
 {
     T::getInstance()->use();
-    glBindVertexArray(SharedObject::FullScreenQuadVAO);
+    glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
     T::getInstance()->setUniforms(args...);
     glDrawArrays(GL_TRIANGLES, 0, 3);
 }
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 77f7a663d..4a45be84d 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -16,17 +16,19 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+#include "graphics/central_settings.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
+#include "modes/world.hpp"
+#include "physics/triangle_mesh.hpp"
+#include "tracks/track.hpp"
+
 #include <limits>
 #include <ICameraSceneNode.h>
 #include <SViewFrustum.h>
 #include "../../lib/irrlicht/source/Irrlicht/CSceneManager.h"
 #include "../../lib/irrlicht/source/Irrlicht/os.h"
-#include "graphics/central_settings.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/shaders.hpp"
-#include "modes/world.hpp"
-#include "physics/triangle_mesh.hpp"
-#include "tracks/track.hpp"
 
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
@@ -164,8 +166,10 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
 
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
     glBindBuffer(GL_COPY_READ_BUFFER, tempShadowMatssbo);
-    glBindBuffer(GL_COPY_WRITE_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
-    glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 80 * sizeof(float), 4 * 16 * sizeof(float));
+    glBindBuffer(GL_COPY_WRITE_BUFFER,
+                 SharedGPUObjects::getViewProjectionMatricesUBO());
+    glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0,
+                        80 * sizeof(float), 4 * 16 * sizeof(float));
 }
 
 /** Generate View, Projection, Inverse View, Inverse Projection, ViewProjection and InverseProjection matrixes
@@ -318,7 +322,7 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
 
     tmp[144] = float(width);
     tmp[145] = float(height);
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedObject::ViewProjectionMatrixesUBO);
+    glBindBuffer(GL_UNIFORM_BUFFER, SharedGPUObjects::getViewProjectionMatricesUBO());
     if (CVS->isSDSMEnabled())
     {
         glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 5) * sizeof(float), tmp);
diff --git a/src/graphics/shared_gpu_objects.cpp b/src/graphics/shared_gpu_objects.cpp
new file mode 100644
index 000000000..0ada1043c
--- /dev/null
+++ b/src/graphics/shared_gpu_objects.cpp
@@ -0,0 +1,198 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/shared_gpu_objects.hpp"
+
+GLuint SharedGPUObjects::m_billboard_vbo;
+GLuint SharedGPUObjects::m_sky_tri_vbo;
+GLuint SharedGPUObjects::m_frustrum_vbo;
+GLuint SharedGPUObjects::m_frustrum_indices;
+GLuint SharedGPUObjects::m_particle_quad_vbo;
+GLuint SharedGPUObjects::m_View_projection_matrices_ubo;
+GLuint SharedGPUObjects::m_lighting_data_ubo;
+GLuint SharedGPUObjects::m_full_screen_quad_vao;
+GLuint SharedGPUObjects::m_ui_vao;
+GLuint SharedGPUObjects::m_quad_buffer;
+bool   SharedGPUObjects::m_has_been_initialised = false;
+
+/** Initialises m_full_screen_quad_vbo.
+ */
+void SharedGPUObjects::initQuadVBO()
+{
+    const float QUAD_VERTEX[] =
+    {
+        -1., -1., 0., 0.,   // UpperLeft
+        -1.,  1., 0., 1.,   // LowerLeft
+         1., -1., 1., 0.,   // UpperRight
+         1.,  1., 1., 1.    // LowerRight
+    }; 
+    GLuint quad_vbo;
+    glGenBuffers(1, &quad_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, quad_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), QUAD_VERTEX,
+                 GL_STATIC_DRAW);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+    const float TRI_VERTEX[] =
+    {
+        -1., -1.,
+        -1.,  3.,
+         3., -1.,
+    };
+    GLuint tri_vbo;
+    glGenBuffers(1, &tri_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, tri_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(float), TRI_VERTEX,
+                 GL_STATIC_DRAW);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+    glGenVertexArrays(1, &m_full_screen_quad_vao);
+    glBindVertexArray(m_full_screen_quad_vao);
+    glBindBuffer(GL_ARRAY_BUFFER, tri_vbo);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), 0);
+    glBindVertexArray(0);
+}   // initQuadVBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initQuadBuffer()
+{
+    const float QUAD_VERTEX[] =
+    {
+        -1., -1., -1.,  1.,   // UpperLeft
+        -1.,  1., -1., -1.,   // LowerLeft
+         1., -1.,  1.,  1.,   // UpperRight
+         1.,  1.,  1., -1.    // LowerRight 
+    };
+    glGenBuffers(1, &m_quad_buffer);
+    glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), QUAD_VERTEX,
+        GL_STATIC_DRAW);
+
+    glGenVertexArrays(1, &m_ui_vao);
+    glBindVertexArray(m_ui_vao);
+    glEnableVertexAttribArray(0);
+    glEnableVertexAttribArray(3);
+    glBindBuffer(GL_ARRAY_BUFFER, m_quad_buffer);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
+    glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float),
+                          (GLvoid *)(2 * sizeof(float)));
+    glBindVertexArray(0);
+}   // initQuadBuffer
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initBillboardVBO()
+{
+    float QUAD[] = 
+    {
+        -.5, -.5, 0., 1.,
+        -.5,  .5, 0., 0.,
+         .5, -.5, 1., 1.,
+         .5,  .5, 1., 0.,
+    };
+    glGenBuffers(1, &m_billboard_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_billboard_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), QUAD, GL_STATIC_DRAW);
+}   // initBillboardVBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initSkyTriVBO()
+{
+    const float TRI_VERTEX[] =
+    {
+        -1., -1., 1.,
+        -1.,  3., 1.,
+         3., -1., 1.,
+    };
+
+    glGenBuffers(1, &m_sky_tri_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_sky_tri_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 3 * 3 * sizeof(float), TRI_VERTEX,
+                 GL_STATIC_DRAW);
+}   // initSkyTriVBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initFrustrumVBO()
+{
+    glGenBuffers(1, &m_frustrum_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_frustrum_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 8 * 3 * sizeof(float), 0, GL_DYNAMIC_DRAW);
+
+    int INDICES[24] = {
+        0, 1, 1, 3, 3, 2, 2, 0,
+        4, 5, 5, 7, 7, 6, 6, 4,
+        0, 4, 1, 5, 2, 6, 3, 7,
+    };
+
+    glGenBuffers(1, &m_frustrum_indices);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_frustrum_indices);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, 12 * 2 * sizeof(int), INDICES,
+                 GL_STATIC_DRAW);
+}   // initFrustrumVBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initShadowVPMUBO()
+{
+    glGenBuffers(1, &m_View_projection_matrices_ubo);
+    glBindBuffer(GL_UNIFORM_BUFFER, m_View_projection_matrices_ubo);
+    glBufferData(GL_UNIFORM_BUFFER, (16 * 9 + 2) * sizeof(float), 0,
+                 GL_STREAM_DRAW);
+    glBindBuffer(GL_UNIFORM_BUFFER, 0);
+}   // initShadowVPMUBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initLightingDataUBO()
+{
+    glGenBuffers(1, &m_lighting_data_ubo);
+    glBindBuffer(GL_UNIFORM_BUFFER, m_lighting_data_ubo);
+    glBufferData(GL_UNIFORM_BUFFER, 36 * sizeof(float), 0, GL_STREAM_DRAW);
+    glBindBuffer(GL_UNIFORM_BUFFER, 0);
+}   // initLightingDataUBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::initParticleQuadVBO()
+{
+    static const GLfloat QUAD_VERTEX[] =
+    {
+        -.5, -.5, 0., 0.,
+         .5, -.5, 1., 0.,
+        -.5,  .5, 0., 1.,
+         .5,  .5, 1., 1.,
+    };
+    glGenBuffers(1, &m_particle_quad_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_particle_quad_vbo);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(QUAD_VERTEX), QUAD_VERTEX,
+                 GL_STATIC_DRAW);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+}   // initParticleQuadVBO
+
+// ----------------------------------------------------------------------------
+void SharedGPUObjects::init()
+{
+    if (m_has_been_initialised)
+        return;
+    initQuadVBO();
+    initQuadBuffer();
+    initBillboardVBO();
+    initSkyTriVBO();
+    initFrustrumVBO();
+    initShadowVPMUBO();
+    initLightingDataUBO();
+    initParticleQuadVBO();
+
+    m_has_been_initialised = true;
+}   // SharedGPUObjects
\ No newline at end of file
diff --git a/src/graphics/shared_gpu_objects.hpp b/src/graphics/shared_gpu_objects.hpp
new file mode 100644
index 000000000..b3588a690
--- /dev/null
+++ b/src/graphics/shared_gpu_objects.hpp
@@ -0,0 +1,115 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SHARED_GPU_OBJECTS_HPP
+#define HEADER_SHARED_GPU_OBJECTS_HPP
+
+#include "graphics/gl_headers.hpp"
+
+#include <assert.h>
+
+class SharedGPUObjects
+{
+private:
+    static bool m_has_been_initialised;
+    static GLuint m_billboard_vbo;
+    static GLuint m_sky_tri_vbo;
+    static GLuint m_frustrum_vbo;
+    static GLuint m_frustrum_indices;
+    static GLuint m_particle_quad_vbo;
+    static GLuint m_View_projection_matrices_ubo;
+    static GLuint m_lighting_data_ubo;
+    static GLuint m_full_screen_quad_vao;
+    static GLuint m_ui_vao;
+    static GLuint m_quad_buffer;
+
+    static void initQuadVBO();
+    static void initQuadBuffer();
+    static void initBillboardVBO();
+    static void initSkyTriVBO();
+    static void initFrustrumVBO();
+    static void initShadowVPMUBO();
+    static void initLightingDataUBO();
+    static void initParticleQuadVBO();
+
+public:
+    static void init();
+    // ------------------------------------------------------------------------
+    static GLuint getBillboardVBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_billboard_vbo;
+    }   // getBillboardVBO
+    // ------------------------------------------------------------------------
+    static GLuint getSkyTriVBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_sky_tri_vbo;
+    }   // getSkyTriVBO
+    // ------------------------------------------------------------------------
+    static GLuint getFrustrumVBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_frustrum_vbo;
+    }   // getFrustrumVBO
+    // ------------------------------------------------------------------------
+    static GLuint getFrustrumIndices() 
+    {
+        assert(m_has_been_initialised);
+        return m_frustrum_indices;
+    }   // getFrustrumIndices
+    // ------------------------------------------------------------------------
+    static GLuint getParticleQuadVBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_particle_quad_vbo;
+    }   // getParticleQuadVBO
+    // ------------------------------------------------------------------------
+    static GLuint getViewProjectionMatricesUBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_View_projection_matrices_ubo;
+    }   // getViewProjectionMatricesUBO
+    // ------------------------------------------------------------------------
+    static GLuint getLightingDataUBO() 
+    {
+        assert(m_has_been_initialised);
+        return m_lighting_data_ubo;
+    }   // getLightingDataUBO
+    // -------------- ----------------------------------------------------------
+    static GLuint getFullScreenQuadVAO() 
+    {
+        assert(m_has_been_initialised);
+        return m_full_screen_quad_vao;
+    }   // getFullScreenQuadVAO
+    // ------------------------------------------------------------------------
+    static GLuint getUI_VAO() 
+    {
+        assert(m_has_been_initialised);
+        return m_ui_vao;
+    }  // getUI_VAO
+    // ------------------------------------------------------------------------
+    static GLuint getQuadBuffer() 
+    {
+        assert(m_has_been_initialised);
+        return m_quad_buffer;
+    }   // getQuadBuffer
+ 
+};   // class SharedGPUObjecctS
+
+
+#endif
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 4902e2590..5cf911237 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -16,9 +16,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/stkbillboard.hpp"
+
 #include "graphics/glwrap.hpp"
-#include "graphics/shaders.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/shaders.hpp"
+#include "graphics/shared_gpu_objects.hpp"
+
 #include <ISceneManager.h>
 
 using namespace irr;
@@ -51,7 +54,7 @@ static void createBillboardVAO()
 {
     glGenVertexArrays(1, &billboardvao);
     glBindVertexArray(billboardvao);
-    glBindBuffer(GL_ARRAY_BUFFER, SharedObject::billboardvbo);
+    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getBillboardVBO());
     glEnableVertexAttribArray(0);
     glEnableVertexAttribArray(3);
     glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);

From 488f506932c573eff3d981258ba0d893b29655b9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 14 May 2015 16:43:32 +1000
Subject: [PATCH 199/331] Moved more shaders into PostProcessing.

---
 src/graphics/post_processing.cpp | 165 +++++++++++++++++++++++++++----
 src/graphics/shaders.cpp         |  85 ----------------
 src/graphics/shaders.hpp         |  52 ----------
 3 files changed, 146 insertions(+), 156 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 1d8f57305..7b1f5f4db 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -257,6 +257,134 @@ public:
 };   // ComputeGaussian17TapVShader
 
 // ============================================================================
+class BloomShader : public Shader<BloomShader>,
+                    public TextureReadNew<ST_NEAREST_FILTERED>
+{
+public:
+    BloomShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
+                            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
+                            GL_FRAGMENT_SHADER, "bloom.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
+    }   // BloomShader
+};   // BloomShader
+
+// ============================================================================
+class BloomBlendShader : public Shader<BloomBlendShader>,
+                         public TextureReadNew<ST_BILINEAR_FILTERED, 
+                                               ST_BILINEAR_FILTERED,
+                                               ST_BILINEAR_FILTERED>
+{
+public:
+    BloomBlendShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "bloomblend.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
+                                      1, "tex_256", ST_BILINEAR_FILTERED,
+                                      2, "tex_512", ST_BILINEAR_FILTERED);
+    }   // BloomBlendShader
+};   // BloomBlendShader
+
+// ============================================================================
+class LensBlendShader : public Shader<LensBlendShader>, 
+                        public TextureReadNew<ST_BILINEAR_FILTERED,
+                                              ST_BILINEAR_FILTERED,
+                                              ST_BILINEAR_FILTERED>
+{
+public:
+    LensBlendShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "lensblend.frag");
+        assignUniforms();
+
+        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
+                                      1, "tex_256", ST_BILINEAR_FILTERED,
+                                      2, "tex_512", ST_BILINEAR_FILTERED);
+    }   // LensBlendShader
+};   // LensBlendShader
+
+// ============================================================================
+class ToneMapShader : public Shader<ToneMapShader, float>,
+                      public TextureReadNew<ST_NEAREST_FILTERED>
+{
+public:
+
+    ToneMapShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
+                            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
+                            GL_FRAGMENT_SHADER, "tonemap.frag");
+        assignUniforms("vignette_weight");
+        assignSamplerNames(m_program, 0, "text", ST_NEAREST_FILTERED);
+    }   // ToneMapShader
+};   // ToneMapShader
+
+// ============================================================================
+class DepthOfFieldShader : public Shader<DepthOfFieldShader>,
+                           public TextureReadNew<ST_BILINEAR_FILTERED, 
+                                                 ST_NEAREST_FILTERED>
+{
+public:
+    DepthOfFieldShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "dof.frag");
+
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED,
+                                      1, "dtex", ST_NEAREST_FILTERED);
+    }   // DepthOfFieldShader
+};   // DepthOfFieldShader
+
+// ============================================================================
+class IBLShader : public Shader<IBLShader>,
+                  public TextureReadNew<ST_NEAREST_FILTERED,
+                                        ST_NEAREST_FILTERED,
+                                        ST_TRILINEAR_CUBEMAP>
+{
+public:
+    IBLShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
+                            GL_FRAGMENT_SHADER, "IBL.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "ntex",  ST_NEAREST_FILTERED,
+                                      1, "dtex",  ST_NEAREST_FILTERED,
+                                      2, "probe", ST_TRILINEAR_CUBEMAP);
+    }   // IBLShader
+};   // IBLShader
+
+// ============================================================================
+class DegradedIBLShader : public Shader<DegradedIBLShader>,
+                          public TextureReadNew<ST_NEAREST_FILTERED>
+{
+public:
+    DegradedIBLShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
+                            GL_FRAGMENT_SHADER, "degraded_ibl.frag");
+        assignUniforms();
+        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED);
+    }   // DegradedIBLShader
+};   // DegradedIBLShader
+
+// ============================================================================
+
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
 {
     // Initialization
@@ -422,12 +550,11 @@ void PostProcessing::update(float dt)
     }
 }   // update
 
-static
-void renderBloom(GLuint in)
+static void renderBloom(GLuint in)
 {
-    FullScreenShader::BloomShader::getInstance()->setTextureUnits(in);
-    DrawFullScreenEffect<FullScreenShader::BloomShader>();
-}
+    BloomShader::getInstance()->setTextureUnits(in);
+    DrawFullScreenEffect<BloomShader>();
+}   // renderBloom
 
 void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff, const float *rSHCoeff, GLuint skybox)
 {
@@ -438,19 +565,19 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
 
     if (UserConfigParams::m_degraded_IBL)
     {
-        FullScreenShader::DegradedIBLShader::getInstance()->use();
+        DegradedIBLShader::getInstance()->use();
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
-        FullScreenShader::DegradedIBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
-        FullScreenShader::DegradedIBLShader::getInstance()->setUniforms();
+        DegradedIBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
+        DegradedIBLShader::getInstance()->setUniforms();
     }
     else
     {
-        FullScreenShader::IBLShader::getInstance()->use();
+        IBLShader::getInstance()->use();
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
-        FullScreenShader::IBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
-        FullScreenShader::IBLShader::getInstance()->setUniforms();
+        IBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
+        IBLShader::getInstance()->setUniforms();
     }
 
     glDrawArrays(GL_TRIANGLES, 0, 3);
@@ -782,15 +909,15 @@ static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 static void toneMap(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
 {
     fbo.Bind();
-    FullScreenShader::ToneMapShader::getInstance()->setTextureUnits(rtt);
-    DrawFullScreenEffect<FullScreenShader::ToneMapShader>(vignette_weight);
+    ToneMapShader::getInstance()->setTextureUnits(rtt);
+    DrawFullScreenEffect<ToneMapShader>(vignette_weight);
 }
 
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    FullScreenShader::DepthOfFieldShader::getInstance()->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::DepthOfFieldShader>();
+    DepthOfFieldShader::getInstance()->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
+    DrawFullScreenEffect<DepthOfFieldShader>();
 }
 
 void PostProcessing::applyMLAA()
@@ -968,13 +1095,13 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
             
-            FullScreenShader::BloomBlendShader::getInstance()->setTextureUnits(
+            BloomBlendShader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
-            DrawFullScreenEffect<FullScreenShader::BloomBlendShader>();
+            DrawFullScreenEffect<BloomBlendShader>();
 
-            FullScreenShader::LensBlendShader::getInstance()->setTextureUnits(
+            LensBlendShader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_LENS_128), irr_driver->getRenderTargetTexture(RTT_LENS_256), irr_driver->getRenderTargetTexture(RTT_LENS_512));
-            DrawFullScreenEffect<FullScreenShader::LensBlendShader>();
+            DrawFullScreenEffect<LensBlendShader>();
 
 
             glDisable(GL_BLEND);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index b00a951f4..f87524c60 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -675,64 +675,6 @@ static GLuint createVAO(GLuint Program)
 
 namespace FullScreenShader
 {
-    BloomShader::BloomShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
-            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
-            GL_FRAGMENT_SHADER, "bloom.frag");
-        assignUniforms();
-
-        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
-    }
-
-    BloomBlendShader::BloomBlendShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "bloomblend.frag");
-        assignUniforms();
-
-        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
-                                      1, "tex_256", ST_BILINEAR_FILTERED,
-                                      2, "tex_512", ST_BILINEAR_FILTERED);
-    }
-	
-	LensBlendShader::LensBlendShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "lensblend.frag");
-        assignUniforms();
-
-        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
-                                      1, "tex_256", ST_BILINEAR_FILTERED,
-                                      2, "tex_512", ST_BILINEAR_FILTERED);
-    }
-
-    ToneMapShader::ToneMapShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
-            GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
-            GL_FRAGMENT_SHADER, "tonemap.frag");
-        assignUniforms("vignette_weight");
-
-        assignSamplerNames(m_program, 0, "text", ST_NEAREST_FILTERED);
-    }
-
-    DepthOfFieldShader::DepthOfFieldShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "dof.frag");
-
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
-    }
 
     SunLightShader::SunLightShader()
     {
@@ -750,33 +692,6 @@ namespace FullScreenShader
         assignUniforms("direction", "col");
     }
 
-    IBLShader::IBLShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
-            GL_FRAGMENT_SHADER, "IBL.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex",  ST_NEAREST_FILTERED,
-                                      1, "dtex",  ST_NEAREST_FILTERED,
-                                      2, "probe", ST_TRILINEAR_CUBEMAP);
-    }
-
-    DegradedIBLShader::DegradedIBLShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseIBL.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
-            GL_FRAGMENT_SHADER, "degraded_ibl.frag");
-        assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED);
-    }
 
     ShadowedSunLightShaderPCF::ShadowedSunLightShaderPCF()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7c6f989c9..f0c55d5cd 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -186,44 +186,6 @@ static void DrawFullScreenEffect(Args...args)
 namespace FullScreenShader
 {
 
-class BloomShader : public Shader<BloomShader>,
-                    public TextureReadNew<ST_NEAREST_FILTERED>
-{
-public:
-    BloomShader();
-};
-
-class BloomBlendShader : public Shader<BloomBlendShader>,
-                         public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
-                                               ST_BILINEAR_FILTERED>
-{
-public:
-    BloomBlendShader();
-};
-
-class LensBlendShader : public Shader<LensBlendShader>, 
-                        public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
-                                              ST_BILINEAR_FILTERED>
-{
-public:
-    LensBlendShader();
-};
-
-
-class ToneMapShader : public Shader<ToneMapShader, float>,
-                      public TextureReadNew<ST_NEAREST_FILTERED>
-{
-public:
-
-    ToneMapShader();
-};
-
-class DepthOfFieldShader : public Shader<DepthOfFieldShader>,
-                           public TextureReadNew<ST_BILINEAR_FILTERED, ST_NEAREST_FILTERED>
-{
-public:
-    DepthOfFieldShader();
-};
 
 class SunLightShader : public Shader<SunLightShader, core::vector3df, video::SColorf>,
                        public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
@@ -232,20 +194,6 @@ public:
     SunLightShader();
 };
 
-class IBLShader : public Shader<IBLShader>,
-                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_TRILINEAR_CUBEMAP>
-{
-public:
-    IBLShader();
-};
-
-class DegradedIBLShader : public Shader<DegradedIBLShader>,
-                          public TextureReadNew<ST_NEAREST_FILTERED>
-{
-public:
-    DegradedIBLShader();
-};
-
 class ShadowedSunLightShaderPCF : public Shader<ShadowedSunLightShaderPCF, float, float, float, float, float>,
                                   public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_SHADOW_SAMPLER>
 {

From dc211f20008b3c24acc522b0aceb33652b760cfa Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 15 May 2015 08:16:23 +1000
Subject: [PATCH 200/331] Improved coding style.

---
 src/graphics/post_processing.cpp | 445 +++++++++++++++++++++----------
 1 file changed, 305 insertions(+), 140 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 7b1f5f4db..657276313 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -489,16 +489,18 @@ void PostProcessing::reset()
     }  // for i <number of cameras
 }   // reset
 
+// ----------------------------------------------------------------------------
 void PostProcessing::setMotionBlurCenterY(const u32 num, const float y)
 {
     MotionBlurProvider * const cb = 
         (MotionBlurProvider *) Shaders::getCallback(ES_MOTIONBLUR);
 
-    const float tex_height = m_vertices[num].v1.TCoords.Y - m_vertices[num].v0.TCoords.Y;
+    const float tex_height =
+                m_vertices[num].v1.TCoords.Y - m_vertices[num].v0.TCoords.Y;
     m_center[num].Y = m_vertices[num].v0.TCoords.Y + y * tex_height;
 
     cb->setCenter(num, m_center[num].X, m_center[num].Y);
-}
+}   // setMotionBlurCenterY
 
 // ----------------------------------------------------------------------------
 /** Setup some PP data.
@@ -508,7 +510,7 @@ void PostProcessing::begin()
     m_any_boost = false;
     for (u32 i = 0; i < m_boost_time.size(); i++)
         m_any_boost |= m_boost_time[i] > 0.01f;
-}   // beginCapture
+}   // begin
 
 // ----------------------------------------------------------------------------
 /** Set the boost amount according to the speed of the camera */
@@ -550,13 +552,16 @@ void PostProcessing::update(float dt)
     }
 }   // update
 
+// ----------------------------------------------------------------------------
 static void renderBloom(GLuint in)
 {
     BloomShader::getInstance()->setTextureUnits(in);
     DrawFullScreenEffect<BloomShader>();
 }   // renderBloom
 
-void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff, const float *rSHCoeff, GLuint skybox)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
+                                  const float *rSHCoeff, GLuint skybox)
 {
     glDisable(GL_DEPTH_TEST);
     glEnable(GL_BLEND);
@@ -568,7 +573,9 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
         DegradedIBLShader::getInstance()->use();
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
-        DegradedIBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
+        DegradedIBLShader::getInstance()
+            ->setTextureUnits(irr_driver
+                              ->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH));
         DegradedIBLShader::getInstance()->setUniforms();
     }
     else
@@ -576,7 +583,9 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
         IBLShader::getInstance()->use();
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
 
-        IBLShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), skybox);
+        IBLShader::getInstance()->setTextureUnits(
+            irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+            irr_driver->getDepthStencilTexture(), skybox);
         IBLShader::getInstance()->setUniforms();
     }
 
@@ -586,10 +595,12 @@ void PostProcessing::renderEnvMap(const float *bSHCoeff, const float *gSHCoeff,
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
-}
+}   // renderEnvMap
 
-
-void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, const core::matrix4 &rh_matrix, const core::vector3df &rh_extend)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB,
+                                   const core::matrix4 &rh_matrix,
+                                   const core::vector3df &rh_extend)
 {
     glEnable(GL_PROGRAM_POINT_SIZE);
     FullScreenShader::RHDebug::getInstance()->use();
@@ -602,31 +613,40 @@ void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, con
     FullScreenShader::RHDebug::getInstance()->setUniforms(rh_matrix, rh_extend);
     glDrawArrays(GL_POINTS, 0, 32 * 16 * 32);
     glDisable(GL_PROGRAM_POINT_SIZE);
-}
+}   // renderRHDebug
 
-void PostProcessing::renderGI(const core::matrix4 &RHMatrix, const core::vector3df &rh_extend, GLuint shr, GLuint shg, GLuint shb)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderGI(const core::matrix4 &RHMatrix,
+                              const core::vector3df &rh_extend, GLuint shr,
+                              GLuint shg, GLuint shb)
 {
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()->setTextureUnits(
-        irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), shr, shg, shb);
-    DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>(RHMatrix, InvRHMatrix, rh_extend);
-}
+    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), 
+                          irr_driver->getDepthStencilTexture(), shr, shg, shb);
+    DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>
+                                     (RHMatrix, InvRHMatrix, rh_extend);
+}   // renderGI
 
-void PostProcessing::renderSunlight(const core::vector3df &direction, const video::SColorf &col)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderSunlight(const core::vector3df &direction,
+                                    const video::SColorf &col)
 {
     glEnable(GL_BLEND);
     glDisable(GL_DEPTH_TEST);
     glBlendFunc(GL_ONE, GL_ONE);
     glBlendEquation(GL_FUNC_ADD);
 
-    FullScreenShader::SunLightShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
+    FullScreenShader::SunLightShader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                          irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::SunLightShader>(direction, col);
-}
+}   // renderSunlight
 
-static
-std::vector<float> getGaussianWeight(float sigma, size_t count)
+// ----------------------------------------------------------------------------
+static std::vector<float> getGaussianWeight(float sigma, size_t count)
 {
     float g0, g1, g2, total;
 
@@ -645,40 +665,59 @@ std::vector<float> getGaussianWeight(float sigma, size_t count)
     for (float &weight : weights)
         weight /= total;
     return weights;
-}
+}   // getGaussianWeight
 
-void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, 
+                                         FrameBuffer &auxiliary)
 {
-    assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
-    float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
+    assert(in_fbo.getWidth() == auxiliary.getWidth() && 
+           in_fbo.getHeight() == auxiliary.getHeight());
+    float inv_width  = 1.0f / in_fbo.getWidth();
+    float inv_height = 1.0f / in_fbo.getHeight();
     {
         auxiliary.Bind();
 
-        Gaussian3VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian3VBlurShader>(core::vector2df(inv_width, inv_height));
+        Gaussian3VBlurShader::getInstance()
+            ->setTextureUnits(in_fbo.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian3VBlurShader>
+                                     (core::vector2df(inv_width, inv_height));
     }
     {
         in_fbo.Bind();
 
-        Gaussian3HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian3HBlurShader>(core::vector2df(inv_width, inv_height));
+        Gaussian3HBlurShader::getInstance()
+            ->setTextureUnits(auxiliary.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian3HBlurShader>
+                                      (core::vector2df(inv_width, inv_height));
     }
-}
+}   // renderGaussian3Blur
 
-void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer, float sigmaH, float sigmaV)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
+                                              size_t layer, float sigmaH,
+                                              float sigmaV)
 {
     GLuint LayerTex;
     glGenTextures(1, &LayerTex);
-    glTextureView(LayerTex, GL_TEXTURE_2D, in_fbo.getRTT()[0], GL_R32F, 0, 1, layer, 1);
+    glTextureView(LayerTex, GL_TEXTURE_2D, in_fbo.getRTT()[0],
+                  GL_R32F, 0, 1, layer, 1);
     if (!CVS->supportsComputeShadersFiltering())
     {
         // Used as temp
         irr_driver->getFBO(FBO_SCALAR_1024).Bind();
         Gaussian6VBlurShader::getInstance()->setTextureUnits(LayerTex);
-        DrawFullScreenEffect<Gaussian6VBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaV);
+        DrawFullScreenEffect<Gaussian6VBlurShader>
+            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 
+                             1.f / UserConfigParams::m_shadows_resolution), 
+            sigmaV);
         in_fbo.BindLayer(layer);
-        Gaussian6HBlurShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), sigmaH);
+        Gaussian6HBlurShader::getInstance()
+            ->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>
+            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
+                             1.f / UserConfigParams::m_shadows_resolution),
+             sigmaH);
     }
     else
     {
@@ -687,104 +726,157 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
         ComputeShadowBlurVShader::getInstance()->use();
         ComputeShadowBlurVShader::getInstance()->setTextureUnits(LayerTex);
         glBindSampler(ComputeShadowBlurVShader::getInstance()->m_dest_tu, 0);
-        glBindImageTexture(ComputeShadowBlurVShader::getInstance()->m_dest_tu, irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R32F);
-        ComputeShadowBlurVShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsV);
-        glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1, (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
+        glBindImageTexture(ComputeShadowBlurVShader::getInstance()->m_dest_tu,
+                           irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0,
+                           false, 0, GL_WRITE_ONLY, GL_R32F);
+        ComputeShadowBlurVShader::getInstance()->setUniforms
+            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
+                             1.f / UserConfigParams::m_shadows_resolution),
+             weightsV);
+        glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1,
+                          (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
-        glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
+        glMemoryBarrier(  GL_TEXTURE_FETCH_BARRIER_BIT 
+                        | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         ComputeShadowBlurHShader::getInstance()->use();
-        ComputeShadowBlurHShader::getInstance()->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        ComputeShadowBlurHShader::getInstance()
+            ->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
         glBindSampler(ComputeShadowBlurHShader::getInstance()->m_dest_tu, 0);
-        glBindImageTexture(ComputeShadowBlurHShader::getInstance()->m_dest_tu, LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
-        ComputeShadowBlurHShader::getInstance()->setUniforms(core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 1.f / UserConfigParams::m_shadows_resolution), weightsH);
-        glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1, (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
+        glBindImageTexture(ComputeShadowBlurHShader::getInstance()->m_dest_tu,
+                           LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
+        ComputeShadowBlurHShader::getInstance()->setUniforms
+            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
+                            1.f / UserConfigParams::m_shadows_resolution),
+              weightsH);
+        glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1,
+                          (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
     glDeleteTextures(1, &LayerTex);
-}
+}   // renderGaussian6BlurLayer
 
-void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary, float sigmaV, float sigmaH)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
+                                         FrameBuffer &auxiliary, float sigmaV,
+                                         float sigmaH)
 {
-    assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
-    float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
+    assert(in_fbo.getWidth() == auxiliary.getWidth() && 
+           in_fbo.getHeight() == auxiliary.getHeight());
+    float inv_width = 1.0f / in_fbo.getWidth();
+    float inv_height = 1.0f / in_fbo.getHeight();
 
     if (!CVS->supportsComputeShadersFiltering())
     {
         auxiliary.Bind();
 
         Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6VBlurShader>(core::vector2df(inv_width, inv_height), sigmaV);
+        DrawFullScreenEffect<Gaussian6VBlurShader>
+                        (core::vector2df(inv_width, inv_height), sigmaV);
 
         in_fbo.Bind();
 
         Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), sigmaH);
+        DrawFullScreenEffect<Gaussian6HBlurShader>
+                        (core::vector2df(inv_width, inv_height), sigmaH);
     }
     else
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
         ComputeGaussian6VBlurShader::getInstance()->use();
-        ComputeGaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
+        ComputeGaussian6VBlurShader::getInstance()
+            ->setTextureUnits(in_fbo.getRTT()[0]);
         glBindSampler(ComputeGaussian6VBlurShader::getInstance()->m_dest_tu, 0);
-        glBindImageTexture(ComputeGaussian6VBlurShader::getInstance()->m_dest_tu, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
-        ComputeGaussian6VBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsV);
-        glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
+        glBindImageTexture(ComputeGaussian6VBlurShader::getInstance()->m_dest_tu,
+                            auxiliary.getRTT()[0], 0, false, 0,
+                            GL_WRITE_ONLY, GL_RGBA16F);
+        ComputeGaussian6VBlurShader::getInstance()
+            ->setUniforms(core::vector2df(inv_width, inv_height), weightsV);
+        glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, 
+                          (int)in_fbo.getHeight() / 8 + 1, 1);
 
         const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
-        glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
+        glMemoryBarrier(  GL_TEXTURE_FETCH_BARRIER_BIT 
+                        | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         ComputeGaussian6HBlurShader::getInstance()->use();
-        ComputeGaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
+        ComputeGaussian6HBlurShader::getInstance()
+                         ->setTextureUnits(auxiliary.getRTT()[0]);
         glBindSampler(ComputeGaussian6HBlurShader::getInstance()->m_dest_tu, 0);
-        glBindImageTexture(ComputeGaussian6HBlurShader::getInstance()->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_RGBA16F);
-        ComputeGaussian6HBlurShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height), weightsH);
-        glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
+        glBindImageTexture(ComputeGaussian6HBlurShader::getInstance()->m_dest_tu,
+                           in_fbo.getRTT()[0], 0, false, 0,
+                           GL_WRITE_ONLY, GL_RGBA16F);
+        ComputeGaussian6HBlurShader::getInstance()
+                ->setUniforms(core::vector2df(inv_width, inv_height), weightsH);
+        glDispatchCompute((int)in_fbo.getWidth() / 8 + 1,
+                          (int)in_fbo.getHeight() / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
 
-}
+}   // renderGaussian6Blur
 
-void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
+                                          FrameBuffer &auxiliary)
 {
-    assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
-    float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
+    assert(in_fbo.getWidth() == auxiliary.getWidth() &&
+           in_fbo.getHeight() == auxiliary.getHeight());
+    float inv_width  = 1.0f / in_fbo.getWidth();
+    float inv_height = 1.0f / in_fbo.getHeight();
     {
         auxiliary.Bind();
 
-        Gaussian6HBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
+        Gaussian6HBlurShader::getInstance()
+                                ->setTextureUnits(in_fbo.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>
+                         (core::vector2df(inv_width, inv_height), 2.0f);
     }
     {
         in_fbo.Bind();
 
-        Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>(core::vector2df(inv_width, inv_height), 2.0f);
+        Gaussian6HBlurShader::getInstance()
+                      ->setTextureUnits(auxiliary.getRTT()[0]);
+        DrawFullScreenEffect<Gaussian6HBlurShader>
+                   (core::vector2df(inv_width, inv_height), 2.0f);
     }
-}
+}   // renderHorizontalBlur
 
 
-void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
+                                             FrameBuffer &auxiliary)
 {
-    assert(in_fbo.getWidth() == auxiliary.getWidth() && in_fbo.getHeight() == auxiliary.getHeight());
+    assert(in_fbo.getWidth() == auxiliary.getWidth() &&
+           in_fbo.getHeight() == auxiliary.getHeight());
     if (CVS->supportsComputeShadersFiltering())
         glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT);
-    float inv_width = 1.0f / in_fbo.getWidth(), inv_height = 1.0f / in_fbo.getHeight();
+    float inv_width = 1.0f / in_fbo.getWidth();
+    float inv_height = 1.0f / in_fbo.getHeight();
     {
         if (!CVS->supportsComputeShadersFiltering())
         {
             auxiliary.Bind();
-            Gaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<Gaussian17TapHShader>(core::vector2df(inv_width, inv_height));
+            Gaussian17TapHShader::getInstance()
+                ->setTextureUnits(in_fbo.getRTT()[0], 
+                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            DrawFullScreenEffect<Gaussian17TapHShader>
+                                      (core::vector2df(inv_width, inv_height));
         }
         else
         {
             ComputeGaussian17TapHShader::getInstance()->use();
-            glBindSampler(ComputeGaussian17TapHShader::getInstance()->m_dest_tu, 0);
-            ComputeGaussian17TapHShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(ComputeGaussian17TapHShader::getInstance()->m_dest_tu, auxiliary.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
-            ComputeGaussian17TapHShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
-            glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
+            glBindSampler(ComputeGaussian17TapHShader::getInstance()
+                          ->m_dest_tu, 0);
+            ComputeGaussian17TapHShader::getInstance()
+                ->setTextureUnits(in_fbo.getRTT()[0], 
+                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            glBindImageTexture(ComputeGaussian17TapHShader::getInstance()
+                               ->m_dest_tu, auxiliary.getRTT()[0], 0, false,
+                               0, GL_WRITE_ONLY, GL_R16F);
+            ComputeGaussian17TapHShader::getInstance()
+                ->setUniforms(core::vector2df(inv_width, inv_height));
+            glDispatchCompute((int)in_fbo.getWidth()  / 8 + 1,
+                              (int)in_fbo.getHeight() / 8 + 1, 1);
         }
     }
     if (CVS->supportsComputeShadersFiltering())
@@ -794,43 +886,58 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &a
         {
             in_fbo.Bind();
 
-            Gaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<Gaussian17TapVShader>(core::vector2df(inv_width, inv_height));
+            Gaussian17TapVShader::getInstance()
+                ->setTextureUnits(auxiliary.getRTT()[0], 
+                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            DrawFullScreenEffect<Gaussian17TapVShader>
+                              (core::vector2df(inv_width, inv_height));
         }
         else
         {
             ComputeGaussian17TapVShader::getInstance()->use();
-            glBindSampler(ComputeGaussian17TapVShader::getInstance()->m_dest_tu, 0);
-            ComputeGaussian17TapVShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0], irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(ComputeGaussian17TapVShader::getInstance()->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0, GL_WRITE_ONLY, GL_R16F);
-            ComputeGaussian17TapVShader::getInstance()->setUniforms(core::vector2df(inv_width, inv_height));
-            glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, (int)in_fbo.getHeight() / 8 + 1, 1);
+            glBindSampler(ComputeGaussian17TapVShader::getInstance()
+                          ->m_dest_tu, 0);
+            ComputeGaussian17TapVShader::getInstance()
+                ->setTextureUnits(auxiliary.getRTT()[0],
+                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+            glBindImageTexture(ComputeGaussian17TapVShader::getInstance()
+                                ->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0,
+                                GL_WRITE_ONLY, GL_R16F);
+            ComputeGaussian17TapVShader::getInstance()
+                ->setUniforms(core::vector2df(inv_width, inv_height));
+            glDispatchCompute((int)in_fbo.getWidth() / 8 + 1,
+                              (int)in_fbo.getHeight() / 8 + 1, 1);
         }
     }
     if (CVS->supportsComputeShadersFiltering())
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-}
+}   // renderGaussian17TapBlur
 
-void PostProcessing::renderPassThrough(GLuint tex, unsigned width, unsigned height)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderPassThrough(GLuint tex, unsigned width,
+                                       unsigned height)
 {
     FullScreenShader::PassThroughShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::PassThroughShader>(width, height);
-}
+}   // renderPassThrough
 
+// ----------------------------------------------------------------------------
 void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 {
     FullScreenShader::LayerPassThroughShader::getInstance()->use();
     glBindVertexArray(FullScreenShader::LayerPassThroughShader::getInstance()->vao);
 
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::LayerPassThroughShader::getInstance()->TU_texture);
+    glActiveTexture(GL_TEXTURE0 + FullScreenShader::LayerPassThroughShader
+                                                  ::getInstance()->TU_texture);
     glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     FullScreenShader::LayerPassThroughShader::getInstance()->setUniforms(layer);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-}
+}   // renderTextureLayer
 
+// ----------------------------------------------------------------------------
 void PostProcessing::renderGlow(unsigned tex)
 {
     FullScreenShader::GlowShader::getInstance()->use();
@@ -840,8 +947,9 @@ void PostProcessing::renderGlow(unsigned tex)
     FullScreenShader::GlowShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-}
+}   // renderGlow
 
+// ----------------------------------------------------------------------------
 void PostProcessing::renderSSAO()
 {
     glDisable(GL_DEPTH_TEST);
@@ -849,19 +957,27 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    FullScreenShader::LinearizeDepthShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>(irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), irr_driver->getSceneManager()->getActiveCamera()->getFarValue());
+    FullScreenShader::LinearizeDepthShader::getInstance()
+        ->setTextureUnits(irr_driver->getDepthStencilTexture());
+    DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>
+        (irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), 
+         irr_driver->getSceneManager()->getActiveCamera()->getFarValue()  );
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    FullScreenShader::SSAOShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
+    FullScreenShader::SSAOShader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
     glGenerateMipmap(GL_TEXTURE_2D);
 
-    DrawFullScreenEffect<FullScreenShader::SSAOShader>(irr_driver->getSSAORadius(), irr_driver->getSSAOK(), irr_driver->getSSAOSigma());
+    DrawFullScreenEffect<FullScreenShader::SSAOShader>
+        (irr_driver->getSSAORadius(), irr_driver->getSSAOK(),
+         irr_driver->getSSAOSigma()                           );
 }
-
-void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffer &out_fbo)
+// ----------------------------------------------------------------------------
+void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
+                                      FrameBuffer &out_fbo)
 {
-    MotionBlurProvider * const cb = (MotionBlurProvider *)Shaders::getCallback(ES_MOTIONBLUR);
+    MotionBlurProvider * const cb =
+                      (MotionBlurProvider *)Shaders::getCallback(ES_MOTIONBLUR);
     Camera *cam = Camera::getActiveCamera();
     unsigned camID = cam->getIndex();
 
@@ -885,44 +1001,54 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo, FrameBuffe
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    FullScreenShader::MotionBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0], irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::MotionBlurShader>(
-                                  // Todo : use a previousPVMatrix per cam, not global
-                                  cam->getPreviousPVMatrix(),
-                                  core::vector2df(0.5, 0.5),
-                                  cb->getBoostTime(cam->getIndex()) * 10, // Todo : should be framerate dependent
-                                  0.15f);
-}
+    FullScreenShader::MotionBlurShader::getInstance()
+        ->setTextureUnits(in_fbo.getRTT()[0], 
+                          irr_driver->getDepthStencilTexture());
+    DrawFullScreenEffect<FullScreenShader::MotionBlurShader>
+        (// Todo : use a previousPVMatrix per cam, not global
+         cam->getPreviousPVMatrix(),
+         core::vector2df(0.5, 0.5),
+         cb->getBoostTime(cam->getIndex()) * 10, // Todo : should be framerate dependent
+         0.15f);
+}   // renderMotionBlur
 
+// ----------------------------------------------------------------------------
 static void renderGodFade(GLuint tex, const SColor &col)
 {
     FullScreenShader::GodFadeShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::GodFadeShader>(col);
-}
+}   // renderGodFade
 
+// ----------------------------------------------------------------------------
 static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 {
     FullScreenShader::GodRayShader::getInstance()->setTextureUnits(tex);
     DrawFullScreenEffect<FullScreenShader::GodRayShader>(sunpos);
-}
+}   // renderGodRay
 
+// ----------------------------------------------------------------------------
 static void toneMap(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
 {
     fbo.Bind();
     ToneMapShader::getInstance()->setTextureUnits(rtt);
     DrawFullScreenEffect<ToneMapShader>(vignette_weight);
-}
+}   // toneMap
 
+// ----------------------------------------------------------------------------
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
 {
     fbo.Bind();
-    DepthOfFieldShader::getInstance()->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
+    DepthOfFieldShader::getInstance()
+        ->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<DepthOfFieldShader>();
-}
+}   // renderDoF
 
+// ----------------------------------------------------------------------------
 void PostProcessing::applyMLAA()
 {
-    const core::vector2df &PIXEL_SIZE = core::vector2df(1.0f / UserConfigParams::m_width, 1.0f / UserConfigParams::m_height);
+    const core::vector2df &PIXEL_SIZE =
+                     core::vector2df(1.0f / UserConfigParams::m_width,
+                                     1.0f / UserConfigParams::m_height);
 
     irr_driver->getFBO(FBO_MLAA_TMP).Bind();
     glEnable(GL_STENCIL_TEST);
@@ -933,8 +1059,10 @@ void PostProcessing::applyMLAA()
 
     // Pass 1: color edge detection
     FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->use();
-    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
-    DrawFullScreenEffect<FullScreenShader::MLAAColorEdgeDetectionSHader>(PIXEL_SIZE);
+    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
+    DrawFullScreenEffect<FullScreenShader::MLAAColorEdgeDetectionSHader>
+                                                                  (PIXEL_SIZE);
 
     glStencilFunc(GL_EQUAL, 1, ~0);
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
@@ -944,33 +1072,40 @@ void PostProcessing::applyMLAA()
     glClear(GL_COLOR_BUFFER_BIT);
 
     FullScreenShader::MLAABlendWeightSHader::getInstance()->use();
-    FullScreenShader::MLAABlendWeightSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP), getTextureGLuint(m_areamap));
+    FullScreenShader::MLAABlendWeightSHader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP),
+                          getTextureGLuint(m_areamap));
     DrawFullScreenEffect<FullScreenShader::MLAABlendWeightSHader>(PIXEL_SIZE);
 
     // Blit in to tmp1
-    FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS), irr_driver->getFBO(FBO_MLAA_TMP));
+    FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS),
+                      irr_driver->getFBO(FBO_MLAA_TMP));
 
     // Pass 3: gather
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
     FullScreenShader::MLAAGatherSHader::getInstance()->use();
-    FullScreenShader::MLAAGatherSHader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND), irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
+    FullScreenShader::MLAAGatherSHader::getInstance()
+        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND),
+                          irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
     DrawFullScreenEffect<FullScreenShader::MLAAGatherSHader>(PIXEL_SIZE);
 
     // Done.
     glDisable(GL_STENCIL_TEST);
-}
+}   // applyMLAA
 
 // ----------------------------------------------------------------------------
 /** Render the post-processed scene */
-FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, bool isRace)
+FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
+                                    bool isRace)
 {
     FrameBuffer *in_fbo = &irr_driver->getFBO(FBO_COLORS);
     FrameBuffer *out_fbo = &irr_driver->getFBO(FBO_TMP1_WITH_DS);
     // Each effect uses these as named, and sets them up for the next effect.
     // This allows chaining effects where some may be disabled.
 
-    // As the original color shouldn't be touched, the first effect can't be disabled.
+    // As the original color shouldn't be touched, the first effect
+    // can't be disabled.
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
 
@@ -1014,11 +1149,13 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
 
             // Fade to quarter
             irr_driver->getFBO(FBO_QUARTER1).Bind();
-            glViewport(0, 0, irr_driver->getActualScreenSize().Width / 4, irr_driver->getActualScreenSize().Height / 4);
+            glViewport(0, 0, irr_driver->getActualScreenSize().Width / 4,
+                             irr_driver->getActualScreenSize().Height / 4);
             renderGodFade(out_fbo->getRTT()[0], col);
 
             // Blur
-            renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER1), irr_driver->getFBO(FBO_QUARTER2));
+            renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER1),
+                                irr_driver->getFBO(FBO_QUARTER2));
 
             // Calculate the sun's position in texcoords
             const core::vector3df pos = track->getGodRaysPosition();
@@ -1028,18 +1165,22 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
 
             trans.transformVect(ndc, pos);
 
-            const float texh = m_vertices[0].v1.TCoords.Y - m_vertices[0].v0.TCoords.Y;
-            const float texw = m_vertices[0].v3.TCoords.X - m_vertices[0].v0.TCoords.X;
+            const float texh = 
+                m_vertices[0].v1.TCoords.Y - m_vertices[0].v0.TCoords.Y;
+            const float texw = 
+                m_vertices[0].v3.TCoords.X - m_vertices[0].v0.TCoords.X;
 
             const float sunx = ((ndc[0] / ndc[3]) * 0.5f + 0.5f) * texw;
             const float suny = ((ndc[1] / ndc[3]) * 0.5f + 0.5f) * texh;
 
             // Rays please
             irr_driver->getFBO(FBO_QUARTER2).Bind();
-            renderGodRay(irr_driver->getRenderTargetTexture(RTT_QUARTER1), core::vector2df(sunx, suny));
+            renderGodRay(irr_driver->getRenderTargetTexture(RTT_QUARTER1),
+                         core::vector2df(sunx, suny));
 
             // Blur
-            renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER2), irr_driver->getFBO(FBO_QUARTER1));
+            renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER2),
+                                irr_driver->getFBO(FBO_QUARTER1));
 
             // Blend
             glEnable(GL_BLEND);
@@ -1048,7 +1189,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glBlendEquation(GL_FUNC_ADD);
 
             in_fbo->Bind();
-            renderPassThrough(irr_driver->getRenderTargetTexture(RTT_QUARTER2), in_fbo->getWidth(), in_fbo->getHeight());
+            renderPassThrough(irr_driver->getRenderTargetTexture(RTT_QUARTER2),
+                              in_fbo->getWidth(), in_fbo->getHeight());
             glDisable(GL_BLEND);
         }
         PROFILER_POP_CPU_MARKER();
@@ -1064,29 +1206,46 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glClear(GL_STENCIL_BUFFER_BIT);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
 
-            FrameBuffer::Blit(*in_fbo, irr_driver->getFBO(FBO_BLOOM_1024), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            FrameBuffer::Blit(*in_fbo, irr_driver->getFBO(FBO_BLOOM_1024),
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
             irr_driver->getFBO(FBO_BLOOM_512).Bind();
             renderBloom(irr_driver->getRenderTargetTexture(RTT_BLOOM_1024));
 
             // Downsample
-            FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_BLOOM_256), GL_COLOR_BUFFER_BIT, GL_LINEAR);
-            FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_BLOOM_128), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512),
+                              irr_driver->getFBO(FBO_BLOOM_256), 
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
+            FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256),
+                              irr_driver->getFBO(FBO_BLOOM_128),
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
 			// Copy for lens flare
-			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_LENS_512), GL_COLOR_BUFFER_BIT, GL_LINEAR);
-			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_LENS_256), GL_COLOR_BUFFER_BIT, GL_LINEAR);
-			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_LENS_128), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_512),
+                              irr_driver->getFBO(FBO_LENS_512), 
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
+			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_256),
+                              irr_driver->getFBO(FBO_LENS_256),
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
+			FrameBuffer::Blit(irr_driver->getFBO(FBO_BLOOM_128),
+                              irr_driver->getFBO(FBO_LENS_128),
+                              GL_COLOR_BUFFER_BIT, GL_LINEAR);
 			
 
             // Blur
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_512), irr_driver->getFBO(FBO_TMP_512), 1., 1.);
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256), irr_driver->getFBO(FBO_TMP_256), 1., 1.);
-            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128), irr_driver->getFBO(FBO_TMP_128), 1., 1.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_512),
+                                irr_driver->getFBO(FBO_TMP_512), 1., 1.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_256),
+                                irr_driver->getFBO(FBO_TMP_256), 1., 1.);
+            renderGaussian6Blur(irr_driver->getFBO(FBO_BLOOM_128),
+                                irr_driver->getFBO(FBO_TMP_128), 1., 1.);
 
-            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_512), irr_driver->getFBO(FBO_TMP_512));
-            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_256), irr_driver->getFBO(FBO_TMP_256));
-            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_128), irr_driver->getFBO(FBO_TMP_128));
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_512), 
+                                 irr_driver->getFBO(FBO_TMP_512));
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_256),
+                                 irr_driver->getFBO(FBO_TMP_256));
+            renderHorizontalBlur(irr_driver->getFBO(FBO_LENS_128), 
+                                 irr_driver->getFBO(FBO_TMP_128));
             
 
             // Additively blend on top of tmp1
@@ -1096,11 +1255,15 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
             glBlendEquation(GL_FUNC_ADD);
             
             BloomBlendShader::getInstance()->setTextureUnits(
-                irr_driver->getRenderTargetTexture(RTT_BLOOM_128), irr_driver->getRenderTargetTexture(RTT_BLOOM_256), irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
+                irr_driver->getRenderTargetTexture(RTT_BLOOM_128),
+                irr_driver->getRenderTargetTexture(RTT_BLOOM_256),
+                irr_driver->getRenderTargetTexture(RTT_BLOOM_512)  );
             DrawFullScreenEffect<BloomBlendShader>();
 
             LensBlendShader::getInstance()->setTextureUnits(
-                irr_driver->getRenderTargetTexture(RTT_LENS_128), irr_driver->getRenderTargetTexture(RTT_LENS_256), irr_driver->getRenderTargetTexture(RTT_LENS_512));
+                irr_driver->getRenderTargetTexture(RTT_LENS_128),
+                irr_driver->getRenderTargetTexture(RTT_LENS_256),
+                irr_driver->getRenderTargetTexture(RTT_LENS_512));
             DrawFullScreenEffect<LensBlendShader>();
 
 
@@ -1148,7 +1311,9 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, boo
 
     glEnable(GL_FRAMEBUFFER_SRGB);
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
-    renderPassThrough(in_fbo->getRTT()[0], irr_driver->getFBO(FBO_MLAA_COLORS).getWidth(), irr_driver->getFBO(FBO_MLAA_COLORS).getHeight());
+    renderPassThrough(in_fbo->getRTT()[0],
+                      irr_driver->getFBO(FBO_MLAA_COLORS).getWidth(),
+                      irr_driver->getFBO(FBO_MLAA_COLORS).getHeight());
     out_fbo = &irr_driver->getFBO(FBO_MLAA_COLORS);
 
     if (UserConfigParams::m_mlaa) // MLAA. Must be the last pp filter.

From e23f854845d68d21d35b0bb52c86f10846cefdbe Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 14 May 2015 19:27:32 -0400
Subject: [PATCH 201/331] Scripting work

---
 src/scriptengine/script_track.cpp | 44 +++++++++++++------------------
 src/scriptengine/script_track.hpp |  7 -----
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index d1107deb8..e27fc64c7 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -61,52 +61,44 @@ namespace Scripting
             return World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*objID);
         }
 
-        // TODO: assign types for documentation
-        /** Generic disable method for track objects */
-        void disableTrackObject(asIScriptGeneric *gen)
+        /** Hide/disable a track object */
+        void disableTrackObject(std::string* objID)
         {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str);
+            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*objID);
         }
 
-        /** Generic enable method for track objects */
-        void enableTrackObject(asIScriptGeneric *gen)
+        /** Show/enable a track objects */
+        void enableTrackObject(std::string* objID)
         {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*str);
+            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*objID);
         }
 
         /** Disables an action trigger of specified ID */
-        void disableTrigger(asIScriptGeneric *gen)
+        void disableTrigger(std::string* triggerID)
         {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*str);
+            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*triggerID);
         }
 
         /** Enables an action trigger of specified ID */
-        void enableTrigger(asIScriptGeneric *gen)
+        void enableTrigger(std::string* triggerID)
         {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
-            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*str);
+            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*triggerID);
         }
 
         /** Creates a trigger at the specified location */
-        void createTrigger(asIScriptGeneric *gen)
+        void createTrigger(std::string* triggerID, Vec3* creation_loc, float distance)
         {
-            std::string *script_name = (std::string*)gen->GetArgAddress(0);
-            Vec3 *creation_loc = (Vec3*)gen->GetArgAddress(1);
             float x = creation_loc->getX();
             float y = creation_loc->getY();
             float z = creation_loc->getZ();
-            float distance = gen->GetArgFloat(2); //triggering distance
             core::vector3df posi(x, y, z);
             core::vector3df hpr(0, 0, 0);
             core::vector3df scale(1.0f, 1.0f, 1.0f);
             TrackObjectPresentationActionTrigger* newtrigger =
-                new TrackObjectPresentationActionTrigger(posi, *script_name, distance);
+                new TrackObjectPresentationActionTrigger(posi, *triggerID, distance);
             TrackObject* tobj = new TrackObject(posi, hpr, scale,
                 "none", newtrigger, false /* isDynamic */, NULL /* physics settings */);
-            tobj->setID(*script_name);
+            tobj->setID(*triggerID);
             World::getWorld()->getTrack()->getTrackObjectManager()->insertObject(tobj);
         }
     }
@@ -246,11 +238,11 @@ namespace Scripting
             r = engine->RegisterObjectType("SoundEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
             r = engine->RegisterObjectType("Animator", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
 
-            r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_GENERIC); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void createTrigger(const string &in,Vec3 &in, float distance)",
+            r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)",
                 asFUNCTION(createTrigger), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             
diff --git a/src/scriptengine/script_track.hpp b/src/scriptengine/script_track.hpp
index 9b2b77c70..4f33d4fe8 100644
--- a/src/scriptengine/script_track.hpp
+++ b/src/scriptengine/script_track.hpp
@@ -31,13 +31,6 @@ namespace Scripting
         void registerScriptFunctions(asIScriptEngine *engine);
         asIScriptFunction*
             registerScriptCallbacks(asIScriptEngine *engine , std::string scriptName);
-
-        //script-bound functions
-        void disableAnimation(asIScriptGeneric *gen);
-        void enableAnimation(asIScriptGeneric *gen);
-        void enableTrigger(asIScriptGeneric *gen);
-        void disableTrigger(asIScriptGeneric *gen);
-        void createTrigger(asIScriptGeneric *gen);
     }
 
 }

From 329a4ac0470523981df444c5e2bef6efc00fcf77 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 16 May 2015 10:39:33 +1000
Subject: [PATCH 202/331] Removed multiple inheritance, instead made
 TextureRead inherit from Shader. work in progress!

---
 src/graphics/2dutils.cpp         |  20 ++--
 src/graphics/IBL.cpp             |   5 +-
 src/graphics/gpuparticles.cpp    |  10 +-
 src/graphics/post_processing.cpp |  92 ++++++-----------
 src/graphics/render_geometry.cpp | 165 ++++++++-----------------------
 src/graphics/shaders.hpp         | 112 +++++++--------------
 src/graphics/stkbillboard.cpp    |   5 +-
 src/graphics/texture_read.hpp    |  26 ++---
 8 files changed, 140 insertions(+), 295 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 657ea5e9b..802117653 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -29,8 +29,7 @@
 
 
 // ============================================================================
-class Primitive2DList : public Shader<Primitive2DList>,
-                        public TextureReadNew<ST_BILINEAR_FILTERED >
+class Primitive2DList : public TextureRead<Primitive2DList, 1>
 {
 public:
     Primitive2DList()
@@ -43,11 +42,10 @@ public:
 };   //Primitive2DList
 
 // ============================================================================
-class UniformColoredTextureRectShader : public Shader<UniformColoredTextureRectShader,
+class UniformColoredTextureRectShader : public TextureRead<UniformColoredTextureRectShader,1,
                                                       core::vector2df, core::vector2df,
                                                       core::vector2df, core::vector2df,
-                                                      video::SColor>,
-                                        public TextureReadNew<ST_BILINEAR_FILTERED>
+                                                      video::SColor>
 {
 public:
     UniformColoredTextureRectShader()
@@ -62,10 +60,9 @@ public:
 };   // UniformColoredTextureRectShader
 
 // ============================================================================
-class TextureRectShader : public Shader<TextureRectShader, core::vector2df,
-                                        core::vector2df, core::vector2df,
-                                        core::vector2df>,
-                          public TextureReadNew<ST_BILINEAR_FILTERED>
+class TextureRectShader : public TextureRead<TextureRectShader, 1, 
+                                             core::vector2df, core::vector2df,
+                                             core::vector2df, core::vector2df>
 {
 public:
     TextureRectShader()
@@ -93,10 +90,9 @@ public:
 
 // ============================================================================
 
-class ColoredTextureRectShader : public Shader<ColoredTextureRectShader,
+class ColoredTextureRectShader : public TextureRead<ColoredTextureRectShader, 1,
                                                core::vector2df, core::vector2df,
-                                               core::vector2df, core::vector2df>,
-                                 public TextureReadNew<ST_BILINEAR_FILTERED>
+                                               core::vector2df, core::vector2df>
 {
 #ifdef XX
 private:
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index ce2de3bd5..f728df098 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -26,9 +26,8 @@
 #include <set>
 
 
-class SpecularIBLGenerator : public Shader<SpecularIBLGenerator, core::matrix4,
-                                           float >,
-                             public TextureReadNew<ST_TRILINEAR_CUBEMAP>
+class SpecularIBLGenerator : public TextureRead<SpecularIBLGenerator, 1, 
+                                                core::matrix4, float >
 {
 public:
     GLuint m_tu_samples;
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 82cdce6a4..0306ec002 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -54,10 +54,8 @@ public:
 
 /** A Shader to render particles.
 */
-class SimpleParticleRender : public Shader<SimpleParticleRender, video::SColorf,
-                                           video::SColorf>,
-                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                                   ST_NEAREST_FILTERED>
+class SimpleParticleRender : public TextureRead<SimpleParticleRender, 2,
+                                                video::SColorf, video::SColorf>
 {
 public:
     SimpleParticleRender()
@@ -76,9 +74,7 @@ public:
 
 // ============================================================================
 
-class FlipParticleRender : public Shader<FlipParticleRender>, 
-                           public TextureReadNew < ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                                   ST_NEAREST_FILTERED >
+class FlipParticleRender : public TextureRead<FlipParticleRender, 2>
 {
 public:
     FlipParticleRender()
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 657276313..4f5a7ec76 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -43,9 +43,8 @@ using namespace video;
 using namespace scene;
 
 // ============================================================================
-class Gaussian3HBlurShader : public Shader<Gaussian3HBlurShader,
-                                           core::vector2df>,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian3HBlurShader : public TextureRead<Gaussian3HBlurShader, 1,
+                                           core::vector2df>
 {
 public:
     Gaussian3HBlurShader()
@@ -59,10 +58,9 @@ public:
 };   // Gaussian3HBlurShader
 
 // ============================================================================
-class ComputeShadowBlurVShader : public Shader<ComputeShadowBlurVShader,
+class ComputeShadowBlurVShader : public TextureRead<ComputeShadowBlurVShader, 1,
                                                core::vector2df,
-                                               std::vector<float> >,
-                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
+                                               std::vector<float> >
 {
 public:
     GLuint m_dest_tu;
@@ -78,9 +76,8 @@ public:
 };   // ComputeShadowBlurVShader
 
 // ============================================================================
-class Gaussian6VBlurShader : public Shader<Gaussian6VBlurShader,
-                                           core::vector2df, float>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian6VBlurShader : public TextureRead<Gaussian6VBlurShader, 1,
+                                           core::vector2df, float>
 {
 public:
     Gaussian6VBlurShader()
@@ -94,9 +91,8 @@ public:
 };   // Gaussian6VBlurShader
 
 // ============================================================================
-class Gaussian3VBlurShader : public Shader<Gaussian3VBlurShader,
-                                           core::vector2df>,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian3VBlurShader : public TextureRead<Gaussian3VBlurShader, 1,
+                                           core::vector2df>
 {
 public:
     Gaussian3VBlurShader()
@@ -110,10 +106,9 @@ public:
 };   // Gaussian3VBlurShader
 
 // ============================================================================
-class ComputeGaussian6VBlurShader : public Shader<ComputeGaussian6VBlurShader,
+class ComputeGaussian6VBlurShader : public TextureRead<ComputeGaussian6VBlurShader, 1,
                                                   core::vector2df,
-                                                  std::vector<float> >,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+                                                  std::vector<float> >
 {
 public:
     GLuint m_dest_tu;
@@ -129,10 +124,9 @@ public:
 };   // ComputeGaussian6VBlurShader
 
 // ============================================================================
-class ComputeGaussian6HBlurShader : public Shader<ComputeGaussian6HBlurShader,
+class ComputeGaussian6HBlurShader : public TextureRead<ComputeGaussian6HBlurShader, 1,
                                                   core::vector2df, 
-                                                  std::vector<float> >,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+                                                  std::vector<float> >
 {
 public:
     GLuint m_dest_tu;
@@ -148,10 +142,9 @@ public:
 };   // ComputeGaussian6HBlurShader
 
 // ============================================================================
-class ComputeShadowBlurHShader : public Shader<ComputeShadowBlurHShader,
+class ComputeShadowBlurHShader : public TextureRead<ComputeShadowBlurHShader, 1,
                                                core::vector2df,
-                                               std::vector<float> >,
-                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED>
+                                               std::vector<float> >
 {
 public:
     GLuint m_dest_tu;
@@ -166,9 +159,8 @@ public:
 };   // ComputeShadowBlurHShader
 
 // ============================================================================
-class Gaussian6HBlurShader : public Shader<Gaussian6HBlurShader,
-                                           core::vector2df, float>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian6HBlurShader : public TextureRead<Gaussian6HBlurShader, 1,
+                                           core::vector2df, float>
 {
 public:
     Gaussian6HBlurShader()
@@ -182,10 +174,8 @@ public:
 };   // Gaussian6HBlurShader
 
 // ============================================================================
-class Gaussian17TapHShader : public Shader<Gaussian17TapHShader,
-                                           core::vector2df>,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
-                                                  ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian17TapHShader : public TextureRead<Gaussian17TapHShader, 2,
+                                           core::vector2df>
 {
 public:
     Gaussian17TapHShader()
@@ -199,10 +189,8 @@ public:
 };   // Gaussian17TapHShader
 
 // ============================================================================
-class ComputeGaussian17TapHShader : public Shader<ComputeGaussian17TapHShader,
-                                                  core::vector2df>,
-                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
-                                                    ST_NEARED_CLAMPED_FILTERED>
+class ComputeGaussian17TapHShader : public TextureRead<ComputeGaussian17TapHShader, 2,
+                                                  core::vector2df>
 {
 public:
     GLuint m_dest_tu;
@@ -219,10 +207,8 @@ public:
 
 
 // ============================================================================
-class Gaussian17TapVShader : public Shader<Gaussian17TapVShader,
-                                           core::vector2df>,
-                            public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED,
-                                                  ST_BILINEAR_CLAMPED_FILTERED>
+class Gaussian17TapVShader : public TextureRead<Gaussian17TapVShader, 2,
+                                           core::vector2df>
 {
 public:
     Gaussian17TapVShader()
@@ -237,10 +223,8 @@ public:
 };   // Gaussian17TapVShader
 
 // ============================================================================
-class ComputeGaussian17TapVShader : public Shader<ComputeGaussian17TapVShader, 
-                                                  core::vector2df>,
-                              public TextureReadNew<ST_NEARED_CLAMPED_FILTERED,
-                                                    ST_NEARED_CLAMPED_FILTERED>
+class ComputeGaussian17TapVShader : public TextureRead<ComputeGaussian17TapVShader, 2, 
+                                                  core::vector2df>
 {
 public:
     GLuint m_dest_tu;
@@ -257,8 +241,7 @@ public:
 };   // ComputeGaussian17TapVShader
 
 // ============================================================================
-class BloomShader : public Shader<BloomShader>,
-                    public TextureReadNew<ST_NEAREST_FILTERED>
+class BloomShader : public TextureRead<BloomShader, 1>
 {
 public:
     BloomShader()
@@ -273,10 +256,7 @@ public:
 };   // BloomShader
 
 // ============================================================================
-class BloomBlendShader : public Shader<BloomBlendShader>,
-                         public TextureReadNew<ST_BILINEAR_FILTERED, 
-                                               ST_BILINEAR_FILTERED,
-                                               ST_BILINEAR_FILTERED>
+class BloomBlendShader : public TextureRead<BloomBlendShader, 3>
 {
 public:
     BloomBlendShader()
@@ -291,10 +271,7 @@ public:
 };   // BloomBlendShader
 
 // ============================================================================
-class LensBlendShader : public Shader<LensBlendShader>, 
-                        public TextureReadNew<ST_BILINEAR_FILTERED,
-                                              ST_BILINEAR_FILTERED,
-                                              ST_BILINEAR_FILTERED>
+class LensBlendShader : public TextureRead<LensBlendShader, 3>
 {
 public:
     LensBlendShader()
@@ -310,8 +287,7 @@ public:
 };   // LensBlendShader
 
 // ============================================================================
-class ToneMapShader : public Shader<ToneMapShader, float>,
-                      public TextureReadNew<ST_NEAREST_FILTERED>
+class ToneMapShader : public TextureRead<ToneMapShader, 1, float>
 {
 public:
 
@@ -327,9 +303,7 @@ public:
 };   // ToneMapShader
 
 // ============================================================================
-class DepthOfFieldShader : public Shader<DepthOfFieldShader>,
-                           public TextureReadNew<ST_BILINEAR_FILTERED, 
-                                                 ST_NEAREST_FILTERED>
+class DepthOfFieldShader : public TextureRead<DepthOfFieldShader, 2>
 {
 public:
     DepthOfFieldShader()
@@ -344,10 +318,7 @@ public:
 };   // DepthOfFieldShader
 
 // ============================================================================
-class IBLShader : public Shader<IBLShader>,
-                  public TextureReadNew<ST_NEAREST_FILTERED,
-                                        ST_NEAREST_FILTERED,
-                                        ST_TRILINEAR_CUBEMAP>
+class IBLShader : public TextureRead<IBLShader, 3>
 {
 public:
     IBLShader()
@@ -366,8 +337,7 @@ public:
 };   // IBLShader
 
 // ============================================================================
-class DegradedIBLShader : public Shader<DegradedIBLShader>,
-                          public TextureReadNew<ST_NEAREST_FILTERED>
+class DegradedIBLShader : public TextureRead<DegradedIBLShader, 1>
 {
 public:
     DegradedIBLShader()
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index c45b61142..894a5f959 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -77,8 +77,7 @@ layout(location = 6) in vec3 Bitangent;
 */
 
 // ============================================================================
-class InstancedObjectPass1Shader : public Shader<InstancedObjectPass1Shader>,
-                    public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedObjectPass1Shader : public TextureRead<InstancedObjectPass1Shader, 1>
 {
 public:
     InstancedObjectPass1Shader()
@@ -95,9 +94,7 @@ public:
 };   // class InstancedObjectPass1Shader
 
 // ============================================================================
-class InstancedObjectRefPass1Shader : public Shader<InstancedObjectRefPass1Shader>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedObjectRefPass1Shader : public TextureRead<InstancedObjectRefPass1Shader, 2>
 {
 public:
     InstancedObjectRefPass1Shader()
@@ -116,13 +113,8 @@ public:
 };   // InstancedObjectRefPass1Shader
 
 // ============================================================================
-class ObjectRefPass2Shader : public Shader<ObjectRefPass2Shader, core::matrix4,
-                                           core::matrix4>,
-                       public TextureReadNew<ST_NEAREST_FILTERED,
-                                             ST_NEAREST_FILTERED, 
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class ObjectRefPass2Shader : public TextureRead<ObjectRefPass2Shader, 5,
+                                                core::matrix4, core::matrix4>
 {
 public:
     ObjectRefPass2Shader()
@@ -141,12 +133,7 @@ public:
 };   // ObjectRefPass2Shader
 
 // ============================================================================
-class InstancedObjectPass2Shader : public Shader<InstancedObjectPass2Shader>,
-                       public TextureReadNew<ST_NEAREST_FILTERED, 
-                                             ST_NEAREST_FILTERED, 
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedObjectPass2Shader : public TextureRead<InstancedObjectPass2Shader, 5>
 {
 public:
     InstancedObjectPass2Shader()
@@ -165,12 +152,7 @@ public:
 };   // InstancedObjectPass2Shader
 
 // ============================================================================
-class InstancedObjectRefPass2Shader : public Shader<InstancedObjectRefPass2Shader>, 
-                      public TextureReadNew<ST_NEAREST_FILTERED,
-                                            ST_NEAREST_FILTERED,
-                                            ST_BILINEAR_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedObjectRefPass2Shader : public TextureRead<InstancedObjectRefPass2Shader, 5>
 {
 public:
     InstancedObjectRefPass2Shader()
@@ -190,8 +172,7 @@ public:
 };   // InstancedObjectRefPass2Shader
 
 // ============================================================================
-class ShadowShader : public Shader<ShadowShader, int, core::matrix4>,
-                     public TextureReadNew<>
+class ShadowShader : public TextureRead<ShadowShader, 0, int, core::matrix4>
 {
 public:
     ShadowShader()
@@ -215,8 +196,7 @@ public:
 };   // ShadowShader
 
 // ============================================================================
-class InstancedShadowShader : public Shader<InstancedShadowShader, int>,
-                              public TextureReadNew<>
+class InstancedShadowShader : public TextureRead<InstancedShadowShader, 0, int>
 {
 public:
     InstancedShadowShader()
@@ -243,9 +223,8 @@ public:
 };   // InstancedShadowShader
 
 // ============================================================================
-class CRSMShader : public Shader<CRSMShader, core::matrix4, core::matrix4, 
-                                 core::matrix4>,
-                  public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class CRSMShader : public TextureRead<CRSMShader, 1, core::matrix4, core::matrix4, 
+                                 core::matrix4>
 {
 public:
     CRSMShader()
@@ -261,13 +240,8 @@ public:
 
 
 // ============================================================================
-class SplattingRSMShader : public Shader<SplattingRSMShader, core::matrix4,
-                                  core::matrix4>,
-                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED, 
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class SplattingRSMShader : public TextureRead<SplattingRSMShader, 5, core::matrix4,
+                                  core::matrix4>
 {
 public:
     SplattingRSMShader()
@@ -287,8 +261,7 @@ public:
 };  // SplattingRSMShader
 
 // ============================================================================
-class CInstancedRSMShader : public Shader<CInstancedRSMShader, core::matrix4>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class CInstancedRSMShader : public TextureRead<CInstancedRSMShader, 1, core::matrix4>
 {
 public:
     CInstancedRSMShader()
@@ -304,12 +277,8 @@ public:
 };   // CInstancedRSMShader
 
 // ============================================================================
-class SphereMapShader : public Shader<SphereMapShader, core::matrix4,
-                                      core::matrix4>,
-                       public TextureReadNew<ST_NEAREST_FILTERED, 
-                                             ST_NEAREST_FILTERED, 
-                                             ST_BILINEAR_FILTERED, 
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class SphereMapShader : public TextureRead<SphereMapShader, 4, core::matrix4,
+                                      core::matrix4>
 {
 public:
     SphereMapShader()
@@ -328,11 +297,7 @@ public:
 };   // SphereMapShader
 
 // ============================================================================
-class InstancedSphereMapShader : public Shader<InstancedSphereMapShader>,
-                       public TextureReadNew<ST_NEAREST_FILTERED,
-                                             ST_NEAREST_FILTERED,
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedSphereMapShader : public TextureRead<InstancedSphereMapShader, 4>
 {
 public:
     InstancedSphereMapShader()
@@ -352,15 +317,7 @@ public:
 };   // InstancedSphereMapShader
 
 // ============================================================================
-class SplattingShader : public Shader<SplattingShader, core::matrix4>, 
-                       public TextureReadNew<ST_NEAREST_FILTERED,
-                                             ST_NEAREST_FILTERED,
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED, 
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class SplattingShader : public TextureRead<SplattingShader, 8, core::matrix4>
 {
 public:
     SplattingShader()
@@ -383,10 +340,8 @@ public:
 };   // SplattingShader
 
 // ============================================================================
-class ObjectRefPass1Shader : public Shader<ObjectRefPass1Shader, core::matrix4,
-                                           core::matrix4, core::matrix4>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class ObjectRefPass1Shader : public TextureRead<ObjectRefPass1Shader, 2, core::matrix4,
+                                           core::matrix4, core::matrix4>
 {
 public:
     ObjectRefPass1Shader()
@@ -403,10 +358,8 @@ public:
 
 
 // ============================================================================
-class NormalMapShader : public Shader<NormalMapShader, core::matrix4, 
-                                      core::matrix4>,
-                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class NormalMapShader : public TextureRead<NormalMapShader, 2, core::matrix4, 
+                                      core::matrix4>
 {
 public:
     NormalMapShader()
@@ -423,9 +376,7 @@ public:
 };   // NormalMapShader
 
 // ============================================================================
-class InstancedNormalMapShader : public Shader<InstancedNormalMapShader>,
-                      public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedNormalMapShader : public TextureRead<InstancedNormalMapShader, 2>
 {
 public:
     InstancedNormalMapShader()
@@ -442,12 +393,8 @@ public:
 };   // InstancedNormalMapShader
 
 // ============================================================================
-class ObjectUnlitShader : public Shader<ObjectUnlitShader, core::matrix4, 
-                                        core::matrix4>,
-                          public TextureReadNew<ST_NEAREST_FILTERED,
-                                                ST_NEAREST_FILTERED,
-                                                ST_BILINEAR_FILTERED,
-                                                ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class ObjectUnlitShader : public TextureRead<ObjectUnlitShader, 4, core::matrix4, 
+                                        core::matrix4>
 {
 public:
     ObjectUnlitShader()
@@ -464,11 +411,7 @@ public:
 };   // ObjectUnlitShader
 
 // ============================================================================
-class InstancedObjectUnlitShader : public Shader<InstancedObjectUnlitShader>,
-                       public TextureReadNew<ST_NEAREST_FILTERED, 
-                                             ST_NEAREST_FILTERED, 
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedObjectUnlitShader : public TextureRead<InstancedObjectUnlitShader, 4>
 {
 public:
     InstancedObjectUnlitShader()
@@ -605,10 +548,8 @@ const STK::Tuple<size_t> UnlitMat::ShadowTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> UnlitMat::RSMTextures = STK::Tuple<size_t>(0);
 
 // ============================================================================
-class GrassPass1Shader : public Shader<GrassPass1Shader, core::matrix4,
-                                       core::matrix4, core::vector3df>,
-                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                              ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class GrassPass1Shader : public TextureRead<GrassPass1Shader, 2, core::matrix4,
+                                       core::matrix4, core::vector3df>
 {
 public:
     GrassPass1Shader()
@@ -625,10 +566,8 @@ public:
 };   // class GrassPass1Shader
 
 // ============================================================================
-class InstancedGrassPass1Shader : public Shader<InstancedGrassPass1Shader,
-                                                core::vector3df>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedGrassPass1Shader : public TextureRead<InstancedGrassPass1Shader, 2,
+                                                core::vector3df>
 {
 public:
     InstancedGrassPass1Shader()
@@ -645,9 +584,8 @@ public:
 };   // InstancedGrassPass1Shader
 
 // ============================================================================
-class GrassShadowShader : public Shader<GrassShadowShader, int, core::matrix4,
-                                        core::vector3df>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class GrassShadowShader : public TextureRead<GrassShadowShader, 1, int, core::matrix4,
+                                        core::vector3df>
 {
 public:
     GrassShadowShader()
@@ -673,9 +611,8 @@ public:
 };   // GrassShadowShader
 
 // ============================================================================
-class InstancedGrassShadowShader : public Shader<InstancedGrassShadowShader,
-                                                 int, core::vector3df>,
-                    public TextureReadNew < ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedGrassShadowShader : public TextureRead<InstancedGrassShadowShader, 1, 
+                                                 int, core::vector3df>
 {
 public:
     InstancedGrassShadowShader()
@@ -705,13 +642,8 @@ public:
 
 
 // ============================================================================
-class GrassPass2Shader : public Shader<GrassPass2Shader, core::matrix4,
-                                       core::vector3df>,
-                      public TextureReadNew<ST_NEAREST_FILTERED, 
-                                            ST_NEAREST_FILTERED,
-                                            ST_BILINEAR_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class GrassPass2Shader : public TextureRead<GrassPass2Shader, 5, core::matrix4,
+                                       core::vector3df>
 {
 public:
     GrassPass2Shader()
@@ -730,14 +662,8 @@ public:
 };   // GrassPass2Shader
 
 // ============================================================================
-class InstancedGrassPass2Shader : public Shader<InstancedGrassPass2Shader,
-                                             core::vector3df, core::vector3df>,
-                       public TextureReadNew<ST_NEAREST_FILTERED,
-                                             ST_NEAREST_FILTERED,
-                                             ST_BILINEAR_FILTERED,
-                                             ST_NEAREST_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedGrassPass2Shader : public TextureRead<InstancedGrassPass2Shader, 6,
+                                             core::vector3df, core::vector3df>
 {
 public:
     InstancedGrassPass2Shader()
@@ -758,14 +684,8 @@ public:
 };   // InstancedGrassPass2Shader
 
 // ============================================================================
-class DetailedObjectPass2Shader : public Shader<DetailedObjectPass2Shader,
-                                                 core::matrix4>,
-                                   public TextureReadNew<ST_NEAREST_FILTERED,
-                                             ST_NEAREST_FILTERED, 
-                                             ST_BILINEAR_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                             ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class DetailedObjectPass2Shader : public TextureRead<DetailedObjectPass2Shader, 6,
+                                                 core::matrix4>
 {
 public:
     DetailedObjectPass2Shader()
@@ -784,11 +704,7 @@ public:
 };   // DetailedObjectPass2Shader
 
 // ============================================================================
-class InstancedDetailedObjectPass2Shader : public Shader<InstancedDetailedObjectPass2Shader>,
-      public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, 
-                            ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                            ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                            ST_TRILINEAR_ANISOTROPIC_FILTERED >
+class InstancedDetailedObjectPass2Shader : public TextureRead<InstancedDetailedObjectPass2Shader, 6>
 {
 public:
     InstancedDetailedObjectPass2Shader()
@@ -1519,6 +1435,7 @@ static video::ITexture *displaceTex = 0;
 // ----------------------------------------------------------------------------
 void IrrDriver::renderTransparent()
 {
+
     glEnable(GL_DEPTH_TEST);
     glDepthMask(GL_FALSE);
     glEnable(GL_BLEND);
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index f0c55d5cd..7db8b2f4d 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -34,8 +34,8 @@ class ParticleSystemProxy;
 
 namespace MeshShader
 {
-class ObjectPass1Shader : public Shader<ObjectPass1Shader, core::matrix4, core::matrix4>, 
-                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class ObjectPass1Shader : public TextureRead<ObjectPass1Shader, 1,
+                                             core::matrix4, core::matrix4>
 {
 public:
     ObjectPass1Shader();
@@ -43,9 +43,7 @@ public:
 
 
 
-class ObjectPass2Shader : public Shader<ObjectPass2Shader, core::matrix4, core::matrix4>,
-    public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_BILINEAR_FILTERED,
-                        ST_TRILINEAR_ANISOTROPIC_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class ObjectPass2Shader : public TextureRead<ObjectPass2Shader, 5, core::matrix4, core::matrix4>
 {
 public:
     ObjectPass2Shader();
@@ -54,16 +52,14 @@ public:
 
 
 
-class TransparentShader : public Shader<TransparentShader, core::matrix4, core::matrix4>,
-                          public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class TransparentShader : public TextureRead<TransparentShader, 1, core::matrix4, core::matrix4>
 {
 public:
     TransparentShader();
 };
 
-class TransparentFogShader : public Shader<TransparentFogShader, core::matrix4, core::matrix4, float, float, 
-                                           float, float, float, video::SColorf>,
-                             public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class TransparentFogShader : public TextureRead<TransparentFogShader, 1, core::matrix4, core::matrix4, float, float, 
+                                           float, float, float, video::SColorf>
 {
 public:
     TransparentFogShader();
@@ -84,15 +80,13 @@ public:
 
 
 
-class RefShadowShader : public Shader<RefShadowShader, int, core::matrix4>,
-                        public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class RefShadowShader : public TextureRead<RefShadowShader, 1, int, core::matrix4>
 {
 public:
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public Shader<InstancedRefShadowShader, int>,
-                                 public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class InstancedRefShadowShader : public TextureRead<InstancedRefShadowShader, 1, int>
 {
 public:
     InstancedRefShadowShader();
@@ -105,16 +99,14 @@ public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public Shader<DisplaceShader, core::matrix4, core::vector2df, core::vector2df>,
-                       public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED,
-                                             ST_BILINEAR_FILTERED, ST_TRILINEAR_ANISOTROPIC_FILTERED>
+class DisplaceShader : public TextureRead<DisplaceShader, 4, core::matrix4,
+                                          core::vector2df, core::vector2df>
 {
 public:
     DisplaceShader();
 };
 
-class SkyboxShader : public Shader<SkyboxShader>,
-                     public TextureReadNew<ST_TRILINEAR_CUBEMAP>
+class SkyboxShader : public TextureRead<SkyboxShader,1>
 {
 public:
     SkyboxShader();
@@ -154,8 +146,7 @@ namespace LightShader
     };
 
 
-    class PointLightShader : public Shader<PointLightShader>,
-                             public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
+    class PointLightShader : public TextureRead<PointLightShader, 2>
     {
     public:
         GLuint vbo;
@@ -163,8 +154,7 @@ namespace LightShader
         PointLightShader();
     };
 
-    class PointLightScatterShader : public Shader<PointLightScatterShader, float, core::vector3df>,
-                                     public TextureReadNew<ST_NEAREST_FILTERED>
+    class PointLightScatterShader : public TextureRead<PointLightScatterShader, 1, float, core::vector3df>
     {
     public:
         GLuint vbo;
@@ -187,43 +177,35 @@ namespace FullScreenShader
 {
 
 
-class SunLightShader : public Shader<SunLightShader, core::vector3df, video::SColorf>,
-                       public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
+class SunLightShader : public TextureRead<SunLightShader, 2,  core::vector3df, video::SColorf>
 {
 public:
     SunLightShader();
 };
 
-class ShadowedSunLightShaderPCF : public Shader<ShadowedSunLightShaderPCF, float, float, float, float, float>,
-                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED, ST_SHADOW_SAMPLER>
+class ShadowedSunLightShaderPCF : public TextureRead<ShadowedSunLightShaderPCF, 3,  float, float, float, float, float>
 {
 public:
     ShadowedSunLightShaderPCF();
 };
 
-class ShadowedSunLightShaderESM : public Shader<ShadowedSunLightShaderESM, float, float, float, float>,
-                                  public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
-                                                        ST_TRILINEAR_CLAMPED_ARRAY2D>
+class ShadowedSunLightShaderESM : public TextureRead<ShadowedSunLightShaderESM, 3, float, float, float, float>
 {
 public:
     ShadowedSunLightShaderESM();
 };
 
-class RadianceHintsConstructionShader : public Shader<RadianceHintsConstructionShader, core::matrix4, 
-                                                      core::matrix4, core::vector3df, video::SColorf>,
-                                        public TextureReadNew<ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED, ST_BILINEAR_FILTERED>
+class RadianceHintsConstructionShader : public TextureRead<RadianceHintsConstructionShader, 3, core::matrix4, 
+                                                      core::matrix4, core::vector3df, video::SColorf>
 {
 public:
     RadianceHintsConstructionShader();
 };
 
 // Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public Shader<NVWorkaroundRadianceHintsConstructionShader,
-                                                                   core::matrix4, core::matrix4, core::vector3df,
-                                                                   int, video::SColorf>,
-                                                    public TextureReadNew<ST_BILINEAR_FILTERED,
-                                                                          ST_BILINEAR_FILTERED,
-                                                                          ST_BILINEAR_FILTERED>
+class NVWorkaroundRadianceHintsConstructionShader : public TextureRead<NVWorkaroundRadianceHintsConstructionShader,
+                                                                   3, core::matrix4, core::matrix4, core::vector3df,
+                                                                   int, video::SColorf>
 {
 public:
     NVWorkaroundRadianceHintsConstructionShader();
@@ -237,27 +219,21 @@ public:
     RHDebug();
 };
 
-class GlobalIlluminationReconstructionShader : public Shader<GlobalIlluminationReconstructionShader,
-                                                             core::matrix4, core::matrix4, core::vector3df>,
-                                               public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED,
-                                                                     ST_VOLUME_LINEAR_FILTERED,
-                                                                     ST_VOLUME_LINEAR_FILTERED,
-                                                                     ST_VOLUME_LINEAR_FILTERED>
+class GlobalIlluminationReconstructionShader : public TextureRead<GlobalIlluminationReconstructionShader, 5,
+                                                             core::matrix4, core::matrix4, core::vector3df>
 {
 public:
     GlobalIlluminationReconstructionShader();
 };
 
-class HorizontalBlurShader : public Shader<HorizontalBlurShader, core::vector2df>,
-                             public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED>
+class HorizontalBlurShader : public TextureRead<HorizontalBlurShader, 1, core::vector2df>
 {
 public:
     HorizontalBlurShader();
 };
 
 
-class PassThroughShader : public Shader<PassThroughShader, int, int>,
-                          public TextureReadNew<ST_BILINEAR_FILTERED>
+class PassThroughShader : public TextureRead<PassThroughShader, 1, int, int>
 {
 public:
     PassThroughShader();
@@ -272,17 +248,15 @@ public:
     LayerPassThroughShader();
 };
 
-class LinearizeDepthShader : public Shader<LinearizeDepthShader, float, float>,
-                             public TextureReadNew<ST_BILINEAR_FILTERED>
+class LinearizeDepthShader : public TextureRead<LinearizeDepthShader, 1, float, float>
 {
 public:
     LinearizeDepthShader();
 };
 
-class LightspaceBoundingBoxShader : public Shader<LightspaceBoundingBoxShader, 
+class LightspaceBoundingBoxShader : public TextureRead<LightspaceBoundingBoxShader, 1,
                                                   core::matrix4, float, float,
-                                                  float, float>,
-                                    public TextureReadNew<ST_NEAREST_FILTERED >
+                                                  float, float>
 {
 public:
     LightspaceBoundingBoxShader();
@@ -294,15 +268,13 @@ public:
     ShadowMatrixesGenerationShader();
 };
 
-class DepthHistogramShader : public Shader<DepthHistogramShader>, 
-                             public TextureReadNew<ST_NEAREST_FILTERED>
+class DepthHistogramShader : public TextureRead<DepthHistogramShader, 1>
 {
 public:
     DepthHistogramShader();
 };
 
-class GlowShader : public Shader<GlowShader>,
-                   public TextureReadNew<ST_BILINEAR_FILTERED>
+class GlowShader : public TextureRead<GlowShader, 1>
 {
 public:
     GLuint vao;
@@ -310,57 +282,49 @@ public:
     GlowShader();
 };
 
-class SSAOShader : public Shader<SSAOShader, float, float, float>,
-                   public TextureReadNew<ST_SEMI_TRILINEAR>
+class SSAOShader : public TextureRead<SSAOShader, 1, float, float, float>
 {
 public:
     SSAOShader();
 };
 
-class FogShader : public Shader<FogShader, float, core::vector3df>,
-                  public TextureReadNew<ST_NEAREST_FILTERED>
+class FogShader : public TextureRead<FogShader, 1, float, core::vector3df>
 {
 public:
     FogShader();
 };
 
-class MotionBlurShader : public Shader<MotionBlurShader, core::matrix4, core::vector2df, float, float>,
-                         public TextureReadNew<ST_BILINEAR_CLAMPED_FILTERED, ST_NEAREST_FILTERED>
+class MotionBlurShader : public TextureRead<MotionBlurShader, 2, core::matrix4, core::vector2df, float, float>
 {
 public:
     MotionBlurShader();
 };
 
-class GodFadeShader : public Shader<GodFadeShader, video::SColorf>,
-                      public TextureReadNew<ST_BILINEAR_FILTERED>
+class GodFadeShader : public TextureRead<GodFadeShader, 1, video::SColorf>
 {
 public:
     GodFadeShader();
 };
 
-class GodRayShader : public Shader<GodRayShader, core::vector2df>,
-                     public TextureReadNew<ST_BILINEAR_FILTERED>
+class GodRayShader : public TextureRead<GodRayShader, 1, core::vector2df>
 {
 public:
     GodRayShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public Shader<MLAAColorEdgeDetectionSHader, core::vector2df>,
-                                    public TextureReadNew<ST_NEAREST_FILTERED>
+class MLAAColorEdgeDetectionSHader : public TextureRead<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
 {
 public:
     MLAAColorEdgeDetectionSHader();
 };
 
-class MLAABlendWeightSHader : public Shader<MLAABlendWeightSHader, core::vector2df>,
-                              public TextureReadNew<ST_BILINEAR_FILTERED, ST_NEAREST_FILTERED>
+class MLAABlendWeightSHader : public TextureRead<MLAABlendWeightSHader, 2, core::vector2df>
 {
 public:
     MLAABlendWeightSHader();
 };
 
-class MLAAGatherSHader : public Shader<MLAAGatherSHader, core::vector2df>,
-                         public TextureReadNew<ST_NEAREST_FILTERED, ST_NEAREST_FILTERED>
+class MLAAGatherSHader : public TextureRead<MLAAGatherSHader, 2, core::vector2df>
 {
 public:
     MLAAGatherSHader();
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 5cf911237..b868eb3cf 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -30,10 +30,9 @@ using namespace irr;
 static GLuint billboardvao = 0;
 
 
-class BillboardShader : public Shader<BillboardShader, core::matrix4,
+class BillboardShader : public TextureRead<BillboardShader, 1, core::matrix4,
                                       core::matrix4, core::vector3df,
-                                      core::dimension2df>,
-                       public TextureReadNew<ST_TRILINEAR_ANISOTROPIC_FILTERED>
+                                      core::dimension2df>
 {
 public:
     BillboardShader()
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_read.hpp
index f32c7ae41..4fbe1eac2 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_read.hpp
@@ -20,6 +20,7 @@
 
 #include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
+#include "graphics/shader.hpp"
 
 #include <assert.h>
 #include <functional>
@@ -76,10 +77,14 @@ protected:
     static GLuint m_all_texture_types[];
 };   // TextureReadBaseNew
 
-// ============================================================================
-
-template<SamplerTypeNew...tp>
-class TextureReadNew : public TextureReadBaseNew
+// ========================================================================
+/** Class C needs to be the newly declared shaders class (necessary for
+ *  the instance template). NUM_TEXTURES is the number of texture units
+ *  used in this shader. It is used to test at compile time that the 
+ *  right number of arguments are supplied to the variadic functions.
+ */
+template<class C, int NUM_TEXTURES, typename...tp>
+class TextureRead : public TextureReadBaseNew, public Shader<C, tp...>
 {
 
 private:
@@ -99,7 +104,7 @@ private:
     template<unsigned N, typename...Args>
     void assignTextureNamesImpl(GLuint)
     {
-        static_assert(N == sizeof...(tp), "Wrong number of texture name");
+        static_assert(N == NUM_TEXTURES, "Wrong number of texture names");
     }   // assignTextureNamesImpl
 
     // ------------------------------------------------------------------------
@@ -149,7 +154,7 @@ public:
     template<int N>
     void setTextureUnitsImpl()
     {
-        static_assert(N == sizeof...(tp), "Not enough texture set");
+        static_assert(N == NUM_TEXTURES, "Not enough texture set");
     }   // setTextureUnitsImpl
 
     // ------------------------------------------------------------------------
@@ -193,7 +198,7 @@ public:
     template<int N>
     void setTextureHandlesImpl()
     {
-        static_assert(N == sizeof...(tp), "Not enough handle set");
+        static_assert(N == NUM_TEXTURES, "Not enough handles set");
     }   // setTextureHandlesImpl
 
     // ------------------------------------------------------------------------
@@ -225,14 +230,13 @@ public:
     // ------------------------------------------------------------------------
     /** Destructor which frees al lsampler ids.
      */
-    ~TextureReadNew()
+    ~TextureRead()
     {
         for (unsigned i = 0; i < m_sampler_ids.size(); i++)
             glDeleteSamplers(1, &m_sampler_ids[i]);
-    }   // ~TextureReadNew
+    }   // ~TextureRead
 
 
-};   // class TextureReadNew
-
+};   // class TextureRead
 
 #endif

From e0ef9101373d3e02122891d9427475f56c33ec99 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 17 May 2015 00:04:19 +1000
Subject: [PATCH 203/331] Renamed TextureRead to TextureShader.

---
 sources.cmake                                 |  2 +-
 src/graphics/2dutils.cpp                      | 10 +--
 src/graphics/IBL.cpp                          |  2 +-
 src/graphics/gpuparticles.cpp                 |  6 +-
 src/graphics/post_processing.cpp              | 38 ++++++------
 src/graphics/render_geometry.cpp              | 52 ++++++++--------
 src/graphics/shaders.hpp                      | 62 +++++++++----------
 src/graphics/stkbillboard.cpp                 |  2 +-
 .../{texture_read.cpp => texture_shader.cpp}  | 62 +++++++++----------
 .../{texture_read.hpp => texture_shader.hpp}  | 17 ++---
 10 files changed, 127 insertions(+), 126 deletions(-)
 rename src/graphics/{texture_read.cpp => texture_shader.cpp} (85%)
 rename src/graphics/{texture_read.hpp => texture_shader.hpp} (96%)

diff --git a/sources.cmake b/sources.cmake
index 0837c5629..8f7f40bbb 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.    
+# This will then trigger a new cmake run automatically.     
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 802117653..6bdf8aa13 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -21,7 +21,7 @@
 #include "graphics/shader.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/shared_gpu_objects.hpp"
-#include "graphics/texture_read.hpp"
+#include "graphics/texture_shader.hpp"
 #include "glwrap.hpp"
 #include "utils/cpp2011.hpp"
 
@@ -29,7 +29,7 @@
 
 
 // ============================================================================
-class Primitive2DList : public TextureRead<Primitive2DList, 1>
+class Primitive2DList : public TextureShader<Primitive2DList, 1>
 {
 public:
     Primitive2DList()
@@ -42,7 +42,7 @@ public:
 };   //Primitive2DList
 
 // ============================================================================
-class UniformColoredTextureRectShader : public TextureRead<UniformColoredTextureRectShader,1,
+class UniformColoredTextureRectShader : public TextureShader<UniformColoredTextureRectShader,1,
                                                       core::vector2df, core::vector2df,
                                                       core::vector2df, core::vector2df,
                                                       video::SColor>
@@ -60,7 +60,7 @@ public:
 };   // UniformColoredTextureRectShader
 
 // ============================================================================
-class TextureRectShader : public TextureRead<TextureRectShader, 1, 
+class TextureRectShader : public TextureShader<TextureRectShader, 1, 
                                              core::vector2df, core::vector2df,
                                              core::vector2df, core::vector2df>
 {
@@ -90,7 +90,7 @@ public:
 
 // ============================================================================
 
-class ColoredTextureRectShader : public TextureRead<ColoredTextureRectShader, 1,
+class ColoredTextureRectShader : public TextureShader<ColoredTextureRectShader, 1,
                                                core::vector2df, core::vector2df,
                                                core::vector2df, core::vector2df>
 {
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index f728df098..7286e87ec 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -26,7 +26,7 @@
 #include <set>
 
 
-class SpecularIBLGenerator : public TextureRead<SpecularIBLGenerator, 1, 
+class SpecularIBLGenerator : public TextureShader<SpecularIBLGenerator, 1, 
                                                 core::matrix4, float >
 {
 public:
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 0306ec002..3c8fa5a8c 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -23,7 +23,7 @@
 #include "graphics/particle_emitter.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/shared_gpu_objects.hpp"
-#include "graphics/texture_read.hpp"
+#include "graphics/texture_shader.hpp"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
 
@@ -54,7 +54,7 @@ public:
 
 /** A Shader to render particles.
 */
-class SimpleParticleRender : public TextureRead<SimpleParticleRender, 2,
+class SimpleParticleRender : public TextureShader<SimpleParticleRender, 2,
                                                 video::SColorf, video::SColorf>
 {
 public:
@@ -74,7 +74,7 @@ public:
 
 // ============================================================================
 
-class FlipParticleRender : public TextureRead<FlipParticleRender, 2>
+class FlipParticleRender : public TextureShader<FlipParticleRender, 2>
 {
 public:
     FlipParticleRender()
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 4f5a7ec76..c20b50643 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -43,7 +43,7 @@ using namespace video;
 using namespace scene;
 
 // ============================================================================
-class Gaussian3HBlurShader : public TextureRead<Gaussian3HBlurShader, 1,
+class Gaussian3HBlurShader : public TextureShader<Gaussian3HBlurShader, 1,
                                            core::vector2df>
 {
 public:
@@ -58,7 +58,7 @@ public:
 };   // Gaussian3HBlurShader
 
 // ============================================================================
-class ComputeShadowBlurVShader : public TextureRead<ComputeShadowBlurVShader, 1,
+class ComputeShadowBlurVShader : public TextureShader<ComputeShadowBlurVShader, 1,
                                                core::vector2df,
                                                std::vector<float> >
 {
@@ -76,7 +76,7 @@ public:
 };   // ComputeShadowBlurVShader
 
 // ============================================================================
-class Gaussian6VBlurShader : public TextureRead<Gaussian6VBlurShader, 1,
+class Gaussian6VBlurShader : public TextureShader<Gaussian6VBlurShader, 1,
                                            core::vector2df, float>
 {
 public:
@@ -91,7 +91,7 @@ public:
 };   // Gaussian6VBlurShader
 
 // ============================================================================
-class Gaussian3VBlurShader : public TextureRead<Gaussian3VBlurShader, 1,
+class Gaussian3VBlurShader : public TextureShader<Gaussian3VBlurShader, 1,
                                            core::vector2df>
 {
 public:
@@ -106,7 +106,7 @@ public:
 };   // Gaussian3VBlurShader
 
 // ============================================================================
-class ComputeGaussian6VBlurShader : public TextureRead<ComputeGaussian6VBlurShader, 1,
+class ComputeGaussian6VBlurShader : public TextureShader<ComputeGaussian6VBlurShader, 1,
                                                   core::vector2df,
                                                   std::vector<float> >
 {
@@ -124,7 +124,7 @@ public:
 };   // ComputeGaussian6VBlurShader
 
 // ============================================================================
-class ComputeGaussian6HBlurShader : public TextureRead<ComputeGaussian6HBlurShader, 1,
+class ComputeGaussian6HBlurShader : public TextureShader<ComputeGaussian6HBlurShader, 1,
                                                   core::vector2df, 
                                                   std::vector<float> >
 {
@@ -142,7 +142,7 @@ public:
 };   // ComputeGaussian6HBlurShader
 
 // ============================================================================
-class ComputeShadowBlurHShader : public TextureRead<ComputeShadowBlurHShader, 1,
+class ComputeShadowBlurHShader : public TextureShader<ComputeShadowBlurHShader, 1,
                                                core::vector2df,
                                                std::vector<float> >
 {
@@ -159,7 +159,7 @@ public:
 };   // ComputeShadowBlurHShader
 
 // ============================================================================
-class Gaussian6HBlurShader : public TextureRead<Gaussian6HBlurShader, 1,
+class Gaussian6HBlurShader : public TextureShader<Gaussian6HBlurShader, 1,
                                            core::vector2df, float>
 {
 public:
@@ -174,7 +174,7 @@ public:
 };   // Gaussian6HBlurShader
 
 // ============================================================================
-class Gaussian17TapHShader : public TextureRead<Gaussian17TapHShader, 2,
+class Gaussian17TapHShader : public TextureShader<Gaussian17TapHShader, 2,
                                            core::vector2df>
 {
 public:
@@ -189,7 +189,7 @@ public:
 };   // Gaussian17TapHShader
 
 // ============================================================================
-class ComputeGaussian17TapHShader : public TextureRead<ComputeGaussian17TapHShader, 2,
+class ComputeGaussian17TapHShader : public TextureShader<ComputeGaussian17TapHShader, 2,
                                                   core::vector2df>
 {
 public:
@@ -207,7 +207,7 @@ public:
 
 
 // ============================================================================
-class Gaussian17TapVShader : public TextureRead<Gaussian17TapVShader, 2,
+class Gaussian17TapVShader : public TextureShader<Gaussian17TapVShader, 2,
                                            core::vector2df>
 {
 public:
@@ -223,7 +223,7 @@ public:
 };   // Gaussian17TapVShader
 
 // ============================================================================
-class ComputeGaussian17TapVShader : public TextureRead<ComputeGaussian17TapVShader, 2, 
+class ComputeGaussian17TapVShader : public TextureShader<ComputeGaussian17TapVShader, 2, 
                                                   core::vector2df>
 {
 public:
@@ -241,7 +241,7 @@ public:
 };   // ComputeGaussian17TapVShader
 
 // ============================================================================
-class BloomShader : public TextureRead<BloomShader, 1>
+class BloomShader : public TextureShader<BloomShader, 1>
 {
 public:
     BloomShader()
@@ -256,7 +256,7 @@ public:
 };   // BloomShader
 
 // ============================================================================
-class BloomBlendShader : public TextureRead<BloomBlendShader, 3>
+class BloomBlendShader : public TextureShader<BloomBlendShader, 3>
 {
 public:
     BloomBlendShader()
@@ -271,7 +271,7 @@ public:
 };   // BloomBlendShader
 
 // ============================================================================
-class LensBlendShader : public TextureRead<LensBlendShader, 3>
+class LensBlendShader : public TextureShader<LensBlendShader, 3>
 {
 public:
     LensBlendShader()
@@ -287,7 +287,7 @@ public:
 };   // LensBlendShader
 
 // ============================================================================
-class ToneMapShader : public TextureRead<ToneMapShader, 1, float>
+class ToneMapShader : public TextureShader<ToneMapShader, 1, float>
 {
 public:
 
@@ -303,7 +303,7 @@ public:
 };   // ToneMapShader
 
 // ============================================================================
-class DepthOfFieldShader : public TextureRead<DepthOfFieldShader, 2>
+class DepthOfFieldShader : public TextureShader<DepthOfFieldShader, 2>
 {
 public:
     DepthOfFieldShader()
@@ -318,7 +318,7 @@ public:
 };   // DepthOfFieldShader
 
 // ============================================================================
-class IBLShader : public TextureRead<IBLShader, 3>
+class IBLShader : public TextureShader<IBLShader, 3>
 {
 public:
     IBLShader()
@@ -337,7 +337,7 @@ public:
 };   // IBLShader
 
 // ============================================================================
-class DegradedIBLShader : public TextureRead<DegradedIBLShader, 1>
+class DegradedIBLShader : public TextureShader<DegradedIBLShader, 1>
 {
 public:
     DegradedIBLShader()
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 894a5f959..41e5f1f51 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -77,7 +77,7 @@ layout(location = 6) in vec3 Bitangent;
 */
 
 // ============================================================================
-class InstancedObjectPass1Shader : public TextureRead<InstancedObjectPass1Shader, 1>
+class InstancedObjectPass1Shader : public TextureShader<InstancedObjectPass1Shader, 1>
 {
 public:
     InstancedObjectPass1Shader()
@@ -94,7 +94,7 @@ public:
 };   // class InstancedObjectPass1Shader
 
 // ============================================================================
-class InstancedObjectRefPass1Shader : public TextureRead<InstancedObjectRefPass1Shader, 2>
+class InstancedObjectRefPass1Shader : public TextureShader<InstancedObjectRefPass1Shader, 2>
 {
 public:
     InstancedObjectRefPass1Shader()
@@ -113,7 +113,7 @@ public:
 };   // InstancedObjectRefPass1Shader
 
 // ============================================================================
-class ObjectRefPass2Shader : public TextureRead<ObjectRefPass2Shader, 5,
+class ObjectRefPass2Shader : public TextureShader<ObjectRefPass2Shader, 5,
                                                 core::matrix4, core::matrix4>
 {
 public:
@@ -133,7 +133,7 @@ public:
 };   // ObjectRefPass2Shader
 
 // ============================================================================
-class InstancedObjectPass2Shader : public TextureRead<InstancedObjectPass2Shader, 5>
+class InstancedObjectPass2Shader : public TextureShader<InstancedObjectPass2Shader, 5>
 {
 public:
     InstancedObjectPass2Shader()
@@ -152,7 +152,7 @@ public:
 };   // InstancedObjectPass2Shader
 
 // ============================================================================
-class InstancedObjectRefPass2Shader : public TextureRead<InstancedObjectRefPass2Shader, 5>
+class InstancedObjectRefPass2Shader : public TextureShader<InstancedObjectRefPass2Shader, 5>
 {
 public:
     InstancedObjectRefPass2Shader()
@@ -172,7 +172,7 @@ public:
 };   // InstancedObjectRefPass2Shader
 
 // ============================================================================
-class ShadowShader : public TextureRead<ShadowShader, 0, int, core::matrix4>
+class ShadowShader : public TextureShader<ShadowShader, 0, int, core::matrix4>
 {
 public:
     ShadowShader()
@@ -196,7 +196,7 @@ public:
 };   // ShadowShader
 
 // ============================================================================
-class InstancedShadowShader : public TextureRead<InstancedShadowShader, 0, int>
+class InstancedShadowShader : public TextureShader<InstancedShadowShader, 0, int>
 {
 public:
     InstancedShadowShader()
@@ -223,7 +223,7 @@ public:
 };   // InstancedShadowShader
 
 // ============================================================================
-class CRSMShader : public TextureRead<CRSMShader, 1, core::matrix4, core::matrix4, 
+class CRSMShader : public TextureShader<CRSMShader, 1, core::matrix4, core::matrix4, 
                                  core::matrix4>
 {
 public:
@@ -240,7 +240,7 @@ public:
 
 
 // ============================================================================
-class SplattingRSMShader : public TextureRead<SplattingRSMShader, 5, core::matrix4,
+class SplattingRSMShader : public TextureShader<SplattingRSMShader, 5, core::matrix4,
                                   core::matrix4>
 {
 public:
@@ -261,7 +261,7 @@ public:
 };  // SplattingRSMShader
 
 // ============================================================================
-class CInstancedRSMShader : public TextureRead<CInstancedRSMShader, 1, core::matrix4>
+class CInstancedRSMShader : public TextureShader<CInstancedRSMShader, 1, core::matrix4>
 {
 public:
     CInstancedRSMShader()
@@ -277,7 +277,7 @@ public:
 };   // CInstancedRSMShader
 
 // ============================================================================
-class SphereMapShader : public TextureRead<SphereMapShader, 4, core::matrix4,
+class SphereMapShader : public TextureShader<SphereMapShader, 4, core::matrix4,
                                       core::matrix4>
 {
 public:
@@ -297,7 +297,7 @@ public:
 };   // SphereMapShader
 
 // ============================================================================
-class InstancedSphereMapShader : public TextureRead<InstancedSphereMapShader, 4>
+class InstancedSphereMapShader : public TextureShader<InstancedSphereMapShader, 4>
 {
 public:
     InstancedSphereMapShader()
@@ -317,7 +317,7 @@ public:
 };   // InstancedSphereMapShader
 
 // ============================================================================
-class SplattingShader : public TextureRead<SplattingShader, 8, core::matrix4>
+class SplattingShader : public TextureShader<SplattingShader, 8, core::matrix4>
 {
 public:
     SplattingShader()
@@ -340,7 +340,7 @@ public:
 };   // SplattingShader
 
 // ============================================================================
-class ObjectRefPass1Shader : public TextureRead<ObjectRefPass1Shader, 2, core::matrix4,
+class ObjectRefPass1Shader : public TextureShader<ObjectRefPass1Shader, 2, core::matrix4,
                                            core::matrix4, core::matrix4>
 {
 public:
@@ -358,7 +358,7 @@ public:
 
 
 // ============================================================================
-class NormalMapShader : public TextureRead<NormalMapShader, 2, core::matrix4, 
+class NormalMapShader : public TextureShader<NormalMapShader, 2, core::matrix4, 
                                       core::matrix4>
 {
 public:
@@ -376,7 +376,7 @@ public:
 };   // NormalMapShader
 
 // ============================================================================
-class InstancedNormalMapShader : public TextureRead<InstancedNormalMapShader, 2>
+class InstancedNormalMapShader : public TextureShader<InstancedNormalMapShader, 2>
 {
 public:
     InstancedNormalMapShader()
@@ -393,7 +393,7 @@ public:
 };   // InstancedNormalMapShader
 
 // ============================================================================
-class ObjectUnlitShader : public TextureRead<ObjectUnlitShader, 4, core::matrix4, 
+class ObjectUnlitShader : public TextureShader<ObjectUnlitShader, 4, core::matrix4, 
                                         core::matrix4>
 {
 public:
@@ -411,7 +411,7 @@ public:
 };   // ObjectUnlitShader
 
 // ============================================================================
-class InstancedObjectUnlitShader : public TextureRead<InstancedObjectUnlitShader, 4>
+class InstancedObjectUnlitShader : public TextureShader<InstancedObjectUnlitShader, 4>
 {
 public:
     InstancedObjectUnlitShader()
@@ -548,7 +548,7 @@ const STK::Tuple<size_t> UnlitMat::ShadowTextures = STK::Tuple<size_t>(0);
 const STK::Tuple<size_t> UnlitMat::RSMTextures = STK::Tuple<size_t>(0);
 
 // ============================================================================
-class GrassPass1Shader : public TextureRead<GrassPass1Shader, 2, core::matrix4,
+class GrassPass1Shader : public TextureShader<GrassPass1Shader, 2, core::matrix4,
                                        core::matrix4, core::vector3df>
 {
 public:
@@ -566,7 +566,7 @@ public:
 };   // class GrassPass1Shader
 
 // ============================================================================
-class InstancedGrassPass1Shader : public TextureRead<InstancedGrassPass1Shader, 2,
+class InstancedGrassPass1Shader : public TextureShader<InstancedGrassPass1Shader, 2,
                                                 core::vector3df>
 {
 public:
@@ -584,7 +584,7 @@ public:
 };   // InstancedGrassPass1Shader
 
 // ============================================================================
-class GrassShadowShader : public TextureRead<GrassShadowShader, 1, int, core::matrix4,
+class GrassShadowShader : public TextureShader<GrassShadowShader, 1, int, core::matrix4,
                                         core::vector3df>
 {
 public:
@@ -611,7 +611,7 @@ public:
 };   // GrassShadowShader
 
 // ============================================================================
-class InstancedGrassShadowShader : public TextureRead<InstancedGrassShadowShader, 1, 
+class InstancedGrassShadowShader : public TextureShader<InstancedGrassShadowShader, 1, 
                                                  int, core::vector3df>
 {
 public:
@@ -642,7 +642,7 @@ public:
 
 
 // ============================================================================
-class GrassPass2Shader : public TextureRead<GrassPass2Shader, 5, core::matrix4,
+class GrassPass2Shader : public TextureShader<GrassPass2Shader, 5, core::matrix4,
                                        core::vector3df>
 {
 public:
@@ -662,7 +662,7 @@ public:
 };   // GrassPass2Shader
 
 // ============================================================================
-class InstancedGrassPass2Shader : public TextureRead<InstancedGrassPass2Shader, 6,
+class InstancedGrassPass2Shader : public TextureShader<InstancedGrassPass2Shader, 6,
                                              core::vector3df, core::vector3df>
 {
 public:
@@ -684,7 +684,7 @@ public:
 };   // InstancedGrassPass2Shader
 
 // ============================================================================
-class DetailedObjectPass2Shader : public TextureRead<DetailedObjectPass2Shader, 6,
+class DetailedObjectPass2Shader : public TextureShader<DetailedObjectPass2Shader, 6,
                                                  core::matrix4>
 {
 public:
@@ -704,7 +704,7 @@ public:
 };   // DetailedObjectPass2Shader
 
 // ============================================================================
-class InstancedDetailedObjectPass2Shader : public TextureRead<InstancedDetailedObjectPass2Shader, 6>
+class InstancedDetailedObjectPass2Shader : public TextureShader<InstancedDetailedObjectPass2Shader, 6>
 {
 public:
     InstancedDetailedObjectPass2Shader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7db8b2f4d..693164f5e 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -21,7 +21,7 @@
 #include "config/user_config.hpp"
 #include "graphics/shader.hpp"
 #include "graphics/shared_gpu_objects.hpp"
-#include "graphics/texture_read.hpp"
+#include "graphics/texture_shader.hpp"
 
 #include <IMeshSceneNode.h>
 #include <IShaderConstantSetCallBack.h>
@@ -34,7 +34,7 @@ class ParticleSystemProxy;
 
 namespace MeshShader
 {
-class ObjectPass1Shader : public TextureRead<ObjectPass1Shader, 1,
+class ObjectPass1Shader : public TextureShader<ObjectPass1Shader, 1,
                                              core::matrix4, core::matrix4>
 {
 public:
@@ -43,7 +43,7 @@ public:
 
 
 
-class ObjectPass2Shader : public TextureRead<ObjectPass2Shader, 5, core::matrix4, core::matrix4>
+class ObjectPass2Shader : public TextureShader<ObjectPass2Shader, 5, core::matrix4, core::matrix4>
 {
 public:
     ObjectPass2Shader();
@@ -52,13 +52,13 @@ public:
 
 
 
-class TransparentShader : public TextureRead<TransparentShader, 1, core::matrix4, core::matrix4>
+class TransparentShader : public TextureShader<TransparentShader, 1, core::matrix4, core::matrix4>
 {
 public:
     TransparentShader();
 };
 
-class TransparentFogShader : public TextureRead<TransparentFogShader, 1, core::matrix4, core::matrix4, float, float, 
+class TransparentFogShader : public TextureShader<TransparentFogShader, 1, core::matrix4, core::matrix4, float, float, 
                                            float, float, float, video::SColorf>
 {
 public:
@@ -80,13 +80,13 @@ public:
 
 
 
-class RefShadowShader : public TextureRead<RefShadowShader, 1, int, core::matrix4>
+class RefShadowShader : public TextureShader<RefShadowShader, 1, int, core::matrix4>
 {
 public:
     RefShadowShader();
 };
 
-class InstancedRefShadowShader : public TextureRead<InstancedRefShadowShader, 1, int>
+class InstancedRefShadowShader : public TextureShader<InstancedRefShadowShader, 1, int>
 {
 public:
     InstancedRefShadowShader();
@@ -99,14 +99,14 @@ public:
     DisplaceMaskShader();
 };
 
-class DisplaceShader : public TextureRead<DisplaceShader, 4, core::matrix4,
+class DisplaceShader : public TextureShader<DisplaceShader, 4, core::matrix4,
                                           core::vector2df, core::vector2df>
 {
 public:
     DisplaceShader();
 };
 
-class SkyboxShader : public TextureRead<SkyboxShader,1>
+class SkyboxShader : public TextureShader<SkyboxShader,1>
 {
 public:
     SkyboxShader();
@@ -146,7 +146,7 @@ namespace LightShader
     };
 
 
-    class PointLightShader : public TextureRead<PointLightShader, 2>
+    class PointLightShader : public TextureShader<PointLightShader, 2>
     {
     public:
         GLuint vbo;
@@ -154,7 +154,7 @@ namespace LightShader
         PointLightShader();
     };
 
-    class PointLightScatterShader : public TextureRead<PointLightScatterShader, 1, float, core::vector3df>
+    class PointLightScatterShader : public TextureShader<PointLightScatterShader, 1, float, core::vector3df>
     {
     public:
         GLuint vbo;
@@ -177,25 +177,25 @@ namespace FullScreenShader
 {
 
 
-class SunLightShader : public TextureRead<SunLightShader, 2,  core::vector3df, video::SColorf>
+class SunLightShader : public TextureShader<SunLightShader, 2,  core::vector3df, video::SColorf>
 {
 public:
     SunLightShader();
 };
 
-class ShadowedSunLightShaderPCF : public TextureRead<ShadowedSunLightShaderPCF, 3,  float, float, float, float, float>
+class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF, 3,  float, float, float, float, float>
 {
 public:
     ShadowedSunLightShaderPCF();
 };
 
-class ShadowedSunLightShaderESM : public TextureRead<ShadowedSunLightShaderESM, 3, float, float, float, float>
+class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM, 3, float, float, float, float>
 {
 public:
     ShadowedSunLightShaderESM();
 };
 
-class RadianceHintsConstructionShader : public TextureRead<RadianceHintsConstructionShader, 3, core::matrix4, 
+class RadianceHintsConstructionShader : public TextureShader<RadianceHintsConstructionShader, 3, core::matrix4, 
                                                       core::matrix4, core::vector3df, video::SColorf>
 {
 public:
@@ -203,7 +203,7 @@ public:
 };
 
 // Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public TextureRead<NVWorkaroundRadianceHintsConstructionShader,
+class NVWorkaroundRadianceHintsConstructionShader : public TextureShader<NVWorkaroundRadianceHintsConstructionShader,
                                                                    3, core::matrix4, core::matrix4, core::vector3df,
                                                                    int, video::SColorf>
 {
@@ -219,21 +219,21 @@ public:
     RHDebug();
 };
 
-class GlobalIlluminationReconstructionShader : public TextureRead<GlobalIlluminationReconstructionShader, 5,
+class GlobalIlluminationReconstructionShader : public TextureShader<GlobalIlluminationReconstructionShader, 5,
                                                              core::matrix4, core::matrix4, core::vector3df>
 {
 public:
     GlobalIlluminationReconstructionShader();
 };
 
-class HorizontalBlurShader : public TextureRead<HorizontalBlurShader, 1, core::vector2df>
+class HorizontalBlurShader : public TextureShader<HorizontalBlurShader, 1, core::vector2df>
 {
 public:
     HorizontalBlurShader();
 };
 
 
-class PassThroughShader : public TextureRead<PassThroughShader, 1, int, int>
+class PassThroughShader : public TextureShader<PassThroughShader, 1, int, int>
 {
 public:
     PassThroughShader();
@@ -248,13 +248,13 @@ public:
     LayerPassThroughShader();
 };
 
-class LinearizeDepthShader : public TextureRead<LinearizeDepthShader, 1, float, float>
+class LinearizeDepthShader : public TextureShader<LinearizeDepthShader, 1, float, float>
 {
 public:
     LinearizeDepthShader();
 };
 
-class LightspaceBoundingBoxShader : public TextureRead<LightspaceBoundingBoxShader, 1,
+class LightspaceBoundingBoxShader : public TextureShader<LightspaceBoundingBoxShader, 1,
                                                   core::matrix4, float, float,
                                                   float, float>
 {
@@ -268,13 +268,13 @@ public:
     ShadowMatrixesGenerationShader();
 };
 
-class DepthHistogramShader : public TextureRead<DepthHistogramShader, 1>
+class DepthHistogramShader : public TextureShader<DepthHistogramShader, 1>
 {
 public:
     DepthHistogramShader();
 };
 
-class GlowShader : public TextureRead<GlowShader, 1>
+class GlowShader : public TextureShader<GlowShader, 1>
 {
 public:
     GLuint vao;
@@ -282,49 +282,49 @@ public:
     GlowShader();
 };
 
-class SSAOShader : public TextureRead<SSAOShader, 1, float, float, float>
+class SSAOShader : public TextureShader<SSAOShader, 1, float, float, float>
 {
 public:
     SSAOShader();
 };
 
-class FogShader : public TextureRead<FogShader, 1, float, core::vector3df>
+class FogShader : public TextureShader<FogShader, 1, float, core::vector3df>
 {
 public:
     FogShader();
 };
 
-class MotionBlurShader : public TextureRead<MotionBlurShader, 2, core::matrix4, core::vector2df, float, float>
+class MotionBlurShader : public TextureShader<MotionBlurShader, 2, core::matrix4, core::vector2df, float, float>
 {
 public:
     MotionBlurShader();
 };
 
-class GodFadeShader : public TextureRead<GodFadeShader, 1, video::SColorf>
+class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
 {
 public:
     GodFadeShader();
 };
 
-class GodRayShader : public TextureRead<GodRayShader, 1, core::vector2df>
+class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
 {
 public:
     GodRayShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public TextureRead<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
+class MLAAColorEdgeDetectionSHader : public TextureShader<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
 {
 public:
     MLAAColorEdgeDetectionSHader();
 };
 
-class MLAABlendWeightSHader : public TextureRead<MLAABlendWeightSHader, 2, core::vector2df>
+class MLAABlendWeightSHader : public TextureShader<MLAABlendWeightSHader, 2, core::vector2df>
 {
 public:
     MLAABlendWeightSHader();
 };
 
-class MLAAGatherSHader : public TextureRead<MLAAGatherSHader, 2, core::vector2df>
+class MLAAGatherSHader : public TextureShader<MLAAGatherSHader, 2, core::vector2df>
 {
 public:
     MLAAGatherSHader();
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index b868eb3cf..6c64a2d27 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -30,7 +30,7 @@ using namespace irr;
 static GLuint billboardvao = 0;
 
 
-class BillboardShader : public TextureRead<BillboardShader, 1, core::matrix4,
+class BillboardShader : public TextureShader<BillboardShader, 1, core::matrix4,
                                       core::matrix4, core::vector3df,
                                       core::dimension2df>
 {
diff --git a/src/graphics/texture_read.cpp b/src/graphics/texture_shader.cpp
similarity index 85%
rename from src/graphics/texture_read.cpp
rename to src/graphics/texture_shader.cpp
index ecc986948..63f737928 100644
--- a/src/graphics/texture_read.cpp
+++ b/src/graphics/texture_shader.cpp
@@ -16,24 +16,24 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/texture_read.hpp"
+#include "graphics/texture_shader.hpp"
 
 #include "config/user_config.hpp"
 
-TextureReadBaseNew::BindFunction TextureReadBaseNew::m_all_bind_functions[] =
-{ /* ST_NEAREST_FILTERED               */ &TextureReadBaseNew::bindTextureNearest,
-  /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureReadBaseNew::bindTextureTrilinearAnisotropic,
-  /* ST_TRILINEAR_CUBEMAP              */ &TextureReadBaseNew::bindCubemapTrilinear,
-  /* ST_BILINEAR_FILTERED              */ &TextureReadBaseNew::bindTextureBilinear,
-  /* ST_SHADOW_SAMPLER                 */ &TextureReadBaseNew::bindTextureShadow,
-  /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ &TextureReadBaseNew::bindTrilinearClampedArrayTexture,
-  /* ST_VOLUME_LINEAR_FILTERED         */ &TextureReadBaseNew::bindTextureVolume,
-  /* ST_NEARED_CLAMPED_FILTERED        */ &TextureReadBaseNew::bindTextureNearestClamped,
-  /* ST_BILINEAR_CLAMPED_FILTERED      */ &TextureReadBaseNew::bindTextureBilinearClamped,
-  /* ST_SEMI_TRILINEAR                 */ &TextureReadBaseNew::bindTextureSemiTrilinear
+TextureShaderBase::BindFunction TextureShaderBase::m_all_bind_functions[] =
+{ /* ST_NEAREST_FILTERED               */ &TextureShaderBase::bindTextureNearest,
+  /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureShaderBase::bindTextureTrilinearAnisotropic,
+  /* ST_TRILINEAR_CUBEMAP              */ &TextureShaderBase::bindCubemapTrilinear,
+  /* ST_BILINEAR_FILTERED              */ &TextureShaderBase::bindTextureBilinear,
+  /* ST_SHADOW_SAMPLER                 */ &TextureShaderBase::bindTextureShadow,
+  /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ &TextureShaderBase::bindTrilinearClampedArrayTexture,
+  /* ST_VOLUME_LINEAR_FILTERED         */ &TextureShaderBase::bindTextureVolume,
+  /* ST_NEARED_CLAMPED_FILTERED        */ &TextureShaderBase::bindTextureNearestClamped,
+  /* ST_BILINEAR_CLAMPED_FILTERED      */ &TextureShaderBase::bindTextureBilinearClamped,
+  /* ST_SEMI_TRILINEAR                 */ &TextureShaderBase::bindTextureSemiTrilinear
 };
 
-GLuint TextureReadBaseNew::m_all_texture_types[] = 
+GLuint TextureShaderBase::m_all_texture_types[] = 
 { /* ST_NEAREST_FILTERED               */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP,
@@ -47,7 +47,7 @@ GLuint TextureReadBaseNew::m_all_texture_types[] =
 };
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
+void TextureShaderBase::bindTextureNearest(GLuint texture_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -60,7 +60,7 @@ void TextureReadBaseNew::bindTextureNearest(GLuint texture_unit, GLuint tex)
 }   // bindTextureNearest
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex)
+void TextureShaderBase::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -75,7 +75,7 @@ void TextureReadBaseNew::bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint
 }   // bindTextureTrilinearAnisotropic
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindCubemapTrilinear(unsigned tex_unit, unsigned tex)
+void TextureShaderBase::bindCubemapTrilinear(unsigned tex_unit, unsigned tex)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
@@ -91,7 +91,7 @@ void TextureReadBaseNew::bindCubemapTrilinear(unsigned tex_unit, unsigned tex)
 }   // bindCubemapTrilinear
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
+void TextureShaderBase::bindTextureNearestClamped(GLuint texture_unit,
                                                    GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
@@ -106,7 +106,7 @@ void TextureReadBaseNew::bindTextureNearestClamped(GLuint texture_unit,
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureBilinear(GLuint texture_unit, GLuint tex)
+void TextureShaderBase::bindTextureBilinear(GLuint texture_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + texture_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -118,7 +118,7 @@ void TextureReadBaseNew::bindTextureBilinear(GLuint texture_unit, GLuint tex)
 }   // bindTextureBilinear
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
+void TextureShaderBase::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex);
@@ -130,7 +130,7 @@ void TextureReadBaseNew::bindTextureBilinearClamped(GLuint tex_unit, GLuint tex)
 }   // bindTextureBilinearClamped
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id)
+void TextureShaderBase::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D, tex_id);
@@ -142,7 +142,7 @@ void TextureReadBaseNew::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id
 }   // bindTextureSemiTrilinear
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureShadow(GLuint tex_unit, GLuint tex_id)
+void TextureShaderBase::bindTextureShadow(GLuint tex_unit, GLuint tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_2D_ARRAY, tex_id);
@@ -155,7 +155,7 @@ void TextureReadBaseNew::bindTextureShadow(GLuint tex_unit, GLuint tex_id)
 }   // bindTextureShadow
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTrilinearClampedArrayTexture(unsigned tex_unit,
+void TextureShaderBase::bindTrilinearClampedArrayTexture(unsigned tex_unit,
                                                           unsigned tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
@@ -171,7 +171,7 @@ void TextureReadBaseNew::bindTrilinearClampedArrayTexture(unsigned tex_unit,
 }   // bindTrilinearClampedArrayTexture
 
 // ----------------------------------------------------------------------------
-void TextureReadBaseNew::bindTextureVolume(unsigned tex_unit, unsigned tex_id)
+void TextureShaderBase::bindTextureVolume(unsigned tex_unit, unsigned tex_id)
 {
     glActiveTexture(GL_TEXTURE0 + tex_unit);
     glBindTexture(GL_TEXTURE_3D, tex_id);
@@ -184,7 +184,7 @@ void TextureReadBaseNew::bindTextureVolume(unsigned tex_unit, unsigned tex_id)
 
 // ----------------------------------------------------------------------------
 
-GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
+GLuint TextureShaderBase::createSamplers(SamplerTypeNew sampler_type)
 {
     switch (sampler_type)
     {
@@ -225,7 +225,7 @@ GLuint TextureReadBaseNew::createSamplers(SamplerTypeNew sampler_type)
 }   // createSamplers
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createNearestSampler()
+GLuint TextureShaderBase::createNearestSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -240,7 +240,7 @@ GLuint TextureReadBaseNew::createNearestSampler()
 }   // createNearestSampler
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createTrilinearSampler()
+GLuint TextureShaderBase::createTrilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -258,7 +258,7 @@ GLuint TextureReadBaseNew::createTrilinearSampler()
 }   // createTrilinearSampler
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createBilinearSampler()
+GLuint TextureShaderBase::createBilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -272,7 +272,7 @@ GLuint TextureReadBaseNew::createBilinearSampler()
 #endif
 }   // createBilinearSampler
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createShadowSampler()
+GLuint TextureShaderBase::createShadowSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -288,7 +288,7 @@ GLuint TextureReadBaseNew::createShadowSampler()
 }   // createShadowSampler
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createBilinearClampedSampler()
+GLuint TextureShaderBase::createBilinearClampedSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -304,7 +304,7 @@ GLuint TextureReadBaseNew::createBilinearClampedSampler()
 
 
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createTrilinearClampedArray()
+GLuint TextureShaderBase::createTrilinearClampedArray()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
@@ -321,7 +321,7 @@ GLuint TextureReadBaseNew::createTrilinearClampedArray()
 #endif
 }   // createTrilinearClampedArray
 // ----------------------------------------------------------------------------
-GLuint TextureReadBaseNew::createSemiTrilinearSampler()
+GLuint TextureShaderBase::createSemiTrilinearSampler()
 {
 #ifdef GL_VERSION_3_3
     unsigned id;
diff --git a/src/graphics/texture_read.hpp b/src/graphics/texture_shader.hpp
similarity index 96%
rename from src/graphics/texture_read.hpp
rename to src/graphics/texture_shader.hpp
index 4fbe1eac2..6a6d193a8 100644
--- a/src/graphics/texture_read.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_TEXTURE_READ_HPP
-#define HEADER_TEXTURE_READ_HPP
+#ifndef HEADER_TEXTURE_SHADER_HPP
+#define HEADER_TEXTURE_SHADER_HPP
 
 #include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
@@ -44,7 +44,7 @@ enum SamplerTypeNew
 };   // SamplerTypeNew
 
 
-class TextureReadBaseNew
+class TextureShaderBase
 {
 public:
     typedef  std::function<void(GLuint, GLuint)> BindFunction;
@@ -75,7 +75,7 @@ protected:
     static BindFunction m_all_bind_functions[];
     std::vector<BindFunction> m_bind_functions;
     static GLuint m_all_texture_types[];
-};   // TextureReadBaseNew
+};   // TextureshaderBase
 
 // ========================================================================
 /** Class C needs to be the newly declared shaders class (necessary for
@@ -84,7 +84,8 @@ protected:
  *  right number of arguments are supplied to the variadic functions.
  */
 template<class C, int NUM_TEXTURES, typename...tp>
-class TextureRead : public TextureReadBaseNew, public Shader<C, tp...>
+class TextureShader : public TextureShaderBase
+                    , public Shader<C, tp...>
 {
 
 private:
@@ -230,13 +231,13 @@ public:
     // ------------------------------------------------------------------------
     /** Destructor which frees al lsampler ids.
      */
-    ~TextureRead()
+    ~TextureShader()
     {
         for (unsigned i = 0; i < m_sampler_ids.size(); i++)
             glDeleteSamplers(1, &m_sampler_ids[i]);
-    }   // ~TextureRead
+    }   // ~TextureShader
 
 
-};   // class TextureRead
+};   // class TextureShader
 
 #endif

From 1a09a09dd9697a4e1c7fdf8aafd3329296a2842a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 17 May 2015 00:22:14 +1000
Subject: [PATCH 204/331] Removed now unnecessary parameter for
 assignSamplerNames.

---
 src/graphics/2dutils.cpp         |   8 +--
 src/graphics/IBL.cpp             |   2 +-
 src/graphics/gpuparticles.cpp    |   8 +--
 src/graphics/post_processing.cpp |  62 +++++++++---------
 src/graphics/render_geometry.cpp |  83 +++++++++--------------
 src/graphics/shaders.cpp         | 109 +++++++++++++++----------------
 src/graphics/stkbillboard.cpp    |   3 +-
 src/graphics/texture_shader.hpp  |  17 +++--
 8 files changed, 133 insertions(+), 159 deletions(-)

diff --git a/src/graphics/2dutils.cpp b/src/graphics/2dutils.cpp
index 6bdf8aa13..3aea30873 100644
--- a/src/graphics/2dutils.cpp
+++ b/src/graphics/2dutils.cpp
@@ -37,7 +37,7 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "primitive2dlist.vert",
                             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // Primitive2DList
 };   //Primitive2DList
 
@@ -55,7 +55,7 @@ public:
 
         assignUniforms("center", "size", "texcenter", "texsize", "color");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // UniformColoredTextureRectShader
 };   // UniformColoredTextureRectShader
 
@@ -71,7 +71,7 @@ public:
                             GL_FRAGMENT_SHADER, "texturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // TextureRectShader
 };   // TextureRectShader
 
@@ -133,7 +133,7 @@ public:
                             GL_FRAGMENT_SHADER, "colortexturedquad.frag");
         assignUniforms("center", "size", "texcenter", "texsize");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
 
         glGenVertexArrays(1, &m_vao);
         glBindVertexArray(m_vao);
diff --git a/src/graphics/IBL.cpp b/src/graphics/IBL.cpp
index 7286e87ec..d97d59b23 100644
--- a/src/graphics/IBL.cpp
+++ b/src/graphics/IBL.cpp
@@ -37,7 +37,7 @@ public:
                       GL_FRAGMENT_SHADER, "importance_sampling_specular.frag");
         assignUniforms("PermutationMatrix", "ViewportSize");
         m_tu_samples = 1;
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_CUBEMAP);
         assignTextureUnit(m_tu_samples, "samples");
     }
 
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp
index 3c8fa5a8c..d668814f3 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpuparticles.cpp
@@ -66,8 +66,8 @@ public:
                     GL_FRAGMENT_SHADER, "particle.frag");
 
         assignUniforms("color_from", "color_to");
-        assignSamplerNames(m_program, 0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
     }   // SimpleParticleRender
 
 };   // SimpleParticleRender
@@ -84,8 +84,8 @@ public:
                     GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                     GL_FRAGMENT_SHADER, "particle.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "tex",  ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
     }
 
 };   // FlipParticleShader
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index c20b50643..833ea6ed4 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -53,7 +53,7 @@ public:
                             GL_FRAGMENT_SHADER, "gaussian3h.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian3HBlurShader
 };   // Gaussian3HBlurShader
 
@@ -69,7 +69,7 @@ public:
         loadProgram(OBJECT, GL_COMPUTE_SHADER, "blurshadowV.comp");
         m_dest_tu = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeShadowBlurVShader
 
@@ -86,7 +86,7 @@ public:
                             GL_FRAGMENT_SHADER, "gaussian6v.frag");
         assignUniforms("pixel", "sigma");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6VBlurShader
 };   // Gaussian6VBlurShader
 
@@ -101,7 +101,7 @@ public:
                             GL_FRAGMENT_SHADER, "gaussian3v.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian3VBlurShader
 };   // Gaussian3VBlurShader
 
@@ -117,8 +117,7 @@ public:
         loadProgram(OBJECT, GL_COMPUTE_SHADER, "gaussian6v.comp");
         m_dest_tu = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", 
-                           ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source", ST_BILINEAR_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian6VBlurShader
 };   // ComputeGaussian6VBlurShader
@@ -135,8 +134,7 @@ public:
         loadProgram(OBJECT, GL_COMPUTE_SHADER, "gaussian6h.comp");
         m_dest_tu = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", 
-                          ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source",  ST_BILINEAR_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian6HBlurShader
 };   // ComputeGaussian6HBlurShader
@@ -153,7 +151,7 @@ public:
         loadProgram(OBJECT, GL_COMPUTE_SHADER, "blurshadowH.comp");
         m_dest_tu = 1;
         assignUniforms("pixel", "weights");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeShadowBlurHShader
 };   // ComputeShadowBlurHShader
@@ -169,7 +167,7 @@ public:
                             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel", "sigma");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6HBlurShader
 };   // Gaussian6HBlurShader
 
@@ -183,8 +181,8 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
                             GL_FRAGMENT_SHADER, "bilateralH.frag");
         assignUniforms("pixel");
-        assignSamplerNames(m_program,0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
-                                     1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                           1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian17TapHShader
 };   // Gaussian17TapHShader
 
@@ -199,8 +197,8 @@ public:
         loadProgram(OBJECT,  GL_COMPUTE_SHADER, "bilateralH.comp");
         m_dest_tu = 2;
         assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
-                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source", ST_NEARED_CLAMPED_FILTERED,
+                           1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian17TapHShader
 };   // ComputeGaussian17TapHShader
@@ -217,8 +215,8 @@ public:
                             GL_FRAGMENT_SHADER, "bilateralV.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program,0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
-                                     1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
+                           1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian17TapVShader
 };   // Gaussian17TapVShader
 
@@ -234,8 +232,8 @@ public:
         loadProgram(OBJECT, GL_COMPUTE_SHADER, "bilateralV.comp");
         m_dest_tu = 2;
         assignUniforms("pixel");
-        assignSamplerNames(m_program, 0, "source", ST_NEARED_CLAMPED_FILTERED,
-                                      1, "depth", ST_NEARED_CLAMPED_FILTERED);
+        assignSamplerNames(0, "source", ST_NEARED_CLAMPED_FILTERED,
+                           1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian17TapVShader
 };   // ComputeGaussian17TapVShader
@@ -251,7 +249,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getRGBfromCIEXxy.frag",
                             GL_FRAGMENT_SHADER, "bloom.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }   // BloomShader
 };   // BloomShader
 
@@ -264,9 +262,9 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
                             GL_FRAGMENT_SHADER, "bloomblend.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
-                                      1, "tex_256", ST_BILINEAR_FILTERED,
-                                      2, "tex_512", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex_128", ST_BILINEAR_FILTERED,
+                           1, "tex_256", ST_BILINEAR_FILTERED,
+                           2, "tex_512", ST_BILINEAR_FILTERED);
     }   // BloomBlendShader
 };   // BloomBlendShader
 
@@ -280,9 +278,9 @@ public:
                             GL_FRAGMENT_SHADER, "lensblend.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex_128", ST_BILINEAR_FILTERED,
-                                      1, "tex_256", ST_BILINEAR_FILTERED,
-                                      2, "tex_512", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex_128", ST_BILINEAR_FILTERED,
+                           1, "tex_256", ST_BILINEAR_FILTERED,
+                           2, "tex_512", ST_BILINEAR_FILTERED);
     }   // LensBlendShader
 };   // LensBlendShader
 
@@ -298,7 +296,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getCIEXYZ.frag",
                             GL_FRAGMENT_SHADER, "tonemap.frag");
         assignUniforms("vignette_weight");
-        assignSamplerNames(m_program, 0, "text", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "text", ST_NEAREST_FILTERED);
     }   // ToneMapShader
 };   // ToneMapShader
 
@@ -312,8 +310,8 @@ public:
                             GL_FRAGMENT_SHADER, "dof.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
     }   // DepthOfFieldShader
 };   // DepthOfFieldShader
 
@@ -330,9 +328,9 @@ public:
                             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
                             GL_FRAGMENT_SHADER, "IBL.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex",  ST_NEAREST_FILTERED,
-                                      1, "dtex",  ST_NEAREST_FILTERED,
-                                      2, "probe", ST_TRILINEAR_CUBEMAP);
+        assignSamplerNames(0, "ntex",  ST_NEAREST_FILTERED,
+                           1, "dtex",  ST_NEAREST_FILTERED,
+                           2, "probe", ST_TRILINEAR_CUBEMAP);
     }   // IBLShader
 };   // IBLShader
 
@@ -349,7 +347,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/SpecularIBL.frag",
                             GL_FRAGMENT_SHADER, "degraded_ibl.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED);
     }   // DegradedIBLShader
 };   // DegradedIBLShader
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 41e5f1f51..b0873d0ec 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -88,8 +88,7 @@ public:
                             GL_FRAGMENT_SHADER, "instanced_object_pass1.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "glosstex",
-                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // InstancedObjectPass1Shader
 };   // class InstancedObjectPass1Shader
 
@@ -105,8 +104,7 @@ public:
                             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program,
-                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
@@ -123,8 +121,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "objectref_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -143,7 +140,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "instanced_object_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -162,8 +159,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "instanced_objectref_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -233,8 +229,7 @@ public:
                             GL_FRAGMENT_SHADER, "rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex",
-                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // CRSMShader
 };   // CRSMShader
 
@@ -250,8 +245,7 @@ public:
                             GL_FRAGMENT_SHADER, "splatting_rsm.frag");
 
         assignUniforms("RSMMatrix", "ModelMatrix");
-        assignSamplerNames(m_program,
-                           0, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            2, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            3, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -271,8 +265,7 @@ public:
                             GL_FRAGMENT_SHADER, "instanced_rsm.frag");
 
         assignUniforms("RSMMatrix");
-        assignSamplerNames(m_program, 0, "tex",
-                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // CInstancedRSMShader
 };   // CInstancedRSMShader
 
@@ -288,8 +281,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                             GL_FRAGMENT_SHADER, "objectpass_spheremap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
@@ -308,8 +300,7 @@ public:
                     GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                     GL_FRAGMENT_SHADER, "instanced_objectpass_spheremap.frag");
         assignUniforms();
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
@@ -327,15 +318,14 @@ public:
                             GL_FRAGMENT_SHADER, "splatting.frag");
         assignUniforms("ModelMatrix");
 
-        assignSamplerNames(m_program,
-                         0, "DiffuseMap", ST_NEAREST_FILTERED,
-                         1, "SpecularMap", ST_NEAREST_FILTERED,
-                         2, "SSAO", ST_BILINEAR_FILTERED,
-                         3, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                         4, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                         5, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                         6, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                         7, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
+                           1, "SpecularMap", ST_NEAREST_FILTERED,
+                           2, "SSAO", ST_BILINEAR_FILTERED,
+                           3, "tex_layout", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           4, "tex_detail0", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           5, "tex_detail1", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           6, "tex_detail2", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                           7, "tex_detail3", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // SplattingShader
 };   // SplattingShader
 
@@ -350,8 +340,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
                             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 
-                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // ObjectRefPass1Shader
 };  // ObjectRefPass1Shader
@@ -368,8 +357,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
                             GL_FRAGMENT_SHADER, "normalmap.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 
-                           1, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(1, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            0, "DiffuseForAlpha", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // NormalMapShader
 
@@ -386,8 +374,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
                             GL_FRAGMENT_SHADER, "instanced_normalmap.frag");
         assignUniforms();
-        assignSamplerNames(m_program,
-                           0, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "normalMap", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "glossMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // InstancedNormalMapShader
 };   // InstancedNormalMapShader
@@ -402,8 +389,7 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
                             GL_FRAGMENT_SHADER, "object_unlit.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
@@ -420,8 +406,7 @@ public:
                             GL_VERTEX_SHADER, "instanced_object_pass.vert",
                             GL_FRAGMENT_SHADER, "instanced_object_unlit.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
@@ -558,8 +543,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
                             GL_FRAGMENT_SHADER, "objectref_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix", "windDir");
-        assignSamplerNames(m_program,
-                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // GrassPass1Shader
 
@@ -577,8 +561,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
                             GL_FRAGMENT_SHADER, "instanced_objectref_pass1.frag");
         assignUniforms("windDir");
-        assignSamplerNames(m_program, 
-                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED,
                            1, "glosstex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // InstancedGrassPass1Shader
 };   // InstancedGrassPass1Shader
@@ -605,8 +588,7 @@ public:
                                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix", "windDir");
-        assignSamplerNames(m_program, 0, "tex",
-            ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // GrassShadowShader
 };   // GrassShadowShader
 
@@ -634,8 +616,7 @@ public:
                                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
 
-        assignSamplerNames(m_program, 0, "tex",
-                           ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
         assignUniforms("layer", "windDir");
     }   // InstancedGrassShadowShader
 };   // InstancedGrassShadowShader
@@ -652,8 +633,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "grass_pass2.frag");
         assignUniforms("ModelMatrix", "windDir");
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -673,8 +653,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "instanced_grass_pass2.frag");
         assignUniforms("windDir", "SunDir");
-        assignSamplerNames(m_program,
-                           0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "dtex", ST_NEAREST_FILTERED,
@@ -694,7 +673,7 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                             GL_FRAGMENT_SHADER, "detailedobject_pass2.frag");
         assignUniforms("ModelMatrix");
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
@@ -714,7 +693,7 @@ public:
                    GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
                    GL_FRAGMENT_SHADER, "instanced_detailedobject_pass2.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
+        assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,
                            2, "SSAO", ST_BILINEAR_FILTERED,
                            3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index f87524c60..f48d93885 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -401,7 +401,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
             GL_FRAGMENT_SHADER, "object_pass1.frag");
         assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
 
@@ -413,11 +413,11 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
             GL_FRAGMENT_SHADER, "object_pass2.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-            assignSamplerNames(m_program, 0, "DiffuseMap", ST_NEAREST_FILTERED,
-                                          1, "SpecularMap", ST_NEAREST_FILTERED,
-                                          2, "SSAO", ST_BILINEAR_FILTERED,
-                                          3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                                          4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+            assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
+                               1, "SpecularMap", ST_NEAREST_FILTERED,
+                               2, "SSAO", ST_BILINEAR_FILTERED,
+                               3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                               4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
 
@@ -428,7 +428,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "object_pass.vert",
             GL_FRAGMENT_SHADER, "transparent.frag");
         assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     TransparentFogShader::TransparentFogShader()
@@ -438,7 +438,7 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "transparentfog.frag");
         assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH",
                        "endH", "start", "end", "col");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
 
@@ -480,7 +480,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "shadowref.frag");
         }
         assignUniforms("layer", "ModelMatrix");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     InstancedRefShadowShader::InstancedRefShadowShader()
@@ -504,7 +504,7 @@ namespace MeshShader
                 GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
         }
         assignUniforms("layer");
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
 
@@ -525,11 +525,10 @@ namespace MeshShader
             GL_FRAGMENT_SHADER, "displace.frag");
         assignUniforms("ModelMatrix", "dir", "dir2");
 
-        assignSamplerNames(m_program,
-            0, "displacement_tex", ST_BILINEAR_FILTERED, 
-            1, "color_tex", ST_BILINEAR_FILTERED,
-            2, "mask_tex", ST_BILINEAR_FILTERED,
-            3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "displacement_tex", ST_BILINEAR_FILTERED, 
+                           1, "color_tex", ST_BILINEAR_FILTERED,
+                           2, "mask_tex", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
     SkyboxShader::SkyboxShader()
@@ -538,7 +537,7 @@ namespace MeshShader
             GL_VERTEX_SHADER, "sky.vert",
             GL_FRAGMENT_SHADER, "sky.frag");
         assignUniforms();
-        assignSamplerNames(m_program, 0, "tex", ST_TRILINEAR_CUBEMAP);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_CUBEMAP);
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -590,8 +589,8 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlight.frag");
 
         assignUniforms();
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED, 
-                                     1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED, 
+                           1, "dtex", ST_NEAREST_FILTERED);
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
 
@@ -627,7 +626,7 @@ namespace LightShader
             GL_FRAGMENT_SHADER, "pointlightscatter.frag");
 
         assignUniforms("density", "fogcol");
-        assignSamplerNames(m_program, 0, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "dtex", ST_NEAREST_FILTERED);
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
@@ -687,8 +686,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
             GL_FRAGMENT_SHADER, "sunlight.frag");
 
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
         assignUniforms("direction", "col");
     }
 
@@ -705,9 +704,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadow.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED,
-                                      8, "shadowtex", ST_SHADOW_SAMPLER);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           8, "shadowtex", ST_SHADOW_SAMPLER);
         assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
     }
 
@@ -723,9 +722,9 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
 
         // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED,
-                                      8, "shadowtex", ST_TRILINEAR_CLAMPED_ARRAY2D);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           8, "shadowtex", ST_TRILINEAR_CLAMPED_ARRAY2D);
             
         assignUniforms("split0", "split1", "split2", "splitmax");
     }
@@ -747,9 +746,9 @@ namespace FullScreenShader
         }
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
-        assignSamplerNames(m_program, 0, "ctex", ST_BILINEAR_FILTERED,
-                                      1, "ntex", ST_BILINEAR_FILTERED,
-                                      2, "dtex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
+                           1, "ntex", ST_BILINEAR_FILTERED,
+                           2, "dtex", ST_BILINEAR_FILTERED);
     }
 
     NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
@@ -761,9 +760,9 @@ namespace FullScreenShader
 
         assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
 
-        assignSamplerNames(m_program, 0, "ctex", ST_BILINEAR_FILTERED,
-                                      1, "ntex", ST_BILINEAR_FILTERED,
-                                      2, "dtex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
+                           1, "ntex", ST_BILINEAR_FILTERED,
+                           2, "dtex", ST_BILINEAR_FILTERED);
     }
 
     RHDebug::RHDebug()
@@ -787,11 +786,11 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gi.frag");
 
         assignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        assignSamplerNames(m_program, 0, "ntex", ST_NEAREST_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED,
-                                      2, "SHR", ST_VOLUME_LINEAR_FILTERED,
-                                      3, "SHG", ST_VOLUME_LINEAR_FILTERED,
-                                      4, "SHB", ST_VOLUME_LINEAR_FILTERED);
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           2, "SHR", ST_VOLUME_LINEAR_FILTERED,
+                           3, "SHG", ST_VOLUME_LINEAR_FILTERED,
+                           4, "SHB", ST_VOLUME_LINEAR_FILTERED);
     }
 
 	HorizontalBlurShader::HorizontalBlurShader()
@@ -801,7 +800,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "gaussian6h.frag");
         assignUniforms("pixel");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }
 
     PassThroughShader::PassThroughShader()
@@ -811,7 +810,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "passthrough.frag");
 
         assignUniforms("width", "height");
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }
 
     LayerPassThroughShader::LayerPassThroughShader()
@@ -832,7 +831,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "linearizedepth.frag");
         assignUniforms("zn", "zf");
 
-        assignSamplerNames(m_program, 0, "texture", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "texture", ST_BILINEAR_FILTERED);
     }
 
 
@@ -841,7 +840,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(m_program, 0, "depth", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "depth", ST_NEAREST_FILTERED);
         assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
         glShaderStorageBlockBinding(m_program, block_idx, 2);
@@ -863,7 +862,7 @@ namespace FullScreenShader
         loadProgram(OBJECT,
             GL_COMPUTE_SHADER, "depthhistogram.comp",
             GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(m_program, 0, "depth", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "depth", ST_NEAREST_FILTERED);
 
         GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "Histogram");
         glShaderStorageBlockBinding(m_program, block_idx, 1);
@@ -876,7 +875,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "glow.frag");
         assignUniforms();
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
         vao = createVAO(m_program);
     }
 
@@ -889,7 +888,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "ssao.frag");
 
         assignUniforms("radius", "k", "sigma");
-        assignSamplerNames(m_program, 0, "dtex", ST_SEMI_TRILINEAR);
+        assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
     }
 
     FogShader::FogShader()
@@ -900,7 +899,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "fog.frag");
 
         assignUniforms("density", "col");
-        assignSamplerNames(m_program, 0, "tex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }
 
     MotionBlurShader::MotionBlurShader()
@@ -910,8 +909,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
             GL_FRAGMENT_SHADER, "motion_blur.frag");
         assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        assignSamplerNames(m_program, 0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
-                                      1, "dtex", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
     }
 
     GodFadeShader::GodFadeShader()
@@ -921,7 +920,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godfade.frag");
         assignUniforms("col");
 
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }
 
     GodRayShader::GodRayShader()
@@ -931,7 +930,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "godray.frag");
 
         assignUniforms("sunpos");
-        assignSamplerNames(m_program, 0, "tex", ST_BILINEAR_FILTERED);
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }
 
     MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
@@ -941,7 +940,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_color1.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "colorMapG", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "colorMapG", ST_NEAREST_FILTERED);
     }
 
     MLAABlendWeightSHader::MLAABlendWeightSHader()
@@ -951,8 +950,8 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "edgesMap", ST_BILINEAR_FILTERED,
-                                      1, "areaMap", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "edgesMap", ST_BILINEAR_FILTERED,
+                           1, "areaMap", ST_NEAREST_FILTERED);
     }
 
     MLAAGatherSHader::MLAAGatherSHader()
@@ -962,7 +961,7 @@ namespace FullScreenShader
             GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
         assignUniforms("PIXEL_SIZE");
 
-        assignSamplerNames(m_program, 0, "blendMap", ST_NEAREST_FILTERED,
-                                      1, "colorMap", ST_NEAREST_FILTERED);
+        assignSamplerNames(0, "blendMap", ST_NEAREST_FILTERED,
+                           1, "colorMap", ST_NEAREST_FILTERED);
     }
 }
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stkbillboard.cpp
index 6c64a2d27..ef0ac290f 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stkbillboard.cpp
@@ -42,8 +42,7 @@ public:
 
         assignUniforms("ModelViewMatrix", "ProjectionMatrix", "Position",
                        "Size");
-        assignSamplerNames(m_program, 
-                           0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }   // BillboardShader
 };   // BillboardShader
 
diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index 6a6d193a8..6b6b459bc 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -103,7 +103,7 @@ private:
     /** End of recursive variadic template AssigTextureNames. It just
      *  checks if the number of arguments is correct.*/
     template<unsigned N, typename...Args>
-    void assignTextureNamesImpl(GLuint)
+    void assignTextureNamesImpl()
     {
         static_assert(N == NUM_TEXTURES, "Wrong number of texture names");
     }   // assignTextureNamesImpl
@@ -113,9 +113,8 @@ private:
      *  list of arguments.
      */
     template<unsigned N, typename...Args>
-    void assignTextureNamesImpl(GLuint program, GLuint tex_unit,
-                                const char *name, SamplerTypeNew sampler_type,
-                                Args...args)
+    void assignTextureNamesImpl(GLuint tex_unit, const char *name,
+                                SamplerTypeNew sampler_type, Args...args)
     {
 
         m_sampler_ids.push_back(createSamplers(sampler_type));
@@ -123,7 +122,7 @@ private:
         assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_texture_type.push_back(m_all_texture_types[sampler_type]);
 
-        GLuint location = glGetUniformLocation(program, name);
+        GLuint location = glGetUniformLocation(m_program, name);
         m_texture_location.push_back(location);
         glUniform1i(location, tex_unit);
         m_texture_units.push_back(tex_unit);
@@ -132,7 +131,7 @@ private:
         assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_bind_functions.push_back( m_all_bind_functions[sampler_type]);
 
-        assignTextureNamesImpl<N + 1>(program, args...);
+        assignTextureNamesImpl<N + 1>(args...);
     }   // assignTextureNamesImpl
 
     // ------------------------------------------------------------------------
@@ -141,10 +140,10 @@ public:
     *  from instances.
     */
     template<typename...Args>
-    void assignSamplerNames(GLuint program, Args...args)
+    void assignSamplerNames(Args...args)
     {
-        glUseProgram(program);
-        assignTextureNamesImpl<0>(program, args...);
+        glUseProgram(m_program);
+        assignTextureNamesImpl<0>(args...);
         glUseProgram(0);
     }   // AssignSamplerNames
 

From f0f230b042a637c22527739b65a4ca7f82dba403 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 17 May 2015 00:56:42 +1000
Subject: [PATCH 205/331] Try to fix linux compilation.

---
 src/graphics/shader.hpp         | 5 +++++
 src/graphics/texture_shader.hpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 2ff315750..573e46895 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -94,6 +94,11 @@ public:
     // ------------------------------------------------------------------------
     /** Activates the shader calling glUseProgram. */
     void use() { glUseProgram(m_program); }
+    // ------------------------------------------------------------------------
+    GLuint getUniformLocation(const char *name)
+    {
+        return glGetUniformLocation(m_program, name);
+    }   // getUniformLocation
 };   // ShaderBase
 
 // ============================================================================
diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index 6b6b459bc..cdfef0e0e 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -122,7 +122,7 @@ private:
         assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_texture_type.push_back(m_all_texture_types[sampler_type]);
 
-        GLuint location = glGetUniformLocation(m_program, name);
+        GLuint location = getUniformLocation(name);
         m_texture_location.push_back(location);
         glUniform1i(location, tex_unit);
         m_texture_units.push_back(tex_unit);

From a50d11df365f14aead4209f2af274487f054a03c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 17 May 2015 10:04:01 +1000
Subject: [PATCH 206/331] Try a different linux fix.

---
 src/graphics/texture_shader.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index cdfef0e0e..36a54c3dd 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -142,7 +142,7 @@ public:
     template<typename...Args>
     void assignSamplerNames(Args...args)
     {
-        glUseProgram(m_program);
+        use();
         assignTextureNamesImpl<0>(args...);
         glUseProgram(0);
     }   // AssignSamplerNames

From 37d787ff384419af1d26434e148046bf09d1a6b8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sun, 17 May 2015 10:28:37 +1000
Subject: [PATCH 207/331] Fixed linux compilation.

---
 src/graphics/texture_shader.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index 36a54c3dd..578bff92a 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -122,7 +122,7 @@ private:
         assert(sampler_type >= ST_MIN && sampler_type <= ST_MAX);
         m_texture_type.push_back(m_all_texture_types[sampler_type]);
 
-        GLuint location = getUniformLocation(name);
+        GLuint location = this->getUniformLocation(name);
         m_texture_location.push_back(location);
         glUniform1i(location, tex_unit);
         m_texture_units.push_back(tex_unit);
@@ -142,7 +142,7 @@ public:
     template<typename...Args>
     void assignSamplerNames(Args...args)
     {
-        use();
+        this->use();
         assignTextureNamesImpl<0>(args...);
         glUseProgram(0);
     }   // AssignSamplerNames

From 3cb0c6f4c211e9e43bca7e4c6ef7b6a563212a71 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 May 2015 08:22:52 +1000
Subject: [PATCH 208/331] Fixed coding style in stkmesh.

---
 src/graphics/render_geometry.cpp  |   2 +-
 src/graphics/stkanimatedmesh.cpp  |  10 +-
 src/graphics/stkmesh.cpp          | 181 ++++++++++++++++++------------
 src/graphics/stkmesh.hpp          | 134 +++++++++++++++-------
 src/graphics/stkmeshscenenode.cpp |  10 +-
 5 files changed, 214 insertions(+), 123 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index b0873d0ec..d150e77ca 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -40,7 +40,7 @@
 You need to consider twice before adding a new material : in the worst case a material requires 8 shaders :
 one for each solid pass, one for shadow pass, one for RSM pass, and you need to double that for instanced version.
 
-You need to declare a new enum in MeshMaterial and to write the corresponding dispatch code in MaterialTypeToMeshMaterial
+You need to declare a new enum in MeshMaterial and to write the corresponding dispatch code in getMeshMaterialFromType
 and to create 2 new List* structures (one for standard and one for instanced version).
 
 Then you need to write the code in stkscenemanager.cpp that will add any mesh with the new material to their corresponding
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp
index 59092ee01..634f005d7 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stkanimatedmesh.cpp
@@ -121,12 +121,12 @@ void STKAnimatedMesh::updateNoGL()
 
             if (rnd->isTransparent())
             {
-                TransparentMaterial TranspMat = MaterialTypeToTransparentMaterial(type, MaterialTypeParam, material);
+                TransparentMaterial TranspMat = getTransparentMaterialFromType(type, MaterialTypeParam, material);
                 TransparentMesh[TranspMat].push_back(&mesh);
             }
             else
             {
-                Material::ShaderType MatType = material->getShaderType();// MaterialTypeToMeshMaterial(type, mb->getVertexType(), material);
+                Material::ShaderType MatType = material->getShaderType();// getMeshMaterialFromType(type, mb->getVertexType(), material);
                 MeshSolidMaterial[MatType].push_back(&mesh);
             }
         }
@@ -167,11 +167,11 @@ void STKAnimatedMesh::updateGL()
                 if (mb->getMaterial().getTexture(1) != NULL)
                     material2 = material_manager->getMaterialFor(mb->getMaterial().getTexture(1), mb);
 
-                Material::ShaderType MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType(), material, material2);
-                InitTextures(mesh, MatType);
+                Material::ShaderType MatType = getMeshMaterialFromType(type, mb->getVertexType(), material, material2);
+                initTextures(mesh, MatType);
             }
             else
-                InitTexturesTransparent(mesh);
+                initTexturesTransparent(mesh);
 
             if (CVS->isARBBaseInstanceUsable())
             {
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index 78151771e..d7f5d69d6 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -32,10 +32,14 @@
 #include <IMaterialRenderer.h>
 
 
-Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialType, video::E_VERTEX_TYPE tp,
-    Material* material, Material* layer2Material)
+// ============================================================================
+Material::ShaderType getMeshMaterialFromType(video::E_MATERIAL_TYPE material_type,
+                                              video::E_VERTEX_TYPE tp,
+                                              Material* material,
+                                              Material* layer2_material)
 {
-    if (layer2Material != NULL && layer2Material->getShaderType() == Material::SHADERTYPE_SPLATTING)
+    if (layer2_material != NULL && 
+        layer2_material->getShaderType() == Material::SHADERTYPE_SPLATTING)
         return Material::SHADERTYPE_SPLATTING;
 
     switch (material->getShaderType())
@@ -43,15 +47,18 @@ Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialT
     default:
         return material->getShaderType();   
     case Material::SHADERTYPE_SOLID:
-        if (MaterialType == Shaders::getShader(ES_NORMAL_MAP))
+        if (material_type == Shaders::getShader(ES_NORMAL_MAP))
             return Material::SHADERTYPE_NORMAL_MAP;
         else if (tp == video::EVT_2TCOORDS)
             return Material::SHADERTYPE_DETAIL_MAP;
         return Material::SHADERTYPE_SOLID;
     }
-}
+}   // getMeshMaterialFromType
 
-TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE type, f32 MaterialTypeParam, Material* material)
+// ----------------------------------------------------------------------------
+TransparentMaterial getTransparentMaterialFromType(video::E_MATERIAL_TYPE type,
+                                                   f32 MaterialTypeParam,
+                                                   Material* material)
 {
     if (type == Shaders::getShader(ES_DISPLACE))
         return TM_DISPLACEMENT;
@@ -60,6 +67,7 @@ TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE typ
     return TM_DEFAULT;
 }
 
+// ----------------------------------------------------------------------------
 video::E_VERTEX_TYPE getVTXTYPEFromStride(size_t stride)
 {
     if (stride == sizeof(video::S3DVertex))
@@ -68,8 +76,9 @@ video::E_VERTEX_TYPE getVTXTYPEFromStride(size_t stride)
         return video::EVT_2TCOORDS;
     assert(stride == sizeof(video::S3DVertexTangents));
     return video::EVT_TANGENTS;
-}
+}   // getVTXTYPEFromStride
 
+// ----------------------------------------------------------------------------
 GLuint createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type)
 {
     GLuint vao;
@@ -82,53 +91,68 @@ GLuint createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type)
     case video::EVT_STANDARD:
         // Position
         glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), 0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), 0);
         // Normal
         glEnableVertexAttribArray(1);
-        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)12);
+        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)12);
         // Color
         glEnableVertexAttribArray(2);
-        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, getVertexPitchFromType(type), (GLvoid*)24);
+        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE,
+                              getVertexPitchFromType(type), (GLvoid*)24);
         // Texcoord
         glEnableVertexAttribArray(3);
-        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)28);
+        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)28);
         break;
     case video::EVT_2TCOORDS:
         // Position
         glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), 0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), 0);
         // Normal
         glEnableVertexAttribArray(1);
-        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)12);
+        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)12);
         // Color
         glEnableVertexAttribArray(2);
-        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, getVertexPitchFromType(type), (GLvoid*)24);
+        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, 
+                              getVertexPitchFromType(type), (GLvoid*)24);
         // Texcoord
         glEnableVertexAttribArray(3);
-        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)28);
+        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)28);
         // SecondTexcoord
         glEnableVertexAttribArray(4);
-        glVertexAttribPointer(4, 2, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)36);
+        glVertexAttribPointer(4, 2, GL_FLOAT, GL_FALSE, 
+                              getVertexPitchFromType(type), (GLvoid*)36);
         break;
     case video::EVT_TANGENTS:
         // Position
         glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), 0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), 0);
         // Normal
         glEnableVertexAttribArray(1);
-        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)12);
+        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)12);
         // Color
         glEnableVertexAttribArray(2);
-        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, getVertexPitchFromType(type), (GLvoid*)24);
+        glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE,
+                              getVertexPitchFromType(type), (GLvoid*)24);
         // Texcoord
         glEnableVertexAttribArray(3);
-        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)28);
+        glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)28);
         // Tangent
         glEnableVertexAttribArray(5);
-        glVertexAttribPointer(5, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)36);
+        glVertexAttribPointer(5, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)36);
         // Bitangent
         glEnableVertexAttribArray(6);
-        glVertexAttribPointer(6, 3, GL_FLOAT, GL_FALSE, getVertexPitchFromType(type), (GLvoid*)48);
+        glVertexAttribPointer(6, 3, GL_FLOAT, GL_FALSE,
+                              getVertexPitchFromType(type), (GLvoid*)48);
         break;
     default:
         assert(0 && "Wrong vertex type");
@@ -136,8 +160,9 @@ GLuint createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type)
     assert(idx);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, idx);
     return vao;
-}
+}   // createVAO
 
+// ----------------------------------------------------------------------------
 GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb, const std::string& debug_name)
 {
     GLMesh result = {};
@@ -202,10 +227,10 @@ GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb, const std::string& debug_name)
     result.TextureMatrix = 0;
     result.VAOType = mb->getVertexType();
     return result;
-}
+}   // allocateMeshBuffer
 
-static
-size_t getUnsignedSize(unsigned tp)
+// ----------------------------------------------------------------------------
+static size_t getUnsignedSize(unsigned tp)
 {
     switch (tp)
     {
@@ -217,8 +242,9 @@ size_t getUnsignedSize(unsigned tp)
         assert(0 && "Unsupported index type");
         return 0;
     }
-}
+}   // getUnsignedSize
 
+// ----------------------------------------------------------------------------
 void fillLocalBuffer(GLMesh &mesh, scene::IMeshBuffer* mb)
 {
     glBindVertexArray(0);
@@ -230,37 +256,41 @@ void fillLocalBuffer(GLMesh &mesh, scene::IMeshBuffer* mb)
     const u32 vertexCount = mb->getVertexCount();
 
     const c8* vbuf = static_cast<const c8*>(vertices);
-    glBufferData(GL_ARRAY_BUFFER, vertexCount * mesh.Stride, vbuf, GL_STREAM_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, vertexCount * mesh.Stride, vbuf,
+                 GL_STREAM_DRAW);
     assert(vertexCount);
 
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh.index_buffer);
     const void* indices = mb->getIndices();
     mesh.IndexCount = mb->getIndexCount();
 
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, mesh.IndexCount * getUnsignedSize(mesh.IndexType), indices, GL_STREAM_DRAW);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER,
+                 mesh.IndexCount * getUnsignedSize(mesh.IndexType),
+                 indices, GL_STREAM_DRAW);
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-}
+}   // fillLocalBuffer
 
-
-core::matrix4 computeMVP(const core::matrix4 &ModelMatrix)
+// ----------------------------------------------------------------------------
+core::matrix4 computeMVP(const core::matrix4 &model_matrix)
 {
     core::matrix4 ModelViewProjectionMatrix = irr_driver->getProjMatrix();
     ModelViewProjectionMatrix *= irr_driver->getViewMatrix();
-    ModelViewProjectionMatrix *= ModelMatrix;
+    ModelViewProjectionMatrix *= model_matrix;
     return ModelViewProjectionMatrix;
-}
+}   // computeMVP
 
+// ----------------------------------------------------------------------------
 core::vector3df getWindDir()
 {
     const float time = irr_driver->getDevice()->getTimer()->getTime() / 1000.0f;
-    GrassShaderProvider *gsp = (GrassShaderProvider *)Shaders::getCallback(ES_GRASS);
-    float m_speed = gsp->getSpeed();
-
-    return m_speed * vector3df(1., 0., 0.) * cos(time);
-}
+    GrassShaderProvider *gsp = 
+        (GrassShaderProvider *)Shaders::getCallback(ES_GRASS);
+    return (gsp->getSpeed() * cos(time)) * vector3df(1., 0., 0.);
+}   // getWindDir
 
+// ----------------------------------------------------------------------------
 bool isObject(video::E_MATERIAL_TYPE type)
 {
     if (type == Shaders::getShader(ES_OBJECTPASS))
@@ -296,31 +326,38 @@ bool isObject(video::E_MATERIAL_TYPE type)
     if (type == video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF)
         return true;
     return false;
-}
+}   // isObject
 
-static void
-SetTexture(GLMesh &mesh, unsigned i, bool isSrgb, const std::string &matname)
+// ----------------------------------------------------------------------------
+static void setTexture(GLMesh &mesh, unsigned i, bool is_srgb,
+                       const std::string &mat_name)
 {
     if (!mesh.textures[i])
     {
-        Log::error("STKMesh", "Missing texture %d for material %s", i, matname.c_str());
+        Log::error("STKMesh", "Missing texture %d for material %s", i,
+                   mat_name.c_str());
         // use unicolor texture to replace missing texture
-        mesh.textures[i] = getUnicolorTexture(video::SColor(255, 127, 127, 127));
+        mesh.textures[i] = 
+                      getUnicolorTexture(video::SColor(255, 127, 127, 127));
     }
-    compressTexture(mesh.textures[i], isSrgb);
+    compressTexture(mesh.textures[i], is_srgb);
     if (CVS->isAZDOEnabled())
     {
         if (!mesh.TextureHandles[i])
-            mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[i]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+        {
+            mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(
+                getTextureGLuint(mesh.textures[i]),
+                MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+        }
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[i]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[i]);
     }
-}
+}   // setTexture
 
-static std::string
-getShaderTypeName(Material::ShaderType Mat)
+// ----------------------------------------------------------------------------
+static std::string getShaderTypeName(Material::ShaderType mat)
 {
-    switch (Mat)
+    switch (mat)
     {
     default:
     case Material::SHADERTYPE_SOLID:
@@ -340,11 +377,12 @@ getShaderTypeName(Material::ShaderType Mat)
     case Material::SHADERTYPE_SPLATTING:
         return "Splatting";
     }
-}
+}   // getShaderTypeName
 
-void InitTextures(GLMesh &mesh, Material::ShaderType Mat)
+// ----------------------------------------------------------------------------
+void initTextures(GLMesh &mesh, Material::ShaderType mat)
 {
-    switch (Mat)
+    switch (mat)
     {
     default:
     case Material::SHADERTYPE_SOLID:
@@ -352,28 +390,29 @@ void InitTextures(GLMesh &mesh, Material::ShaderType Mat)
     case Material::SHADERTYPE_VEGETATION:
     case Material::SHADERTYPE_SPHERE_MAP:
     case Material::SHADERTYPE_SOLID_UNLIT:
-        SetTexture(mesh, 0, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 1, false, getShaderTypeName(Mat));
+        setTexture(mesh, 0, true, getShaderTypeName(mat));
+        setTexture(mesh, 1, false, getShaderTypeName(mat));
         break;
     case Material::SHADERTYPE_DETAIL_MAP:
     case Material::SHADERTYPE_NORMAL_MAP:
-        SetTexture(mesh, 0, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 1, false, getShaderTypeName(Mat));
-        SetTexture(mesh, 2, false, getShaderTypeName(Mat));
+        setTexture(mesh, 0, true, getShaderTypeName(mat));
+        setTexture(mesh, 1, false, getShaderTypeName(mat));
+        setTexture(mesh, 2, false, getShaderTypeName(mat));
         break;
     case Material::SHADERTYPE_SPLATTING:
-        SetTexture(mesh, 0, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 1, false, getShaderTypeName(Mat));
-        SetTexture(mesh, 2, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 3, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 4, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 5, true, getShaderTypeName(Mat));
-        SetTexture(mesh, 6, false, getShaderTypeName(Mat));
+        setTexture(mesh, 0, true, getShaderTypeName(mat));
+        setTexture(mesh, 1, false, getShaderTypeName(mat));
+        setTexture(mesh, 2, true, getShaderTypeName(mat));
+        setTexture(mesh, 3, true, getShaderTypeName(mat));
+        setTexture(mesh, 4, true, getShaderTypeName(mat));
+        setTexture(mesh, 5, true, getShaderTypeName(mat));
+        setTexture(mesh, 6, false, getShaderTypeName(mat));
         break;
     }
-}
+}   // initTextures
 
-void InitTexturesTransparent(GLMesh &mesh)
+// ----------------------------------------------------------------------------
+void initTexturesTransparent(GLMesh &mesh)
 {
     if (!mesh.textures[0])
     {
@@ -384,8 +423,12 @@ void InitTexturesTransparent(GLMesh &mesh)
     if (CVS->isAZDOEnabled())
     {
         if (!mesh.TextureHandles[0])
-            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+        {
+            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(
+                getTextureGLuint(mesh.textures[0]),
+                MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+        }
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
     }
-}
+}   // initTexturesTransparent
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
index b0745742b..44504baff 100644
--- a/src/graphics/stkmesh.hpp
+++ b/src/graphics/stkmesh.hpp
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#ifndef STKMESH_H
-#define STKMESH_H
+#ifndef HEADER_STK_MESH_H
+#define HEADER_STK_MESH_H
 
 #include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
@@ -38,9 +38,10 @@ enum TransparentMaterial
     TM_ADDITIVE,
     TM_DISPLACEMENT,
     TM_COUNT
-};
+};   // TransparentMaterial
 
-struct GLMesh {
+struct GLMesh
+{
     GLuint vao;
     GLuint vertex_buffer;
     GLuint index_buffer;
@@ -58,18 +59,20 @@ struct GLMesh {
 #ifdef DEBUG
     std::string debug_name;
 #endif
-};
+};   // GLMesh
 
-GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb, const std::string& debug_name);
-void fillLocalBuffer(GLMesh &, scene::IMeshBuffer* mb);
+// ----------------------------------------------------------------------------
+GLMesh               allocateMeshBuffer(scene::IMeshBuffer* mb,
+                                        const std::string& debug_name);
+void                 fillLocalBuffer(GLMesh &, scene::IMeshBuffer* mb);
 video::E_VERTEX_TYPE getVTXTYPEFromStride(size_t stride);
-GLuint createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type);
-core::matrix4 computeMVP(const core::matrix4 &ModelViewProjectionMatrix);
-bool isObject(video::E_MATERIAL_TYPE type);
-
-core::vector3df getWindDir();
+GLuint               createVAO(GLuint vbo, GLuint idx, video::E_VERTEX_TYPE type);
+core::matrix4        computeMVP(const core::matrix4 &ModelViewProjectionMatrix);
+bool                 isObject(video::E_MATERIAL_TYPE type);
+core::vector3df      getWindDir();
 
 
+// ----------------------------------------------------------------------------
 class STKMeshCommon
 {
 protected:
@@ -82,8 +85,9 @@ public:
     virtual void updateGL() = 0;
     virtual bool glow() const = 0;
     virtual bool isImmediateDraw() const { return false; }
-};
+};   // STKMeshCommon
 
+// ----------------------------------------------------------------------------
 template<typename T, typename... Args>
 class MeshList : public Singleton<T>
 {
@@ -96,8 +100,9 @@ public:
         for (unsigned i = 0; i < 4; i++)
             Shadows[i].clear();
     }
-};
+};   // MeshList
 
+// ----------------------------------------------------------------------------
 template<typename T>
 class InstancedMeshList : public Singleton<T>
 {
@@ -110,90 +115,133 @@ public:
         for (unsigned i = 0; i < 4; i++)
             Shadows[i].clear();
     }
-};
+};   // InstancedMeshList
 
-// -----------------------------------------Mat Default---------------------------------------------------- //
-class ListMatDefault : public MeshList<ListMatDefault, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatDefault : public MeshList<ListMatDefault, GLMesh *, core::matrix4,
+                                      core::matrix4, core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatDefault : public InstancedMeshList<ListInstancedMatDefault>
 {};
 
-
-// -----------------------------------------Mat Alpha Ref---------------------------------------------------- //
-class ListMatAlphaRef : public MeshList<ListMatAlphaRef, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatAlphaRef : public MeshList<ListMatAlphaRef, GLMesh *, core::matrix4,
+                                        core::matrix4, core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatAlphaRef : public InstancedMeshList<ListInstancedMatAlphaRef>
 {};
 
-// -----------------------------------------Mat Normap Map---------------------------------------------------- //
-class ListMatNormalMap : public MeshList<ListMatNormalMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatNormalMap : public MeshList<ListMatNormalMap, GLMesh *, core::matrix4,
+                                         core::matrix4, core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatNormalMap : public InstancedMeshList<ListInstancedMatNormalMap>
 {};
 
-// -----------------------------------------Mat Grass---------------------------------------------------- //
-class ListMatGrass : public MeshList<ListMatGrass, GLMesh *, core::matrix4, core::matrix4, core::vector3df>
+// ----------------------------------------------------------------------------
+class ListMatGrass : public MeshList<ListMatGrass, GLMesh *, core::matrix4, 
+                                     core::matrix4, core::vector3df>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatGrass : public InstancedMeshList<ListInstancedMatGrass>
 {};
 
-// -----------------------------------------Mat Sphere Map---------------------------------------------------- //
-class ListMatSphereMap : public MeshList<ListMatSphereMap, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatSphereMap : public MeshList<ListMatSphereMap, GLMesh *,
+                                         core::matrix4, core::matrix4,
+                                         core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatSphereMap : public InstancedMeshList<ListInstancedMatSphereMap>
 {};
 
-// -----------------------------------------Mat Splatting---------------------------------------------------- //
-class ListMatSplatting : public MeshList<ListMatSplatting, GLMesh *, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatSplatting : public MeshList<ListMatSplatting, GLMesh *,
+                                         core::matrix4, core::matrix4>
 {};
 
-// -----------------------------------------Mat Unlit---------------------------------------------------- //
-class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4,
+                                     core::matrix4, core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatUnlit : public InstancedMeshList<ListInstancedMatUnlit>
 {};
 
-// -----------------------------------------Mat Details---------------------------------------------------- //
-class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4,
+                                       core::matrix4, core::matrix4>
 {};
 
+// ----------------------------------------------------------------------------
 class ListInstancedMatDetails : public InstancedMeshList<ListInstancedMatDetails>
 {};
 
+// ----------------------------------------------------------------------------
 // Transparent
 template <typename T, typename ...Args>
 class MiscList : public Singleton<T>, public std::vector<STK::Tuple<Args...> >
 {};
 
-class ListBlendTransparent : public MiscList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListBlendTransparent : public MiscList<ListBlendTransparent, GLMesh *,
+                                             core::matrix4, core::matrix4>
 {};
 
-class ListAdditiveTransparent : public MiscList<ListAdditiveTransparent, GLMesh *, core::matrix4, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListAdditiveTransparent : public MiscList<ListAdditiveTransparent,
+                                                GLMesh *, core::matrix4,
+                                                core::matrix4>
 {};
 
-class ListBlendTransparentFog : public MiscList<ListBlendTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+// ----------------------------------------------------------------------------
+class ListBlendTransparentFog : public MiscList<ListBlendTransparentFog,
+                                                GLMesh *, core::matrix4,
+                                                core::matrix4, float, float,
+                                                float, float, float,
+                                                video::SColorf>
 {};
 
-class ListAdditiveTransparentFog : public MiscList<ListAdditiveTransparentFog, GLMesh *, core::matrix4, core::matrix4, float, float, float, float, float, video::SColorf>
+// ----------------------------------------------------------------------------
+class ListAdditiveTransparentFog : public MiscList<ListAdditiveTransparentFog,
+                                                   GLMesh *, core::matrix4,
+                                                   core::matrix4, float, float,
+                                                   float, float, float,
+                                                   video::SColorf>
 {};
 
-class ListDisplacement : public MiscList<ListDisplacement, GLMesh *, core::matrix4>
+// ----------------------------------------------------------------------------
+class ListDisplacement : public MiscList<ListDisplacement, GLMesh *,
+                                         core::matrix4>
 {};
 
-class ListInstancedGlow : public Singleton<ListInstancedGlow>, public std::vector<GLMesh *>
+// ----------------------------------------------------------------------------
+class ListInstancedGlow : public Singleton<ListInstancedGlow>
+                        , public std::vector<GLMesh *>
 {};
 
-Material::ShaderType MaterialTypeToMeshMaterial(video::E_MATERIAL_TYPE MaterialType, video::E_VERTEX_TYPE tp,
-    Material* material, Material* layer2Material);
-TransparentMaterial MaterialTypeToTransparentMaterial(video::E_MATERIAL_TYPE, f32 MaterialTypeParam, Material* material);
+// ----------------------------------------------------------------------------
+Material::ShaderType getMeshMaterialFromType(video::E_MATERIAL_TYPE MaterialType,
+                                             video::E_VERTEX_TYPE tp,
+                                             Material* material,
+                                             Material* layer2Material);
+// ----------------------------------------------------------------------------
+TransparentMaterial getTransparentMaterialFromType(video::E_MATERIAL_TYPE,
+                                                   f32 MaterialTypeParam,
+                                                   Material* material);
 
-void InitTextures(GLMesh &mesh, Material::ShaderType);
-void InitTexturesTransparent(GLMesh &mesh);
+// ----------------------------------------------------------------------------
+void initTextures(GLMesh &mesh, Material::ShaderType);
+// ----------------------------------------------------------------------------
+void initTexturesTransparent(GLMesh &mesh);
 
 #endif // STKMESH_H
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 4a5e75f25..8f886b80d 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -157,7 +157,7 @@ void STKMeshSceneNode::updateNoGL()
             Material* material = material_manager->getMaterialFor(mb->getMaterial().getTexture(0), mb);
             if (rnd->isTransparent())
             {
-                TransparentMaterial TranspMat = MaterialTypeToTransparentMaterial(type, MaterialTypeParam, material);
+                TransparentMaterial TranspMat = getTransparentMaterialFromType(type, MaterialTypeParam, material);
                 if (!immediate_draw)
                     TransparentMesh[TranspMat].push_back(&mesh);
                 else
@@ -169,7 +169,7 @@ void STKMeshSceneNode::updateNoGL()
                 Material* material2 = NULL;
                 if (mb->getMaterial().getTexture(1) != NULL)
                     material2 = material_manager->getMaterialFor(mb->getMaterial().getTexture(1), mb);
-                Material::ShaderType MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType(), material, material2);
+                Material::ShaderType MatType = getMeshMaterialFromType(type, mb->getVertexType(), material, material2);
                 if (!immediate_draw)
                     MeshSolidMaterial[MatType].push_back(&mesh);
             }
@@ -208,12 +208,12 @@ void STKMeshSceneNode::updateGL()
             Material* material2 = NULL;
             if (mb->getMaterial().getTexture(1) != NULL)
                 material2 = material_manager->getMaterialFor(mb->getMaterial().getTexture(1), mb);
-            Material::ShaderType MatType = MaterialTypeToMeshMaterial(type, mb->getVertexType(), material, material2);
+            Material::ShaderType MatType = getMeshMaterialFromType(type, mb->getVertexType(), material, material2);
             if (!immediate_draw)
-                InitTextures(mesh, MatType);
+                initTextures(mesh, MatType);
         }
         else if (!immediate_draw)
-            InitTexturesTransparent(mesh);
+            initTexturesTransparent(mesh);
 
         if (!immediate_draw && CVS->isARBBaseInstanceUsable())
         {

From 78220d5ed74cc9f9b12da8943a4d71dde9d418db Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 May 2015 08:49:41 +1000
Subject: [PATCH 209/331] Moved more shaders.

---
 src/graphics/render.cpp           |  18 ++++-
 src/graphics/render_geometry.cpp  | 102 +++++++++++++++++++++++++---
 src/graphics/render_skybox.cpp    |  36 ++++++++--
 src/graphics/shaders.cpp          | 106 ------------------------------
 src/graphics/shaders.hpp          |  47 -------------
 src/graphics/stkmeshscenenode.cpp |  20 +++++-
 6 files changed, 160 insertions(+), 169 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 7316e9636..8b7c5d14d 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -43,6 +43,22 @@
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
 
+
+// ============================================================================
+class InstancedColorizeShader : public Shader<InstancedColorizeShader>
+{
+public:
+    InstancedColorizeShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER,   "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER,   "glow_object.vert",
+                            GL_FRAGMENT_SHADER, "glow_object.frag");
+        assignUniforms();
+    }   // InstancedColorizeShader
+};   // InstancedColorizeShader
+
+// ============================================================================
+
 extern std::vector<float> BoundingBoxes;
 
 void IrrDriver::renderGLSL(float dt)
@@ -694,7 +710,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     if (CVS->supportsIndirectInstancingRendering())
     {
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, GlowPassCmd::getInstance()->drawindirectcmd);
-        MeshShader::InstancedColorizeShader::getInstance()->use();
+        InstancedColorizeShader::getInstance()->use();
 
         glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(video::EVT_STANDARD, InstanceTypeGlow));
         if (CVS->isAZDOEnabled())
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index d150e77ca..98b9c3262 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -413,6 +413,90 @@ public:
     }   // InstancedObjectUnlitShader
 };   // InstancedObjectUnlitShader
 
+// ============================================================================
+class RefShadowShader : public TextureShader<RefShadowShader, 1, 
+                                             int, core::matrix4>
+{
+public:
+    RefShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow.vert",
+                                GL_FRAGMENT_SHADER, "shadowref.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "shadow.vert",
+                                GL_GEOMETRY_SHADER, "shadow.geom",
+                                GL_FRAGMENT_SHADER, "shadowref.frag");
+        }
+        assignUniforms("layer", "ModelMatrix");
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // RefShadowShader
+};   // RefShadowShader
+
+// ============================================================================
+class InstancedRefShadowShader : public TextureShader<InstancedRefShadowShader,
+                                                      1, int>
+{
+public:
+    InstancedRefShadowShader()
+    {
+        // Geometry shader needed
+        if (CVS->getGLSLVersion() < 150)
+            return;
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT,GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                               GL_VERTEX_SHADER, "instanciedshadow.vert",
+                               GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT,GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                               GL_VERTEX_SHADER, "instanciedshadow.vert",
+                               GL_GEOMETRY_SHADER, "instanced_shadow.geom",
+                               GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
+        }
+        assignUniforms("layer");
+        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // InstancedRefShadowShader
+};   // InstancedRefShadowShader
+
+// ============================================================================
+class DisplaceMaskShader : public Shader<DisplaceMaskShader, core::matrix4>
+{
+public:
+    DisplaceMaskShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "displace.vert",
+                            GL_FRAGMENT_SHADER, "white.frag");
+        assignUniforms("ModelMatrix");
+    }   // DisplaceMaskShader
+};   // DisplaceMaskShader
+
+// ============================================================================
+class DisplaceShader : public TextureShader<DisplaceShader, 4, core::matrix4,
+                                          core::vector2df, core::vector2df>
+{
+public:
+    DisplaceShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "displace.vert",
+                            GL_FRAGMENT_SHADER, "displace.frag");
+        assignUniforms("ModelMatrix", "dir", "dir2");
+
+        assignSamplerNames(0, "displacement_tex", ST_BILINEAR_FILTERED, 
+                           1, "color_tex", ST_BILINEAR_FILTERED,
+                           2, "mask_tex", ST_BILINEAR_FILTERED,
+                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+    }   // DisplaceShader
+};   // DisplaceShader
+
 // ============================================================================
 struct DefaultMaterial
 {
@@ -448,12 +532,12 @@ struct AlphaRef
 {
     typedef InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef InstancedObjectRefPass2Shader InstancedSecondPassShader;
-    typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
+    typedef InstancedRefShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatAlphaRef InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
     typedef ObjectRefPass2Shader SecondPassShader;
-    typedef MeshShader::RefShadowShader ShadowPassShader;
+    typedef RefShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatAlphaRef List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
@@ -507,12 +591,12 @@ struct UnlitMat
 {
     typedef InstancedObjectRefPass1Shader InstancedFirstPassShader;
     typedef InstancedObjectUnlitShader InstancedSecondPassShader;
-    typedef MeshShader::InstancedRefShadowShader InstancedShadowPassShader;
+    typedef InstancedRefShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatUnlit InstancedList;
     typedef ObjectRefPass1Shader FirstPassShader;
     typedef ObjectUnlitShader SecondPassShader;
-    typedef MeshShader::RefShadowShader ShadowPassShader;
+    typedef RefShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatUnlit List;
     static const enum video::E_VERTEX_TYPE VertexType = video::EVT_STANDARD;
@@ -1504,8 +1588,8 @@ void IrrDriver::renderTransparent()
         GLenum itype = mesh.IndexType;
         size_t count = mesh.IndexCount;
 
-        MeshShader::DisplaceMaskShader::getInstance()->use();
-        MeshShader::DisplaceMaskShader::getInstance()->setUniforms(AbsoluteTransformation);
+        DisplaceMaskShader::getInstance()->use();
+        DisplaceMaskShader::getInstance()->setUniforms(AbsoluteTransformation);
         glDrawElementsBaseVertex(ptype, (int)count, itype,
                                  (GLvoid *)mesh.vaoOffset, (int)mesh.vaoBaseVertex);
     }
@@ -1528,13 +1612,13 @@ void IrrDriver::renderTransparent()
         GLenum itype = mesh.IndexType;
         size_t count = mesh.IndexCount;
         // Render the effect
-        MeshShader::DisplaceShader::getInstance()->setTextureUnits(
+        DisplaceShader::getInstance()->setTextureUnits(
             getTextureGLuint(displaceTex),
             irr_driver->getRenderTargetTexture(RTT_COLOR),
             irr_driver->getRenderTargetTexture(RTT_TMP1),
             getTextureGLuint(mesh.textures[0]));
-        MeshShader::DisplaceShader::getInstance()->use();
-        MeshShader::DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
+        DisplaceShader::getInstance()->use();
+        DisplaceShader::getInstance()->setUniforms(AbsoluteTransformation,
             core::vector2df(cb->getDirX(), cb->getDirY()),
             core::vector2df(cb->getDir2X(), cb->getDir2Y()));
 
diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index 53e43c713..ebd1a0975 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -25,6 +25,34 @@
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
+class SkyboxShader : public TextureShader<SkyboxShader,1>
+{
+private:
+    GLuint m_vao;
+
+public:
+    SkyboxShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "sky.vert",
+                            GL_FRAGMENT_SHADER, "sky.frag");
+        assignUniforms();
+        assignSamplerNames(0, "tex", ST_TRILINEAR_CUBEMAP);
+
+        glGenVertexArrays(1, &m_vao);
+        glBindVertexArray(m_vao);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getSkyTriVBO());
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glBindVertexArray(0);
+    }   // SkyboxShader
+    // ------------------------------------------------------------------------
+    void bindVertexArray()
+    {
+        glBindVertexArray(m_vao);
+    }   // bindVertexArray
+};   // SkyboxShader
+
+// ============================================================================
 static float getTexelValue(unsigned i, unsigned j, size_t width, size_t height, float *Coeff, float *Y00, float *Y1minus1, float *Y10, float *Y11,
     float *Y2minus2, float * Y2minus1, float * Y20, float *Y21, float *Y22)
 {
@@ -403,11 +431,11 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
 
     glDisable(GL_BLEND);
 
-    MeshShader::SkyboxShader::getInstance()->use();
-    glBindVertexArray(MeshShader::SkyboxShader::getInstance()->vao);
-    MeshShader::SkyboxShader::getInstance()->setUniforms();
+    SkyboxShader::getInstance()->use();
+    SkyboxShader::getInstance()->bindVertexArray();
+    SkyboxShader::getInstance()->setUniforms();
 
-    MeshShader::SkyboxShader::getInstance()->setTextureUnits(SkyboxCubeMap);
+    SkyboxShader::getInstance()->setTextureUnits(SkyboxCubeMap);
 
     glDrawArrays(GL_TRIANGLES, 0, 3);
     glBindVertexArray(0);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index f48d93885..4af69a5fe 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -441,112 +441,6 @@ namespace MeshShader
         assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-
-    ColorizeShader::ColorizeShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "colorize.frag");
-        assignUniforms("ModelMatrix", "col");
-    }
-
-    InstancedColorizeShader::InstancedColorizeShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "glow_object.vert",
-            GL_FRAGMENT_SHADER, "glow_object.frag");
-        assignUniforms();
-    }
-
-
-
-    RefShadowShader::RefShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow.vert",
-                GL_FRAGMENT_SHADER, "shadowref.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "shadow.vert",
-                GL_GEOMETRY_SHADER, "shadow.geom",
-                GL_FRAGMENT_SHADER, "shadowref.frag");
-        }
-        assignUniforms("layer", "ModelMatrix");
-        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    InstancedRefShadowShader::InstancedRefShadowShader()
-    {
-        // Geometry shader needed
-        if (CVS->getGLSLVersion() < 150)
-            return;
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedshadow.vert",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-                GL_VERTEX_SHADER, "instanciedshadow.vert",
-                GL_GEOMETRY_SHADER, "instanced_shadow.geom",
-                GL_FRAGMENT_SHADER, "instanced_shadowref.frag");
-        }
-        assignUniforms("layer");
-        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-
-
-    DisplaceMaskShader::DisplaceMaskShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "displace.vert",
-            GL_FRAGMENT_SHADER, "white.frag");
-        assignUniforms("ModelMatrix");
-    }
-
-
-    DisplaceShader::DisplaceShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "displace.vert",
-            GL_FRAGMENT_SHADER, "displace.frag");
-        assignUniforms("ModelMatrix", "dir", "dir2");
-
-        assignSamplerNames(0, "displacement_tex", ST_BILINEAR_FILTERED, 
-                           1, "color_tex", ST_BILINEAR_FILTERED,
-                           2, "mask_tex", ST_BILINEAR_FILTERED,
-                           3, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    SkyboxShader::SkyboxShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "sky.vert",
-            GL_FRAGMENT_SHADER, "sky.frag");
-        assignUniforms();
-        assignSamplerNames(0, "tex", ST_TRILINEAR_CUBEMAP);
-
-        glGenVertexArrays(1, &vao);
-        glBindVertexArray(vao);
-        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getSkyTriVBO());
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        glBindVertexArray(0);
-    }
-
     NormalVisualizer::NormalVisualizer()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 693164f5e..157d574e5 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -66,53 +66,6 @@ public:
 };
 
 
-class ColorizeShader : public Shader<ColorizeShader, core::matrix4, video::SColorf>
-{
-public:
-    ColorizeShader();
-};
-
-class InstancedColorizeShader : public Shader<InstancedColorizeShader>
-{
-public:
-    InstancedColorizeShader();
-};
-
-
-
-class RefShadowShader : public TextureShader<RefShadowShader, 1, int, core::matrix4>
-{
-public:
-    RefShadowShader();
-};
-
-class InstancedRefShadowShader : public TextureShader<InstancedRefShadowShader, 1, int>
-{
-public:
-    InstancedRefShadowShader();
-};
-
-
-class DisplaceMaskShader : public Shader<DisplaceMaskShader, core::matrix4>
-{
-public:
-    DisplaceMaskShader();
-};
-
-class DisplaceShader : public TextureShader<DisplaceShader, 4, core::matrix4,
-                                          core::vector2df, core::vector2df>
-{
-public:
-    DisplaceShader();
-};
-
-class SkyboxShader : public TextureShader<SkyboxShader,1>
-{
-public:
-    SkyboxShader();
-    GLuint vao;
-};
-
 class NormalVisualizer : public Shader<NormalVisualizer, video::SColor>
 {
 public:
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 8f886b80d..4d27c8cae 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -32,6 +32,22 @@
 #include "utils/tuple.hpp"
 #include "utils/cpp2011.hpp"
 
+
+// ============================================================================
+class ColorizeShader : public Shader<ColorizeShader, core::matrix4, 
+                                     video::SColorf>
+{
+public:
+    ColorizeShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                            GL_FRAGMENT_SHADER, "colorize.frag");
+        assignUniforms("ModelMatrix", "col");
+    }
+
+};   // ColorizeShader
+
+// ============================================================================
 STKMeshSceneNode::STKMeshSceneNode(irr::scene::IMesh* mesh, ISceneNode* parent, irr::scene::ISceneManager* mgr,
     irr::s32 id, const std::string& debug_name,
     const irr::core::vector3df& position,
@@ -108,7 +124,7 @@ void STKMeshSceneNode::drawGlow(const GLMesh &mesh)
     GLenum ptype = mesh.PrimitiveType;
     GLenum itype = mesh.IndexType;
     size_t count = mesh.IndexCount;
-    MeshShader::ColorizeShader::getInstance()->setUniforms(AbsoluteTransformation, video::SColorf(glowcolor.getRed() / 255.f, glowcolor.getGreen() / 255.f, glowcolor.getBlue() / 255.f));
+    ColorizeShader::getInstance()->setUniforms(AbsoluteTransformation, video::SColorf(glowcolor.getRed() / 255.f, glowcolor.getGreen() / 255.f, glowcolor.getBlue() / 255.f));
     glDrawElementsBaseVertex(ptype, count, itype, (GLvoid *)mesh.vaoOffset, mesh.vaoBaseVertex);
 }
 
@@ -366,7 +382,7 @@ void STKMeshSceneNode::render()
 
     if (irr_driver->getPhase() == GLOW_PASS)
     {
-        MeshShader::ColorizeShader::getInstance()->use();
+        ColorizeShader::getInstance()->use();
         for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
         {
             scene::IMeshBuffer* mb = Mesh->getMeshBuffer(i);

From 080936f144bd5acc772d03ad488f9c1e38be6af9 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 17 May 2015 19:27:25 -0400
Subject: [PATCH 210/331] Work on scripting

---
 data/gui/scripting_console.stkgui             |  17 +
 src/physics/physics.cpp                       |   6 +-
 src/scriptengine/script_engine.cpp            | 574 ++++++++++--------
 src/scriptengine/script_engine.hpp            |  12 +-
 src/scriptengine/script_kart.cpp              |   2 +-
 src/scriptengine/script_track.cpp             |   4 +-
 src/scriptengine/script_utils.cpp             |   2 +-
 .../dialogs/scripting_console.cpp             |  86 +++
 .../dialogs/scripting_console.hpp             |  51 ++
 src/tracks/track.cpp                          |   2 +-
 src/tracks/track_object_presentation.cpp      |   2 +-
 src/utils/debug.cpp                           |   7 +
 12 files changed, 495 insertions(+), 270 deletions(-)
 create mode 100644 data/gui/scripting_console.stkgui
 create mode 100644 src/states_screens/dialogs/scripting_console.cpp
 create mode 100644 src/states_screens/dialogs/scripting_console.hpp

diff --git a/data/gui/scripting_console.stkgui b/data/gui/scripting_console.stkgui
new file mode 100644
index 000000000..f900753a9
--- /dev/null
+++ b/data/gui/scripting_console.stkgui
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+        
+        <label raw_text="Run script"/>
+        
+        <textbox id="textfield" width="75%" I18N="In the 'add new grand prix' dialog" align="center"/>
+
+        <spacer height="20" width="20" />
+        
+        <div align="center" height="fit" width="100%" layout="horizontal-row">
+            <button id="run" raw_text="Run" align="center" proportion="1"/>
+            <spacer height="20" width="20" />
+            <button id="close" raw_text="Close" align="center" proportion="1"/>
+        </div>
+    </div>
+</stkgui>
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 5481f763e..c7a25fdd0 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -171,7 +171,7 @@ void Physics::update(float dt)
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             int kartid1 = p->getUserPointer(0)->getPointerKart()->getWorldKartId();
             int kartid2 = p->getUserPointer(1)->getPointerKart()->getWorldKartId();
-            script_engine->runScript("void onKartKartCollision(int, int)",
+            script_engine->runFunction("void onKartKartCollision(int, int)",
                 [=](asIScriptContext* ctx) {
                     ctx->SetArgDWord(0, kartid1);
                     ctx->SetArgDWord(1, kartid2);
@@ -189,7 +189,7 @@ void Physics::update(float dt)
             std::string obj_id = p->getUserPointer(0)->getPointerPhysicalObject()->getID();
             
             // TODO: pass obj_id as arguent
-            script_engine->runScript("void onKartObjectCollision(int)",
+            script_engine->runFunction("void onKartObjectCollision(int)",
                 [=](asIScriptContext* ctx) {
                     ctx->SetArgDWord(0, kartId);
                 });
@@ -260,7 +260,7 @@ void Physics::update(float dt)
             //    p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
             //    "item"
             //);
-            script_engine->runScript("void onItemObjectCollision()");
+            script_engine->runFunction("void onItemObjectCollision()");
             p->getUserPointer(0)->getPointerFlyable()
                 ->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
             PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index eb3a7af6b..8d20e6361 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -38,308 +38,372 @@ using namespace Scripting;
 
 namespace Scripting
 {
+    const char* MODULE_ID_MAIN_SCRIPT_FILE = "main";
+    const char* MODULE_ID_EVAL = "eval";
 
-
-void AngelScript_ErrorCallback (const asSMessageInfo *msg, void *param)
-{
-    const char *type = "ERR ";
-    if (msg->type == asMSGTYPE_WARNING)
-        type = "WARN";
-    else if (msg->type == asMSGTYPE_INFORMATION)
-        type = "INFO";
-
-    Log::warn("Scripting", "%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
-}
-
-
-//Constructor, creates a new Scripting Engine using AngelScript
-ScriptEngine::ScriptEngine()
-{
-    // Create the script engine
-    m_engine = asCreateScriptEngine(ANGELSCRIPT_VERSION);
-    if (m_engine == NULL)
+    void AngelScript_ErrorCallback (const asSMessageInfo *msg, void *param)
     {
-        Log::fatal("Scripting", "Failed to create script engine.");
+        const char *type = "ERR ";
+        if (msg->type == asMSGTYPE_WARNING)
+            type = "WARN";
+        else if (msg->type == asMSGTYPE_INFORMATION)
+            type = "INFO";
+
+        Log::warn("Scripting", "%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
     }
 
-    // The script compiler will write any compiler messages to the callback.
-    m_engine->SetMessageCallback(asFUNCTION(AngelScript_ErrorCallback), 0, asCALL_CDECL);
 
-    // Configure the script engine with all the functions, 
-    // and variables that the script should be able to use.
-    configureEngine(m_engine);
-}
-
-ScriptEngine::~ScriptEngine()
-{
-    // Release the engine
-    m_engine->Release();
-}
-
-
-
-/** Get Script By it's file name
-*  \param string scriptname = name of script to get
-*  \return      The corresponding script
-*/
-std::string getScript(std::string scriptName)
-{
-    std::string script_dir = file_manager->getAsset(FileManager::SCRIPT, "");
-    script_dir += World::getWorld()->getTrack()->getIdent() + "/";
-
-    // TODO: allow splitting in multiple files
-    script_dir += "scripting.as";
-    FILE *f = fopen(script_dir.c_str(), "rb");
-    if (f == NULL)
+    //Constructor, creates a new Scripting Engine using AngelScript
+    ScriptEngine::ScriptEngine()
     {
-        Log::debug("Scripting", "File does not exist : {0}.as", scriptName.c_str());
-        return "";
+        // Create the script engine
+        m_engine = asCreateScriptEngine(ANGELSCRIPT_VERSION);
+        if (m_engine == NULL)
+        {
+            Log::fatal("Scripting", "Failed to create script engine.");
+        }
+
+        // The script compiler will write any compiler messages to the callback.
+        m_engine->SetMessageCallback(asFUNCTION(AngelScript_ErrorCallback), 0, asCALL_CDECL);
+
+        // Configure the script engine with all the functions, 
+        // and variables that the script should be able to use.
+        configureEngine(m_engine);
     }
 
-    // Determine the size of the file   
-    fseek(f, 0, SEEK_END);
-    int len = ftell(f);
-    fseek(f, 0, SEEK_SET);
-
-    // Read the entire file
-    std::string script;
-    script.resize(len);
-    int c = fread(&script[0], len, 1, f);
-    fclose(f);
-    if (c == NULL)
+    ScriptEngine::~ScriptEngine()
     {
-        Log::error("Scripting", "Failed to load script file.");
-        return "";
+        // Release the engine
+        m_engine->Release();
     }
-    return script;
-}
 
-//-----------------------------------------------------------------------------
 
-/** runs the specified script
-*  \param string scriptName = name of script to run
-*/
-void ScriptEngine::runScript(std::string scriptName)
-{
-    std::function<void(asIScriptContext*)> callback;
-    runScript(scriptName, callback);
-}
 
-//-----------------------------------------------------------------------------
-
-/** runs the specified script
-*  \param string scriptName = name of script to run
-*/
-void ScriptEngine::runScript(std::string scriptName, std::function<void(asIScriptContext*)> callback)
-{
-    int r; //int for error checking
-
-    asIScriptFunction *func;
-    auto cached_script = m_script_cache.find(scriptName);
-    if (cached_script == m_script_cache.end())
+    /** Get Script By it's file name
+    *  \param string scriptname = name of script to get
+    *  \return      The corresponding script
+    */
+    std::string getScript(std::string fileName)
     {
-        // Compile the script code
-        Log::debug("Scripting", "Compiling script '%s' (was not in cache)", scriptName.c_str());
-        r = compileScript(m_engine, scriptName);
+        std::string script_dir = file_manager->getAsset(FileManager::SCRIPT, "");
+        script_dir += World::getWorld()->getTrack()->getIdent() + "/";
+
+        script_dir += fileName;
+        FILE *f = fopen(script_dir.c_str(), "rb");
+        if (f == NULL)
+        {
+            Log::debug("Scripting", "File does not exist : {0}.as", fileName.c_str());
+            return "";
+        }
+
+        // Determine the size of the file   
+        fseek(f, 0, SEEK_END);
+        int len = ftell(f);
+        fseek(f, 0, SEEK_SET);
+
+        // Read the entire file
+        std::string script;
+        script.resize(len);
+        int c = fread(&script[0], len, 1, f);
+        fclose(f);
+        if (c == NULL)
+        {
+            Log::error("Scripting", "Failed to load script file.");
+            return "";
+        }
+        return script;
+    }
+
+    //-----------------------------------------------------------------------------
+
+    void ScriptEngine::evalScript(std::string script_fragment)
+    {
+        script_fragment = "void evalScript_main() { \n" + script_fragment + "\n}";
+
+        asIScriptModule* mod = m_engine->GetModule(MODULE_ID_EVAL, asGM_ALWAYS_CREATE);
+        int r = mod->AddScriptSection("script", &script_fragment[0], script_fragment.size());
         if (r < 0)
         {
-            Log::debug("Scripting", "Script '%s' is not available", scriptName.c_str());
-            m_script_cache[scriptName] = NULL; // remember that this script is unavailable
+            Log::error("Scripting", "evalScript: AddScriptSection() failed");
             return;
         }
 
-        // Find the function for the function we want to execute.
-        //This is how you call a normal function with arguments
-        //asIScriptFunction *func = engine->GetModule(0)->GetFunctionByDecl("void func(arg1Type, arg2Type)");
-        func = registerScriptCallbacks(m_engine, scriptName);
-        
-        if (func == NULL)
+        r = mod->Build();
+        if (r < 0)
         {
-            Log::debug("Scripting", "Scripting function was not found : %s", scriptName.c_str());
-            m_script_cache[scriptName] = NULL; // remember that this script is unavailable
+            Log::error("Scripting", "evalScript: Build() failed");
             return;
         }
 
-        //CACHE UPDATE
-        m_script_cache[scriptName] = func;
-        func->AddRef();
-    }
-    else
-    {
-        // Script present in cache
-        func = cached_script->second;
-    }
+        asIScriptFunction* func = m_engine->GetModule(MODULE_ID_EVAL)
+            ->GetFunctionByDecl("void evalScript_main()");
 
-    if (func == NULL)
-    {
-        return; // script unavailable
-    }
+        asIScriptContext *ctx = m_engine->CreateContext();
+        if (ctx == NULL)
+        {
+            Log::error("Scripting", "evalScript: Failed to create the context.");
+            //m_engine->Release();
+            return;
+        }
 
+        r = ctx->Prepare(func);
+        if (r < 0)
+        {
+            Log::error("Scripting", "evalScript: Failed to prepare the context.");
+            ctx->Release();
+            return;
+        }
 
-    // Create a context that will execute the script.
-    asIScriptContext *ctx = m_engine->CreateContext();
-    if (ctx == NULL)
-    {
-        Log::error("Scripting", "Failed to create the context.");
-        //m_engine->Release();
-        return;
-    }
+        // Execute the function
+        r = ctx->Execute();
+        if (r != asEXECUTION_FINISHED)
+        {
+            // The execution didn't finish as we had planned. Determine why.
+            if (r == asEXECUTION_ABORTED)
+            {
+                Log::error("Scripting", "The script was aborted before it could finish. Probably it timed out.");
+            }
+            else if (r == asEXECUTION_EXCEPTION)
+            {
+                Log::error("Scripting", "The script ended with an exception.");
+            }
+            else
+            {
+                Log::error("Scripting", "The script ended for some unforeseen reason (%i)", r);
+            }
+        }
 
-    // Prepare the script context with the function we wish to execute. Prepare()
-    // must be called on the context before each new script function that will be
-    // executed. Note, that if because we intend to execute the same function 
-    // several times, we will store the function returned by 
-    // GetFunctionByDecl(), so that this relatively slow call can be skipped.
-    r = ctx->Prepare(func);
-    if (r < 0)
-    {
-        Log::error("Scripting", "Failed to prepare the context.");
         ctx->Release();
-        //m_engine->Release();
-        return;
     }
 
-    // Here, we can pass parameters to the script functions. 
-    //ctx->setArgType(index, value);
-    //for example : ctx->SetArgFloat(0, 3.14159265359f);
+    //-----------------------------------------------------------------------------
 
-    if (callback)
-        callback(ctx);
-
-    // Execute the function
-    r = ctx->Execute();
-    if (r != asEXECUTION_FINISHED)
+    /** runs the specified script
+    *  \param string scriptName = name of script to run
+    */
+    void ScriptEngine::runFunction(std::string function_name)
     {
-        // The execution didn't finish as we had planned. Determine why.
-        if (r == asEXECUTION_ABORTED)
-        {
-            Log::error("Scripting", "The script was aborted before it could finish. Probably it timed out.");
-        }
-        else if (r == asEXECUTION_EXCEPTION)
-        {
-            Log::error("Scripting", "The script ended with an exception.");
+        std::function<void(asIScriptContext*)> callback;
+        runFunction(function_name, callback);
+    }
 
-            // Write some information about the script exception
-            asIScriptFunction *func = ctx->GetExceptionFunction();
-            //std::cout << "func: " << func->GetDeclaration() << std::endl;
-            //std::cout << "modl: " << func->GetModuleName() << std::endl;
-            //std::cout << "sect: " << func->GetScriptSectionName() << std::endl;
-            //std::cout << "line: " << ctx->GetExceptionLineNumber() << std::endl;
-            //std::cout << "desc: " << ctx->GetExceptionString() << std::endl;
+    //-----------------------------------------------------------------------------
+
+    /** runs the specified script
+    *  \param string scriptName = name of script to run
+    */
+    void ScriptEngine::runFunction(std::string function_name, std::function<void(asIScriptContext*)> callback)
+    {
+        int r; //int for error checking
+
+        asIScriptFunction *func;
+
+        // TODO: allow splitting in multiple files
+        std::string script_filename = "scripting.as";
+        auto cached_script = m_loaded_files.find(script_filename);
+        auto cached_function = m_functions_cache.find(function_name);
+
+        if (cached_script == m_loaded_files.end())
+        {
+            // Compile the script code
+            Log::debug("Scripting", "Compiling script '%s' (was not in cache)", script_filename.c_str());
+            r = compileScript(m_engine, script_filename);
+            if (r < 0)
+            {
+                Log::debug("Scripting", "Script '%s' is not available", script_filename.c_str());
+                m_loaded_files[script_filename] = false;
+                m_functions_cache[function_name] = NULL; // remember that this script is unavailable
+                return;
+            }
+
+            m_loaded_files[script_filename] = true;
+        }
+        else if (cached_script->second == false)
+        {
+            return; // script file unavailable
+        }
+
+        if (cached_function == m_functions_cache.end())
+        {
+            // Find the function for the function we want to execute.
+            //      This is how you call a normal function with arguments
+            //      asIScriptFunction *func = engine->GetModule(0)->GetFunctionByDecl("void func(arg1Type, arg2Type)");
+            func = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE)
+                        ->GetFunctionByDecl(function_name.c_str());
+        
+            if (func == NULL)
+            {
+                Log::debug("Scripting", "Scripting function was not found : %s", function_name.c_str());
+                m_loaded_files[function_name] = NULL; // remember that this script is unavailable
+                return;
+            }
+
+            m_functions_cache[function_name] = func;
+            func->AddRef();
         }
         else
         {
-            Log::error("Scripting", "The script ended for some unforeseen reason (%i)", r);
+            // Script present in cache
+            func = cached_function->second;
         }
+
+        if (func == NULL)
+        {
+            return; // function unavailable
+        }
+
+        // Create a context that will execute the script.
+        asIScriptContext *ctx = m_engine->CreateContext();
+        if (ctx == NULL)
+        {
+            Log::error("Scripting", "Failed to create the context.");
+            //m_engine->Release();
+            return;
+        }
+
+        // Prepare the script context with the function we wish to execute. Prepare()
+        // must be called on the context before each new script function that will be
+        // executed. Note, that if because we intend to execute the same function 
+        // several times, we will store the function returned by 
+        // GetFunctionByDecl(), so that this relatively slow call can be skipped.
+        r = ctx->Prepare(func);
+        if (r < 0)
+        {
+            Log::error("Scripting", "Failed to prepare the context.");
+            ctx->Release();
+            //m_engine->Release();
+            return;
+        }
+
+        // Here, we can pass parameters to the script functions. 
+        //ctx->setArgType(index, value);
+        //for example : ctx->SetArgFloat(0, 3.14159265359f);
+
+        if (callback)
+            callback(ctx);
+
+        // Execute the function
+        r = ctx->Execute();
+        if (r != asEXECUTION_FINISHED)
+        {
+            // The execution didn't finish as we had planned. Determine why.
+            if (r == asEXECUTION_ABORTED)
+            {
+                Log::error("Scripting", "The script was aborted before it could finish. Probably it timed out.");
+            }
+            else if (r == asEXECUTION_EXCEPTION)
+            {
+                Log::error("Scripting", "The script ended with an exception.");
+
+                // Write some information about the script exception
+                asIScriptFunction *func = ctx->GetExceptionFunction();
+                //std::cout << "func: " << func->GetDeclaration() << std::endl;
+                //std::cout << "modl: " << func->GetModuleName() << std::endl;
+                //std::cout << "sect: " << func->GetScriptSectionName() << std::endl;
+                //std::cout << "line: " << ctx->GetExceptionLineNumber() << std::endl;
+                //std::cout << "desc: " << ctx->GetExceptionString() << std::endl;
+            }
+            else
+            {
+                Log::error("Scripting", "The script ended for some unforeseen reason (%i)", r);
+            }
+        }
+        else
+        {
+            // Retrieve the return value from the context here (for scripts that return values)
+            // <type> returnValue = ctx->getReturnType(); for example
+            //float returnValue = ctx->GetReturnFloat();
+        }
+
+        // We must release the contexts when no longer using them
+        ctx->Release();
     }
-    else
+
+    //-----------------------------------------------------------------------------
+
+    void ScriptEngine::cleanupCache()
     {
-        // Retrieve the return value from the context here (for scripts that return values)
-        // <type> returnValue = ctx->getReturnType(); for example
-        //float returnValue = ctx->GetReturnFloat();
+        for (auto curr : m_functions_cache)
+        {
+            if (curr.second != NULL)
+                curr.second->Release();
+        }
+        m_functions_cache.clear();
+        m_loaded_files.clear();
     }
 
-    // We must release the contexts when no longer using them
-    ctx->Release();
-}
-
-//-----------------------------------------------------------------------------
-
-asIScriptFunction* ScriptEngine::registerScriptCallbacks(asIScriptEngine *engine,
-    std::string function_name)
-{
-    asIScriptFunction *func;
-    func = engine->GetModule(0)->GetFunctionByDecl(function_name.c_str());
-    return func;
-}
-
-//-----------------------------------------------------------------------------
-
-void ScriptEngine::cleanupCache()
-{
-    for (auto curr : m_script_cache)
+    //-----------------------------------------------------------------------------
+    /** Configures the script engine by binding functions, enums
+    *  \param asIScriptEngine engine = engine to configure
+    */
+    void ScriptEngine::configureEngine(asIScriptEngine *engine)
     {
-        if (curr.second != NULL)
-            curr.second->Release();
-    }
-    m_script_cache.clear();
-}
+        // Register the script string type
+        RegisterStdString(engine); //register std::string
+        RegisterVec3(engine);      //register Vec3
 
-//-----------------------------------------------------------------------------
-/** Configures the script engine by binding functions, enums
-*  \param asIScriptEngine engine = engine to configure
-*/
-void ScriptEngine::configureEngine(asIScriptEngine *engine)
-{
-    // Register the script string type
-    RegisterStdString(engine); //register std::string
-    RegisterVec3(engine);      //register Vec3
-
-    Scripting::Track::registerScriptFunctions(m_engine);
-    Scripting::Kart::registerScriptFunctions(m_engine);
-    Scripting::Physics::registerScriptFunctions(m_engine);
-    Scripting::Utils::registerScriptFunctions(m_engine);
-    Scripting::GUI::registerScriptFunctions(m_engine);
-    Scripting::GUI::registerScriptEnums(m_engine);
+        Scripting::Track::registerScriptFunctions(m_engine);
+        Scripting::Kart::registerScriptFunctions(m_engine);
+        Scripting::Physics::registerScriptFunctions(m_engine);
+        Scripting::Utils::registerScriptFunctions(m_engine);
+        Scripting::GUI::registerScriptFunctions(m_engine);
+        Scripting::GUI::registerScriptEnums(m_engine);
     
-    // It is possible to register the functions, properties, and types in 
-    // configuration groups as well. When compiling the scripts it can then
-    // be defined which configuration groups should be available for that
-    // script. If necessary a configuration group can also be removed from
-    // the engine, so that the engine configuration could be changed 
-    // without having to recompile all the scripts.
-}
-
-//-----------------------------------------------------------------------------
-
-int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
-{
-    int r;
-
-    std::string script = getScript(scriptName);
-    if (script.size() == 0)
-    {
-        // No such file
-        return -1;
+        // It is possible to register the functions, properties, and types in 
+        // configuration groups as well. When compiling the scripts it can then
+        // be defined which configuration groups should be available for that
+        // script. If necessary a configuration group can also be removed from
+        // the engine, so that the engine configuration could be changed 
+        // without having to recompile all the scripts.
     }
 
-    // Add the script sections that will be compiled into executable code.
-    // If we want to combine more than one file into the same script, then 
-    // we can call AddScriptSection() several times for the same module and
-    // the script engine will treat them all as if they were one. The script
-    // section name, will allow us to localize any errors in the script code.
-    asIScriptModule *mod = engine->GetModule(0, asGM_ALWAYS_CREATE);
-    r = mod->AddScriptSection("script", &script[0], script.size());
-    if (r < 0)
+    //-----------------------------------------------------------------------------
+
+    int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
     {
-        Log::error("Scripting", "AddScriptSection() failed");
-        return -1;
-    }
+        int r;
+
+        std::string script = getScript(scriptName);
+        if (script.size() == 0)
+        {
+            // No such file
+            return -1;
+        }
+
+        // Add the script sections that will be compiled into executable code.
+        // If we want to combine more than one file into the same script, then 
+        // we can call AddScriptSection() several times for the same module and
+        // the script engine will treat them all as if they were one. The script
+        // section name, will allow us to localize any errors in the script code.
+        asIScriptModule *mod = engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ALWAYS_CREATE);
+        r = mod->AddScriptSection("script", &script[0], script.size());
+        if (r < 0)
+        {
+            Log::error("Scripting", "AddScriptSection() failed");
+            return -1;
+        }
     
-    // Compile the script. If there are any compiler messages they will
-    // be written to the message stream that we set right after creating the 
-    // script engine. If there are no errors, and no warnings, nothing will
-    // be written to the stream.
-    r = mod->Build();
-    if (r < 0)
-    {
-        Log::error("Scripting", "Build() failed");
-        return -1;
+        // Compile the script. If there are any compiler messages they will
+        // be written to the message stream that we set right after creating the 
+        // script engine. If there are no errors, and no warnings, nothing will
+        // be written to the stream.
+        r = mod->Build();
+        if (r < 0)
+        {
+            Log::error("Scripting", "Build() failed");
+            return -1;
+        }
+
+        // The engine doesn't keep a copy of the script sections after Build() has
+        // returned. So if the script needs to be recompiled, then all the script
+        // sections must be added again.
+
+        // If we want to have several scripts executing at different times but 
+        // that have no direct relation with each other, then we can compile them
+        // into separate script modules. Each module uses their own namespace and 
+        // scope, so function names, and global variables will not conflict with
+        // each other.
+
+        return 0;
     }
-
-    // The engine doesn't keep a copy of the script sections after Build() has
-    // returned. So if the script needs to be recompiled, then all the script
-    // sections must be added again.
-
-    // If we want to have several scripts executing at different times but 
-    // that have no direct relation with each other, then we can compile them
-    // into separate script modules. Each module uses their own namespace and 
-    // scope, so function names, and global variables will not conflict with
-    // each other.
-
-    return 0;
-}
-
-
-
 }
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 9dca59770..5a7e01e88 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -51,16 +51,16 @@ namespace Scripting
 
         ScriptEngine();
         ~ScriptEngine();
-        
-        void runScript(std::string scriptName);
-        void runScript(std::string scriptName, std::function<void(asIScriptContext*)> callback);
+
+        void runFunction(std::string function_name);
+        void runFunction(std::string function_name, std::function<void(asIScriptContext*)> callback);
+        void evalScript(std::string script_fragment);
         void cleanupCache();
-        asIScriptFunction*
-            registerScriptCallbacks(asIScriptEngine *engine, std::string scriptName);
 
     private:
         asIScriptEngine *m_engine;
-        std::map<std::string, asIScriptFunction*> m_script_cache;
+        std::map<std::string, bool> m_loaded_files;
+        std::map<std::string, asIScriptFunction*> m_functions_cache;
 
         void configureEngine(asIScriptEngine *engine);
         int  compileScript(asIScriptEngine *engine,std::string scriptName);
diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index 2b2a8aacd..a13b05039 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -115,7 +115,7 @@ namespace Scripting
 
         void registerScriptFunctions(asIScriptEngine *engine)
         {
-            int r;
+            int r; // of type asERetCodes
             engine->SetDefaultNamespace("Kart");
             r = engine->RegisterGlobalFunction("void squash(int id, float time)", asFUNCTION(squash), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void teleport(int id, const Vec3 &in)", asFUNCTION(teleport), asCALL_CDECL); assert(r >= 0);
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index e27fc64c7..921e5f440 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -227,7 +227,7 @@ namespace Scripting
 
         void registerScriptFunctions(asIScriptEngine *engine)
         {
-            int r;
+            int r; // of type asERetCodes
 
             engine->SetDefaultNamespace("Track");
 
@@ -243,7 +243,7 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)",
-                asFUNCTION(createTrigger), asCALL_GENERIC); assert(r >= 0);
+                asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             
             // TrackObject
diff --git a/src/scriptengine/script_utils.cpp b/src/scriptengine/script_utils.cpp
index ca057b936..1768d9c20 100644
--- a/src/scriptengine/script_utils.cpp
+++ b/src/scriptengine/script_utils.cpp
@@ -107,7 +107,7 @@ namespace Scripting
         {
             std::string *str = (std::string*)gen->GetArgAddress(0);
             ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-            script_engine->runScript(*str);
+            script_engine->runFunction(*str);
         }
 
         /** Log to the console */
diff --git a/src/states_screens/dialogs/scripting_console.cpp b/src/states_screens/dialogs/scripting_console.cpp
new file mode 100644
index 000000000..f7b7228f6
--- /dev/null
+++ b/src/states_screens/dialogs/scripting_console.cpp
@@ -0,0 +1,86 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 Marc Coll
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "states_screens/dialogs/scripting_console.hpp"
+
+#include "guiengine/engine.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
+#include "modes/world.hpp"
+#include "scriptengine/script_engine.hpp"
+#include "states_screens/state_manager.hpp"
+#include "utils/translation.hpp"
+
+#include <IGUIEnvironment.h>
+
+
+using namespace GUIEngine;
+using namespace irr::core;
+
+// -----------------------------------------------------------------------------
+
+ScriptingConsole::ScriptingConsole() :
+    ModalDialog(0.95f, 0.2f, GUIEngine::MODAL_DIALOG_LOCATION_BOTTOM)
+{
+    m_fade_background = false;
+    loadFromFile("scripting_console.stkgui");
+
+    TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
+    assert(textCtrl != NULL);
+    textCtrl->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+}
+
+// -----------------------------------------------------------------------------
+
+ScriptingConsole::~ScriptingConsole()
+{
+    // FIXME: what is this code for?
+    TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
+    textCtrl->getIrrlichtElement()->remove();
+    textCtrl->clearListeners();
+}
+
+// -----------------------------------------------------------------------------
+
+GUIEngine::EventPropagation ScriptingConsole::processEvent(const std::string& eventSource)
+{
+    if (eventSource == "close")
+    {
+        dismiss();
+        return GUIEngine::EVENT_BLOCK;
+    }
+    else if (eventSource == "run")
+    {
+        runScript();
+        return GUIEngine::EVENT_BLOCK;
+    }
+    return GUIEngine::EVENT_LET;
+}
+
+// -----------------------------------------------------------------------------
+
+void ScriptingConsole::runScript()
+{
+    TextBoxWidget* textCtrl = getWidget<TextBoxWidget>("textfield");
+    core::stringw script = textCtrl->getText();
+    textCtrl->setText(L"");
+
+    World::getWorld()->getScriptEngine()->evalScript(core::stringc(script.c_str()).c_str());
+}
+
+// -----------------------------------------------------------------------------
diff --git a/src/states_screens/dialogs/scripting_console.hpp b/src/states_screens/dialogs/scripting_console.hpp
new file mode 100644
index 000000000..f4200a715
--- /dev/null
+++ b/src/states_screens/dialogs/scripting_console.hpp
@@ -0,0 +1,51 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 Marc Coll
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#ifndef HEADER_SCRIPTING_CONSOLE_DIALOG_HPP
+#define HEADER_SCRIPTING_CONSOLE_DIALOG_HPP
+
+#include "guiengine/modaldialog.hpp"
+#include "utils/cpp2011.hpp"
+
+#include <irrString.h>
+
+
+namespace GUIEngine
+{
+    class TextBoxWidget;
+    class ButtonWidget;
+    class LabelWidget;
+}
+
+/**
+ * \brief Dialog that allows the player to enter the name for a new grand prix
+ * \ingroup states_screens
+ */
+class ScriptingConsole : public GUIEngine::ModalDialog
+{
+public:
+
+    ScriptingConsole();
+    ~ScriptingConsole();
+
+    virtual void onEnterPressedInternal() OVERRIDE{ runScript(); }
+    void runScript();
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+};
+
+#endif
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index deaf53440..b5d447bb1 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1486,7 +1486,7 @@ void Track::update(float dt)
     if (!m_startup_run) // first time running update = good point to run startup script
     {
         Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-        script_engine->runScript("void onStart()");
+        script_engine->runFunction("void onStart()");
         m_startup_run = true;
     }
     m_track_object_manager->update(dt);
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 8008cc94e..cf4be74ef 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -955,7 +955,7 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
         Camera* camera = Camera::getActiveCamera();
         if (camera != NULL && camera->getKart() != NULL)
             idKart = camera->getKart()->getWorldKartId();
-        script_engine->runScript("void " + m_action + "(int)",
+        script_engine->runFunction("void " + m_action + "(int)",
             [=](asIScriptContext* ctx) { ctx->SetArgDWord(0, idKart); });
     }
 }   // onTriggerItemApproached
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index b40481a27..f82bdddb4 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -33,6 +33,7 @@
 #include "main_loop.hpp"
 #include "replay/replay_recorder.hpp"
 #include "states_screens/dialogs/debug_slider.hpp"
+#include "states_screens/dialogs/scripting_console.hpp"
 #include "utils/constants.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
@@ -103,6 +104,7 @@ enum DebugMenuCommand
     DEBUG_VISUAL_VALUES,
     DEBUG_PRINT_START_POS,
     DEBUG_ADJUST_LIGHTS,
+    DEBUG_SCRIPT_CONSOLE
 };   // DebugMenuCommand
 
 // -----------------------------------------------------------------------------
@@ -265,6 +267,7 @@ bool onEvent(const SEvent &event)
             mnu->addItem(L"Save history", DEBUG_SAVE_HISTORY);
             mnu->addItem(L"Print position", DEBUG_PRINT_START_POS);
             mnu->addItem(L"Adjust Lights", DEBUG_ADJUST_LIGHTS);
+            mnu->addItem(L"Scripting console", DEBUG_SCRIPT_CONSOLE);
 
             g_debug_menu_visible = true;
             irr_driver->showPointer();
@@ -650,6 +653,10 @@ bool onEvent(const SEvent &event)
                     dsd->changeLabel("SSAO Sigma", "[None]");
 #endif
                 }
+                else if (cmdID == DEBUG_SCRIPT_CONSOLE)
+                {
+                    ScriptingConsole* console = new ScriptingConsole();
+                }
             }
 
             return false;   // event has been handled

From db4c6f479976c0ed78cb585ffd6f5929bb6c6710 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 17 May 2015 20:03:53 -0400
Subject: [PATCH 211/331] Work on scripting console

---
 src/scriptengine/script_engine.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 8d20e6361..5542bbba2 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -120,24 +120,16 @@ namespace Scripting
     {
         script_fragment = "void evalScript_main() { \n" + script_fragment + "\n}";
 
-        asIScriptModule* mod = m_engine->GetModule(MODULE_ID_EVAL, asGM_ALWAYS_CREATE);
-        int r = mod->AddScriptSection("script", &script_fragment[0], script_fragment.size());
+        asIScriptModule* mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ONLY_IF_EXISTS);
+
+        asIScriptFunction* func;
+        int r = mod->CompileFunction("eval", script_fragment.c_str(), 0, 0, &func);
         if (r < 0)
         {
-            Log::error("Scripting", "evalScript: AddScriptSection() failed");
+            Log::error("Scripting", "evalScript: CompileFunction() failed");
             return;
         }
 
-        r = mod->Build();
-        if (r < 0)
-        {
-            Log::error("Scripting", "evalScript: Build() failed");
-            return;
-        }
-
-        asIScriptFunction* func = m_engine->GetModule(MODULE_ID_EVAL)
-            ->GetFunctionByDecl("void evalScript_main()");
-
         asIScriptContext *ctx = m_engine->CreateContext();
         if (ctx == NULL)
         {
@@ -174,6 +166,7 @@ namespace Scripting
         }
 
         ctx->Release();
+        func->Release();
     }
 
     //-----------------------------------------------------------------------------

From e290e9003d80b76a7aaedf58186e3982b6579fb9 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 17 May 2015 20:12:39 -0400
Subject: [PATCH 212/331] Tweak for scripting documentation

---
 src/physics/physical_object.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 1b7dbce87..7cebcec6d 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -208,13 +208,13 @@ public:
     /** Returns true if this object should cause a kart that touches it to
     *  be flattened. */
     bool isFlattenKartObject() const { return m_flatten_kart; }
-    void disable(void *memory)
+    void disable(/** \cond DOXYGEN_IGNORE */void *memory/** \endcond */)
     {
         ((PhysicalObject*)(memory))->removeBody();
     }
 
     //enables track object passed from the script
-    void enable(void *memory)
+    void enable(/** \cond DOXYGEN_IGNORE */void *memory/** \endcond */)
     {
         ((PhysicalObject*)(memory))->addBody();
     }

From 90d7fac6c44737d6007a914ed42142b9fb42b058 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 May 2015 16:43:30 +1000
Subject: [PATCH 213/331] Fixed coding style.

---
 src/graphics/render_skybox.cpp | 240 +++++++++------------------------
 1 file changed, 64 insertions(+), 176 deletions(-)

diff --git a/src/graphics/render_skybox.cpp b/src/graphics/render_skybox.cpp
index ebd1a0975..607431020 100644
--- a/src/graphics/render_skybox.cpp
+++ b/src/graphics/render_skybox.cpp
@@ -53,23 +53,32 @@ public:
 };   // SkyboxShader
 
 // ============================================================================
-static float getTexelValue(unsigned i, unsigned j, size_t width, size_t height, float *Coeff, float *Y00, float *Y1minus1, float *Y10, float *Y11,
-    float *Y2minus2, float * Y2minus1, float * Y20, float *Y21, float *Y22)
+static float getTexelValue(unsigned i, unsigned j, size_t width, size_t height,
+                           float *Coeff, float *Y00, float *Y1minus1,
+                           float *Y10, float *Y11, float *Y2minus2, 
+                           float * Y2minus1, float * Y20, float *Y21,
+                           float *Y22)
 {
     float solidangle = 1.;
     size_t idx = i * height + j;
     float reconstructedVal = Y00[idx] * Coeff[0];
-    reconstructedVal += Y1minus1[i * height + j] * Coeff[1] + Y10[i * height + j] * Coeff[2] + Y11[i * height + j] * Coeff[3];
-    reconstructedVal += Y2minus2[idx] * Coeff[4] + Y2minus1[idx] * Coeff[5] + Y20[idx] * Coeff[6] + Y21[idx] * Coeff[7] + Y22[idx] * Coeff[8];
+    reconstructedVal += Y1minus1[i * height + j] * Coeff[1] 
+                     +  Y10[i * height + j] * Coeff[2] 
+                     + Y11[i * height + j] * Coeff[3];
+    reconstructedVal += Y2minus2[idx] * Coeff[4] 
+                      + Y2minus1[idx] * Coeff[5] + Y20[idx] * Coeff[6]
+                      + Y21[idx] * Coeff[7] + Y22[idx] * Coeff[8];
     reconstructedVal /= solidangle;
     return MAX2(255.0f * reconstructedVal, 0.f);
-}
+}   // getTexelValue
 
+// ----------------------------------------------------------------------------
 static void unprojectSH(float *output[], size_t width, size_t height,
-    float *Y00[],
-    float *Y1minus1[], float *Y10[], float *Y11[],
-    float *Y2minus2[], float *Y2minus1[], float * Y20[], float *Y21[], float *Y22[],
-    float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff)
+                        float *Y00[], float *Y1minus1[], float *Y10[],
+                        float *Y11[], float *Y2minus2[], float *Y2minus1[],
+                        float * Y20[], float *Y21[], float *Y22[],
+                        float *blueSHCoeff, float *greenSHCoeff,
+                        float *redSHCoeff)
 {
     for (unsigned face = 0; face < 6; face++)
     {
@@ -81,176 +90,46 @@ static void unprojectSH(float *output[], size_t width, size_t height,
                 fi /= width, fj /= height;
                 fi = 2 * fi - 1, fj = 2 * fj - 1;
 
-                output[face][4 * height * i + 4 * j + 2] = getTexelValue(i, j, width, height,
-                    redSHCoeff,
-                    Y00[face], Y1minus1[face], Y10[face], Y11[face], Y2minus2[face], Y2minus1[face], Y20[face], Y21[face], Y22[face]);
-                output[face][4 * height * i + 4 * j + 1] = getTexelValue(i, j, width, height,
-                    greenSHCoeff,
-                    Y00[face], Y1minus1[face], Y10[face], Y11[face], Y2minus2[face], Y2minus1[face], Y20[face], Y21[face], Y22[face]);
-                output[face][4 * height * i + 4 * j] = getTexelValue(i, j, width, height,
-                    blueSHCoeff,
-                    Y00[face], Y1minus1[face], Y10[face], Y11[face], Y2minus2[face], Y2minus1[face], Y20[face], Y21[face], Y22[face]);
+                output[face][4 * height * i + 4 * j + 2] =
+                    getTexelValue(i, j, width, height, redSHCoeff, Y00[face],
+                                  Y1minus1[face], Y10[face], Y11[face],
+                                  Y2minus2[face], Y2minus1[face], Y20[face],
+                                  Y21[face], Y22[face]);
+                output[face][4 * height * i + 4 * j + 1] = 
+                    getTexelValue(i, j, width, height, greenSHCoeff, Y00[face],
+                                  Y1minus1[face], Y10[face], Y11[face],
+                                  Y2minus2[face], Y2minus1[face], Y20[face],
+                                  Y21[face], Y22[face]);
+                output[face][4 * height * i + 4 * j] = 
+                    getTexelValue(i, j, width, height, blueSHCoeff, Y00[face],
+                                  Y1minus1[face], Y10[face], Y11[face],
+                                  Y2minus2[face], Y2minus1[face], Y20[face],
+                                  Y21[face], Y22[face]);
             }
         }
     }
-}
-
+}   // unprojectSH
 
+// ----------------------------------------------------------------------------
 static void displayCoeff(float *SHCoeff)
 {
     printf("L00:%f\n", SHCoeff[0]);
     printf("L1-1:%f, L10:%f, L11:%f\n", SHCoeff[1], SHCoeff[2], SHCoeff[3]);
-    printf("L2-2:%f, L2-1:%f, L20:%f, L21:%f, L22:%f\n", SHCoeff[4], SHCoeff[5], SHCoeff[6], SHCoeff[7], SHCoeff[8]);
-}
+    printf("L2-2:%f, L2-1:%f, L20:%f, L21:%f, L22:%f\n",
+            SHCoeff[4], SHCoeff[5], SHCoeff[6], SHCoeff[7], SHCoeff[8]);
+}   // displayCoeff
 
-// Only for 9 coefficients
-/*static void testSH(unsigned char *color[6], size_t width, size_t height,
-    float *blueSHCoeff, float *greenSHCoeff, float *redSHCoeff)
-{
-    float *Y00[6];
-    float *Y1minus1[6];
-    float *Y10[6];
-    float *Y11[6];
-    float *Y2minus2[6];
-    float *Y2minus1[6];
-    float *Y20[6];
-    float *Y21[6];
-    float *Y22[6];
-
-    float *testoutput[6];
-    for (unsigned i = 0; i < 6; i++)
-    {
-        testoutput[i] = new float[width * height * 4];
-        for (unsigned j = 0; j < width * height; j++)
-        {
-            testoutput[i][4 * j] = float(0xFF & color[i][4 * j]);
-            testoutput[i][4 * j + 1] = float(0xFF & color[i][4 * j + 1]);
-            testoutput[i][4 * j + 2] = float(0xFF & color[i][4 * j + 2]);
-        }
-    }
-
-    for (unsigned face = 0; face < 6; face++)
-    {
-        Y00[face] = new float[width * height];
-        Y1minus1[face] = new float[width * height];
-        Y10[face] = new float[width * height];
-        Y11[face] = new float[width * height];
-        Y2minus2[face] = new float[width * height];
-        Y2minus1[face] = new float[width * height];
-        Y20[face] = new float[width * height];
-        Y21[face] = new float[width * height];
-        Y22[face] = new float[width * height];
-
-        getYml(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, width, height, Y00[face], Y1minus1[face], Y10[face], Y11[face], Y2minus2[face], Y2minus1[face], Y20[face], Y21[face], Y22[face]);
-    }
-
-        blueSHCoeff[0] = 0.54,
-    blueSHCoeff[1] = .6, blueSHCoeff[2] = -.27, blueSHCoeff[3] = .01,
-    blueSHCoeff[4] = -.12, blueSHCoeff[5] = -.47, blueSHCoeff[6] = -.15, blueSHCoeff[7] = .14, blueSHCoeff[8] = -.3;
-    greenSHCoeff[0] = .44,
-    greenSHCoeff[1] = .35, greenSHCoeff[2] = -.18, greenSHCoeff[3] = -.06,
-    greenSHCoeff[4] = -.05, greenSHCoeff[5] = -.22, greenSHCoeff[6] = -.09, greenSHCoeff[7] = .21, greenSHCoeff[8] = -.05;
-    redSHCoeff[0] = .79,
-    redSHCoeff[1] = .39, redSHCoeff[2] = -.34, redSHCoeff[3] = -.29,
-    redSHCoeff[4] = -.11, redSHCoeff[5] = -.26, redSHCoeff[6] = -.16, redSHCoeff[7] = .56, redSHCoeff[8] = .21;
-
-    printf("Blue:\n");
-    displayCoeff(blueSHCoeff);
-    printf("Green:\n");
-    displayCoeff(greenSHCoeff);
-    printf("Red:\n");
-    displayCoeff(redSHCoeff);*/
-
-/*    projectSH(testoutput, width, height,
-        Y00,
-        Y1minus1, Y10, Y11,
-        Y2minus2, Y2minus1, Y20, Y21, Y22,
-        blueSHCoeff, greenSHCoeff, redSHCoeff
-        );*/
-
-    //printf("Blue:\n");
-    //displayCoeff(blueSHCoeff);
-    //printf("Green:\n");
-    //displayCoeff(greenSHCoeff);
-    //printf("Red:\n");
-    //displayCoeff(redSHCoeff);
-
-
-
-    // Convolute in frequency space
-    /*    float A0 = 3.141593;
-    float A1 = 2.094395;
-    float A2 = 0.785398;
-    blueSHCoeff[0] *= A0;
-    greenSHCoeff[0] *= A0;
-    redSHCoeff[0] *= A0;
-    for (unsigned i = 0; i < 3; i++)
-    {
-    blueSHCoeff[1 + i] *= A1;
-    greenSHCoeff[1 + i] *= A1;
-    redSHCoeff[1 + i] *= A1;
-    }
-    for (unsigned i = 0; i < 5; i++)
-    {
-    blueSHCoeff[4 + i] *= A2;
-    greenSHCoeff[4 + i] *= A2;
-    redSHCoeff[4 + i] *= A2;
-    }
-
-
-    unprojectSH(testoutput, width, height,
-    Y00,
-    Y1minus1, Y10, Y11,
-    Y2minus2, Y2minus1, Y20, Y21, Y22,
-    blueSHCoeff, greenSHCoeff, redSHCoeff
-    );*/
-
-
-    /*    printf("Blue:\n");
-    displayCoeff(blueSHCoeff);
-    printf("Green:\n");
-    displayCoeff(greenSHCoeff);
-    printf("Red:\n");
-    displayCoeff(redSHCoeff);
-
-    printf("\nAfter projection\n\n");
-
-
-
-    for (unsigned i = 0; i < 6; i++)
-    {
-        for (unsigned j = 0; j < width * height; j++)
-        {
-            color[i][4 * j] = char(MIN2(testoutput[i][4 * j], 255));
-            color[i][4 * j + 1] = char(MIN2(testoutput[i][4 * j + 1], 255));
-            color[i][4 * j + 2] = char(MIN2(testoutput[i][4 * j + 2], 255));
-        }
-    }
-
-    for (unsigned face = 0; face < 6; face++)
-    {
-        delete[] testoutput[face];
-        delete[] Y00[face];
-        delete[] Y1minus1[face];
-        delete[] Y10[face];
-        delete[] Y11[face];
-        delete[] Y2minus2[face];
-        delete[] Y2minus1[face];
-        delete[] Y20[face];
-        delete[] Y21[face];
-        delete[] Y22[face];
-    }
-}*/
-
-void swapPixels(char *old_img, char *new_img, unsigned stride, unsigned old_i, unsigned old_j, unsigned new_i, unsigned new_j)
+// ----------------------------------------------------------------------------
+void swapPixels(char *old_img, char *new_img, unsigned stride, unsigned old_i,
+                unsigned old_j, unsigned new_i, unsigned new_j)
 {
     new_img[4 * (stride * new_i + new_j)] = old_img[4 * (stride * old_i + old_j)];
     new_img[4 * (stride * new_i + new_j) + 1] = old_img[4 * (stride * old_i + old_j) + 1];
     new_img[4 * (stride * new_i + new_j) + 2] = old_img[4 * (stride * old_i + old_j) + 2];
     new_img[4 * (stride * new_i + new_j) + 3] = old_img[4 * (stride * old_i + old_j) + 3];
-}
-
+}   // swapPixels
 
+// ----------------------------------------------------------------------------
 /** Generate an opengl cubemap texture from 6 2d textures.
 Out of legacy the sequence of textures maps to :
 - 1st texture maps to GL_TEXTURE_CUBE_MAP_POSITIVE_Y
@@ -283,12 +162,10 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
     {
         unsigned idx = texture_permutation[i];
 
-        video::IImage* image = irr_driver->getVideoDriver()->createImageFromData(
-            textures[idx]->getColorFormat(),
-            textures[idx]->getSize(),
-            textures[idx]->lock(),
-            false
-            );
+        video::IImage* image = irr_driver->getVideoDriver()
+            ->createImageFromData(textures[idx]->getColorFormat(),
+                                  textures[idx]->getSize(),
+                                  textures[idx]->lock(), false   );
         textures[idx]->unlock();
 
         image->copyToScaling(rgba[i], size, size);
@@ -310,16 +187,25 @@ GLuint generateCubeMapFromTextures(const std::vector<video::ITexture *> &texture
 
         glBindTexture(GL_TEXTURE_CUBE_MAP, result);
         if (CVS->isTextureCompressionEnabled())
-            glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_COMPRESSED_SRGB_ALPHA, size, size, 0, GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
+        {
+            glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
+                         GL_COMPRESSED_SRGB_ALPHA, size, size, 0, GL_BGRA,
+                         GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
+        }
         else
-            glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_SRGB_ALPHA, size, size, 0, GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
+        {
+            glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0,
+                         GL_SRGB_ALPHA, size, size, 0, GL_BGRA,
+                         GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]);
+        }
     }
     glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
     for (unsigned i = 0; i < 6; i++)
         delete[] rgba[i];
     return result;
-}
+}   // generateCubeMapFromTextures
 
+// ----------------------------------------------------------------------------
 void IrrDriver::prepareSkybox()
 {
     glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
@@ -330,8 +216,9 @@ void IrrDriver::prepareSkybox()
         SkyboxCubeMap = generateCubeMapFromTextures(SkyboxTextures);
         SkyboxSpecularProbe = generateSpecularCubemap(SkyboxCubeMap);
     }
-}
+}   // prepareSkybox
 
+// ----------------------------------------------------------------------------
 void IrrDriver::generateDiffuseCoefficients()
 {
     const unsigned texture_permutation[] = { 2, 3, 0, 1, 5, 4 };
@@ -419,8 +306,9 @@ void IrrDriver::generateDiffuseCoefficients()
             redSHCoeff[i] *= 4;
         }
     }
-}
+}   // generateDiffuseCoefficients
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
 {
     if (SkyboxTextures.empty())
@@ -439,4 +327,4 @@ void IrrDriver::renderSkybox(const scene::ICameraSceneNode *camera)
 
     glDrawArrays(GL_TRIANGLES, 0, 3);
     glBindVertexArray(0);
-}
+}   // renderSkybox

From 6def0c752c2d0229302ea9a7678357a403171220 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 May 2015 16:52:42 +1000
Subject: [PATCH 214/331] Moved more shaders.

---
 src/graphics/render.cpp          | 36 +++++++++++++++++++++++++++++---
 src/graphics/render_geometry.cpp | 22 +++++++++++++++----
 src/graphics/shaders.cpp         | 27 ------------------------
 src/graphics/shaders.hpp         | 15 -------------
 4 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 8b7c5d14d..e3a3b0af4 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -57,6 +57,36 @@ public:
     }   // InstancedColorizeShader
 };   // InstancedColorizeShader
 
+// ============================================================================
+class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
+{
+private:
+    GLuint m_frustrum_vao;
+
+public:    ViewFrustrumShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "frustrum.vert",
+                            GL_FRAGMENT_SHADER, "coloredquad.frag");
+
+        assignUniforms("color", "idx");
+
+        glGenVertexArrays(1, &m_frustrum_vao);
+        glBindVertexArray(m_frustrum_vao);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
+                     SharedGPUObjects::getFrustrumIndices());
+        glBindVertexArray(0);
+    }   // ViewFrustrumShader
+    // ------------------------------------------------------------------------
+    void bindVertexArray()
+    {
+        glBindVertexArray(m_frustrum_vao);
+    }   // bindVertexArray
+
+};   // ViewFrustrumShader
+
 // ============================================================================
 
 extern std::vector<float> BoundingBoxes;
@@ -646,12 +676,12 @@ void IrrDriver::renderParticles()
 
 static void renderWireFrameFrustrum(float *tmp, unsigned i)
 {
-    MeshShader::ViewFrustrumShader::getInstance()->use();
-    glBindVertexArray(MeshShader::ViewFrustrumShader::getInstance()->frustrumvao);
+    ViewFrustrumShader::getInstance()->use();
+    ViewFrustrumShader::getInstance()->bindVertexArray();
     glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
 
     glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * 3 * sizeof(float), (void *)tmp);
-    MeshShader::ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
+    ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
     glDrawElements(GL_LINES, 24, GL_UNSIGNED_INT, 0);
 }
 
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 98b9c3262..df125c7f8 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -497,6 +497,20 @@ public:
     }   // DisplaceShader
 };   // DisplaceShader
 
+// ============================================================================
+class NormalVisualizer : public Shader<NormalVisualizer, video::SColor>
+{
+public:
+    NormalVisualizer()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
+                            GL_VERTEX_SHADER, "instanced_object_pass.vert",
+                            GL_GEOMETRY_SHADER, "normal_visualizer.geom",
+                            GL_FRAGMENT_SHADER, "coloredquad.frag");
+        assignUniforms("color");
+    }   // NormalVisualizer
+};   // NormalVisualizer
+
 // ============================================================================
 struct DefaultMaterial
 {
@@ -1412,11 +1426,11 @@ template<typename T>
 static void renderInstancedMeshNormals()
 {
     std::vector<GLMesh *> &meshes = T::InstancedList::getInstance()->SolidPass;
-    MeshShader::NormalVisualizer::getInstance()->use();
+    NormalVisualizer::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     for (unsigned i = 0; i < meshes.size(); i++)
     {
-        MeshShader::NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
+        NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
         glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, 
              (const void*)((SolidPassCmd::getInstance()->Offset[T::MaterialType] + i) 
              * sizeof(DrawElementsIndirectCommand)));
@@ -1427,11 +1441,11 @@ static void renderInstancedMeshNormals()
 template<typename T>
 static void renderMultiMeshNormals()
 {
-    MeshShader::NormalVisualizer::getInstance()->use();
+    NormalVisualizer::getInstance()->use();
     glBindVertexArray(VAOManager::getInstance()->getInstanceVAO(T::VertexType, T::Instance));
     if (SolidPassCmd::getInstance()->Size[T::MaterialType])
     {
-        MeshShader::NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
+        NormalVisualizer::getInstance()->setUniforms(video::SColor(255, 0, 255, 0));
         glMultiDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT,
             (const void*)(SolidPassCmd::getInstance()->Offset[T::MaterialType] * sizeof(DrawElementsIndirectCommand)),
             (int)SolidPassCmd::getInstance()->Size[T::MaterialType],
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 4af69a5fe..c30bcba55 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -441,33 +441,6 @@ namespace MeshShader
         assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
     }
 
-    NormalVisualizer::NormalVisualizer()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
-            GL_VERTEX_SHADER, "instanced_object_pass.vert",
-            GL_GEOMETRY_SHADER, "normal_visualizer.geom",
-            GL_FRAGMENT_SHADER, "coloredquad.frag");
-        assignUniforms("color");
-    }
-
-    ViewFrustrumShader::ViewFrustrumShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "frustrum.vert",
-            GL_FRAGMENT_SHADER, "coloredquad.frag");
-
-        assignUniforms("color", "idx");
-
-        glGenVertexArrays(1, &frustrumvao);
-        glBindVertexArray(frustrumvao);
-        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
-                     SharedGPUObjects::getFrustrumIndices());
-        glBindVertexArray(0);
-    }
 }
 
 namespace LightShader
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 157d574e5..cb2fd9045 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -65,21 +65,6 @@ public:
     TransparentFogShader();
 };
 
-
-class NormalVisualizer : public Shader<NormalVisualizer, video::SColor>
-{
-public:
-    NormalVisualizer();
-};
-
-class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
-{
-public:
-    GLuint frustrumvao;
-
-    ViewFrustrumShader();
-};
-
 }
 
 #define MAXLIGHT 32

From 2b36759ba3cafb2981f3b61532e0a3c15d3de07d Mon Sep 17 00:00:00 2001
From: Nado <nado@troglodyte.be>
Date: Mon, 18 May 2015 09:10:28 +0200
Subject: [PATCH 215/331] Resized max length of mail address up to 254 chars

---
 data/po/supertuxkart.pot               | 2 +-
 src/states_screens/register_screen.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index a53e8355f..68b27d40f 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -1067,7 +1067,7 @@ msgid "Email"
 msgstr ""
 
 #: src/states_screens/register_screen.cpp:292
-msgid "Email has to be between 4 and 50 characters long!"
+msgid "Email has to be between 5 and 254 characters long!"
 msgstr ""
 
 #: src/states_screens/register_screen.cpp:298
diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 387ba9a76..19623be8b 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -287,9 +287,9 @@ void RegisterScreen::doRegister()
     {
         m_info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
     }
-    else if (email.size() < 4 || email.size() > 50)
+    else if (email.size() < 5 || email.size() > 254)
     {
-        m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
+        m_info_widget->setText(_("Email has to be between 5 and 254 characters long!"), false);
     }
     else if (  email.find(L"@")== -1 || email.find(L".")== -1 ||
               (email.findLast(L'.') - email.findLast(L'@') <= 2 ) ||

From 8e4ee298e02d025355f72ad8d08c3c87ae8ba25a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 18 May 2015 21:33:26 +1000
Subject: [PATCH 216/331] Moved shaders into render_lighting, fixed coding
 style for render_lighting.

---
 src/graphics/irr_driver.hpp      |   2 +-
 src/graphics/render.cpp          |   2 +-
 src/graphics/render_lighting.cpp | 264 +++++++++++++++++++++++++------
 src/graphics/rtts.cpp            |   2 +-
 src/graphics/shaders.cpp         |  79 ---------
 src/graphics/shaders.hpp         |  33 ----
 6 files changed, 219 insertions(+), 163 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index cc9dd01e5..3ac58994d 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -719,7 +719,7 @@ public:
     void onUnloadWorld();
 
     void renderScene(scene::ICameraSceneNode * const camnode, unsigned pointlightcount, std::vector<GlowData>& glows, float dt, bool hasShadows, bool forceRTT);
-    unsigned UpdateLightsInfo(scene::ICameraSceneNode * const camnode, float dt);
+    unsigned updateLightsInfo(scene::ICameraSceneNode * const camnode, float dt);
     void UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, size_t height);
     void computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode, size_t width, size_t height);
     void uploadLightingData();
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index e3a3b0af4..422d7877d 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -228,7 +228,7 @@ void IrrDriver::renderGLSL(float dt)
             glEnable(GL_FRAMEBUFFER_SRGB);
 
         PROFILER_PUSH_CPU_MARKER("Update Light Info", 0xFF, 0x0, 0x0);
-        unsigned plc = UpdateLightsInfo(camnode, dt);
+        unsigned plc = updateLightsInfo(camnode, dt);
         PROFILER_POP_CPU_MARKER();
         PROFILER_PUSH_CPU_MARKER("UBO upload", 0x0, 0xFF, 0x0);
         computeMatrixesAndCameras(camnode, viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X, viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 9b43148be..b7fa13cfc 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -33,8 +33,134 @@
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
-static LightShader::PointLightInfo PointLightsInfo[MAXLIGHT];
+class LightBaseClass
+{
+public:
+    struct PointLightInfo
+    {
+        float posX;
+        float posY;
+        float posZ;
+        float energy;
+        float red;
+        float green;
+        float blue;
+        float radius;
+    };
+public:
+    static const unsigned int MAXLIGHT = 32;
+public:
+    static struct PointLightInfo m_point_lights_info[MAXLIGHT];
+};   // LightBaseClass
 
+// ============================================================================
+LightBaseClass::PointLightInfo m_point_lights_info[LightBaseClass::MAXLIGHT];
+
+// ============================================================================
+class PointLightShader : public TextureShader < PointLightShader, 2 >
+                       , private LightBaseClass
+{
+public:
+    GLuint vbo;
+    GLuint vao;
+    PointLightShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "pointlight.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "pointlight.frag");
+
+        assignUniforms();
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED, 
+                           1, "dtex", ST_NEAREST_FILTERED);
+        glGenVertexArrays(1, &vao);
+        glBindVertexArray(vao);
+
+        glGenBuffers(1, &vbo);
+        glBindBuffer(GL_ARRAY_BUFFER, vbo);
+        glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0,
+                     GL_DYNAMIC_DRAW);
+
+        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
+        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
+        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
+        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
+
+        glEnableVertexAttribArray(attrib_Position);
+        glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, 
+                              sizeof(PointLightInfo), 0);
+        glEnableVertexAttribArray(attrib_Energy);
+        glVertexAttribPointer(attrib_Energy, 1, GL_FLOAT, GL_FALSE,
+                              sizeof(PointLightInfo),
+                              (GLvoid*)(3 * sizeof(float)));
+        glEnableVertexAttribArray(attrib_Color);
+        glVertexAttribPointer(attrib_Color, 3, GL_FLOAT, GL_FALSE,
+                              sizeof(PointLightInfo),
+                              (GLvoid*)(4 * sizeof(float)));
+        glEnableVertexAttribArray(attrib_Radius);
+        glVertexAttribPointer(attrib_Radius, 1, GL_FLOAT, GL_FALSE, 
+                              sizeof(PointLightInfo),
+                              (GLvoid*)(7 * sizeof(float)));
+
+        glVertexAttribDivisorARB(attrib_Position, 1);
+        glVertexAttribDivisorARB(attrib_Energy, 1);
+        glVertexAttribDivisorARB(attrib_Color, 1);
+        glVertexAttribDivisorARB(attrib_Radius, 1);
+    }   // PointLightShader
+};   // PointLightShader
+
+
+// ============================================================================
+class PointLightScatterShader : public TextureShader<PointLightScatterShader,
+                                                     1, float, core::vector3df>
+{
+public:
+    GLuint vbo;
+    GLuint vao;
+    PointLightScatterShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "pointlight.vert",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "pointlightscatter.frag");
+
+        assignUniforms("density", "fogcol");
+        assignSamplerNames(0, "dtex", ST_NEAREST_FILTERED);
+
+        glGenVertexArrays(1, &vao);
+        glBindVertexArray(vao);
+
+        glBindBuffer(GL_ARRAY_BUFFER, PointLightShader::getInstance()->vbo);
+
+        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
+        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
+        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
+        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
+
+        glEnableVertexAttribArray(attrib_Position);
+        glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE,
+                              sizeof(LightBaseClass::PointLightInfo), 0);
+        glEnableVertexAttribArray(attrib_Energy);
+        glVertexAttribPointer(attrib_Energy, 1, GL_FLOAT, GL_FALSE,
+                              sizeof(LightBaseClass::PointLightInfo),
+                              (GLvoid*)(3 * sizeof(float)));
+        glEnableVertexAttribArray(attrib_Color);
+        glVertexAttribPointer(attrib_Color, 3, GL_FLOAT, GL_FALSE,
+                              sizeof(LightBaseClass::PointLightInfo),
+                              (GLvoid*)(4 * sizeof(float)));
+        glEnableVertexAttribArray(attrib_Radius);
+        glVertexAttribPointer(attrib_Radius, 1, GL_FLOAT, GL_FALSE,
+                              sizeof(LightBaseClass::PointLightInfo),
+                              (GLvoid*)(7 * sizeof(float)));
+
+        glVertexAttribDivisorARB(attrib_Position, 1);
+        glVertexAttribDivisorARB(attrib_Energy, 1);
+        glVertexAttribDivisorARB(attrib_Color, 1);
+        glVertexAttribDivisorARB(attrib_Radius, 1);
+    }   // PointLightScatterShader
+};
+// ============================================================================
 static void renderPointLights(unsigned count)
 {
     glEnable(GL_BLEND);
@@ -43,18 +169,24 @@ static void renderPointLights(unsigned count)
     glEnable(GL_DEPTH_TEST);
     glDepthMask(GL_FALSE);
 
-    LightShader::PointLightShader::getInstance()->use();
-    glBindVertexArray(LightShader::PointLightShader::getInstance()->vao);
-    glBindBuffer(GL_ARRAY_BUFFER, LightShader::PointLightShader::getInstance()->vbo);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(LightShader::PointLightInfo), PointLightsInfo);
+    PointLightShader::getInstance()->use();
+    glBindVertexArray(PointLightShader::getInstance()->vao);
+    glBindBuffer(GL_ARRAY_BUFFER, PointLightShader::getInstance()->vbo);
+    glBufferSubData(GL_ARRAY_BUFFER, 0, 
+                     count * sizeof(LightBaseClass::PointLightInfo),
+                     m_point_lights_info);
 
-    LightShader::PointLightShader::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture());
-    LightShader::PointLightShader::getInstance()->setUniforms();
+    PointLightShader::getInstance()->setTextureUnits(
+        irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+        irr_driver->getDepthStencilTexture());
+    PointLightShader::getInstance()->setUniforms();
 
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, count);
-}
+}   // renderPointLights
 
-unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, float dt)
+// ----------------------------------------------------------------------------
+unsigned IrrDriver::updateLightsInfo(scene::ICameraSceneNode * const camnode,
+                                     float dt)
 {
     const u32 lightcount = (u32)m_lights.size();
     const core::vector3df &campos = camnode->getAbsolutePosition();
@@ -70,7 +202,8 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
             m_lights[i]->render();
             continue;
         }
-        const core::vector3df &lightpos = (m_lights[i]->getAbsolutePosition() - campos);
+        const core::vector3df &lightpos = 
+                                 (m_lights[i]->getAbsolutePosition() - campos);
         unsigned idx = (unsigned)(lightpos.getLength() / 10);
         if (idx > 14)
             idx = 14;
@@ -83,7 +216,7 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
     {
         for (unsigned j = 0; j < BucketedLN[i].size(); j++)
         {
-            if (++lightnum >= MAXLIGHT)
+            if (++lightnum >= LightBaseClass::MAXLIGHT)
             {
                 LightNode* light_node = BucketedLN[i].at(j);
                 light_node->setEnergyMultiplier(0.0f);
@@ -99,22 +232,23 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
                 }
 
                 const core::vector3df &pos = light_node->getAbsolutePosition();
-                PointLightsInfo[lightnum].posX = pos.X;
-                PointLightsInfo[lightnum].posY = pos.Y;
-                PointLightsInfo[lightnum].posZ = pos.Z;
+                m_point_lights_info[lightnum].posX = pos.X;
+                m_point_lights_info[lightnum].posY = pos.Y;
+                m_point_lights_info[lightnum].posZ = pos.Z;
 
-                PointLightsInfo[lightnum].energy = light_node->getEffectiveEnergy();
+                m_point_lights_info[lightnum].energy = 
+                                              light_node->getEffectiveEnergy();
 
                 const core::vector3df &col = light_node->getColor();
-                PointLightsInfo[lightnum].red = col.X;
-                PointLightsInfo[lightnum].green = col.Y;
-                PointLightsInfo[lightnum].blue = col.Z;
+                m_point_lights_info[lightnum].red = col.X;
+                m_point_lights_info[lightnum].green = col.Y;
+                m_point_lights_info[lightnum].blue = col.Z;
 
                 // Light radius
-                PointLightsInfo[lightnum].radius = light_node->getRadius();
+                m_point_lights_info[lightnum].radius = light_node->getRadius();
             }
         }
-        if (lightnum > MAXLIGHT)
+        if (lightnum > LightBaseClass::MAXLIGHT)
         {
             irr_driver->setLastLightBucketDistance(i * 10);
             break;
@@ -123,10 +257,11 @@ unsigned IrrDriver::UpdateLightsInfo(scene::ICameraSceneNode * const camnode, fl
 
     lightnum++;
     return lightnum;
-}
+}   // updateLightsInfo
 
+// ----------------------------------------------------------------------------
 /** Upload lighting info to the dedicated uniform buffer
-*/
+ */
 void IrrDriver::uploadLightingData()
 {
     float Lighting[36];
@@ -144,10 +279,12 @@ void IrrDriver::uploadLightingData()
 
     glBindBuffer(GL_UNIFORM_BUFFER, SharedGPUObjects::getLightingDataUBO());
     glBufferSubData(GL_UNIFORM_BUFFER, 0, 36 * sizeof(float), Lighting);
-}
+}   // uploadLightingData
 
+// ----------------------------------------------------------------------------
 extern float shadowSplit[5];
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 {
     //RH
@@ -159,24 +296,34 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
         if (CVS->needRHWorkaround())
         {
-            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->use();
-            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->setTextureUnits(
-                m_rtts->getRSM().getRTT()[0], m_rtts->getRSM().getRTT()[1], m_rtts->getRSM().getDepthTexture());
+            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
+                            ::getInstance()->use();
+            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
+                            ::getInstance()->setTextureUnits(
+                m_rtts->getRSM().getRTT()[0],
+                m_rtts->getRSM().getRTT()[1],
+                m_rtts->getRSM().getDepthTexture());
             for (unsigned i = 0; i < 32; i++)
             {
-                FullScreenShader::NVWorkaroundRadianceHintsConstructionShader::getInstance()->setUniforms(rsm_matrix, rh_matrix, rh_extend, i, irr_driver->getSunColor());
+                FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
+                       ::getInstance()->setUniforms(rsm_matrix, rh_matrix,
+                                                    rh_extend, i,
+                                                    irr_driver->getSunColor());
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             }
         }
         else
         {
             FullScreenShader::RadianceHintsConstructionShader::getInstance()->use();
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()->setTextureUnits(
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()
+                ->setTextureUnits(
                     m_rtts->getRSM().getRTT()[0],
                     m_rtts->getRSM().getRTT()[1],
                     m_rtts->getRSM().getDepthTexture()
             );
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()->setUniforms(rsm_matrix, rh_matrix, rh_extend, irr_driver->getSunColor());
+            FullScreenShader::RadianceHintsConstructionShader::getInstance()
+                ->setUniforms(rsm_matrix, rh_matrix, rh_extend,
+                              irr_driver->getSunColor());
             glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, 32);
         }
     }
@@ -190,14 +337,18 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     if (CVS->isGlobalIlluminationEnabled() && hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
-        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2]);
+        m_post_processing->renderGI(rh_matrix, rh_extend,
+                                    m_rtts->getRH().getRTT()[0],
+                                    m_rtts->getRH().getRTT()[1],
+                                    m_rtts->getRH().getRTT()[2]);
     }
 
     m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
 
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_ENVMAP));
-        m_post_processing->renderEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff, SkyboxSpecularProbe);
+        m_post_processing->renderEnvMap(blueSHCoeff, greenSHCoeff,
+                                        redSHCoeff, SkyboxSpecularProbe);
     }
 
     // Render sunlight if and only if track supports shadow
@@ -213,12 +364,21 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 
             if (CVS->isESMEnabled())
             {
-                FullScreenShader::ShadowedSunLightShaderESM::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getRTT()[0]);
-                DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShaderESM>(shadowSplit[1], shadowSplit[2], shadowSplit[3], shadowSplit[4]);
+                FullScreenShader::ShadowedSunLightShaderESM::getInstance()
+                    ->setTextureUnits(
+                        irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                        irr_driver->getDepthStencilTexture(),
+                        m_rtts->getShadowFBO().getRTT()[0]);
+                DrawFullScreenEffect<FullScreenShader
+                    ::ShadowedSunLightShaderESM>(shadowSplit[1], shadowSplit[2],
+                                                 shadowSplit[3], shadowSplit[4]);
             }
             else
             {
-                FullScreenShader::ShadowedSunLightShaderPCF::getInstance()->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), m_rtts->getShadowFBO().getDepthTexture());
+                FullScreenShader::ShadowedSunLightShaderPCF::getInstance()
+                    ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), 
+                                      irr_driver->getDepthStencilTexture(),
+                                      m_rtts->getShadowFBO().getDepthTexture());
                 DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShaderPCF>(shadowSplit[1],
                                                                                   shadowSplit[2],
                                                                                   shadowSplit[3],
@@ -227,14 +387,16 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
             }
         }
         else
-            m_post_processing->renderSunlight(irr_driver->getSunDirection(), irr_driver->getSunColor());
+            m_post_processing->renderSunlight(irr_driver->getSunDirection(),
+                                              irr_driver->getSunColor());
     }
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_POINTLIGHTS));
-        renderPointLights(MIN2(pointlightcount, MAXLIGHT));
+        renderPointLights(MIN2(pointlightcount, LightBaseClass::MAXLIGHT));
     }
-}
+}   // renderLights
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderSSAO()
 {
     m_rtts->getFBO(FBO_SSAO).Bind();
@@ -242,11 +404,15 @@ void IrrDriver::renderSSAO()
     glClear(GL_COLOR_BUFFER_BIT);
     m_post_processing->renderSSAO();
     // Blur it to reduce noise.
-    FrameBuffer::Blit(m_rtts->getFBO(FBO_SSAO), m_rtts->getFBO(FBO_HALF1_R), GL_COLOR_BUFFER_BIT, GL_LINEAR);
-    m_post_processing->renderGaussian17TapBlur(irr_driver->getFBO(FBO_HALF1_R), irr_driver->getFBO(FBO_HALF2_R));
+    FrameBuffer::Blit(m_rtts->getFBO(FBO_SSAO),
+                      m_rtts->getFBO(FBO_HALF1_R), 
+                      GL_COLOR_BUFFER_BIT, GL_LINEAR);
+    m_post_processing->renderGaussian17TapBlur(irr_driver->getFBO(FBO_HALF1_R), 
+                                               irr_driver->getFBO(FBO_HALF2_R));
 
-}
+}   // renderSSAO
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderAmbientScatter()
 {
     const Track * const track = World::getWorld()->getTrack();
@@ -265,10 +431,12 @@ void IrrDriver::renderAmbientScatter()
     glBlendEquation(GL_FUNC_ADD);
     glBlendFunc(GL_ONE, GL_ONE);
 
-    FullScreenShader::FogShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
+    FullScreenShader::FogShader::getInstance()
+        ->setTextureUnits(irr_driver->getDepthStencilTexture());
     DrawFullScreenEffect<FullScreenShader::FogShader>(1.f / (40.f * start), col);
-}
+}   // renderAmbientScatter
 
+// ----------------------------------------------------------------------------
 void IrrDriver::renderLightsScatter(unsigned pointlightcount)
 {
     getFBO(FBO_HALF1).Bind();
@@ -293,13 +461,13 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
     glEnable(GL_DEPTH_TEST);
     core::vector3df col2(1., 1., 1.);
 
-    LightShader::PointLightScatterShader::getInstance()->use();
-    glBindVertexArray(LightShader::PointLightScatterShader::getInstance()->vao);
+    PointLightScatterShader::getInstance()->use();
+    glBindVertexArray(PointLightScatterShader::getInstance()->vao);
 
-    LightShader::PointLightScatterShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
-    LightShader::PointLightScatterShader::getInstance()->setUniforms(1.f / (40.f * start), col2);
+    PointLightScatterShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
+    PointLightScatterShader::getInstance()->setUniforms(1.f / (40.f * start), col2);
 
-    glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, MIN2(pointlightcount, MAXLIGHT));
+    glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, MIN2(pointlightcount, LightBaseClass::MAXLIGHT));
 
     glDisable(GL_BLEND);
     m_post_processing->renderGaussian6Blur(getFBO(FBO_HALF1), getFBO(FBO_HALF2), 5., 5.);
@@ -309,4 +477,4 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
     glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     getFBO(FBO_COLORS).Bind();
     m_post_processing->renderPassThrough(getRenderTargetTexture(RTT_HALF1), getFBO(FBO_COLORS).getWidth(), getFBO(FBO_COLORS).getHeight());
-}
+}   // renderLightsScatter
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 7f0cf23c2..f60906081 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -300,7 +300,7 @@ FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
     // TODO: put this outside of the rendering loop
     irr_driver->generateDiffuseCoefficients();
     irr_driver->computeMatrixesAndCameras(camera, m_width, m_height);
-    unsigned plc = irr_driver->UpdateLightsInfo(camera, dt);
+    unsigned plc = irr_driver->updateLightsInfo(camera, dt);
     irr_driver->uploadLightingData();
     irr_driver->renderScene(camera, plc, glows, dt, false, true);
     FrameBuffer* frame_buffer = irr_driver->getPostProcessing()->render(camera, false);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index c30bcba55..e0fd7c475 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -443,85 +443,6 @@ namespace MeshShader
 
 }
 
-namespace LightShader
-{
-    PointLightShader::PointLightShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "pointlight.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "pointlight.frag");
-
-        assignUniforms();
-        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED, 
-                           1, "dtex", ST_NEAREST_FILTERED);
-        glGenVertexArrays(1, &vao);
-        glBindVertexArray(vao);
-
-        glGenBuffers(1, &vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, vbo);
-        glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0, GL_DYNAMIC_DRAW);
-
-        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
-        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
-        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
-        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
-
-        glEnableVertexAttribArray(attrib_Position);
-        glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), 0);
-        glEnableVertexAttribArray(attrib_Energy);
-        glVertexAttribPointer(attrib_Energy, 1, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(3 * sizeof(float)));
-        glEnableVertexAttribArray(attrib_Color);
-        glVertexAttribPointer(attrib_Color, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(4 * sizeof(float)));
-        glEnableVertexAttribArray(attrib_Radius);
-        glVertexAttribPointer(attrib_Radius, 1, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(7 * sizeof(float)));
-
-        glVertexAttribDivisorARB(attrib_Position, 1);
-        glVertexAttribDivisorARB(attrib_Energy, 1);
-        glVertexAttribDivisorARB(attrib_Color, 1);
-        glVertexAttribDivisorARB(attrib_Radius, 1);
-    }
-
-    PointLightScatterShader::PointLightScatterShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "pointlight.vert",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "pointlightscatter.frag");
-
-        assignUniforms("density", "fogcol");
-        assignSamplerNames(0, "dtex", ST_NEAREST_FILTERED);
-
-        glGenVertexArrays(1, &vao);
-        glBindVertexArray(vao);
-
-        glBindBuffer(GL_ARRAY_BUFFER, PointLightShader::getInstance()->vbo);
-
-        GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
-        GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
-        GLuint attrib_Energy = glGetAttribLocation(m_program, "Energy");
-        GLuint attrib_Radius = glGetAttribLocation(m_program, "Radius");
-
-        glEnableVertexAttribArray(attrib_Position);
-        glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), 0);
-        glEnableVertexAttribArray(attrib_Energy);
-        glVertexAttribPointer(attrib_Energy, 1, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(3 * sizeof(float)));
-        glEnableVertexAttribArray(attrib_Color);
-        glVertexAttribPointer(attrib_Color, 3, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(4 * sizeof(float)));
-        glEnableVertexAttribArray(attrib_Radius);
-        glVertexAttribPointer(attrib_Radius, 1, GL_FLOAT, GL_FALSE, sizeof(PointLightInfo), (GLvoid*)(7 * sizeof(float)));
-
-        glVertexAttribDivisorARB(attrib_Position, 1);
-        glVertexAttribDivisorARB(attrib_Energy, 1);
-        glVertexAttribDivisorARB(attrib_Color, 1);
-        glVertexAttribDivisorARB(attrib_Radius, 1);
-    }
-}
-
-
 
 static GLuint createVAO(GLuint Program)
 {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index cb2fd9045..10960d622 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -67,39 +67,6 @@ public:
 
 }
 
-#define MAXLIGHT 32
-
-namespace LightShader
-{
-    struct PointLightInfo
-    {
-        float posX;
-        float posY;
-        float posZ;
-        float energy;
-        float red;
-        float green;
-        float blue;
-        float radius;
-    };
-
-
-    class PointLightShader : public TextureShader<PointLightShader, 2>
-    {
-    public:
-        GLuint vbo;
-        GLuint vao;
-        PointLightShader();
-    };
-
-    class PointLightScatterShader : public TextureShader<PointLightScatterShader, 1, float, core::vector3df>
-    {
-    public:
-        GLuint vbo;
-        GLuint vao;
-        PointLightScatterShader();
-    };
-}
 
 
 template<typename T, typename... Args>

From 65c25065ee99494ebc8d775c2c270bb123cce3da Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 18 May 2015 17:17:19 +0300
Subject: [PATCH 217/331] angelscript: don't use deprecated GetParamTypeId

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 src/scriptengine/scriptarray.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scriptengine/scriptarray.cpp b/src/scriptengine/scriptarray.cpp
index edb2bcd1c..c04b3f98c 100644
--- a/src/scriptengine/scriptarray.cpp
+++ b/src/scriptengine/scriptarray.cpp
@@ -1496,7 +1496,8 @@ void CScriptArray::Precache()
 					continue;
 
 				// The parameter must either be a reference to the subtype or a handle to the subtype
-				int paramTypeId = func->GetParamTypeId(0, &flags);
+				int paramTypeId;
+				func->GetParam(0, &paramTypeId, &flags, NULL, NULL);
 
 				if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId &  ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
 					continue;

From 7005f3b069ead45bf7e5f6eb99c2a4c6a6197508 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 18 May 2015 17:23:28 +0300
Subject: [PATCH 218/331] build: allow to use system angelscript

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 CMakeLists.txt              | 14 ++++++++++----
 cmake/FindAngelscript.cmake | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 cmake/FindAngelscript.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c2f3f5c7..52a06913f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,9 +121,15 @@ elseif(MSVC)
 endif()
 
 
-# Build the angelscript library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
-include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+# Build the angelscript library if not in system
+find_package(Angelscript)
+if(ANGELSCRIPT_FOUND)
+    include_directories(${Angelscript_INCLUDE_DIRS})
+else()
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
+    include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+    set(Angelscript_LIBRARIES angelscript)
+endif()
 
 # OpenAL
 if(APPLE)
@@ -310,7 +316,7 @@ target_link_libraries(supertuxkart
     enet
     glew
     stkirrlicht
-    angelscript
+    ${Angelscript_LIBRARIES}
     ${CURL_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
diff --git a/cmake/FindAngelscript.cmake b/cmake/FindAngelscript.cmake
new file mode 100644
index 000000000..09020c319
--- /dev/null
+++ b/cmake/FindAngelscript.cmake
@@ -0,0 +1,33 @@
+# - Try to find angelscript
+# Once done this will define
+#
+#  ANGELSCRIPT_FOUND - system has angelscript
+#  Angelscript_INCLUDE_DIRS - the angelscript include directory
+#  Angelscript_LIBRARIES - the libraries needed to use angelscript
+#
+
+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+    )
+
+FIND_LIBRARY(Angelscript_LIBRARY
+    NAMES angelscript
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+    )
+
+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
+
+IF (ANGELSCRIPT_FOUND)
+    SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
+ENDIF (ANGELSCRIPT_FOUND)
+
+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)

From b40f84e89ded72379aa9e6c3d409efa92f2e3e85 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 09:20:29 +1000
Subject: [PATCH 219/331] Moved more shaders.

---
 src/graphics/render_lighting.cpp | 72 ++++++++++++++++++++++----------
 src/graphics/shaders.cpp         | 17 --------
 src/graphics/shaders.hpp         |  6 ---
 3 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index b7fa13cfc..a440d772c 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -58,7 +58,6 @@ LightBaseClass::PointLightInfo m_point_lights_info[LightBaseClass::MAXLIGHT];
 
 // ============================================================================
 class PointLightShader : public TextureShader < PointLightShader, 2 >
-                       , private LightBaseClass
 {
 public:
     GLuint vbo;
@@ -80,8 +79,9 @@ public:
 
         glGenBuffers(1, &vbo);
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
-        glBufferData(GL_ARRAY_BUFFER, MAXLIGHT * sizeof(PointLightInfo), 0,
-                     GL_DYNAMIC_DRAW);
+        glBufferData(GL_ARRAY_BUFFER, 
+                     LightBaseClass::MAXLIGHT * sizeof(LightBaseClass::PointLightInfo),
+                     0, GL_DYNAMIC_DRAW);
 
         GLuint attrib_Position = glGetAttribLocation(m_program, "Position");
         GLuint attrib_Color = glGetAttribLocation(m_program, "Color");
@@ -90,18 +90,18 @@ public:
 
         glEnableVertexAttribArray(attrib_Position);
         glVertexAttribPointer(attrib_Position, 3, GL_FLOAT, GL_FALSE, 
-                              sizeof(PointLightInfo), 0);
+                              sizeof(LightBaseClass::PointLightInfo), 0);
         glEnableVertexAttribArray(attrib_Energy);
         glVertexAttribPointer(attrib_Energy, 1, GL_FLOAT, GL_FALSE,
-                              sizeof(PointLightInfo),
+                              sizeof(LightBaseClass::PointLightInfo),
                               (GLvoid*)(3 * sizeof(float)));
         glEnableVertexAttribArray(attrib_Color);
         glVertexAttribPointer(attrib_Color, 3, GL_FLOAT, GL_FALSE,
-                              sizeof(PointLightInfo),
+                              sizeof(LightBaseClass::PointLightInfo),
                               (GLvoid*)(4 * sizeof(float)));
         glEnableVertexAttribArray(attrib_Radius);
         glVertexAttribPointer(attrib_Radius, 1, GL_FLOAT, GL_FALSE, 
-                              sizeof(PointLightInfo),
+                              sizeof(LightBaseClass::PointLightInfo),
                               (GLvoid*)(7 * sizeof(float)));
 
         glVertexAttribDivisorARB(attrib_Position, 1);
@@ -160,6 +160,31 @@ public:
         glVertexAttribDivisorARB(attrib_Radius, 1);
     }   // PointLightScatterShader
 };
+
+// ============================================================================
+class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF,
+                                                       3,  float, float, float,
+                                                       float, float>
+{
+public:
+    ShadowedSunLightShaderPCF()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+                            GL_FRAGMENT_SHADER, "sunlightshadow.frag");
+
+        // Use 8 to circumvent a catalyst bug when binding sampler
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           8, "shadowtex", ST_SHADOW_SAMPLER);
+        assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
+    }   // ShadowedSunLightShaderPCF
+};   // ShadowedSunLightShaderPCF
+
 // ============================================================================
 static void renderPointLights(unsigned count)
 {
@@ -375,15 +400,14 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
             }
             else
             {
-                FullScreenShader::ShadowedSunLightShaderPCF::getInstance()
-                    ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), 
-                                      irr_driver->getDepthStencilTexture(),
-                                      m_rtts->getShadowFBO().getDepthTexture());
-                DrawFullScreenEffect<FullScreenShader::ShadowedSunLightShaderPCF>(shadowSplit[1],
-                                                                                  shadowSplit[2],
-                                                                                  shadowSplit[3],
-                                                                                  shadowSplit[4],
-                                                                                  float(UserConfigParams::m_shadows_resolution));
+                ShadowedSunLightShaderPCF::getInstance()->setTextureUnits
+                    (irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                     irr_driver->getDepthStencilTexture(),
+                     m_rtts->getShadowFBO().getDepthTexture()                );
+                DrawFullScreenEffect<ShadowedSunLightShaderPCF>
+                    (shadowSplit[1], shadowSplit[2], shadowSplit[3],
+                     shadowSplit[4],
+                     float(UserConfigParams::m_shadows_resolution)   );
             }
         }
         else
@@ -464,17 +488,23 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
     PointLightScatterShader::getInstance()->use();
     glBindVertexArray(PointLightScatterShader::getInstance()->vao);
 
-    PointLightScatterShader::getInstance()->setTextureUnits(irr_driver->getDepthStencilTexture());
-    PointLightScatterShader::getInstance()->setUniforms(1.f / (40.f * start), col2);
+    PointLightScatterShader::getInstance()
+        ->setTextureUnits(irr_driver->getDepthStencilTexture());
+    PointLightScatterShader::getInstance()
+        ->setUniforms(1.f / (40.f * start), col2);
 
-    glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, MIN2(pointlightcount, LightBaseClass::MAXLIGHT));
+    glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4,
+                          MIN2(pointlightcount, LightBaseClass::MAXLIGHT));
 
     glDisable(GL_BLEND);
-    m_post_processing->renderGaussian6Blur(getFBO(FBO_HALF1), getFBO(FBO_HALF2), 5., 5.);
+    m_post_processing->renderGaussian6Blur(getFBO(FBO_HALF1),
+                                           getFBO(FBO_HALF2), 5., 5.);
     glEnable(GL_BLEND);
 
     glDisable(GL_DEPTH_TEST);
     glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     getFBO(FBO_COLORS).Bind();
-    m_post_processing->renderPassThrough(getRenderTargetTexture(RTT_HALF1), getFBO(FBO_COLORS).getWidth(), getFBO(FBO_COLORS).getHeight());
+    m_post_processing->renderPassThrough(getRenderTargetTexture(RTT_HALF1),
+                                         getFBO(FBO_COLORS).getWidth(),
+                                         getFBO(FBO_COLORS).getHeight());
 }   // renderLightsScatter
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e0fd7c475..eb97be7cb 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -480,23 +480,6 @@ namespace FullScreenShader
     }
 
 
-    ShadowedSunLightShaderPCF::ShadowedSunLightShaderPCF()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
-            GL_FRAGMENT_SHADER, "sunlightshadow.frag");
-
-        // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
-                           1, "dtex", ST_NEAREST_FILTERED,
-                           8, "shadowtex", ST_SHADOW_SAMPLER);
-        assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
-    }
 
     ShadowedSunLightShaderESM::ShadowedSunLightShaderESM()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 10960d622..6703bd2c5 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,12 +88,6 @@ public:
     SunLightShader();
 };
 
-class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF, 3,  float, float, float, float, float>
-{
-public:
-    ShadowedSunLightShaderPCF();
-};
-
 class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM, 3, float, float, float, float>
 {
 public:

From 283a7c58b9c2a2b50a3f194a2afbcbe3b0ff2911 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 09:36:28 +1000
Subject: [PATCH 220/331] Moved more shaders.

---
 src/graphics/post_processing.cpp |  55 ++++++++++++++--
 src/graphics/render_lighting.cpp | 110 ++++++++++++++++++++++++++-----
 src/graphics/shaders.cpp         |  82 -----------------------
 src/graphics/shaders.hpp         |  37 -----------
 4 files changed, 140 insertions(+), 144 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 833ea6ed4..04ed3a5db 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -351,6 +351,47 @@ public:
     }   // DegradedIBLShader
 };   // DegradedIBLShader
 
+// ============================================================================
+class RHDebug : public Shader<RHDebug, core::matrix4, core::vector3df>
+{
+public:
+    GLuint m_tu_shr, m_tu_shg, m_tu_shb;
+
+    RHDebug()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "rhdebug.vert",
+                            GL_FRAGMENT_SHADER, "rhdebug.frag");
+        assignUniforms("RHMatrix", "extents");
+        m_tu_shr = 0;
+        m_tu_shg = 1;
+        m_tu_shb = 2;
+        assignTextureUnit(m_tu_shr, "SHR",  m_tu_shg, "SHG", 
+                          m_tu_shb, "SHB");
+    }   // RHDebug
+};   // RHDebug
+
+// ============================================================================
+class GlobalIlluminationReconstructionShader 
+    : public TextureShader<GlobalIlluminationReconstructionShader, 5,
+                           core::matrix4, core::matrix4, core::vector3df >
+{
+public:
+    GlobalIlluminationReconstructionShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "gi.frag");
+
+        assignUniforms("RHMatrix", "InvRHMatrix", "extents");
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           2, "SHR", ST_VOLUME_LINEAR_FILTERED,
+                           3, "SHG", ST_VOLUME_LINEAR_FILTERED,
+                           4, "SHB", ST_VOLUME_LINEAR_FILTERED);
+    }   // GlobalIlluminationReconstructionShader
+};   // GlobalIlluminationReconstructionShader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -571,14 +612,14 @@ void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB,
                                    const core::vector3df &rh_extend)
 {
     glEnable(GL_PROGRAM_POINT_SIZE);
-    FullScreenShader::RHDebug::getInstance()->use();
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::RHDebug::getInstance()->TU_SHR);
+    RHDebug::getInstance()->use();
+    glActiveTexture(GL_TEXTURE0 + RHDebug::getInstance()->m_tu_shr);
     glBindTexture(GL_TEXTURE_3D, SHR);
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::RHDebug::getInstance()->TU_SHG);
+    glActiveTexture(GL_TEXTURE0 + RHDebug::getInstance()->m_tu_shg);
     glBindTexture(GL_TEXTURE_3D, SHG);
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::RHDebug::getInstance()->TU_SHB);
+    glActiveTexture(GL_TEXTURE0 + RHDebug::getInstance()->m_tu_shb);
     glBindTexture(GL_TEXTURE_3D, SHB);
-    FullScreenShader::RHDebug::getInstance()->setUniforms(rh_matrix, rh_extend);
+    RHDebug::getInstance()->setUniforms(rh_matrix, rh_extend);
     glDrawArrays(GL_POINTS, 0, 32 * 16 * 32);
     glDisable(GL_PROGRAM_POINT_SIZE);
 }   // renderRHDebug
@@ -591,10 +632,10 @@ void PostProcessing::renderGI(const core::matrix4 &RHMatrix,
     core::matrix4 InvRHMatrix;
     RHMatrix.getInverse(InvRHMatrix);
     glDisable(GL_DEPTH_TEST);
-    FullScreenShader::GlobalIlluminationReconstructionShader::getInstance()
+    GlobalIlluminationReconstructionShader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), 
                           irr_driver->getDepthStencilTexture(), shr, shg, shb);
-    DrawFullScreenEffect<FullScreenShader::GlobalIlluminationReconstructionShader>
+    DrawFullScreenEffect<GlobalIlluminationReconstructionShader>
                                      (RHMatrix, InvRHMatrix, rh_extend);
 }   // renderGI
 
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index a440d772c..49f5ed0da 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -185,6 +185,80 @@ public:
     }   // ShadowedSunLightShaderPCF
 };   // ShadowedSunLightShaderPCF
 
+// ============================================================================
+class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM,
+                                                       3, float, float, float,
+                                                       float>
+{
+public:
+    ShadowedSunLightShaderESM() 
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+                            GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
+
+        // Use 8 to circumvent a catalyst bug when binding sampler
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           8, "shadowtex", ST_TRILINEAR_CLAMPED_ARRAY2D);
+            
+        assignUniforms("split0", "split1", "split2", "splitmax");
+    }   // ShadowedSunLightShaderESM
+};   // ShadowedSunLightShaderESM
+
+// ============================================================================
+class RadianceHintsConstructionShader
+    : public TextureShader<RadianceHintsConstructionShader, 3, core::matrix4, 
+                          core::matrix4, core::vector3df, video::SColorf>
+{
+public:
+    RadianceHintsConstructionShader()
+    {
+        if (CVS->isAMDVertexShaderLayerUsable())
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "slicedscreenquad.vert",
+                                GL_FRAGMENT_SHADER, "rh.frag");
+        }
+        else
+        {
+            loadProgram(OBJECT, GL_VERTEX_SHADER, "slicedscreenquad.vert",
+                                GL_GEOMETRY_SHADER, "rhpassthrough.geom",
+                                GL_FRAGMENT_SHADER, "rh.frag");
+        }
+
+        assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
+        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
+                           1, "ntex", ST_BILINEAR_FILTERED,
+                           2, "dtex", ST_BILINEAR_FILTERED);
+    }   // RadianceHintsConstructionShader
+};   // RadianceHintsConstructionShader
+
+// ============================================================================
+// Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
+class NVWorkaroundRadianceHintsConstructionShader
+    : public TextureShader<NVWorkaroundRadianceHintsConstructionShader,
+                           3, core::matrix4, core::matrix4, core::vector3df,
+                           int, video::SColorf >
+{
+public:
+    NVWorkaroundRadianceHintsConstructionShader()
+    {
+        loadProgram(OBJECT,GL_VERTEX_SHADER,"slicedscreenquad_nvworkaround.vert",
+                           GL_GEOMETRY_SHADER, "rhpassthrough.geom",
+                           GL_FRAGMENT_SHADER, "rh.frag");
+
+        assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
+
+        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
+                           1, "ntex", ST_BILINEAR_FILTERED,
+                           2, "dtex", ST_BILINEAR_FILTERED);
+    }   // NVWorkaroundRadianceHintsConstructionShader
+};   // NVWorkaroundRadianceHintsConstructionShader
+
 // ============================================================================
 static void renderPointLights(unsigned count)
 {
@@ -321,32 +395,31 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
         if (CVS->needRHWorkaround())
         {
-            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
-                            ::getInstance()->use();
-            FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
-                            ::getInstance()->setTextureUnits(
-                m_rtts->getRSM().getRTT()[0],
-                m_rtts->getRSM().getRTT()[1],
-                m_rtts->getRSM().getDepthTexture());
+            NVWorkaroundRadianceHintsConstructionShader::getInstance()->use();
+            NVWorkaroundRadianceHintsConstructionShader::getInstance()
+                ->setTextureUnits(
+                    m_rtts->getRSM().getRTT()[0],
+                    m_rtts->getRSM().getRTT()[1],
+                    m_rtts->getRSM().getDepthTexture());
             for (unsigned i = 0; i < 32; i++)
             {
-                FullScreenShader::NVWorkaroundRadianceHintsConstructionShader
-                       ::getInstance()->setUniforms(rsm_matrix, rh_matrix,
-                                                    rh_extend, i,
-                                                    irr_driver->getSunColor());
+                NVWorkaroundRadianceHintsConstructionShader::getInstance()
+                    ->setUniforms(rsm_matrix, rh_matrix,
+                                  rh_extend, i,
+                                  irr_driver->getSunColor());
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             }
         }
         else
         {
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()->use();
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()
+            RadianceHintsConstructionShader::getInstance()->use();
+            RadianceHintsConstructionShader::getInstance()
                 ->setTextureUnits(
                     m_rtts->getRSM().getRTT()[0],
                     m_rtts->getRSM().getRTT()[1],
                     m_rtts->getRSM().getDepthTexture()
             );
-            FullScreenShader::RadianceHintsConstructionShader::getInstance()
+            RadianceHintsConstructionShader::getInstance()
                 ->setUniforms(rsm_matrix, rh_matrix, rh_extend,
                               irr_driver->getSunColor());
             glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, 32);
@@ -389,14 +462,15 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 
             if (CVS->isESMEnabled())
             {
-                FullScreenShader::ShadowedSunLightShaderESM::getInstance()
+                ShadowedSunLightShaderESM::getInstance()
                     ->setTextureUnits(
                         irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
                         irr_driver->getDepthStencilTexture(),
                         m_rtts->getShadowFBO().getRTT()[0]);
-                DrawFullScreenEffect<FullScreenShader
-                    ::ShadowedSunLightShaderESM>(shadowSplit[1], shadowSplit[2],
-                                                 shadowSplit[3], shadowSplit[4]);
+                DrawFullScreenEffect<ShadowedSunLightShaderESM>(shadowSplit[1],
+                                                                shadowSplit[2],
+                                                                shadowSplit[3],
+                                                                shadowSplit[4]);
             }
             else
             {
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index eb97be7cb..2c13a2f2a 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -481,88 +481,6 @@ namespace FullScreenShader
 
 
 
-    ShadowedSunLightShaderESM::ShadowedSunLightShaderESM()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
-            GL_FRAGMENT_SHADER, "sunlightshadowesm.frag");
-
-        // Use 8 to circumvent a catalyst bug when binding sampler
-        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
-                           1, "dtex", ST_NEAREST_FILTERED,
-                           8, "shadowtex", ST_TRILINEAR_CLAMPED_ARRAY2D);
-            
-        assignUniforms("split0", "split1", "split2", "splitmax");
-    }
-
-    RadianceHintsConstructionShader::RadianceHintsConstructionShader()
-    {
-        if (CVS->isAMDVertexShaderLayerUsable())
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "slicedscreenquad.vert",
-                GL_FRAGMENT_SHADER, "rh.frag");
-        }
-        else
-        {
-            loadProgram(OBJECT,
-                GL_VERTEX_SHADER, "slicedscreenquad.vert",
-                GL_GEOMETRY_SHADER, "rhpassthrough.geom",
-                GL_FRAGMENT_SHADER, "rh.frag");
-        }
-
-        assignUniforms("RSMMatrix", "RHMatrix", "extents", "suncol");
-        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
-                           1, "ntex", ST_BILINEAR_FILTERED,
-                           2, "dtex", ST_BILINEAR_FILTERED);
-    }
-
-    NVWorkaroundRadianceHintsConstructionShader::NVWorkaroundRadianceHintsConstructionShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "slicedscreenquad_nvworkaround.vert",
-            GL_GEOMETRY_SHADER, "rhpassthrough.geom",
-            GL_FRAGMENT_SHADER, "rh.frag");
-
-        assignUniforms("RSMMatrix", "RHMatrix", "extents", "slice", "suncol");
-
-        assignSamplerNames(0, "ctex", ST_BILINEAR_FILTERED,
-                           1, "ntex", ST_BILINEAR_FILTERED,
-                           2, "dtex", ST_BILINEAR_FILTERED);
-    }
-
-    RHDebug::RHDebug()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "rhdebug.vert",
-            GL_FRAGMENT_SHADER, "rhdebug.frag");
-        assignUniforms("RHMatrix", "extents");
-        TU_SHR = 0;
-        TU_SHG = 1;
-        TU_SHB = 2;
-        assignTextureUnit(TU_SHR, "SHR",  TU_SHG, "SHG",  TU_SHB, "SHB");
-    }
-
-    GlobalIlluminationReconstructionShader::GlobalIlluminationReconstructionShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "gi.frag");
-
-        assignUniforms("RHMatrix", "InvRHMatrix", "extents");
-        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
-                           1, "dtex", ST_NEAREST_FILTERED,
-                           2, "SHR", ST_VOLUME_LINEAR_FILTERED,
-                           3, "SHG", ST_VOLUME_LINEAR_FILTERED,
-                           4, "SHB", ST_VOLUME_LINEAR_FILTERED);
-    }
 
 	HorizontalBlurShader::HorizontalBlurShader()
     {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 6703bd2c5..333df8a34 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,43 +88,6 @@ public:
     SunLightShader();
 };
 
-class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM, 3, float, float, float, float>
-{
-public:
-    ShadowedSunLightShaderESM();
-};
-
-class RadianceHintsConstructionShader : public TextureShader<RadianceHintsConstructionShader, 3, core::matrix4, 
-                                                      core::matrix4, core::vector3df, video::SColorf>
-{
-public:
-    RadianceHintsConstructionShader();
-};
-
-// Workaround for a bug found in kepler nvidia linux and fermi nvidia windows
-class NVWorkaroundRadianceHintsConstructionShader : public TextureShader<NVWorkaroundRadianceHintsConstructionShader,
-                                                                   3, core::matrix4, core::matrix4, core::vector3df,
-                                                                   int, video::SColorf>
-{
-public:
-    NVWorkaroundRadianceHintsConstructionShader();
-};
-
-class RHDebug : public Shader<RHDebug, core::matrix4, core::vector3df>
-{
-public:
-    GLuint TU_SHR, TU_SHG, TU_SHB;
-
-    RHDebug();
-};
-
-class GlobalIlluminationReconstructionShader : public TextureShader<GlobalIlluminationReconstructionShader, 5,
-                                                             core::matrix4, core::matrix4, core::vector3df>
-{
-public:
-    GlobalIlluminationReconstructionShader();
-};
-
 class HorizontalBlurShader : public TextureShader<HorizontalBlurShader, 1, core::vector2df>
 {
 public:

From 2224f4ebfa1f48280d67434c7015bc2f5c436a6e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 09:39:04 +1000
Subject: [PATCH 221/331] Removed unused shader.

---
 src/graphics/shaders.cpp | 13 -------------
 src/graphics/shaders.hpp |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 2c13a2f2a..c17c69a23 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -479,19 +479,6 @@ namespace FullScreenShader
         assignUniforms("direction", "col");
     }
 
-
-
-
-	HorizontalBlurShader::HorizontalBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "gaussian6h.frag");
-        assignUniforms("pixel");
-
-        assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
-    }
-
     PassThroughShader::PassThroughShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 333df8a34..7e6473c99 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,13 +88,6 @@ public:
     SunLightShader();
 };
 
-class HorizontalBlurShader : public TextureShader<HorizontalBlurShader, 1, core::vector2df>
-{
-public:
-    HorizontalBlurShader();
-};
-
-
 class PassThroughShader : public TextureShader<PassThroughShader, 1, int, int>
 {
 public:

From 6d8d78be73b71a890a10698911a8340331684e6e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 16:07:24 +1000
Subject: [PATCH 222/331] Moved more shaders, moved createVAO into Shader.

---
 src/graphics/post_processing.cpp    | 74 +++++++++++++++++++++++++----
 src/graphics/shader.cpp             | 20 ++++++++
 src/graphics/shader.hpp             |  1 +
 src/graphics/shaders.cpp            | 49 +------------------
 src/graphics/shaders.hpp            | 21 --------
 src/graphics/shared_gpu_objects.cpp |  6 +--
 src/graphics/shared_gpu_objects.hpp |  8 +++-
 7 files changed, 96 insertions(+), 83 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 04ed3a5db..5c4d325a4 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -392,6 +392,62 @@ public:
     }   // GlobalIlluminationReconstructionShader
 };   // GlobalIlluminationReconstructionShader
 
+// ============================================================================
+class PassThroughShader : public TextureShader<PassThroughShader, 1, int, int>
+{
+public:
+    PassThroughShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "passthrough.frag");
+        assignUniforms("width", "height");
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
+    }   // PassThroughShader
+};   // PassThroughShader
+
+// ============================================================================
+class LayerPassThroughShader : public Shader<LayerPassThroughShader, int>
+{
+private:
+    GLuint m_tu_texture;
+    GLuint m_vao;
+
+public:
+    LayerPassThroughShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "layertexturequad.frag");
+        m_tu_texture = 0;
+        assignUniforms("layer");
+        assignTextureUnit(m_tu_texture, "tex");
+        m_vao = createVAO();
+    }   // LayerPassThroughShader
+    // ------------------------------------------------------------------------
+    void bindVertexArray()
+    {
+        glBindVertexArray(m_vao);
+    }   // bindVertexArray
+    // ------------------------------------------------------------------------
+    void activateTexture()
+    {
+        glActiveTexture(GL_TEXTURE0 + m_tu_texture);
+    }   // activateTexture
+};   // LayerPassThroughShader
+
+// ============================================================================
+class LinearizeDepthShader : public TextureShader<LinearizeDepthShader, 1,
+                                                  float, float>
+{
+public:
+    LinearizeDepthShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "linearizedepth.frag");
+        assignUniforms("zn", "zf");
+        assignSamplerNames(0, "texture", ST_BILINEAR_FILTERED);
+    }   // LinearizeDepthShader
+};   // LinearizeDepthShader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -926,22 +982,20 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
 void PostProcessing::renderPassThrough(GLuint tex, unsigned width,
                                        unsigned height)
 {
-    FullScreenShader::PassThroughShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<FullScreenShader::PassThroughShader>(width, height);
+    PassThroughShader::getInstance()->setTextureUnits(tex);
+    DrawFullScreenEffect<PassThroughShader>(width, height);
 }   // renderPassThrough
 
 // ----------------------------------------------------------------------------
 void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 {
-    FullScreenShader::LayerPassThroughShader::getInstance()->use();
-    glBindVertexArray(FullScreenShader::LayerPassThroughShader::getInstance()->vao);
-
-    glActiveTexture(GL_TEXTURE0 + FullScreenShader::LayerPassThroughShader
-                                                  ::getInstance()->TU_texture);
+    LayerPassThroughShader::getInstance()->use();
+    LayerPassThroughShader::getInstance()->bindVertexArray();
+    LayerPassThroughShader::getInstance()->activateTexture();
     glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    FullScreenShader::LayerPassThroughShader::getInstance()->setUniforms(layer);
+    LayerPassThroughShader::getInstance()->setUniforms(layer);
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }   // renderTextureLayer
@@ -966,9 +1020,9 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    FullScreenShader::LinearizeDepthShader::getInstance()
+    LinearizeDepthShader::getInstance()
         ->setTextureUnits(irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::LinearizeDepthShader>
+    DrawFullScreenEffect<LinearizeDepthShader>
         (irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), 
          irr_driver->getSceneManager()->getActiveCamera()->getFarValue()  );
     irr_driver->getFBO(FBO_SSAO).Bind();
diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index 817141aaf..f7a56e0d3 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -21,6 +21,7 @@
 #include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
 
@@ -247,4 +248,23 @@ void ShaderBase::setAttribute(AttributeType type)
     }
 }   // setAttribute
 
+// ----------------------------------------------------------------------------
+GLuint ShaderBase::createVAO()
+{
+    GLuint vao;
+    glGenVertexArrays(1, &vao);
+    glBindVertexArray(vao);
+    GLuint attrib_position = glGetAttribLocation(m_program, "Position");
+    GLuint attrib_texcoord = glGetAttribLocation(m_program, "Texcoord");
+    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getQuadVBO());
+    glEnableVertexAttribArray(attrib_position);
+    glEnableVertexAttribArray(attrib_texcoord);
+    glVertexAttribPointer(attrib_position, 2, GL_FLOAT, GL_FALSE,
+                          4 * sizeof(float), 0);
+    glVertexAttribPointer(attrib_texcoord, 2, GL_FLOAT, GL_FALSE,
+                          4 * sizeof(float), (GLvoid*)(2 * sizeof(float)));
+    glBindVertexArray(0);
+    return vao;
+}   // createVAO
+
 // ============================================================================
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 573e46895..60975b869 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -91,6 +91,7 @@ public:
                        const char **varyings,
                        unsigned varyingscount);
     static void updateShaders();
+    GLuint createVAO();
     // ------------------------------------------------------------------------
     /** Activates the shader calling glUseProgram. */
     void use() { glUseProgram(m_program); }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index c17c69a23..ccd400921 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -443,23 +443,6 @@ namespace MeshShader
 
 }
 
-
-static GLuint createVAO(GLuint Program)
-{
-    GLuint vao;
-    glGenVertexArrays(1, &vao);
-    glBindVertexArray(vao);
-    GLuint attrib_position = glGetAttribLocation(Program, "Position");
-    GLuint attrib_texcoord = glGetAttribLocation(Program, "Texcoord");
-    glBindBuffer(GL_ARRAY_BUFFER, quad_vbo);
-    glEnableVertexAttribArray(attrib_position);
-    glEnableVertexAttribArray(attrib_texcoord);
-    glVertexAttribPointer(attrib_position, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), 0);
-    glVertexAttribPointer(attrib_texcoord, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (GLvoid*)(2 * sizeof(float)));
-    glBindVertexArray(0);
-    return vao;
-}
-
 namespace FullScreenShader
 {
 
@@ -479,36 +462,6 @@ namespace FullScreenShader
         assignUniforms("direction", "col");
     }
 
-    PassThroughShader::PassThroughShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "passthrough.frag");
-
-        assignUniforms("width", "height");
-        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-    }
-
-    LayerPassThroughShader::LayerPassThroughShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "layertexturequad.frag");
-        TU_texture = 0;
-        assignUniforms("layer");
-        assignTextureUnit(TU_texture, "tex");
-        vao = createVAO(m_program);
-    }
-
-    LinearizeDepthShader::LinearizeDepthShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "linearizedepth.frag");
-        assignUniforms("zn", "zf");
-
-        assignSamplerNames(0, "texture", ST_BILINEAR_FILTERED);
-    }
 
 
     LightspaceBoundingBoxShader::LightspaceBoundingBoxShader()
@@ -552,7 +505,7 @@ namespace FullScreenShader
         assignUniforms();
 
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-        vao = createVAO(m_program);
+        vao = createVAO();
     }
 
     SSAOShader::SSAOShader()
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 7e6473c99..15a7943c8 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,27 +88,6 @@ public:
     SunLightShader();
 };
 
-class PassThroughShader : public TextureShader<PassThroughShader, 1, int, int>
-{
-public:
-    PassThroughShader();
-};
-
-class LayerPassThroughShader : public Shader<LayerPassThroughShader, int>
-{
-public:
-    GLuint TU_texture;
-    GLuint vao;
-
-    LayerPassThroughShader();
-};
-
-class LinearizeDepthShader : public TextureShader<LinearizeDepthShader, 1, float, float>
-{
-public:
-    LinearizeDepthShader();
-};
-
 class LightspaceBoundingBoxShader : public TextureShader<LightspaceBoundingBoxShader, 1,
                                                   core::matrix4, float, float,
                                                   float, float>
diff --git a/src/graphics/shared_gpu_objects.cpp b/src/graphics/shared_gpu_objects.cpp
index 0ada1043c..79013a3c0 100644
--- a/src/graphics/shared_gpu_objects.cpp
+++ b/src/graphics/shared_gpu_objects.cpp
@@ -27,6 +27,7 @@ GLuint SharedGPUObjects::m_lighting_data_ubo;
 GLuint SharedGPUObjects::m_full_screen_quad_vao;
 GLuint SharedGPUObjects::m_ui_vao;
 GLuint SharedGPUObjects::m_quad_buffer;
+GLuint SharedGPUObjects::m_quad_vbo;
 bool   SharedGPUObjects::m_has_been_initialised = false;
 
 /** Initialises m_full_screen_quad_vbo.
@@ -40,9 +41,8 @@ void SharedGPUObjects::initQuadVBO()
          1., -1., 1., 0.,   // UpperRight
          1.,  1., 1., 1.    // LowerRight
     }; 
-    GLuint quad_vbo;
-    glGenBuffers(1, &quad_vbo);
-    glBindBuffer(GL_ARRAY_BUFFER, quad_vbo);
+    glGenBuffers(1, &m_quad_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_quad_vbo);
     glBufferData(GL_ARRAY_BUFFER, 16 * sizeof(float), QUAD_VERTEX,
                  GL_STATIC_DRAW);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
diff --git a/src/graphics/shared_gpu_objects.hpp b/src/graphics/shared_gpu_objects.hpp
index b3588a690..8c6b52f4c 100644
--- a/src/graphics/shared_gpu_objects.hpp
+++ b/src/graphics/shared_gpu_objects.hpp
@@ -36,6 +36,7 @@ private:
     static GLuint m_full_screen_quad_vao;
     static GLuint m_ui_vao;
     static GLuint m_quad_buffer;
+    static GLuint m_quad_vbo;
 
     static void initQuadVBO();
     static void initQuadBuffer();
@@ -108,7 +109,12 @@ public:
         assert(m_has_been_initialised);
         return m_quad_buffer;
     }   // getQuadBuffer
- 
+    // ------------------------------------------------------------------------
+    static GLuint getQuadVBO()
+    {
+        assert(m_has_been_initialised);
+        return m_quad_vbo;
+    }   // getQuadVBO
 };   // class SharedGPUObjecctS
 
 

From e94c3e5d3f6be6007a7486d20d644912c9d0cb01 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 16:11:54 +1000
Subject: [PATCH 223/331] Removed unused global variables.

---
 src/graphics/shaders.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index ccd400921..3119a7f13 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -244,11 +244,6 @@ Shaders::ColoredLine::ColoredLine()
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 }   // Shaders::ColoredLine
 
-
-
-GLuint quad_vbo, tri_vbo;
-
-
 void Shaders::loadShaders()
 {
     const std::string &dir = file_manager->getAsset(FileManager::SHADER, "");

From a401096487b72fcdd938b5b6a498e17fe4712cf0 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 16:34:07 +1000
Subject: [PATCH 224/331] Moved more shaders, minor cleanup of coding style in
 irr_driver.hpp.

---
 src/graphics/irr_driver.hpp      |  83 +++++++++++++---
 src/graphics/shaders.cpp         |  11 ---
 src/graphics/shaders.hpp         |   7 --
 src/graphics/shadow_matrixes.cpp | 165 ++++++++++++++++++++-----------
 4 files changed, 176 insertions(+), 90 deletions(-)

diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 3ac58994d..26d84babd 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -620,7 +620,8 @@ public:
     // ------------------------------------------------------------------------
     std::vector<LightNode *> getLights() { return m_lights; }
     // ------------------------------------------------------------------------
-    void addGlowingNode(scene::ISceneNode *n, float r = 1.0f, float g = 1.0f, float b = 1.0f)
+    void addGlowingNode(scene::ISceneNode *n, float r = 1.0f, float g = 1.0f,
+                        float b = 1.0f)
     {
         GlowData dat;
         dat.node = n;
@@ -644,61 +645,106 @@ public:
     // ------------------------------------------------------------------------
     void clearForcedBloom() { m_forcedbloom.clear(); }
     // ------------------------------------------------------------------------
-    const std::vector<BloomData> &getForcedBloom() const { return m_forcedbloom; }
+    const std::vector<BloomData> &getForcedBloom() const
+    { 
+        return m_forcedbloom;
+    }
     // ------------------------------------------------------------------------
     void clearBackgroundNodes() { m_background.clear(); }
     // ------------------------------------------------------------------------
-    void addBackgroundNode(scene::ISceneNode * const n) { m_background.push_back(n); }
+    void addBackgroundNode(scene::ISceneNode * const n) 
+    {
+        m_background.push_back(n);
+    }
     // ------------------------------------------------------------------------
     void applyObjectPassShader();
-    void applyObjectPassShader(scene::ISceneNode * const node, bool rimlit = false);
+    void applyObjectPassShader(scene::ISceneNode * const node,
+                               bool rimlit = false);
     // ------------------------------------------------------------------------
-    scene::ISceneNode *addLight(const core::vector3df &pos, float energy, float radius, float r,
-                  float g, float b, bool sun = false, scene::ISceneNode* parent = NULL);
+    scene::ISceneNode *addLight(const core::vector3df &pos, float energy,
+                                float radius, float r, float g, float b,
+                                bool sun = false, 
+                                scene::ISceneNode* parent = NULL);
     // ------------------------------------------------------------------------
     void clearLights();
     // ------------------------------------------------------------------------
     class STKMeshSceneNode *getSunInterposer() { return m_sun_interposer; }
+    // ------------------------------------------------------------------------
     void cleanSunInterposer();
     void createSunInterposer();
     // ------------------------------------------------------------------------
-    void setViewMatrix(core::matrix4 matrix) { m_ViewMatrix = matrix; matrix.getInverse(m_InvViewMatrix); }
+    void setViewMatrix(core::matrix4 matrix)
+    {
+        m_ViewMatrix = matrix; matrix.getInverse(m_InvViewMatrix);
+    }
+    // ------------------------------------------------------------------------
     const core::matrix4 &getViewMatrix() const { return m_ViewMatrix; }
+    // ------------------------------------------------------------------------
     const core::matrix4 &getInvViewMatrix() const { return m_InvViewMatrix; }
-    void setProjMatrix(core::matrix4 matrix) { m_ProjMatrix = matrix; matrix.getInverse(m_InvProjMatrix); }
+    // ------------------------------------------------------------------------
+    void setProjMatrix(core::matrix4 matrix)
+    {
+        m_ProjMatrix = matrix; matrix.getInverse(m_InvProjMatrix);
+    }
+    // ------------------------------------------------------------------------
     const core::matrix4 &getProjMatrix() const { return m_ProjMatrix; }
+    // ------------------------------------------------------------------------
     const core::matrix4 &getInvProjMatrix() const { return m_InvProjMatrix; }
-    void genProjViewMatrix() { m_ProjViewMatrix = m_ProjMatrix * m_ViewMatrix; m_InvProjViewMatrix = m_ProjViewMatrix; m_InvProjViewMatrix.makeInverse(); }
+    // ------------------------------------------------------------------------
+    void genProjViewMatrix() 
+    {
+        m_ProjViewMatrix = m_ProjMatrix * m_ViewMatrix; 
+        m_InvProjViewMatrix = m_ProjViewMatrix; 
+        m_InvProjViewMatrix.makeInverse(); 
+    }
+    // ------------------------------------------------------------------------
     const core::matrix4 &getProjViewMatrix() const { return m_ProjViewMatrix; }
-    const core::matrix4 &getInvProjViewMatrix() const { return m_InvProjViewMatrix; }
-    const core::vector2df &getCurrentScreenSize() const { return m_current_screen_size; }
-    const core::dimension2du getActualScreenSize() const { return m_actual_screen_size; }
+    // ------------------------------------------------------------------------
+    const core::matrix4 &getInvProjViewMatrix() const 
+    {
+        return m_InvProjViewMatrix;
+    }
+    // ------------------------------------------------------------------------
+    const core::vector2df &getCurrentScreenSize() const
+    {
+        return m_current_screen_size;
+    }
+    // ------------------------------------------------------------------------
+    const core::dimension2du getActualScreenSize() const
+    { 
+        return m_actual_screen_size;
+    }
     // ------------------------------------------------------------------------
     float getSSAORadius() const
     {
         return m_ssao_radius;
     }
 
+    // ------------------------------------------------------------------------
     void setSSAORadius(float v)
     {
         m_ssao_radius = v;
     }
 
+    // ------------------------------------------------------------------------
     float getSSAOK() const
     {
         return m_ssao_k;
     }
 
+    // ------------------------------------------------------------------------
     void setSSAOK(float v)
     {
         m_ssao_k = v;
     }
 
+    // ------------------------------------------------------------------------
     float getSSAOSigma() const
     {
         return m_ssao_sigma;
     }
 
+    // ------------------------------------------------------------------------
     void setSSAOSigma(float v)
     {
         m_ssao_sigma = v;
@@ -718,10 +764,15 @@ public:
     void onLoadWorld();
     void onUnloadWorld();
 
-    void renderScene(scene::ICameraSceneNode * const camnode, unsigned pointlightcount, std::vector<GlowData>& glows, float dt, bool hasShadows, bool forceRTT);
-    unsigned updateLightsInfo(scene::ICameraSceneNode * const camnode, float dt);
-    void UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, size_t height);
-    void computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode, size_t width, size_t height);
+    void renderScene(scene::ICameraSceneNode * const camnode,
+                     unsigned pointlightcount, std::vector<GlowData>& glows,
+                     float dt, bool hasShadows, bool forceRTT);
+    unsigned updateLightsInfo(scene::ICameraSceneNode * const camnode,
+                              float dt);
+    void updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
+                                                         size_t height);
+    void computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode,
+                                   size_t width, size_t height);
     void uploadLightingData();
 
     // --------------------- OLD RTT --------------------
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 3119a7f13..e4359519f 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -459,17 +459,6 @@ namespace FullScreenShader
 
 
 
-    LightspaceBoundingBoxShader::LightspaceBoundingBoxShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
-            GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(0, "depth", ST_NEAREST_FILTERED);
-        assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
-        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
-        glShaderStorageBlockBinding(m_program, block_idx, 2);
-    }
-
     ShadowMatrixesGenerationShader::ShadowMatrixesGenerationShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 15a7943c8..25af8cf25 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,13 +88,6 @@ public:
     SunLightShader();
 };
 
-class LightspaceBoundingBoxShader : public TextureShader<LightspaceBoundingBoxShader, 1,
-                                                  core::matrix4, float, float,
-                                                  float, float>
-{
-public:
-    LightspaceBoundingBoxShader();
-};
 
 class ShadowMatrixesGenerationShader : public Shader <ShadowMatrixesGenerationShader, core::matrix4>
 {
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 4a45be84d..054787ae2 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -33,8 +33,28 @@
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
-static std::vector<vector3df>
-getFrustrumVertex(const scene::SViewFrustum &frustrum)
+
+// ============================================================================
+class LightspaceBoundingBoxShader 
+    : public TextureShader<LightspaceBoundingBoxShader, 1,
+                           core::matrix4, float, float, float, float>
+{
+public:
+    LightspaceBoundingBoxShader() 
+    {
+        loadProgram(OBJECT, GL_COMPUTE_SHADER, "Lightspaceboundingbox.comp",
+                            GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
+        assignSamplerNames(0, "depth", ST_NEAREST_FILTERED);
+        assignUniforms("SunCamMatrix", "split0", "split1", "split2", "splitmax");
+        GLuint block_idx = 
+            glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, 
+                                      "BoundingBoxes");
+        glShaderStorageBlockBinding(m_program, block_idx, 2);
+    }   // LightspaceBoundingBoxShader
+};   // LightspaceBoundingBoxShader
+
+// ============================================================================
+static std::vector<vector3df> getFrustrumVertex(const scene::SViewFrustum &frustrum)
 {
     std::vector<vector3df> vectors;
     vectors.push_back(frustrum.getFarLeftDown());
@@ -48,14 +68,17 @@ getFrustrumVertex(const scene::SViewFrustum &frustrum)
     return vectors;
 }
 
-/** Given a matrix transform and a set of points returns an orthogonal projection matrix that maps coordinates of
-transformed points between -1 and 1.
-*  \param transform a transform matrix.
-*  \param pointsInside a vector of point in 3d space.
-*  \param size returns the size (width, height) of shadowmap coverage
-*/
-static core::matrix4
-getTighestFitOrthoProj(const core::matrix4 &transform, const std::vector<vector3df> &pointsInside, std::pair<float, float> &size)
+// ----------------------------------------------------------------------------
+/** Given a matrix transform and a set of points returns an orthogonal
+ *  projection matrix that maps coordinates of transformed points between -1 
+ *  and 1.
+ *  \param transform a transform matrix.
+ *  \param pointsInside a vector of point in 3d space.
+ *  \param size returns the size (width, height) of shadowmap coverage
+ */
+static core::matrix4 getTighestFitOrthoProj(const core::matrix4 &transform,
+                                    const std::vector<vector3df> &pointsInside,
+                                    std::pair<float, float> &size)
 {
     float xmin = std::numeric_limits<float>::infinity();
     float xmax = -std::numeric_limits<float>::infinity();
@@ -92,8 +115,9 @@ getTighestFitOrthoProj(const core::matrix4 &transform, const std::vector<vector3
         down, up,
         zmin - 100, zmax);
     return tmp_matrix;
-}
+}   // getTighestFitOrthoProj
 
+// ----------------------------------------------------------------------------
 float shadowSplit[5] = { 1., 5., 20., 50., 150 };
 
 struct CascadeBoundingBox
@@ -117,15 +141,20 @@ struct Histogram
     int count;
 };
 
+// ----------------------------------------------------------------------------
 /** Update shadowSplit values and make Cascade Bounding Box pointer valid.
-* The function aunches two compute kernel that generates an histogram of the depth buffer value (between 0 and 250 with increment of 0.25)
-* and get an axis aligned bounding box (from SunCamMatrix view) containing all depth buffer value.
-* It also retrieves the result from the previous computations (in a Round Robin fashion) and update CBB pointer.
-* \param width of the depth buffer
-* \param height of the depth buffer
-* TODO : The depth histogram part is commented out, needs to tweak it when I have some motivation
-*/
-void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, size_t height)
+ *  The function aunches two compute kernel that generates an histogram of the 
+ *  depth buffer value (between 0 and 250 with increment of 0.25) and get an
+ *  axis aligned bounding box (from SunCamMatrix view) containing all depth
+ *  buffer value. It also retrieves the result from the previous computations 
+ *  (in a Round Robin fashion) and update CBB pointer.
+ *  \param width of the depth buffer
+ *  \param height of the depth buffer
+ *  TODO : The depth histogram part is commented out, needs to tweak it when 
+ *         I have some motivation
+ */
+void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
+                                                                size_t height)
 {
     // Value that should be kept between multiple calls
     static bool ssboInit = false;
@@ -146,22 +175,28 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
     }
 
     glBindBuffer(GL_SHADER_STORAGE_BUFFER, CBBssbo);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * sizeof(CascadeBoundingBox), InitialCBB, GL_STATIC_DRAW);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * sizeof(CascadeBoundingBox),
+                 InitialCBB, GL_STATIC_DRAW);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, CBBssbo);
 
-    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->use();
-    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->setTextureUnits(getDepthStencilTexture());
-    FullScreenShader::LightspaceBoundingBoxShader::getInstance()->setUniforms(m_suncam->getViewMatrix(), shadowSplit[1], shadowSplit[2], shadowSplit[3], shadowSplit[4]);
+    LightspaceBoundingBoxShader::getInstance()->use();
+    LightspaceBoundingBoxShader::getInstance()
+        ->setTextureUnits(getDepthStencilTexture());
+    LightspaceBoundingBoxShader::getInstance()
+        ->setUniforms(m_suncam->getViewMatrix(), shadowSplit[1],
+                      shadowSplit[2], shadowSplit[3], shadowSplit[4]);
     glDispatchCompute((int)width / 64, (int)height / 64, 1);
 
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
 
     glBindBuffer(GL_SHADER_STORAGE_BUFFER, tempShadowMatssbo);
-    glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * 16 * sizeof(float), 0, GL_STATIC_COPY);
+    glBufferData(GL_SHADER_STORAGE_BUFFER, 4 * 16 * sizeof(float), 0,
+                 GL_STATIC_COPY);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, tempShadowMatssbo);
 
     FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->use();
-    FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->setUniforms(m_suncam->getViewMatrix());
+    FullScreenShader::ShadowMatrixesGenerationShader::getInstance()
+        ->setUniforms(m_suncam->getViewMatrix());
     glDispatchCompute(4, 1, 1);
 
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
@@ -170,22 +205,28 @@ void IrrDriver::UpdateSplitAndLightcoordRangeFromComputeShaders(size_t width, si
                  SharedGPUObjects::getViewProjectionMatricesUBO());
     glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0,
                         80 * sizeof(float), 4 * 16 * sizeof(float));
-}
+}   // updateSplitAndLightcoordRangeFromComputeShaders
 
-/** Generate View, Projection, Inverse View, Inverse Projection, ViewProjection and InverseProjection matrixes
-and matrixes and cameras for the four shadow cascade and RSM.
-*   \param camnode point of view used
-*   \param width of the rendering viewport
-*   \param height of the rendering viewport
-*/
-void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode, size_t width, size_t height)
+// ----------------------------------------------------------------------------
+/** Generate View, Projection, Inverse View, Inverse Projection, ViewProjection
+ *  and InverseProjection matrixes and matrixes and cameras for the four shadow
+ *   cascade and RSM.
+ *   \param camnode point of view used
+ *   \param width of the rendering viewport
+ *   \param height of the rendering viewport
+ */
+void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode,
+                                          size_t width, size_t height)
 {
     if (CVS->isSDSMEnabled())
-        UpdateSplitAndLightcoordRangeFromComputeShaders(width, height);
-    static_cast<scene::CSceneManager *>(m_scene_manager)->OnAnimate(os::Timer::getTime());
+        updateSplitAndLightcoordRangeFromComputeShaders(width, height);
+    static_cast<scene::CSceneManager *>(m_scene_manager)
+        ->OnAnimate(os::Timer::getTime());
     camnode->render();
-    irr_driver->setProjMatrix(irr_driver->getVideoDriver()->getTransform(video::ETS_PROJECTION));
-    irr_driver->setViewMatrix(irr_driver->getVideoDriver()->getTransform(video::ETS_VIEW));
+    irr_driver->setProjMatrix(irr_driver->getVideoDriver()
+                              ->getTransform(video::ETS_PROJECTION));
+    irr_driver->setViewMatrix(irr_driver->getVideoDriver()
+                              ->getTransform(video::ETS_VIEW));
     irr_driver->genProjViewMatrix();
 
     m_current_screen_size = core::vector2df(float(width), float(height));
@@ -208,10 +249,10 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
     };
 
     float tmp[16 * 9 + 2];
-    memcpy(tmp, irr_driver->getViewMatrix().pointer(), 16 * sizeof(float));
-    memcpy(&tmp[16], irr_driver->getProjMatrix().pointer(), 16 * sizeof(float));
-    memcpy(&tmp[32], irr_driver->getInvViewMatrix().pointer(), 16 * sizeof(float));
-    memcpy(&tmp[48], irr_driver->getInvProjMatrix().pointer(), 16 * sizeof(float));
+    memcpy(tmp, irr_driver->getViewMatrix().pointer(),          16 * sizeof(float));
+    memcpy(&tmp[16], irr_driver->getProjMatrix().pointer(),     16 * sizeof(float));
+    memcpy(&tmp[32], irr_driver->getInvViewMatrix().pointer(),  16 * sizeof(float));
+    memcpy(&tmp[48], irr_driver->getInvProjMatrix().pointer(),  16 * sizeof(float));
     memcpy(&tmp[64], irr_driver->getProjViewMatrix().pointer(), 16 * sizeof(float));
 
     m_suncam->render();
@@ -230,7 +271,8 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
         btVector3 btmin, btmax;
         if (World::getWorld()->getTrack()->getPtrTriangleMesh())
         {
-            World::getWorld()->getTrack()->getTriangleMesh().getCollisionShape().getAabb(btTransform::getIdentity(), btmin, btmax);
+            World::getWorld()->getTrack()->getTriangleMesh().getCollisionShape()
+                              .getAabb(btTransform::getIdentity(), btmin, btmax);
         }
         const Vec3 vmin = btmin, vmax = btmax;
         core::aabbox3df trackbox(vmin.toIrrVector(), vmax.toIrrVector() -
@@ -274,13 +316,16 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
             memcpy(m_shadows_cam[i], tmp, 24 * sizeof(float));
 
             std::vector<vector3df> vectors = getFrustrumVertex(*frustrum);
-            tmp_matrix = getTighestFitOrthoProj(SunCamViewMatrix, vectors, m_shadow_scales[i]);
+            tmp_matrix = getTighestFitOrthoProj(SunCamViewMatrix, vectors,
+                                                m_shadow_scales[i]);
 
 
             m_shadow_camnodes[i]->setProjectionMatrix(tmp_matrix, true);
             m_shadow_camnodes[i]->render();
 
-            sun_ortho_matrix.push_back(getVideoDriver()->getTransform(video::ETS_PROJECTION) * getVideoDriver()->getTransform(video::ETS_VIEW));
+            sun_ortho_matrix.push_back(
+                  getVideoDriver()->getTransform(video::ETS_PROJECTION) 
+                * getVideoDriver()->getTransform(video::ETS_VIEW)       );
         }
 
         // Rsm Matrix and camera
@@ -293,19 +338,24 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
             {
                 SunCamViewMatrix.transformBoxEx(trackbox);
                 core::matrix4 tmp_matrix;
-                tmp_matrix.buildProjectionMatrixOrthoLH(trackbox.MinEdge.X, trackbox.MaxEdge.X,
-                    trackbox.MaxEdge.Y, trackbox.MinEdge.Y,
-                    30, trackbox.MaxEdge.Z);
+                tmp_matrix.buildProjectionMatrixOrthoLH(trackbox.MinEdge.X,
+                                                        trackbox.MaxEdge.X,
+                                                        trackbox.MaxEdge.Y,
+                                                        trackbox.MinEdge.Y,
+                                                        30, trackbox.MaxEdge.Z);
                 m_suncam->setProjectionMatrix(tmp_matrix, true);
                 m_suncam->render();
             }
-            rsm_matrix = getVideoDriver()->getTransform(video::ETS_PROJECTION) * getVideoDriver()->getTransform(video::ETS_VIEW);
+            rsm_matrix = getVideoDriver()->getTransform(video::ETS_PROJECTION) 
+                       * getVideoDriver()->getTransform(video::ETS_VIEW);
             m_rsm_matrix_initialized = true;
             m_rsm_map_available = false;
         }
         rh_extend = core::vector3df(128, 64, 128);
         core::vector3df campos = camnode->getAbsolutePosition();
-        core::vector3df translation(8 * floor(campos.X / 8), 8 * floor(campos.Y / 8), 8 * floor(campos.Z / 8));
+        core::vector3df translation(8 * floor(campos.X / 8), 
+                                    8 * floor(campos.Y / 8),
+                                    8 * floor(campos.Z / 8));
         rh_matrix.setTranslation(translation);
 
 
@@ -317,19 +367,22 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
 
         size_t size = irr_driver->getShadowViewProj().size();
         for (unsigned i = 0; i < size; i++)
-            memcpy(&tmp[16 * i + 80], irr_driver->getShadowViewProj()[i].pointer(), 16 * sizeof(float));
+            memcpy(&tmp[16 * i + 80],
+                   irr_driver->getShadowViewProj()[i].pointer(),
+                   16 * sizeof(float));
     }
 
     tmp[144] = float(width);
     tmp[145] = float(height);
-    glBindBuffer(GL_UNIFORM_BUFFER, SharedGPUObjects::getViewProjectionMatricesUBO());
+    glBindBuffer(GL_UNIFORM_BUFFER, 
+                 SharedGPUObjects::getViewProjectionMatricesUBO());
     if (CVS->isSDSMEnabled())
     {
         glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 5) * sizeof(float), tmp);
-        glBufferSubData(GL_UNIFORM_BUFFER, (16 * 9) * sizeof(float), 2 * sizeof(float), &tmp[144]);
+        glBufferSubData(GL_UNIFORM_BUFFER, (16 * 9) * sizeof(float), 
+                        2 * sizeof(float), &tmp[144]);
     }
     else
-        glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 9 + 2) * sizeof(float), tmp);
-}
-
-
+        glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 9 + 2) * sizeof(float),
+                        tmp);
+}   // computeMatrixesAndCameras

From 52017e31ea9638dabb3321c27cbc65be764cd0ed Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 16:36:24 +1000
Subject: [PATCH 225/331] Removed unused shader.

---
 data/shaders/depthhistogram.comp | 55 --------------------------------
 src/graphics/shaders.cpp         | 11 -------
 src/graphics/shaders.hpp         |  6 ----
 3 files changed, 72 deletions(-)
 delete mode 100644 data/shaders/depthhistogram.comp

diff --git a/data/shaders/depthhistogram.comp b/data/shaders/depthhistogram.comp
deleted file mode 100644
index 76c46e701..000000000
--- a/data/shaders/depthhistogram.comp
+++ /dev/null
@@ -1,55 +0,0 @@
-uniform sampler2D depth;
-
-layout (local_size_x = 32, local_size_y = 32) in;
-
-layout (std430) buffer Histogram
-{
-    int bin[1024];
-    int mindepth;
-    int maxdepth;
-    int count;
-};
-
-vec4 getPosFromUVDepth(vec3 uvDepth, mat4 InverseProjectionMatrix);
-
-shared int sbin[1024];
-shared int smindepth;
-shared int smaxdepth;
-shared int scount;
-
-void main()
-{
-    int x = int(gl_GlobalInvocationID.x), y = int(gl_GlobalInvocationID.y);
-    vec2 uv = vec2(x, y) / screen;
-    float z = texture(depth, uv).x;
-    vec4 xpos = getPosFromUVDepth(vec3(uv, z), InverseProjectionMatrix);
-
-    int lineardepth = int(xpos.z * 4);
-
-
-    sbin[gl_LocalInvocationIndex] = 0;
-    if (gl_LocalInvocationIndex == 0) {
-        smindepth = 1000;
-        smaxdepth = 0;
-        scount = 0;
-    }
-
-    barrier();
-
-    if (lineardepth < 1000) {
-        atomicAdd(sbin[lineardepth], 1);
-        atomicAdd(scount, 1);
-        atomicMin(smindepth, lineardepth);
-        atomicMax(smaxdepth, lineardepth);
-     }
-
-    barrier();
-
-    atomicAdd(bin[gl_LocalInvocationIndex], sbin[gl_LocalInvocationIndex]);
-    if (gl_LocalInvocationIndex == 0) {
-        atomicAdd(count, scount);
-        atomicMin(mindepth, smindepth);
-        atomicMax(maxdepth, smaxdepth);
-    }
-}
-
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e4359519f..0c869507d 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -470,17 +470,6 @@ namespace FullScreenShader
         glShaderStorageBlockBinding(m_program, block_idx, 1);
     }
 
-    DepthHistogramShader::DepthHistogramShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "depthhistogram.comp",
-            GL_COMPUTE_SHADER, "utils/getPosFromUVDepth.frag");
-        assignSamplerNames(0, "depth", ST_NEAREST_FILTERED);
-
-        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "Histogram");
-        glShaderStorageBlockBinding(m_program, block_idx, 1);
-    }
-
     GlowShader::GlowShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 25af8cf25..dfd277eeb 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -95,12 +95,6 @@ public:
     ShadowMatrixesGenerationShader();
 };
 
-class DepthHistogramShader : public TextureShader<DepthHistogramShader, 1>
-{
-public:
-    DepthHistogramShader();
-};
-
 class GlowShader : public TextureShader<GlowShader, 1>
 {
 public:

From 553a0a8b58346cc19066ff8e2e9703df5b65cf35 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 16:40:47 +1000
Subject: [PATCH 226/331] Moved more shaders.

---
 src/graphics/shaders.cpp         | 13 -------------
 src/graphics/shaders.hpp         |  7 -------
 src/graphics/shadow_matrixes.cpp | 26 ++++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 0c869507d..e88d7a0f4 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -457,19 +457,6 @@ namespace FullScreenShader
         assignUniforms("direction", "col");
     }
 
-
-
-    ShadowMatrixesGenerationShader::ShadowMatrixesGenerationShader()
-    {
-        loadProgram(OBJECT,
-            GL_COMPUTE_SHADER, "shadowmatrixgeneration.comp");
-        assignUniforms("SunCamMatrix");
-        GLuint block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
-        glShaderStorageBlockBinding(m_program, block_idx, 2);
-        block_idx = glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK, "NewMatrixData");
-        glShaderStorageBlockBinding(m_program, block_idx, 1);
-    }
-
     GlowShader::GlowShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index dfd277eeb..2fed461c8 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,13 +88,6 @@ public:
     SunLightShader();
 };
 
-
-class ShadowMatrixesGenerationShader : public Shader <ShadowMatrixesGenerationShader, core::matrix4>
-{
-public:
-    ShadowMatrixesGenerationShader();
-};
-
 class GlowShader : public TextureShader<GlowShader, 1>
 {
 public:
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 054787ae2..7e94b9729 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -53,6 +53,28 @@ public:
     }   // LightspaceBoundingBoxShader
 };   // LightspaceBoundingBoxShader
 
+// ============================================================================
+class ShadowMatricesGenerationShader 
+    : public Shader <ShadowMatricesGenerationShader, core::matrix4>
+{
+public:
+    ShadowMatricesGenerationShader()
+    {
+        loadProgram(OBJECT,  GL_COMPUTE_SHADER, "shadowmatrixgeneration.comp");
+        assignUniforms("SunCamMatrix");
+        GLuint block_idx = 
+            glGetProgramResourceIndex(m_program, 
+                                      GL_SHADER_STORAGE_BLOCK, "BoundingBoxes");
+        glShaderStorageBlockBinding(m_program, block_idx, 2);
+        block_idx = 
+            glGetProgramResourceIndex(m_program, GL_SHADER_STORAGE_BLOCK,
+                                      "NewMatrixData");
+        glShaderStorageBlockBinding(m_program, block_idx, 1);
+    }
+
+
+};   // ShadowMatricesGenerationShader
+
 // ============================================================================
 static std::vector<vector3df> getFrustrumVertex(const scene::SViewFrustum &frustrum)
 {
@@ -194,8 +216,8 @@ void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
                  GL_STATIC_COPY);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, tempShadowMatssbo);
 
-    FullScreenShader::ShadowMatrixesGenerationShader::getInstance()->use();
-    FullScreenShader::ShadowMatrixesGenerationShader::getInstance()
+    ShadowMatricesGenerationShader::getInstance()->use();
+    ShadowMatricesGenerationShader::getInstance()
         ->setUniforms(m_suncam->getViewMatrix());
     glDispatchCompute(4, 1, 1);
 

From 0c2e6c1640a23361bbb45ac0f903a01306b1d534 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 18:51:26 +1000
Subject: [PATCH 227/331] Moved more shaders.

---
 src/graphics/post_processing.cpp | 67 ++++++++++++++++++++++++++++----
 src/graphics/shaders.cpp         | 34 ----------------
 src/graphics/shaders.hpp         | 20 ----------
 3 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 5c4d325a4..ae063c734 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -448,6 +448,57 @@ public:
     }   // LinearizeDepthShader
 };   // LinearizeDepthShader
 
+// ============================================================================
+class GlowShader : public TextureShader < GlowShader, 1 >
+{
+public:
+    GLuint vao;
+
+    GlowShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+            GL_FRAGMENT_SHADER, "glow.frag");
+        assignUniforms();
+
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
+        vao = createVAO();
+    }   // GlowShader
+};   // GlowShader
+
+// ============================================================================
+class SSAOShader : public TextureShader<SSAOShader, 1, float, float, float>
+{
+public:
+    SSAOShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "ssao.frag");
+
+        assignUniforms("radius", "k", "sigma");
+        assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
+    }   // SSAOShader
+};   // SSAOShader
+
+// ============================================================================
+class MotionBlurShader : public TextureShader<MotionBlurShader, 2,
+                                              core::matrix4, core::vector2df,
+                                              float, float>
+{
+public:
+    MotionBlurShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "motion_blur.frag");
+        assignUniforms("previous_viewproj", "center", "boost_amount",
+                        "mask_radius");
+        assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
+    }    // MotionBlurShader
+};   // MotionBlurShader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -1003,11 +1054,11 @@ void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 // ----------------------------------------------------------------------------
 void PostProcessing::renderGlow(unsigned tex)
 {
-    FullScreenShader::GlowShader::getInstance()->use();
-    glBindVertexArray(FullScreenShader::GlowShader::getInstance()->vao);
+    GlowShader::getInstance()->use();
+    glBindVertexArray(GlowShader::getInstance()->vao);
 
-    FullScreenShader::GlowShader::getInstance()->setTextureUnits(tex);
-    FullScreenShader::GlowShader::getInstance()->setUniforms();
+    GlowShader::getInstance()->setTextureUnits(tex);
+    GlowShader::getInstance()->setUniforms();
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }   // renderGlow
@@ -1027,11 +1078,11 @@ void PostProcessing::renderSSAO()
          irr_driver->getSceneManager()->getActiveCamera()->getFarValue()  );
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    FullScreenShader::SSAOShader::getInstance()
+    SSAOShader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
     glGenerateMipmap(GL_TEXTURE_2D);
 
-    DrawFullScreenEffect<FullScreenShader::SSAOShader>
+    DrawFullScreenEffect<SSAOShader>
         (irr_driver->getSSAORadius(), irr_driver->getSSAOK(),
          irr_driver->getSSAOSigma()                           );
 }
@@ -1064,10 +1115,10 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    FullScreenShader::MotionBlurShader::getInstance()
+    MotionBlurShader::getInstance()
         ->setTextureUnits(in_fbo.getRTT()[0], 
                           irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::MotionBlurShader>
+    DrawFullScreenEffect<MotionBlurShader>
         (// Todo : use a previousPVMatrix per cam, not global
          cam->getPreviousPVMatrix(),
          core::vector2df(0.5, 0.5),
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index e88d7a0f4..1bf4167f2 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -457,29 +457,6 @@ namespace FullScreenShader
         assignUniforms("direction", "col");
     }
 
-    GlowShader::GlowShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "glow.frag");
-        assignUniforms();
-
-        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-        vao = createVAO();
-    }
-
-    SSAOShader::SSAOShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "ssao.frag");
-
-        assignUniforms("radius", "k", "sigma");
-        assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
-    }
-
     FogShader::FogShader()
     {
         loadProgram(OBJECT,
@@ -491,17 +468,6 @@ namespace FullScreenShader
         assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }
 
-    MotionBlurShader::MotionBlurShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "motion_blur.frag");
-        assignUniforms("previous_viewproj", "center", "boost_amount", "mask_radius");
-        assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
-                           1, "dtex", ST_NEAREST_FILTERED);
-    }
-
     GodFadeShader::GodFadeShader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 2fed461c8..329bd4929 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -88,32 +88,12 @@ public:
     SunLightShader();
 };
 
-class GlowShader : public TextureShader<GlowShader, 1>
-{
-public:
-    GLuint vao;
-
-    GlowShader();
-};
-
-class SSAOShader : public TextureShader<SSAOShader, 1, float, float, float>
-{
-public:
-    SSAOShader();
-};
-
 class FogShader : public TextureShader<FogShader, 1, float, core::vector3df>
 {
 public:
     FogShader();
 };
 
-class MotionBlurShader : public TextureShader<MotionBlurShader, 2, core::matrix4, core::vector2df, float, float>
-{
-public:
-    MotionBlurShader();
-};
-
 class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
 {
 public:

From ab4f77e80e41af8feb3588a6a485f486face59e4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 18:55:32 +1000
Subject: [PATCH 228/331] Moved more shaders.

---
 src/graphics/post_processing.cpp | 35 ++++++++++++++++++++++++++++----
 src/graphics/shaders.cpp         | 20 ------------------
 src/graphics/shaders.hpp         | 12 -----------
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index ae063c734..5dc62644e 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -499,6 +499,33 @@ public:
     }    // MotionBlurShader
 };   // MotionBlurShader
 
+// ============================================================================
+class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
+{
+public:
+    GodFadeShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "godfade.frag");
+        assignUniforms("col");
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
+    }   // GodFadeShader
+};
+
+// ============================================================================
+class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
+{
+public:
+    GodRayShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "godray.frag");
+
+        assignUniforms("sunpos");
+        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
+    }   // GodRayShader
+};   // GodRayShader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -1129,15 +1156,15 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
 // ----------------------------------------------------------------------------
 static void renderGodFade(GLuint tex, const SColor &col)
 {
-    FullScreenShader::GodFadeShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<FullScreenShader::GodFadeShader>(col);
+    GodFadeShader::getInstance()->setTextureUnits(tex);
+    DrawFullScreenEffect<GodFadeShader>(col);
 }   // renderGodFade
 
 // ----------------------------------------------------------------------------
 static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
 {
-    FullScreenShader::GodRayShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<FullScreenShader::GodRayShader>(sunpos);
+    GodRayShader::getInstance()->setTextureUnits(tex);
+    DrawFullScreenEffect<GodRayShader>(sunpos);
 }   // renderGodRay
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 1bf4167f2..8509c0e58 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -468,26 +468,6 @@ namespace FullScreenShader
         assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }
 
-    GodFadeShader::GodFadeShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "godfade.frag");
-        assignUniforms("col");
-
-        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-    }
-
-    GodRayShader::GodRayShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "godray.frag");
-
-        assignUniforms("sunpos");
-        assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-    }
-
     MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
     {
         loadProgram(OBJECT,
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 329bd4929..6b5c3a1ec 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -94,18 +94,6 @@ public:
     FogShader();
 };
 
-class GodFadeShader : public TextureShader<GodFadeShader, 1, video::SColorf>
-{
-public:
-    GodFadeShader();
-};
-
-class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
-{
-public:
-    GodRayShader();
-};
-
 class MLAAColorEdgeDetectionSHader : public TextureShader<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
 {
 public:

From e0b1e876f0c9b890004660ab0c95e22d02bc1688 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 21:10:49 +1000
Subject: [PATCH 229/331] Moved more shaders.

---
 src/graphics/post_processing.cpp | 64 +++++++++++++++++++++++++++-----
 src/graphics/shaders.cpp         | 31 ----------------
 src/graphics/shaders.hpp         | 18 ---------
 3 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 5dc62644e..34708d4ca 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -526,6 +526,51 @@ public:
     }   // GodRayShader
 };   // GodRayShader
 
+// ============================================================================
+class MLAAColorEdgeDetectionSHader 
+    : public TextureShader<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
+{
+public:
+    MLAAColorEdgeDetectionSHader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "mlaa_color1.frag");
+        assignUniforms("PIXEL_SIZE");
+        assignSamplerNames(0, "colorMapG", ST_NEAREST_FILTERED);
+    }   // MLAAColorEdgeDetectionSHader
+};   // MLAAColorEdgeDetectionSHader
+
+// ============================================================================
+class MLAABlendWeightSHader : public TextureShader<MLAABlendWeightSHader,
+                                                   2, core::vector2df>
+{
+public:
+    MLAABlendWeightSHader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
+        assignUniforms("PIXEL_SIZE");
+
+        assignSamplerNames(0, "edgesMap", ST_BILINEAR_FILTERED,
+                           1, "areaMap", ST_NEAREST_FILTERED);
+    }   // MLAABlendWeightSHader
+};   // MLAABlendWeightSHader
+
+// ============================================================================
+class MLAAGatherSHader : public TextureShader<MLAAGatherSHader, 2,
+                                              core::vector2df>
+{
+public:
+    MLAAGatherSHader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
+        assignUniforms("PIXEL_SIZE");
+        assignSamplerNames(0, "blendMap", ST_NEAREST_FILTERED,
+                           1, "colorMap", ST_NEAREST_FILTERED);
+    }   // MLAAGatherSHader
+};   // MLAAGatherSHader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -1199,11 +1244,10 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
     // Pass 1: color edge detection
-    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()->use();
-    FullScreenShader::MLAAColorEdgeDetectionSHader::getInstance()
+    MLAAColorEdgeDetectionSHader::getInstance()->use();
+    MLAAColorEdgeDetectionSHader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
-    DrawFullScreenEffect<FullScreenShader::MLAAColorEdgeDetectionSHader>
-                                                                  (PIXEL_SIZE);
+    DrawFullScreenEffect<MLAAColorEdgeDetectionSHader>(PIXEL_SIZE);
 
     glStencilFunc(GL_EQUAL, 1, ~0);
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
@@ -1212,11 +1256,11 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_BLEND).Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    FullScreenShader::MLAABlendWeightSHader::getInstance()->use();
-    FullScreenShader::MLAABlendWeightSHader::getInstance()
+    MLAABlendWeightSHader::getInstance()->use();
+    MLAABlendWeightSHader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP),
                           getTextureGLuint(m_areamap));
-    DrawFullScreenEffect<FullScreenShader::MLAABlendWeightSHader>(PIXEL_SIZE);
+    DrawFullScreenEffect<MLAABlendWeightSHader>(PIXEL_SIZE);
 
     // Blit in to tmp1
     FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS),
@@ -1225,11 +1269,11 @@ void PostProcessing::applyMLAA()
     // Pass 3: gather
     irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
 
-    FullScreenShader::MLAAGatherSHader::getInstance()->use();
-    FullScreenShader::MLAAGatherSHader::getInstance()
+    MLAAGatherSHader::getInstance()->use();
+    MLAAGatherSHader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND),
                           irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
-    DrawFullScreenEffect<FullScreenShader::MLAAGatherSHader>(PIXEL_SIZE);
+    DrawFullScreenEffect<MLAAGatherSHader>(PIXEL_SIZE);
 
     // Done.
     glDisable(GL_STENCIL_TEST);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 8509c0e58..4ac0eb0dc 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -468,35 +468,4 @@ namespace FullScreenShader
         assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }
 
-    MLAAColorEdgeDetectionSHader::MLAAColorEdgeDetectionSHader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "mlaa_color1.frag");
-        assignUniforms("PIXEL_SIZE");
-
-        assignSamplerNames(0, "colorMapG", ST_NEAREST_FILTERED);
-    }
-
-    MLAABlendWeightSHader::MLAABlendWeightSHader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "mlaa_blend2.frag");
-        assignUniforms("PIXEL_SIZE");
-
-        assignSamplerNames(0, "edgesMap", ST_BILINEAR_FILTERED,
-                           1, "areaMap", ST_NEAREST_FILTERED);
-    }
-
-    MLAAGatherSHader::MLAAGatherSHader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "mlaa_neigh3.frag");
-        assignUniforms("PIXEL_SIZE");
-
-        assignSamplerNames(0, "blendMap", ST_NEAREST_FILTERED,
-                           1, "colorMap", ST_NEAREST_FILTERED);
-    }
 }
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 6b5c3a1ec..2653600be 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -94,24 +94,6 @@ public:
     FogShader();
 };
 
-class MLAAColorEdgeDetectionSHader : public TextureShader<MLAAColorEdgeDetectionSHader, 1, core::vector2df>
-{
-public:
-    MLAAColorEdgeDetectionSHader();
-};
-
-class MLAABlendWeightSHader : public TextureShader<MLAABlendWeightSHader, 2, core::vector2df>
-{
-public:
-    MLAABlendWeightSHader();
-};
-
-class MLAAGatherSHader : public TextureShader<MLAAGatherSHader, 2, core::vector2df>
-{
-public:
-    MLAAGatherSHader();
-};
-
 }
 
 #define FOREACH_SHADER(ACT) \

From d64428db34a9555d856442ba8cc734160e2e470e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 19 May 2015 23:01:36 +1000
Subject: [PATCH 230/331] Moved more shaders, cleaned up unused code and other
 left-over bits.

---
 src/graphics/post_processing.cpp | 25 +++++++++++-
 src/graphics/render_lighting.cpp | 18 ++++++++-
 src/graphics/shaders.cpp         | 67 --------------------------------
 src/graphics/shaders.hpp         | 17 --------
 4 files changed, 39 insertions(+), 88 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 34708d4ca..48eddac25 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -571,6 +571,27 @@ public:
     }   // MLAAGatherSHader
 };   // MLAAGatherSHader
 
+// ============================================================================
+class SunLightShader : public TextureShader<SunLightShader, 2,
+                                            core::vector3df, video::SColorf>
+{
+public:
+    SunLightShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
+                            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
+                            GL_FRAGMENT_SHADER, "sunlight.frag");
+
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED);
+        assignUniforms("direction", "col");
+    }   // SunLightShader
+};   // SunLightShader
+
 // ============================================================================
 
 PostProcessing::PostProcessing(IVideoDriver* video_driver)
@@ -827,10 +848,10 @@ void PostProcessing::renderSunlight(const core::vector3df &direction,
     glBlendFunc(GL_ONE, GL_ONE);
     glBlendEquation(GL_FUNC_ADD);
 
-    FullScreenShader::SunLightShader::getInstance()
+    SunLightShader::getInstance()
         ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
                           irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::SunLightShader>(direction, col);
+    DrawFullScreenEffect<SunLightShader>(direction, col);
 }   // renderSunlight
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 49f5ed0da..9397d3c9e 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -259,6 +259,20 @@ public:
     }   // NVWorkaroundRadianceHintsConstructionShader
 };   // NVWorkaroundRadianceHintsConstructionShader
 
+// ============================================================================
+class FogShader : public TextureShader<FogShader, 1, float, core::vector3df>
+{
+public:
+    FogShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
+                            GL_FRAGMENT_SHADER, "fog.frag");
+        assignUniforms("density", "col");
+        assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
+    }   // FogShader
+};   // FogShader
+
 // ============================================================================
 static void renderPointLights(unsigned count)
 {
@@ -529,9 +543,9 @@ void IrrDriver::renderAmbientScatter()
     glBlendEquation(GL_FUNC_ADD);
     glBlendFunc(GL_ONE, GL_ONE);
 
-    FullScreenShader::FogShader::getInstance()
+    FogShader::getInstance()
         ->setTextureUnits(irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FullScreenShader::FogShader>(1.f / (40.f * start), col);
+    DrawFullScreenEffect<FogShader>(1.f / (40.f * start), col);
 }   // renderAmbientScatter
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 4ac0eb0dc..fff958c4e 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -344,42 +344,6 @@ void Shaders::check(const int num)
     }
 }   // check
 
-// ----------------------------------------------------------------------------
-void bypassUBO(GLuint Program)
-{
-    GLint VM = glGetUniformLocation(Program, "ViewMatrix");
-    glUniformMatrix4fv(VM, 1, GL_FALSE, irr_driver->getViewMatrix().pointer());
-    GLint PM = glGetUniformLocation(Program, "ProjectionMatrix");
-    glUniformMatrix4fv(PM, 1, GL_FALSE, irr_driver->getProjMatrix().pointer());
-    GLint IVM = glGetUniformLocation(Program, "InverseViewMatrix");
-    glUniformMatrix4fv(IVM, 1, GL_FALSE, irr_driver->getInvViewMatrix().pointer());
-    GLint IPM = glGetUniformLocation(Program, "InverseProjectionMatrix");
-    glUniformMatrix4fv(IPM, 1, GL_FALSE, irr_driver->getInvProjMatrix().pointer());
-    GLint Screen = glGetUniformLocation(Program, "screen");
-    glUniform2f(Screen, irr_driver->getCurrentScreenSize().X, irr_driver->getCurrentScreenSize().Y);
-    GLint bLmn = glGetUniformLocation(Program, "blueLmn[0]");
-    glUniform1fv(bLmn, 9, irr_driver->blueSHCoeff);
-    GLint gLmn = glGetUniformLocation(Program, "greenLmn[0]");
-    glUniform1fv(gLmn, 9, irr_driver->greenSHCoeff);
-    GLint rLmn = glGetUniformLocation(Program, "redLmn[0]");
-    glUniform1fv(rLmn, 9, irr_driver->redSHCoeff);
-    GLint sundir = glGetUniformLocation(Program, "sun_direction");
-    glUniform3f(sundir, irr_driver->getSunDirection().X, irr_driver->getSunDirection().Y, irr_driver->getSunDirection().Z);
-    GLint suncol = glGetUniformLocation(Program, "sun_col");
-    glUniform3f(suncol, irr_driver->getSunColor().getRed(), irr_driver->getSunColor().getGreen(), irr_driver->getSunColor().getBlue());
-    GLint sunangle = glGetUniformLocation(Program, "sun_angle");
-    glUniform1f(sunangle, 0.54f);
-}
-
-namespace UtilShader
-{
-}
-
-
-using namespace UtilShader;
-
-
-
 
 unsigned getGLSLVersion()
 {
@@ -438,34 +402,3 @@ namespace MeshShader
 
 }
 
-namespace FullScreenShader
-{
-
-    SunLightShader::SunLightShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/decodeNormal.frag",
-            GL_FRAGMENT_SHADER, "utils/SpecularBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/DiffuseBRDF.frag",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "utils/SunMRP.frag",
-            GL_FRAGMENT_SHADER, "sunlight.frag");
-
-        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
-                           1, "dtex", ST_NEAREST_FILTERED);
-        assignUniforms("direction", "col");
-    }
-
-    FogShader::FogShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
-            GL_FRAGMENT_SHADER, "fog.frag");
-
-        assignUniforms("density", "col");
-        assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
-    }
-
-}
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 2653600be..6cd255306 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -78,23 +78,6 @@ static void DrawFullScreenEffect(Args...args)
     glDrawArrays(GL_TRIANGLES, 0, 3);
 }
 
-namespace FullScreenShader
-{
-
-
-class SunLightShader : public TextureShader<SunLightShader, 2,  core::vector3df, video::SColorf>
-{
-public:
-    SunLightShader();
-};
-
-class FogShader : public TextureShader<FogShader, 1, float, core::vector3df>
-{
-public:
-    FogShader();
-};
-
-}
 
 #define FOREACH_SHADER(ACT) \
     ACT(ES_NORMAL_MAP) \

From e241f167a75483b8f84668e3dd195aa27b63b48a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 08:41:03 +1000
Subject: [PATCH 231/331] Started to remove global DrawFullScreenEffect
 template.

---
 src/graphics/post_processing.cpp | 128 +++++++++++++++++--------------
 src/graphics/post_processing.hpp |   7 +-
 src/graphics/render.cpp          |   2 +-
 src/graphics/render_lighting.cpp |   5 +-
 src/graphics/shader.hpp          |   9 +++
 5 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 48eddac25..bcc92277e 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -298,6 +298,13 @@ public:
         assignUniforms("vignette_weight");
         assignSamplerNames(0, "text", ST_NEAREST_FILTERED);
     }   // ToneMapShader
+    // ----------------------------------------------------------------------------
+    void render(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
+    {
+        fbo.Bind();
+        setTextureUnits(rtt);
+        drawFullScreenEffect(vignette_weight);
+    }   // render
 };   // ToneMapShader
 
 // ============================================================================
@@ -361,7 +368,7 @@ public:
     {
         loadProgram(OBJECT, GL_VERTEX_SHADER, "rhdebug.vert",
                             GL_FRAGMENT_SHADER, "rhdebug.frag");
-        assignUniforms("RHMatrix", "extents");
+        assignUniforms("rh_matrix", "extents");
         m_tu_shr = 0;
         m_tu_shg = 1;
         m_tu_shb = 2;
@@ -383,13 +390,26 @@ public:
                             GL_FRAGMENT_SHADER, "utils/getPosFromUVDepth.frag",
                             GL_FRAGMENT_SHADER, "gi.frag");
 
-        assignUniforms("RHMatrix", "InvRHMatrix", "extents");
+        assignUniforms("rh_matrix", "inv_rh_matrix", "extents");
         assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
                            1, "dtex", ST_NEAREST_FILTERED,
                            2, "SHR", ST_VOLUME_LINEAR_FILTERED,
                            3, "SHG", ST_VOLUME_LINEAR_FILTERED,
                            4, "SHB", ST_VOLUME_LINEAR_FILTERED);
     }   // GlobalIlluminationReconstructionShader
+
+    // ------------------------------------------------------------------------
+    void render(const core::matrix4 &rh_matrix,
+                const core::vector3df &rh_extend, const FrameBuffer &fb)
+    {
+        core::matrix4 inv_rh_matrix;
+        rh_matrix.getInverse(inv_rh_matrix);
+        glDisable(GL_DEPTH_TEST);
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                        irr_driver->getDepthStencilTexture(),
+                        fb.getRTT()[0], fb.getRTT()[1], fb.getRTT()[2]);
+        drawFullScreenEffect(rh_matrix, inv_rh_matrix, rh_extend);
+    }   // render
 };   // GlobalIlluminationReconstructionShader
 
 // ============================================================================
@@ -403,6 +423,13 @@ public:
         assignUniforms("width", "height");
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // PassThroughShader
+    // ------------------------------------------------------------------------
+    void render(GLuint tex, unsigned width, unsigned height)
+    {
+        PassThroughShader::getInstance()->setTextureUnits(tex);
+        drawFullScreenEffect(width, height);
+    }   // render
+
 };   // PassThroughShader
 
 // ============================================================================
@@ -451,18 +478,27 @@ public:
 // ============================================================================
 class GlowShader : public TextureShader < GlowShader, 1 >
 {
+private:
+    GLuint m_vao;
 public:
-    GLuint vao;
 
     GlowShader()
     {
         loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
-            GL_FRAGMENT_SHADER, "glow.frag");
+                            GL_FRAGMENT_SHADER, "glow.frag");
         assignUniforms();
-
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
-        vao = createVAO();
+        m_vao = createVAO();
     }   // GlowShader
+    // ------------------------------------------------------------------------
+    void render(unsigned tex)
+    {
+        use();
+        glBindVertexArray(m_vao);
+        setTextureUnits(tex);
+        setUniforms();
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    }   // render
 };   // GlowShader
 
 // ============================================================================
@@ -510,7 +546,13 @@ public:
         assignUniforms("col");
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // GodFadeShader
-};
+    // ----------------------------------------------------------------------------
+    void render(GLuint tex, const SColor &col)
+    {
+        setTextureUnits(tex);
+        drawFullScreenEffect(col);
+    }   // render
+};   // GodFadeShader
 
 // ============================================================================
 class GodRayShader : public TextureShader<GodRayShader, 1, core::vector2df>
@@ -524,6 +566,12 @@ public:
         assignUniforms("sunpos");
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED);
     }   // GodRayShader
+    // ----------------------------------------------------------------------------
+    void render(GLuint tex, const core::vector2df &sunpos)
+    {
+        setTextureUnits(tex);
+        DrawFullScreenEffect<GodRayShader>(sunpos);
+    }   // render
 };   // GodRayShader
 
 // ============================================================================
@@ -825,18 +873,13 @@ void PostProcessing::renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB,
 }   // renderRHDebug
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderGI(const core::matrix4 &RHMatrix,
-                              const core::vector3df &rh_extend, GLuint shr,
-                              GLuint shg, GLuint shb)
+void PostProcessing::renderGI(const core::matrix4 &rh_matrix,
+                              const core::vector3df &rh_extend,
+                              const FrameBuffer &fb)
 {
-    core::matrix4 InvRHMatrix;
-    RHMatrix.getInverse(InvRHMatrix);
-    glDisable(GL_DEPTH_TEST);
-    GlobalIlluminationReconstructionShader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), 
-                          irr_driver->getDepthStencilTexture(), shr, shg, shb);
-    DrawFullScreenEffect<GlobalIlluminationReconstructionShader>
-                                     (RHMatrix, InvRHMatrix, rh_extend);
+    GlobalIlluminationReconstructionShader::getInstance()->render(rh_matrix,
+                                                                  rh_extend,
+                                                                  fb);
 }   // renderGI
 
 // ----------------------------------------------------------------------------
@@ -1126,8 +1169,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
 void PostProcessing::renderPassThrough(GLuint tex, unsigned width,
                                        unsigned height)
 {
-    PassThroughShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<PassThroughShader>(width, height);
+    PassThroughShader::getInstance()->render(tex, width, height);
 }   // renderPassThrough
 
 // ----------------------------------------------------------------------------
@@ -1147,13 +1189,7 @@ void PostProcessing::renderTextureLayer(unsigned tex, unsigned layer)
 // ----------------------------------------------------------------------------
 void PostProcessing::renderGlow(unsigned tex)
 {
-    GlowShader::getInstance()->use();
-    glBindVertexArray(GlowShader::getInstance()->vao);
-
-    GlowShader::getInstance()->setTextureUnits(tex);
-    GlowShader::getInstance()->setUniforms();
-
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    GlowShader::getInstance()->render(tex);
 }   // renderGlow
 
 // ----------------------------------------------------------------------------
@@ -1219,27 +1255,6 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
          0.15f);
 }   // renderMotionBlur
 
-// ----------------------------------------------------------------------------
-static void renderGodFade(GLuint tex, const SColor &col)
-{
-    GodFadeShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<GodFadeShader>(col);
-}   // renderGodFade
-
-// ----------------------------------------------------------------------------
-static void renderGodRay(GLuint tex, const core::vector2df &sunpos)
-{
-    GodRayShader::getInstance()->setTextureUnits(tex);
-    DrawFullScreenEffect<GodRayShader>(sunpos);
-}   // renderGodRay
-
-// ----------------------------------------------------------------------------
-static void toneMap(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
-{
-    fbo.Bind();
-    ToneMapShader::getInstance()->setTextureUnits(rtt);
-    DrawFullScreenEffect<ToneMapShader>(vignette_weight);
-}   // toneMap
 
 // ----------------------------------------------------------------------------
 static void renderDoF(FrameBuffer &fbo, GLuint rtt)
@@ -1357,7 +1372,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             irr_driver->getFBO(FBO_QUARTER1).Bind();
             glViewport(0, 0, irr_driver->getActualScreenSize().Width / 4,
                              irr_driver->getActualScreenSize().Height / 4);
-            renderGodFade(out_fbo->getRTT()[0], col);
+            GodFadeShader::getInstance()->render(out_fbo->getRTT()[0], col);
 
             // Blur
             renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER1),
@@ -1381,8 +1396,9 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
 
             // Rays please
             irr_driver->getFBO(FBO_QUARTER2).Bind();
-            renderGodRay(irr_driver->getRenderTargetTexture(RTT_QUARTER1),
-                         core::vector2df(sunx, suny));
+            GodRayShader::getInstance()
+                ->render(irr_driver->getRenderTargetTexture(RTT_QUARTER1),
+                       core::vector2df(sunx, suny)                       );
 
             // Blur
             renderGaussian3Blur(irr_driver->getFBO(FBO_QUARTER2),
@@ -1484,14 +1500,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
         PROFILER_PUSH_CPU_MARKER("- Tonemap", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_TONEMAP));
 		// only enable vignette during race
-		if(isRace)
-		{
-			toneMap(*out_fbo, in_fbo->getRTT()[0], 1.0);
-		}
-		else
-		{
-			toneMap(*out_fbo, in_fbo->getRTT()[0], 0.0);
-		}
+        ToneMapShader::getInstance()->render(*out_fbo, in_fbo->getRTT()[0],
+                                             isRace ? 1.0f : 0.0f);
         std::swap(in_fbo, out_fbo);
         PROFILER_POP_CPU_MARKER();
     }
diff --git a/src/graphics/post_processing.hpp b/src/graphics/post_processing.hpp
index 4a0539cb9..d91f7fc72 100644
--- a/src/graphics/post_processing.hpp
+++ b/src/graphics/post_processing.hpp
@@ -84,10 +84,9 @@ public:
     void renderRHDebug(unsigned SHR, unsigned SHG, unsigned SHB, 
                        const core::matrix4 &rh_matrix,
                        const core::vector3df &rh_extend);
-    void renderGI(const core::matrix4 &RHMatrix,
-                  const core::vector3df &rh_extend, unsigned shr,
-                  unsigned shg, unsigned shb);
-
+    void renderGI(const core::matrix4 &rh_matrix,
+                  const core::vector3df &rh_extend,
+                  const FrameBuffer &fb);
     /** Blur the in texture */
     void renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
 
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 422d7877d..e9edd0277 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -532,7 +532,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     {
         glDisable(GL_BLEND);
         m_rtts->getFBO(FBO_COLORS).Bind();
-        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2]);
+        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
     }
 
     PROFILER_PUSH_CPU_MARKER("- Glow", 0xFF, 0xFF, 0x00);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 9397d3c9e..f4f9e0219 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -449,10 +449,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     if (CVS->isGlobalIlluminationEnabled() && hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
-        m_post_processing->renderGI(rh_matrix, rh_extend,
-                                    m_rtts->getRH().getRTT()[0],
-                                    m_rtts->getRH().getRTT()[1],
-                                    m_rtts->getRH().getRTT()[2]);
+        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
     }
 
     m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index 60975b869..a6da98c42 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -356,6 +356,15 @@ public:
         }
     }   // loadProgram
 
+    // ------------------------------------------------------------------------
+    template<typename... Args>
+    void drawFullScreenEffect(Args...args)
+    {
+        use();
+        glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
+        setUniforms(args...);
+        glDrawArrays(GL_TRIANGLES, 0, 3);
+    }   // drawFullScreenEffect
 
 };   // Shader
 

From 4ef85d692ce72c0959a7bc782f79eb55d831db0b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 09:09:34 +1000
Subject: [PATCH 232/331] Replaced one more call to DrawFulLScreenEffect.

---
 src/graphics/post_processing.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index bcc92277e..fc7675e8b 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -251,6 +251,12 @@ public:
         assignUniforms();
         assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }   // BloomShader
+    // ------------------------------------------------------------------------
+    void render(GLuint in)
+    {
+        BloomShader::getInstance()->setTextureUnits(in);
+        drawFullScreenEffect();
+    }   // render
 };   // BloomShader
 
 // ============================================================================
@@ -570,7 +576,7 @@ public:
     void render(GLuint tex, const core::vector2df &sunpos)
     {
         setTextureUnits(tex);
-        DrawFullScreenEffect<GodRayShader>(sunpos);
+        drawFullScreenEffect(sunpos);
     }   // render
 };   // GodRayShader
 
@@ -812,8 +818,7 @@ void PostProcessing::update(float dt)
 // ----------------------------------------------------------------------------
 static void renderBloom(GLuint in)
 {
-    BloomShader::getInstance()->setTextureUnits(in);
-    DrawFullScreenEffect<BloomShader>();
+    BloomShader::getInstance()->render(in);
 }   // renderBloom
 
 // ----------------------------------------------------------------------------

From 063fb6b65f86330784f84ef6ce1f6167db806b45 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 09:19:59 +1000
Subject: [PATCH 233/331] Try to fix linux compilation.

---
 src/graphics/shader.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index a6da98c42..e0140147f 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -20,6 +20,7 @@
 
 #include "graphics/central_settings.hpp"
 #include "graphics/gl_headers.hpp"
+#include "graphics/shared_gpu_objects.hpp"
 #include "utils/singleton.hpp"
 
 #include <matrix4.h>

From dec62d63eaf3720105b3a0ae74e822271b0dc97e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 10:08:38 +1000
Subject: [PATCH 234/331] Fixed linux compilation.

---
 src/graphics/shader.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index e0140147f..ad83d6a67 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -358,7 +358,6 @@ public:
     }   // loadProgram
 
     // ------------------------------------------------------------------------
-    template<typename... Args>
     void drawFullScreenEffect(Args...args)
     {
         use();

From 8e6d9d2f414ca51668c3f8c19c4d04f6af24a045 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 16:53:30 +1000
Subject: [PATCH 235/331] Removed more references to global
 DrawFullScreenEffect function.

---
 src/graphics/post_processing.cpp | 49 +++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index fc7675e8b..57ed4e9b0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -55,6 +55,13 @@ public:
 
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian3HBlurShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &auxiliary, float inv_width,
+                float inv_height)
+    {
+        setTextureUnits(auxiliary.getRTT()[0]);
+        drawFullScreenEffect(core::vector2df(inv_width, inv_height));
+    }   // render
 };   // Gaussian3HBlurShader
 
 // ============================================================================
@@ -103,6 +110,12 @@ public:
 
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian3VBlurShader
+    // ------------------------------------------------------------------------
+    void render(FrameBuffer in_fbo, float inv_width, float inv_height)
+    {
+        setTextureUnits(in_fbo.getRTT()[0]);
+        drawFullScreenEffect(core::vector2df(inv_width, inv_height));
+    }   // render
 };   // Gaussian3VBlurShader
 
 // ============================================================================
@@ -644,6 +657,18 @@ public:
                            1, "dtex", ST_NEAREST_FILTERED);
         assignUniforms("direction", "col");
     }   // SunLightShader
+    // ------------------------------------------------------------------------
+    void render(const core::vector3df &direction, const video::SColorf &col)
+    {
+        glEnable(GL_BLEND);
+        glDisable(GL_DEPTH_TEST);
+        glBlendFunc(GL_ONE, GL_ONE);
+        glBlendEquation(GL_FUNC_ADD);
+
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                        irr_driver->getDepthStencilTexture());
+        drawFullScreenEffect(direction, col);
+    }   // render
 };   // SunLightShader
 
 // ============================================================================
@@ -891,15 +916,7 @@ void PostProcessing::renderGI(const core::matrix4 &rh_matrix,
 void PostProcessing::renderSunlight(const core::vector3df &direction,
                                     const video::SColorf &col)
 {
-    glEnable(GL_BLEND);
-    glDisable(GL_DEPTH_TEST);
-    glBlendFunc(GL_ONE, GL_ONE);
-    glBlendEquation(GL_FUNC_ADD);
-
-    SunLightShader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
-                          irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<SunLightShader>(direction, col);
+    SunLightShader::getInstance()->render(direction, col);
 }   // renderSunlight
 
 // ----------------------------------------------------------------------------
@@ -934,19 +951,13 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo,
     float inv_height = 1.0f / in_fbo.getHeight();
     {
         auxiliary.Bind();
-
-        Gaussian3VBlurShader::getInstance()
-            ->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian3VBlurShader>
-                                     (core::vector2df(inv_width, inv_height));
+        Gaussian3VBlurShader::getInstance()->render(in_fbo, inv_width,
+                                                    inv_height);
     }
     {
         in_fbo.Bind();
-
-        Gaussian3HBlurShader::getInstance()
-            ->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian3HBlurShader>
-                                      (core::vector2df(inv_width, inv_height));
+        Gaussian3HBlurShader::getInstance()->render(auxiliary, inv_width,
+                                                    inv_height);
     }
 }   // renderGaussian3Blur
 

From d437ffa3bf173332d34a30ba301ee14bc208e94d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 17:11:06 +1000
Subject: [PATCH 236/331] Removed more accesses to global DrawFulLScreenEffect
 function.

---
 src/graphics/post_processing.cpp | 65 +++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 57ed4e9b0..52e333562 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -95,6 +95,16 @@ public:
 
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6VBlurShader
+    // ------------------------------------------------------------------------
+    void render(GLuint layer_tex, float sigma_v)
+    {
+        irr_driver->getFBO(FBO_SCALAR_1024).Bind();
+        Gaussian6VBlurShader::getInstance()->setTextureUnits(layer_tex);
+        drawFullScreenEffect(
+            core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
+                            1.f / UserConfigParams::m_shadows_resolution),
+            sigma_v);
+    }   // render
 };   // Gaussian6VBlurShader
 
 // ============================================================================
@@ -182,6 +192,15 @@ public:
 
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6HBlurShader
+    // ------------------------------------------------------------------------
+    void render(float sigma_h)
+    {
+        setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        drawFullScreenEffect(
+            core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
+                            1.f / UserConfigParams::m_shadows_resolution),
+            sigma_h);
+    }   // render
 };   // Gaussian6HBlurShader
 
 // ============================================================================
@@ -963,36 +982,28 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo,
 
 // ----------------------------------------------------------------------------
 void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
-                                              size_t layer, float sigmaH,
-                                              float sigmaV)
+                                              size_t layer, float sigma_h,
+                                              float sigma_v)
 {
-    GLuint LayerTex;
-    glGenTextures(1, &LayerTex);
-    glTextureView(LayerTex, GL_TEXTURE_2D, in_fbo.getRTT()[0],
+    GLuint layer_tex;
+    glGenTextures(1, &layer_tex);
+    glTextureView(layer_tex, GL_TEXTURE_2D, in_fbo.getRTT()[0],
                   GL_R32F, 0, 1, layer, 1);
     if (!CVS->supportsComputeShadersFiltering())
     {
         // Used as temp
         irr_driver->getFBO(FBO_SCALAR_1024).Bind();
-        Gaussian6VBlurShader::getInstance()->setTextureUnits(LayerTex);
-        DrawFullScreenEffect<Gaussian6VBlurShader>
-            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution, 
-                             1.f / UserConfigParams::m_shadows_resolution), 
-            sigmaV);
+        Gaussian6VBlurShader::getInstance()->render(layer_tex, sigma_v);
+
         in_fbo.BindLayer(layer);
-        Gaussian6HBlurShader::getInstance()
-            ->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>
-            (core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
-                             1.f / UserConfigParams::m_shadows_resolution),
-             sigmaH);
+        Gaussian6HBlurShader::getInstance()->render(sigma_h);
     }
     else
     {
-        const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
+        const std::vector<float> &weightsV = getGaussianWeight(sigma_v, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
         ComputeShadowBlurVShader::getInstance()->use();
-        ComputeShadowBlurVShader::getInstance()->setTextureUnits(LayerTex);
+        ComputeShadowBlurVShader::getInstance()->setTextureUnits(layer_tex);
         glBindSampler(ComputeShadowBlurVShader::getInstance()->m_dest_tu, 0);
         glBindImageTexture(ComputeShadowBlurVShader::getInstance()->m_dest_tu,
                            irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0], 0,
@@ -1004,7 +1015,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
         glDispatchCompute((int)UserConfigParams::m_shadows_resolution / 8 + 1,
                           (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
 
-        const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
+        const std::vector<float> &weightsH = getGaussianWeight(sigma_h, 7);
         glMemoryBarrier(  GL_TEXTURE_FETCH_BARRIER_BIT 
                         | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         ComputeShadowBlurHShader::getInstance()->use();
@@ -1012,7 +1023,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
             ->setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
         glBindSampler(ComputeShadowBlurHShader::getInstance()->m_dest_tu, 0);
         glBindImageTexture(ComputeShadowBlurHShader::getInstance()->m_dest_tu,
-                           LayerTex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
+                           layer_tex, 0, false, 0, GL_WRITE_ONLY, GL_R32F);
         ComputeShadowBlurHShader::getInstance()->setUniforms
             (core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
                             1.f / UserConfigParams::m_shadows_resolution),
@@ -1021,13 +1032,13 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
                           (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
-    glDeleteTextures(1, &LayerTex);
+    glDeleteTextures(1, &layer_tex);
 }   // renderGaussian6BlurLayer
 
 // ----------------------------------------------------------------------------
 void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
-                                         FrameBuffer &auxiliary, float sigmaV,
-                                         float sigmaH)
+                                         FrameBuffer &auxiliary, float sigma_v,
+                                         float sigma_h)
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() && 
            in_fbo.getHeight() == auxiliary.getHeight());
@@ -1040,17 +1051,17 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
 
         Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
         DrawFullScreenEffect<Gaussian6VBlurShader>
-                        (core::vector2df(inv_width, inv_height), sigmaV);
+                        (core::vector2df(inv_width, inv_height), sigma_v);
 
         in_fbo.Bind();
 
         Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         DrawFullScreenEffect<Gaussian6HBlurShader>
-                        (core::vector2df(inv_width, inv_height), sigmaH);
+                        (core::vector2df(inv_width, inv_height), sigma_h);
     }
     else
     {
-        const std::vector<float> &weightsV = getGaussianWeight(sigmaV, 7);
+        const std::vector<float> &weightsV = getGaussianWeight(sigma_v, 7);
         glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
         ComputeGaussian6VBlurShader::getInstance()->use();
         ComputeGaussian6VBlurShader::getInstance()
@@ -1064,7 +1075,7 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
         glDispatchCompute((int)in_fbo.getWidth() / 8 + 1, 
                           (int)in_fbo.getHeight() / 8 + 1, 1);
 
-        const std::vector<float> &weightsH = getGaussianWeight(sigmaH, 7);
+        const std::vector<float> &weightsH = getGaussianWeight(sigma_h, 7);
         glMemoryBarrier(  GL_TEXTURE_FETCH_BARRIER_BIT 
                         | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
         ComputeGaussian6HBlurShader::getInstance()->use();

From e9c2f0ecf1b36782a8fa15a8af62d3bd0556d023 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 20 May 2015 17:18:55 +1000
Subject: [PATCH 237/331] One less DrawFullScreenEffect function.

---
 src/graphics/post_processing.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 52e333562..a64b39e8e 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -96,14 +96,11 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6VBlurShader
     // ------------------------------------------------------------------------
-    void render(GLuint layer_tex, float sigma_v)
+    void render(GLuint layer_tex, int width, int height, float sigma_v)
     {
-        irr_driver->getFBO(FBO_SCALAR_1024).Bind();
         Gaussian6VBlurShader::getInstance()->setTextureUnits(layer_tex);
-        drawFullScreenEffect(
-            core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
-                            1.f / UserConfigParams::m_shadows_resolution),
-            sigma_v);
+        drawFullScreenEffect(core::vector2df(1.f / width, 1.f / height),
+                             sigma_v);
     }   // render
 };   // Gaussian6VBlurShader
 
@@ -993,7 +990,9 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
     {
         // Used as temp
         irr_driver->getFBO(FBO_SCALAR_1024).Bind();
-        Gaussian6VBlurShader::getInstance()->render(layer_tex, sigma_v);
+        Gaussian6VBlurShader::getInstance()
+            ->render(layer_tex, UserConfigParams::m_shadows_resolution, 
+                     UserConfigParams::m_shadows_resolution, sigma_v);
 
         in_fbo.BindLayer(layer);
         Gaussian6HBlurShader::getInstance()->render(sigma_h);
@@ -1048,10 +1047,9 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
     if (!CVS->supportsComputeShadersFiltering())
     {
         auxiliary.Bind();
-
-        Gaussian6VBlurShader::getInstance()->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6VBlurShader>
-                        (core::vector2df(inv_width, inv_height), sigma_v);
+        Gaussian6VBlurShader::getInstance()
+            ->render(in_fbo.getRTT()[0], in_fbo.getWidth(), in_fbo.getWidth(),
+                     sigma_v);
 
         in_fbo.Bind();
 

From 101fcf5df78527e7dbbe49ff268da83955ef573e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 10:09:43 +1000
Subject: [PATCH 238/331] Removed more references to global function.

---
 src/graphics/post_processing.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a64b39e8e..cfe8c927d 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -190,14 +190,14 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian6HBlurShader
     // ------------------------------------------------------------------------
-    void render(float sigma_h)
+    void render(const FrameBuffer &fb, int width, int height, float sigma_h)
     {
-        setTextureUnits(irr_driver->getFBO(FBO_SCALAR_1024).getRTT()[0]);
+        setTextureUnits(fb.getRTT()[0]);
         drawFullScreenEffect(
-            core::vector2df(1.f / UserConfigParams::m_shadows_resolution,
-                            1.f / UserConfigParams::m_shadows_resolution),
+            core::vector2df(1.f / width,
+                            1.f / height),
             sigma_h);
-    }   // render
+    }   // renderq
 };   // Gaussian6HBlurShader
 
 // ============================================================================
@@ -995,7 +995,10 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
                      UserConfigParams::m_shadows_resolution, sigma_v);
 
         in_fbo.BindLayer(layer);
-        Gaussian6HBlurShader::getInstance()->render(sigma_h);
+        Gaussian6HBlurShader::getInstance()
+            ->render(irr_driver->getFBO(FBO_SCALAR_1024),
+                     UserConfigParams::m_shadows_resolution, 
+                     UserConfigParams::m_shadows_resolution, sigma_h);
     }
     else
     {
@@ -1052,10 +1055,9 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
                      sigma_v);
 
         in_fbo.Bind();
-
         Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>
-                        (core::vector2df(inv_width, inv_height), sigma_h);
+        Gaussian6HBlurShader::getInstance()->render(auxiliary, in_fbo.getWidth(),
+                                                   in_fbo.getHeight(), sigma_h);
     }
     else
     {

From 8113ea128b2aada24b5cab0f7617d8ed6539e6ee Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 20 May 2015 20:17:00 -0400
Subject: [PATCH 239/331] Minor scripting work

---
 src/scriptengine/script_engine.cpp | 1 -
 src/scriptengine/script_utils.cpp  | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 5542bbba2..6601d0072 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -39,7 +39,6 @@ using namespace Scripting;
 namespace Scripting
 {
     const char* MODULE_ID_MAIN_SCRIPT_FILE = "main";
-    const char* MODULE_ID_EVAL = "eval";
 
     void AngelScript_ErrorCallback (const asSMessageInfo *msg, void *param)
     {
diff --git a/src/scriptengine/script_utils.cpp b/src/scriptengine/script_utils.cpp
index 1768d9c20..5ab527efa 100644
--- a/src/scriptengine/script_utils.cpp
+++ b/src/scriptengine/script_utils.cpp
@@ -102,10 +102,8 @@ namespace Scripting
         }
 
         /** Runs the script specified by the given string */
-        // TODO: type arguments
-        void runScript(asIScriptGeneric *gen)
+        void runScript(const std::string* str)
         {
-            std::string *str = (std::string*)gen->GetArgAddress(0);
             ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             script_engine->runFunction(*str);
         }
@@ -163,7 +161,7 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues3), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("string insertValues(const string &in, const string &in, const string &in, const string &in, const string &in)", asFUNCTION(proxy_insertValues4), asCALL_CDECL); assert(r >= 0);
             
-            r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_GENERIC); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_CDECL); assert(r >= 0);
 
             r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(logInfo), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(logWarning), asCALL_CDECL); assert(r >= 0);

From dc8361b941135a01ae8e771719fa9a1d20470a68 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 11:19:40 +1000
Subject: [PATCH 240/331] Fixed spelling of shader.

---
 ...edobject_pass2.frag => instanced_detailed_object_pass2.frag} | 0
 src/graphics/render_geometry.cpp                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename data/shaders/{instanced_detailledobject_pass2.frag => instanced_detailed_object_pass2.frag} (100%)

diff --git a/data/shaders/instanced_detailledobject_pass2.frag b/data/shaders/instanced_detailed_object_pass2.frag
similarity index 100%
rename from data/shaders/instanced_detailledobject_pass2.frag
rename to data/shaders/instanced_detailed_object_pass2.frag
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index df125c7f8..313e8c3b0 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -789,7 +789,7 @@ public:
         loadProgram(OBJECT, GL_VERTEX_SHADER, "utils/getworldmatrix.vert",
                    GL_VERTEX_SHADER, "instanced_object_pass.vert",
                    GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-                   GL_FRAGMENT_SHADER, "instanced_detailedobject_pass2.frag");
+                   GL_FRAGMENT_SHADER, "instanced_detailed_object_pass2.frag");
         assignUniforms();
         assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,

From 4d6a9726b6a055f37b398720bd8c372498c1f7cf Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 16:37:59 +1000
Subject: [PATCH 241/331] Renamed shader.

---
 .../{detailedobject_pass2.frag => detailed_object_pass2.frag}   | 0
 src/graphics/render_geometry.cpp                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename data/shaders/{detailedobject_pass2.frag => detailed_object_pass2.frag} (100%)

diff --git a/data/shaders/detailedobject_pass2.frag b/data/shaders/detailed_object_pass2.frag
similarity index 100%
rename from data/shaders/detailedobject_pass2.frag
rename to data/shaders/detailed_object_pass2.frag
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 313e8c3b0..a746184cd 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -769,7 +769,7 @@ public:
     {
         loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
                             GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-                            GL_FRAGMENT_SHADER, "detailedobject_pass2.frag");
+                            GL_FRAGMENT_SHADER, "detailed_object_pass2.frag");
         assignUniforms("ModelMatrix");
         assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
                            1, "SpecularMap", ST_NEAREST_FILTERED,

From abbd54ffa0903768b37adf4d747f87eb0d0918f4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 16:43:41 +1000
Subject: [PATCH 242/331] Replaced another global function reference.

---
 src/graphics/post_processing.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index cfe8c927d..49e300571 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -178,7 +178,7 @@ public:
 
 // ============================================================================
 class Gaussian6HBlurShader : public TextureShader<Gaussian6HBlurShader, 1,
-                                           core::vector2df, float>
+                                                 core::vector2df, float>
 {
 public:
     Gaussian6HBlurShader()
@@ -1105,10 +1105,8 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
     {
         auxiliary.Bind();
 
-        Gaussian6HBlurShader::getInstance()
-                                ->setTextureUnits(in_fbo.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>
-                         (core::vector2df(inv_width, inv_height), 2.0f);
+        Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
+                                                    in_fbo.getHeight(), 2.0f );
     }
     {
         in_fbo.Bind();

From 959d17ccb52d664b8b4b08feecae0ac9277cd0eb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 16:46:46 +1000
Subject: [PATCH 243/331] Moved one more reference to global function, minor
 coding style adjustments.

---
 src/graphics/post_processing.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 49e300571..cdfa47a95 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -1102,20 +1102,13 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
            in_fbo.getHeight() == auxiliary.getHeight());
     float inv_width  = 1.0f / in_fbo.getWidth();
     float inv_height = 1.0f / in_fbo.getHeight();
-    {
-        auxiliary.Bind();
 
-        Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
-                                                    in_fbo.getHeight(), 2.0f );
-    }
-    {
-        in_fbo.Bind();
-
-        Gaussian6HBlurShader::getInstance()
-                      ->setTextureUnits(auxiliary.getRTT()[0]);
-        DrawFullScreenEffect<Gaussian6HBlurShader>
-                   (core::vector2df(inv_width, inv_height), 2.0f);
-    }
+    auxiliary.Bind();
+    Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
+                                                in_fbo.getHeight(), 2.0f );
+    in_fbo.Bind();
+    Gaussian6HBlurShader::getInstance()->render(auxiliary, in_fbo.getWidth(),
+                                                in_fbo.getHeight(), 2.0f);
 }   // renderHorizontalBlur
 
 

From 6f84a4dca1c1e3dd7923126d255088cff8ab9a50 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 16:59:40 +1000
Subject: [PATCH 244/331] Moved functionality into shader.

---
 src/graphics/post_processing.cpp | 46 +++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index cdfa47a95..d14e58cee 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -213,6 +213,14 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
                            1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian17TapHShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &fb, int width, int height)
+    {
+        setTextureUnits(fb.getRTT()[0],
+                        irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0] );
+        drawFullScreenEffect(core::vector2df(1.0f/width, 1.0f/height));
+
+    }   // render
 };   // Gaussian17TapHShader
 
 // ============================================================================
@@ -230,6 +238,19 @@ public:
                            1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian17TapHShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &fb, const FrameBuffer &auxiliary,
+                int width, int height)
+    {
+        use();
+        glBindSampler(m_dest_tu, 0);
+        setTextureUnits(fb.getRTT()[0],
+                        irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+        glBindImageTexture(m_dest_tu, auxiliary.getRTT()[0], 0, false,
+                           0, GL_WRITE_ONLY, GL_R16F);
+        setUniforms(core::vector2df(1.0f/width, 1.0f/height));
+        glDispatchCompute((int)width / 8 + 1, (int)height / 8 + 1, 1);
+    }   // render
 };   // ComputeGaussian17TapHShader
 
 
@@ -1126,27 +1147,16 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
         if (!CVS->supportsComputeShadersFiltering())
         {
             auxiliary.Bind();
-            Gaussian17TapHShader::getInstance()
-                ->setTextureUnits(in_fbo.getRTT()[0], 
-                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<Gaussian17TapHShader>
-                                      (core::vector2df(inv_width, inv_height));
+            Gaussian17TapHShader::getInstance()->render(in_fbo,
+                                                        in_fbo.getWidth(),
+                                                        in_fbo.getHeight());
         }
         else
         {
-            ComputeGaussian17TapHShader::getInstance()->use();
-            glBindSampler(ComputeGaussian17TapHShader::getInstance()
-                          ->m_dest_tu, 0);
-            ComputeGaussian17TapHShader::getInstance()
-                ->setTextureUnits(in_fbo.getRTT()[0], 
-                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(ComputeGaussian17TapHShader::getInstance()
-                               ->m_dest_tu, auxiliary.getRTT()[0], 0, false,
-                               0, GL_WRITE_ONLY, GL_R16F);
-            ComputeGaussian17TapHShader::getInstance()
-                ->setUniforms(core::vector2df(inv_width, inv_height));
-            glDispatchCompute((int)in_fbo.getWidth()  / 8 + 1,
-                              (int)in_fbo.getHeight() / 8 + 1, 1);
+            ComputeGaussian17TapHShader::getInstance()->render(in_fbo,
+                                                               auxiliary,
+                                                               in_fbo.getWidth(),
+                                                               in_fbo.getHeight());
         }
     }
     if (CVS->supportsComputeShadersFiltering())

From 2c68bd194cfb322fbe8800fe677b5fbd44f07f3f Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 17:09:53 +1000
Subject: [PATCH 245/331] Move more code into shader, removed one more
 reference to global function.

---
 src/graphics/post_processing.cpp | 48 +++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index d14e58cee..d7c91f7f9 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -268,6 +268,14 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED,
                            1, "depth", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian17TapVShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &auxiliary, int width, int height)
+    {
+        setTextureUnits(auxiliary.getRTT()[0],
+                        irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+        drawFullScreenEffect(core::vector2df(1.0f/width, 1.0f/height));
+
+    }   // render
 };   // Gaussian17TapVShader
 
 // ============================================================================
@@ -286,6 +294,20 @@ public:
                            1, "depth", ST_NEARED_CLAMPED_FILTERED);
         assignTextureUnit(m_dest_tu, "dest");
     }   // ComputeGaussian17TapVShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &auxiliary, const FrameBuffer &fb, 
+                int width, int height)
+    {
+        use();
+        glBindSampler(m_dest_tu, 0);
+        setTextureUnits(auxiliary.getRTT()[0],
+                        irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
+        glBindImageTexture(m_dest_tu, fb.getRTT()[0], 0, false, 0,
+                           GL_WRITE_ONLY, GL_R16F);
+        setUniforms(core::vector2df(1.0f/width, 1.0f/height));
+        glDispatchCompute((int)fb.getWidth()  / 8 + 1,
+                          (int)fb.getHeight() / 8 + 1, 1);
+    }   // render
 };   // ComputeGaussian17TapVShader
 
 // ============================================================================
@@ -1165,28 +1187,16 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
         if (!CVS->supportsComputeShadersFiltering())
         {
             in_fbo.Bind();
-
-            Gaussian17TapVShader::getInstance()
-                ->setTextureUnits(auxiliary.getRTT()[0], 
-                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            DrawFullScreenEffect<Gaussian17TapVShader>
-                              (core::vector2df(inv_width, inv_height));
+            Gaussian17TapVShader::getInstance()->render(auxiliary,
+                                                        in_fbo.getWidth(),
+                                                        in_fbo.getHeight());
         }
         else
         {
-            ComputeGaussian17TapVShader::getInstance()->use();
-            glBindSampler(ComputeGaussian17TapVShader::getInstance()
-                          ->m_dest_tu, 0);
-            ComputeGaussian17TapVShader::getInstance()
-                ->setTextureUnits(auxiliary.getRTT()[0],
-                             irr_driver->getFBO(FBO_LINEAR_DEPTH).getRTT()[0]);
-            glBindImageTexture(ComputeGaussian17TapVShader::getInstance()
-                                ->m_dest_tu, in_fbo.getRTT()[0], 0, false, 0,
-                                GL_WRITE_ONLY, GL_R16F);
-            ComputeGaussian17TapVShader::getInstance()
-                ->setUniforms(core::vector2df(inv_width, inv_height));
-            glDispatchCompute((int)in_fbo.getWidth() / 8 + 1,
-                              (int)in_fbo.getHeight() / 8 + 1, 1);
+            ComputeGaussian17TapVShader::getInstance()->render(auxiliary,
+                                                               in_fbo, 
+                                                               in_fbo.getWidth(),
+                                                               in_fbo.getHeight());
         }
     }
     if (CVS->supportsComputeShadersFiltering())

From 18179bd18d9b18a1a5dd470310aa6a9553011f0c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 17:12:59 +1000
Subject: [PATCH 246/331] Removed one more reference.

---
 src/graphics/post_processing.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index d7c91f7f9..f149d9bea 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -593,6 +593,17 @@ public:
         assignUniforms("radius", "k", "sigma");
         assignSamplerNames(0, "dtex", ST_SEMI_TRILINEAR);
     }   // SSAOShader
+    // ------------------------------------------------------------------------
+    void render()
+    {
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
+        glGenerateMipmap(GL_TEXTURE_2D);
+
+        drawFullScreenEffect(irr_driver->getSSAORadius(),
+                             irr_driver->getSSAOK(),
+                             irr_driver->getSSAOSigma());
+
+    }   // render
 };   // SSAOShader
 
 // ============================================================================
@@ -1245,14 +1256,9 @@ void PostProcessing::renderSSAO()
          irr_driver->getSceneManager()->getActiveCamera()->getFarValue()  );
     irr_driver->getFBO(FBO_SSAO).Bind();
 
-    SSAOShader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LINEAR_DEPTH));
-    glGenerateMipmap(GL_TEXTURE_2D);
+    SSAOShader::getInstance()->render();
+}   // renderSSAO
 
-    DrawFullScreenEffect<SSAOShader>
-        (irr_driver->getSSAORadius(), irr_driver->getSSAOK(),
-         irr_driver->getSSAOSigma()                           );
-}
 // ----------------------------------------------------------------------------
 void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
                                       FrameBuffer &out_fbo)

From d2a7e216329380dedda8f485728a1282f80fbe89 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 21 May 2015 17:16:03 +1000
Subject: [PATCH 247/331] Removed one more reference to global function.

---
 src/graphics/post_processing.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index f149d9bea..820fa2ce1 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -551,6 +551,14 @@ public:
         assignUniforms("zn", "zf");
         assignSamplerNames(0, "texture", ST_BILINEAR_FILTERED);
     }   // LinearizeDepthShader
+    // ------------------------------------------------------------------------
+    void render()
+    {
+        setTextureUnits(irr_driver->getDepthStencilTexture());
+        scene::ICameraSceneNode *c = irr_driver->getSceneManager()->getActiveCamera();
+        drawFullScreenEffect(c->getNearValue(), c->getFarValue()  );
+
+    }   // render
 };   // LinearizeDepthShader
 
 // ============================================================================
@@ -1249,13 +1257,8 @@ void PostProcessing::renderSSAO()
 
     // Generate linear depth buffer
     irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
-    LinearizeDepthShader::getInstance()
-        ->setTextureUnits(irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<LinearizeDepthShader>
-        (irr_driver->getSceneManager()->getActiveCamera()->getNearValue(), 
-         irr_driver->getSceneManager()->getActiveCamera()->getFarValue()  );
+    LinearizeDepthShader::getInstance()->render();
     irr_driver->getFBO(FBO_SSAO).Bind();
-
     SSAOShader::getInstance()->render();
 }   // renderSSAO
 

From 3a64d2c70efe9d2dbf887bfc04a9c3860f3a2ff5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:18:21 +1000
Subject: [PATCH 248/331] Removed one more reference to global function.

---
 src/graphics/post_processing.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 820fa2ce1..b99677bc7 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -630,6 +630,17 @@ public:
         assignSamplerNames(0, "color_buffer", ST_BILINEAR_CLAMPED_FILTERED,
                            1, "dtex", ST_NEAREST_FILTERED);
     }    // MotionBlurShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &fb, float boost_time)
+    {
+        setTextureUnits(fb.getRTT()[0],  irr_driver->getDepthStencilTexture());
+        Camera *cam = Camera::getActiveCamera();
+        // Todo : use a previousPVMatrix per cam, not global
+        drawFullScreenEffect(cam->getPreviousPVMatrix(),
+                             core::vector2df(0.5, 0.5),
+                             boost_time, // Todo : should be framerate dependent=
+                             0.15f);
+    }   // render
 };   // MotionBlurShader
 
 // ============================================================================
@@ -1291,15 +1302,8 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
     out_fbo.Bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    MotionBlurShader::getInstance()
-        ->setTextureUnits(in_fbo.getRTT()[0], 
-                          irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<MotionBlurShader>
-        (// Todo : use a previousPVMatrix per cam, not global
-         cam->getPreviousPVMatrix(),
-         core::vector2df(0.5, 0.5),
-         cb->getBoostTime(cam->getIndex()) * 10, // Todo : should be framerate dependent
-         0.15f);
+    float boost_time = cb->getBoostTime(cam->getIndex()) * 10;
+    MotionBlurShader::getInstance()->render(in_fbo, boost_time);
 }   // renderMotionBlur
 
 

From cc9163ca77a35c14364244046b2f8dfcf88df48a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:29:42 +1000
Subject: [PATCH 249/331] Removed one more reference to global function,
 renamed functions Bind and BindLayer to bind and bindLayer.

---
 src/graphics/glwrap.cpp          |  4 +-
 src/graphics/glwrap.hpp          |  4 +-
 src/graphics/post_processing.cpp | 63 +++++++++++++++++---------------
 src/graphics/render.cpp          | 23 +++++++-----
 src/graphics/render_geometry.cpp | 14 +++----
 src/graphics/render_lighting.cpp | 14 +++----
 src/graphics/rtts.cpp            |  4 +-
 7 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index 6ad76bc72..f2141c22d 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -244,7 +244,7 @@ FrameBuffer::~FrameBuffer()
         glDeleteFramebuffers(1, &fbolayer);
 }
 
-void FrameBuffer::Bind()
+void FrameBuffer::bind() const
 {
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
     glViewport(0, 0, (int)width, (int)height);
@@ -252,7 +252,7 @@ void FrameBuffer::Bind()
     glDrawBuffers((int)RenderTargets.size(), bufs);
 }
 
-void FrameBuffer::BindLayer(unsigned i)
+void FrameBuffer::bindLayer(unsigned i)
 {
     glBindFramebuffer(GL_FRAMEBUFFER, fbolayer);
     glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, RenderTargets[0], 0, i);
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 8aec2cdf5..1b7ffdabc 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -69,8 +69,8 @@ public:
     FrameBuffer(const std::vector <GLuint> &RTTs, size_t w, size_t h, bool layered = false);
     FrameBuffer(const std::vector <GLuint> &RTTs, GLuint DS, size_t w, size_t h, bool layered = false);
     ~FrameBuffer();
-    void Bind();
-    void BindLayer(unsigned);
+    void bind() const;
+    void bindLayer(unsigned);
     const std::vector<GLuint> &getRTT() const { return RenderTargets; }
     GLuint &getDepthTexture() { assert(DepthTexture); return DepthTexture; }
     size_t getWidth() const { return width; }
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index b99677bc7..a6db81ceb 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -379,7 +379,7 @@ public:
     // ----------------------------------------------------------------------------
     void render(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
     {
-        fbo.Bind();
+        fbo.bind();
         setTextureUnits(rtt);
         drawFullScreenEffect(vignette_weight);
     }   // render
@@ -398,6 +398,14 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_FILTERED,
                            1, "dtex", ST_NEAREST_FILTERED);
     }   // DepthOfFieldShader
+    // ------------------------------------------------------------------------
+    void render(const FrameBuffer &fb, GLuint rtt)
+    {
+        fb.bind();
+        setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
+        drawFullScreenEffect();
+
+    }   // render
 };   // DepthOfFieldShader
 
 // ============================================================================
@@ -1039,12 +1047,12 @@ void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo,
     float inv_width  = 1.0f / in_fbo.getWidth();
     float inv_height = 1.0f / in_fbo.getHeight();
     {
-        auxiliary.Bind();
+        auxiliary.bind();
         Gaussian3VBlurShader::getInstance()->render(in_fbo, inv_width,
                                                     inv_height);
     }
     {
-        in_fbo.Bind();
+        in_fbo.bind();
         Gaussian3HBlurShader::getInstance()->render(auxiliary, inv_width,
                                                     inv_height);
     }
@@ -1062,12 +1070,12 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
     if (!CVS->supportsComputeShadersFiltering())
     {
         // Used as temp
-        irr_driver->getFBO(FBO_SCALAR_1024).Bind();
+        irr_driver->getFBO(FBO_SCALAR_1024).bind();
         Gaussian6VBlurShader::getInstance()
             ->render(layer_tex, UserConfigParams::m_shadows_resolution, 
                      UserConfigParams::m_shadows_resolution, sigma_v);
 
-        in_fbo.BindLayer(layer);
+        in_fbo.bindLayer(layer);
         Gaussian6HBlurShader::getInstance()
             ->render(irr_driver->getFBO(FBO_SCALAR_1024),
                      UserConfigParams::m_shadows_resolution, 
@@ -1122,12 +1130,12 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
 
     if (!CVS->supportsComputeShadersFiltering())
     {
-        auxiliary.Bind();
+        auxiliary.bind();
         Gaussian6VBlurShader::getInstance()
             ->render(in_fbo.getRTT()[0], in_fbo.getWidth(), in_fbo.getWidth(),
                      sigma_v);
 
-        in_fbo.Bind();
+        in_fbo.bind();
         Gaussian6HBlurShader::getInstance()->setTextureUnits(auxiliary.getRTT()[0]);
         Gaussian6HBlurShader::getInstance()->render(auxiliary, in_fbo.getWidth(),
                                                    in_fbo.getHeight(), sigma_h);
@@ -1176,10 +1184,10 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
     float inv_width  = 1.0f / in_fbo.getWidth();
     float inv_height = 1.0f / in_fbo.getHeight();
 
-    auxiliary.Bind();
+    auxiliary.bind();
     Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
                                                 in_fbo.getHeight(), 2.0f );
-    in_fbo.Bind();
+    in_fbo.bind();
     Gaussian6HBlurShader::getInstance()->render(auxiliary, in_fbo.getWidth(),
                                                 in_fbo.getHeight(), 2.0f);
 }   // renderHorizontalBlur
@@ -1198,7 +1206,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
     {
         if (!CVS->supportsComputeShadersFiltering())
         {
-            auxiliary.Bind();
+            auxiliary.bind();
             Gaussian17TapHShader::getInstance()->render(in_fbo,
                                                         in_fbo.getWidth(),
                                                         in_fbo.getHeight());
@@ -1216,7 +1224,7 @@ void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
     {
         if (!CVS->supportsComputeShadersFiltering())
         {
-            in_fbo.Bind();
+            in_fbo.bind();
             Gaussian17TapVShader::getInstance()->render(auxiliary,
                                                         in_fbo.getWidth(),
                                                         in_fbo.getHeight());
@@ -1267,9 +1275,9 @@ void PostProcessing::renderSSAO()
     glDisable(GL_BLEND);
 
     // Generate linear depth buffer
-    irr_driver->getFBO(FBO_LINEAR_DEPTH).Bind();
+    irr_driver->getFBO(FBO_LINEAR_DEPTH).bind();
     LinearizeDepthShader::getInstance()->render();
-    irr_driver->getFBO(FBO_SSAO).Bind();
+    irr_driver->getFBO(FBO_SSAO).bind();
     SSAOShader::getInstance()->render();
 }   // renderSSAO
 
@@ -1299,7 +1307,7 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
     else
         setMotionBlurCenterY(camID, 0.5f);
 
-    out_fbo.Bind();
+    out_fbo.bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
     float boost_time = cb->getBoostTime(cam->getIndex()) * 10;
@@ -1308,12 +1316,9 @@ void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
 
 
 // ----------------------------------------------------------------------------
-static void renderDoF(FrameBuffer &fbo, GLuint rtt)
+static void renderDoF(const FrameBuffer &fbo, GLuint rtt)
 {
-    fbo.Bind();
-    DepthOfFieldShader::getInstance()
-        ->setTextureUnits(rtt, irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<DepthOfFieldShader>();
+    DepthOfFieldShader::getInstance()->render(fbo, rtt);
 }   // renderDoF
 
 // ----------------------------------------------------------------------------
@@ -1323,7 +1328,7 @@ void PostProcessing::applyMLAA()
                      core::vector2df(1.0f / UserConfigParams::m_width,
                                      1.0f / UserConfigParams::m_height);
 
-    irr_driver->getFBO(FBO_MLAA_TMP).Bind();
+    irr_driver->getFBO(FBO_MLAA_TMP).bind();
     glEnable(GL_STENCIL_TEST);
     glClearColor(0.0, 0.0, 0.0, 1.0);
     glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ -1340,7 +1345,7 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
 
     // Pass 2: blend weights
-    irr_driver->getFBO(FBO_MLAA_BLEND).Bind();
+    irr_driver->getFBO(FBO_MLAA_BLEND).bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
     MLAABlendWeightSHader::getInstance()->use();
@@ -1354,7 +1359,7 @@ void PostProcessing::applyMLAA()
                       irr_driver->getFBO(FBO_MLAA_TMP));
 
     // Pass 3: gather
-    irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
+    irr_driver->getFBO(FBO_MLAA_COLORS).bind();
 
     MLAAGatherSHader::getInstance()->use();
     MLAAGatherSHader::getInstance()
@@ -1403,7 +1408,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
 
             glEnable(GL_DEPTH_TEST);
             // Grab the sky
-            out_fbo->Bind();
+            out_fbo->bind();
             glClear(GL_COLOR_BUFFER_BIT);
 //            irr_driver->renderSkybox(camnode);
 
@@ -1420,7 +1425,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             glDisable(GL_DEPTH_TEST);
 
             // Fade to quarter
-            irr_driver->getFBO(FBO_QUARTER1).Bind();
+            irr_driver->getFBO(FBO_QUARTER1).bind();
             glViewport(0, 0, irr_driver->getActualScreenSize().Width / 4,
                              irr_driver->getActualScreenSize().Height / 4);
             GodFadeShader::getInstance()->render(out_fbo->getRTT()[0], col);
@@ -1446,7 +1451,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             const float suny = ((ndc[1] / ndc[3]) * 0.5f + 0.5f) * texh;
 
             // Rays please
-            irr_driver->getFBO(FBO_QUARTER2).Bind();
+            irr_driver->getFBO(FBO_QUARTER2).bind();
             GodRayShader::getInstance()
                 ->render(irr_driver->getRenderTargetTexture(RTT_QUARTER1),
                        core::vector2df(sunx, suny)                       );
@@ -1461,7 +1466,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
 
-            in_fbo->Bind();
+            in_fbo->bind();
             renderPassThrough(irr_driver->getRenderTargetTexture(RTT_QUARTER2),
                               in_fbo->getWidth(), in_fbo->getHeight());
             glDisable(GL_BLEND);
@@ -1482,7 +1487,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             FrameBuffer::Blit(*in_fbo, irr_driver->getFBO(FBO_BLOOM_1024),
                               GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
-            irr_driver->getFBO(FBO_BLOOM_512).Bind();
+            irr_driver->getFBO(FBO_BLOOM_512).bind();
             renderBloom(irr_driver->getRenderTargetTexture(RTT_BLOOM_1024));
 
             // Downsample
@@ -1522,7 +1527,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             
 
             // Additively blend on top of tmp1
-            in_fbo->Bind();
+            in_fbo->bind();
             glEnable(GL_BLEND);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
@@ -1577,7 +1582,7 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
         return in_fbo;
 
     glEnable(GL_FRAMEBUFFER_SRGB);
-    irr_driver->getFBO(FBO_MLAA_COLORS).Bind();
+    irr_driver->getFBO(FBO_MLAA_COLORS).bind();
     renderPassThrough(in_fbo->getRTT()[0],
                       irr_driver->getFBO(FBO_MLAA_COLORS).getWidth(),
                       irr_driver->getFBO(FBO_MLAA_COLORS).getHeight());
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index e9edd0277..8ad400230 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -427,7 +427,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     glEnable(GL_CULL_FACE);
     if (CVS->isDefferedEnabled() || forceRTT)
     {
-        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
+        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).bind();
         glClearColor(0., 0., 0., 0.);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
         renderSolidFirstPass();
@@ -437,7 +437,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
         // We need a cleared depth buffer for some effect (eg particles depth blending)
         if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_FRAMEBUFFER_SRGB_WORKING))
             glDisable(GL_FRAMEBUFFER_SRGB);
-        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
+        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).bind();
         // Bind() modifies the viewport. In order not to affect anything else,
         // the viewport is just reset here and not removed in Bind().
         const core::recti &vp = Camera::getActiveCamera()->getViewport();
@@ -474,7 +474,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     PROFILER_PUSH_CPU_MARKER("- Solid Pass 2", 0x00, 0x00, 0xFF);
     if (CVS->isDefferedEnabled() || forceRTT)
     {
-        m_rtts->getFBO(FBO_COLORS).Bind();
+        m_rtts->getFBO(FBO_COLORS).bind();
         SColor clearColor(0, 150, 150, 150);
         if (World::getWorld() != NULL)
             clearColor = World::getWorld()->getClearColor();
@@ -489,9 +489,9 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
 
     if (getNormals())
     {
-        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
+        m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).bind();
         renderNormalsVisualisation();
-        m_rtts->getFBO(FBO_COLORS).Bind();
+        m_rtts->getFBO(FBO_COLORS).bind();
     }
 
     // Render ambient scattering
@@ -524,14 +524,17 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     if (getRH())
     {
         glDisable(GL_BLEND);
-        m_rtts->getFBO(FBO_COLORS).Bind();
-        m_post_processing->renderRHDebug(m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2], rh_matrix, rh_extend);
+        m_rtts->getFBO(FBO_COLORS).bind();
+        m_post_processing->renderRHDebug(m_rtts->getRH().getRTT()[0],
+                                         m_rtts->getRH().getRTT()[1], 
+                                         m_rtts->getRH().getRTT()[2],
+                                         rh_matrix, rh_extend);
     }
 
     if (getGI())
     {
         glDisable(GL_BLEND);
-        m_rtts->getFBO(FBO_COLORS).Bind();
+        m_rtts->getFBO(FBO_COLORS).bind();
         m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
     }
 
@@ -709,7 +712,7 @@ void IrrDriver::renderShadowsDebug()
 void IrrDriver::renderGlow(std::vector<GlowData>& glows)
 {
     m_scene_manager->setCurrentRendertime(scene::ESNRP_SOLID);
-    m_rtts->getFBO(FBO_TMP1_WITH_DS).Bind();
+    m_rtts->getFBO(FBO_TMP1_WITH_DS).bind();
     glClearStencil(0);
     glClearColor(0, 0, 0, 0);
     glClear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ -776,7 +779,7 @@ void IrrDriver::renderGlow(std::vector<GlowData>& glows)
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glStencilFunc(GL_EQUAL, 0, ~0);
     glEnable(GL_STENCIL_TEST);
-    m_rtts->getFBO(FBO_COLORS).Bind();
+    m_rtts->getFBO(FBO_COLORS).bind();
     m_post_processing->renderGlow(m_rtts->getRenderTarget(RTT_QUARTER1));
     glDisable(GL_STENCIL_TEST);
 }
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index a746184cd..84852fecf 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -1560,9 +1560,9 @@ void IrrDriver::renderTransparent()
         return;
 
     // Render displacement nodes
-    irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
+    irr_driver->getFBO(FBO_TMP1_WITH_DS).bind();
     glClear(GL_COLOR_BUFFER_BIT);
-    irr_driver->getFBO(FBO_DISPLACE).Bind();
+    irr_driver->getFBO(FBO_DISPLACE).bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
     DisplaceProvider * const cb =
@@ -1581,7 +1581,7 @@ void IrrDriver::renderTransparent()
         glBindVertexArray(VAOManager::getInstance()->getVAO(video::EVT_2TCOORDS));
     // Generate displace mask
     // Use RTT_TMP4 as displace mask
-    irr_driver->getFBO(FBO_TMP1_WITH_DS).Bind();
+    irr_driver->getFBO(FBO_TMP1_WITH_DS).bind();
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
     {
         const GLMesh &mesh =
@@ -1608,7 +1608,7 @@ void IrrDriver::renderTransparent()
                                  (GLvoid *)mesh.vaoOffset, (int)mesh.vaoBaseVertex);
     }
 
-    irr_driver->getFBO(FBO_DISPLACE).Bind();
+    irr_driver->getFBO(FBO_DISPLACE).bind();
     if (!displaceTex)
         displaceTex = irr_driver->getTexture(FileManager::TEXTURE, "displace.png");
     for (unsigned i = 0; i < ListDisplacement::getInstance()->size(); i++)
@@ -1640,7 +1640,7 @@ void IrrDriver::renderTransparent()
                                  (int)mesh.vaoBaseVertex);
     }
 
-    irr_driver->getFBO(FBO_COLORS).Bind();
+    irr_driver->getFBO(FBO_COLORS).bind();
     glStencilFunc(GL_EQUAL, 1, 0xFF);
     m_post_processing->renderPassThrough(m_rtts->getRenderTarget(RTT_DISPLACE),
                                          irr_driver->getFBO(FBO_COLORS).getWidth(), 
@@ -1757,7 +1757,7 @@ void IrrDriver::renderShadows()
     glDepthMask(GL_TRUE);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
-    m_rtts->getShadowFBO().Bind();
+    m_rtts->getShadowFBO().bind();
     if (!CVS->isESMEnabled())
     {
         glDrawBuffer(GL_NONE);
@@ -1923,7 +1923,7 @@ void IrrDriver::renderRSM()
     if (m_rsm_map_available)
         return;
     ScopedGPUTimer Timer(getGPUTimer(Q_RSM));
-    m_rtts->getRSM().Bind();
+    m_rtts->getRSM().bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     drawRSM<DefaultMaterial, 3, 1>(rsm_matrix);
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index f4f9e0219..79c5d4a75 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -405,7 +405,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_RH));
         glDisable(GL_BLEND);
-        m_rtts->getRH().Bind();
+        m_rtts->getRH().bind();
         glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
         if (CVS->needRHWorkaround())
         {
@@ -442,17 +442,17 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 
     for (unsigned i = 0; i < sun_ortho_matrix.size(); i++)
         sun_ortho_matrix[i] *= getInvViewMatrix();
-    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
+    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    m_rtts->getFBO(FBO_DIFFUSE).Bind();
+    m_rtts->getFBO(FBO_DIFFUSE).bind();
     if (CVS->isGlobalIlluminationEnabled() && hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
         m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
     }
 
-    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
+    m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).bind();
 
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_ENVMAP));
@@ -508,7 +508,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 // ----------------------------------------------------------------------------
 void IrrDriver::renderSSAO()
 {
-    m_rtts->getFBO(FBO_SSAO).Bind();
+    m_rtts->getFBO(FBO_SSAO).bind();
     glClearColor(1., 1., 1., 1.);
     glClear(GL_COLOR_BUFFER_BIT);
     m_post_processing->renderSSAO();
@@ -548,7 +548,7 @@ void IrrDriver::renderAmbientScatter()
 // ----------------------------------------------------------------------------
 void IrrDriver::renderLightsScatter(unsigned pointlightcount)
 {
-    getFBO(FBO_HALF1).Bind();
+    getFBO(FBO_HALF1).bind();
     glClearColor(0., 0., 0., 0.);
     glClear(GL_COLOR_BUFFER_BIT);
 
@@ -588,7 +588,7 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
 
     glDisable(GL_DEPTH_TEST);
     glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    getFBO(FBO_COLORS).Bind();
+    getFBO(FBO_COLORS).bind();
     m_post_processing->renderPassThrough(getRenderTargetTexture(RTT_HALF1),
                                          getFBO(FBO_COLORS).getWidth(),
                                          getFBO(FBO_COLORS).getHeight());
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index f60906081..5342ac3e4 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -257,11 +257,11 @@ RTT::RTT(size_t width, size_t height)
     }
 
     // Clear this FBO to 1s so that if no SSAO is computed we can still use it.
-    getFBO(FBO_HALF1_R).Bind();
+    getFBO(FBO_HALF1_R).bind();
     glClearColor(1., 1., 1., 1.);
     glClear(GL_COLOR_BUFFER_BIT);
 
-    getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).Bind();
+    getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).bind();
     glClearColor(.5, .5, .5, .5);
     glClear(GL_COLOR_BUFFER_BIT);
     glBindFramebuffer(GL_FRAMEBUFFER, 0);

From 9048b6ffcd7dc63a39482b4c7d9c7742f2910df9 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:37:34 +1000
Subject: [PATCH 250/331] Removed one more reference to global function.

---
 src/graphics/post_processing.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a6db81ceb..78e0ea4a6 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -702,6 +702,13 @@ public:
         assignUniforms("PIXEL_SIZE");
         assignSamplerNames(0, "colorMapG", ST_NEAREST_FILTERED);
     }   // MLAAColorEdgeDetectionSHader
+    // ------------------------------------------------------------------------
+    void render(const core::vector2df &pixel_size)
+    {
+        use();
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
+        drawFullScreenEffect(pixel_size);
+    }   // render
 };   // MLAAColorEdgeDetectionSHader
 
 // ============================================================================
@@ -1336,10 +1343,7 @@ void PostProcessing::applyMLAA()
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
     // Pass 1: color edge detection
-    MLAAColorEdgeDetectionSHader::getInstance()->use();
-    MLAAColorEdgeDetectionSHader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
-    DrawFullScreenEffect<MLAAColorEdgeDetectionSHader>(PIXEL_SIZE);
+    MLAAColorEdgeDetectionSHader::getInstance()->render(PIXEL_SIZE);
 
     glStencilFunc(GL_EQUAL, 1, ~0);
     glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);

From 8577f0d185067fd2a0e881e2a959be01a365ca92 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:40:46 +1000
Subject: [PATCH 251/331] Removed one more reference to global function.

---
 src/graphics/post_processing.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 78e0ea4a6..ede13c672 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -725,6 +725,15 @@ public:
         assignSamplerNames(0, "edgesMap", ST_BILINEAR_FILTERED,
                            1, "areaMap", ST_NEAREST_FILTERED);
     }   // MLAABlendWeightSHader
+    // ------------------------------------------------------------------------
+    void render(video::ITexture *area_map, const core::vector2df &pixel_size)
+    {
+        use();
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP),
+                        getTextureGLuint(area_map));
+    DrawFullScreenEffect<MLAABlendWeightSHader>(pixel_size);
+
+    }   // render
 };   // MLAABlendWeightSHader
 
 // ============================================================================
@@ -1352,11 +1361,7 @@ void PostProcessing::applyMLAA()
     irr_driver->getFBO(FBO_MLAA_BLEND).bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
-    MLAABlendWeightSHader::getInstance()->use();
-    MLAABlendWeightSHader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP),
-                          getTextureGLuint(m_areamap));
-    DrawFullScreenEffect<MLAABlendWeightSHader>(PIXEL_SIZE);
+    MLAABlendWeightSHader::getInstance()->render(m_areamap, PIXEL_SIZE);
 
     // Blit in to tmp1
     FrameBuffer::Blit(irr_driver->getFBO(FBO_MLAA_COLORS),

From c21f6abeb7761479f13d2867632b6fd4ff916a50 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:42:42 +1000
Subject: [PATCH 252/331] Removed one more reference to global function.

---
 src/graphics/post_processing.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index ede13c672..0cdaa39dd 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -749,6 +749,15 @@ public:
         assignSamplerNames(0, "blendMap", ST_NEAREST_FILTERED,
                            1, "colorMap", ST_NEAREST_FILTERED);
     }   // MLAAGatherSHader
+    // ------------------------------------------------------------------------
+    void render(const core::vector2df &pixel_size)
+    {
+        use();
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND),
+                        irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
+        drawFullScreenEffect(pixel_size);
+
+    }   // render
 };   // MLAAGatherSHader
 
 // ============================================================================
@@ -1369,12 +1378,7 @@ void PostProcessing::applyMLAA()
 
     // Pass 3: gather
     irr_driver->getFBO(FBO_MLAA_COLORS).bind();
-
-    MLAAGatherSHader::getInstance()->use();
-    MLAAGatherSHader::getInstance()
-        ->setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_BLEND),
-                          irr_driver->getRenderTargetTexture(RTT_MLAA_TMP));
-    DrawFullScreenEffect<MLAAGatherSHader>(PIXEL_SIZE);
+    MLAAGatherSHader::getInstance()->render(PIXEL_SIZE);
 
     // Done.
     glDisable(GL_STENCIL_TEST);

From 813d80a79271bfa0772c01050d80a0beefef72af Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:45:48 +1000
Subject: [PATCH 253/331] Removed two more references to global function.

---
 src/graphics/post_processing.cpp | 33 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 0cdaa39dd..87c0af4d0 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -344,6 +344,14 @@ public:
                            1, "tex_256", ST_BILINEAR_FILTERED,
                            2, "tex_512", ST_BILINEAR_FILTERED);
     }   // BloomBlendShader
+    // ------------------------------------------------------------------------
+    void render()
+    {
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_BLOOM_128),
+                        irr_driver->getRenderTargetTexture(RTT_BLOOM_256),
+                        irr_driver->getRenderTargetTexture(RTT_BLOOM_512));
+        drawFullScreenEffect();
+    }   // render
 };   // BloomBlendShader
 
 // ============================================================================
@@ -360,6 +368,15 @@ public:
                            1, "tex_256", ST_BILINEAR_FILTERED,
                            2, "tex_512", ST_BILINEAR_FILTERED);
     }   // LensBlendShader
+    // ------------------------------------------------------------------------
+    void render()
+    {
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_LENS_128),
+                        irr_driver->getRenderTargetTexture(RTT_LENS_256),
+                        irr_driver->getRenderTargetTexture(RTT_LENS_512));
+        drawFullScreenEffect();
+
+    }   // render
 };   // LensBlendShader
 
 // ============================================================================
@@ -731,7 +748,7 @@ public:
         use();
         setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_TMP),
                         getTextureGLuint(area_map));
-    DrawFullScreenEffect<MLAABlendWeightSHader>(pixel_size);
+        drawFullScreenEffect(pixel_size);
 
     }   // render
 };   // MLAABlendWeightSHader
@@ -1545,18 +1562,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
             
-            BloomBlendShader::getInstance()->setTextureUnits(
-                irr_driver->getRenderTargetTexture(RTT_BLOOM_128),
-                irr_driver->getRenderTargetTexture(RTT_BLOOM_256),
-                irr_driver->getRenderTargetTexture(RTT_BLOOM_512)  );
-            DrawFullScreenEffect<BloomBlendShader>();
-
-            LensBlendShader::getInstance()->setTextureUnits(
-                irr_driver->getRenderTargetTexture(RTT_LENS_128),
-                irr_driver->getRenderTargetTexture(RTT_LENS_256),
-                irr_driver->getRenderTargetTexture(RTT_LENS_512));
-            DrawFullScreenEffect<LensBlendShader>();
-
+            BloomBlendShader::getInstance()->render();
+            LensBlendShader::getInstance()->render();
 
             glDisable(GL_BLEND);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);

From 0f8d36889f92eab7cd187a96b9f38a5c04db9d9b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:51:09 +1000
Subject: [PATCH 254/331] Remved references to global function.

---
 src/graphics/render_lighting.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 79c5d4a75..38d285371 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -186,6 +186,8 @@ public:
 };   // ShadowedSunLightShaderPCF
 
 // ============================================================================
+extern float shadowSplit[5];
+// ----------------------------------------------------------------------------
 class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM,
                                                        3, float, float, float,
                                                        float>
@@ -208,6 +210,15 @@ public:
             
         assignUniforms("split0", "split1", "split2", "splitmax");
     }   // ShadowedSunLightShaderESM
+    // ------------------------------------------------------------------------
+    void render(RTT *rtt)
+    {
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                        irr_driver->getDepthStencilTexture(),
+                        rtt->getShadowFBO().getRTT()[0]);
+        drawFullScreenEffect(shadowSplit[1], shadowSplit[2],
+                             shadowSplit[3], shadowSplit[4]);
+    }   // render
 };   // ShadowedSunLightShaderESM
 
 // ============================================================================
@@ -394,9 +405,6 @@ void IrrDriver::uploadLightingData()
     glBufferSubData(GL_UNIFORM_BUFFER, 0, 36 * sizeof(float), Lighting);
 }   // uploadLightingData
 
-// ----------------------------------------------------------------------------
-extern float shadowSplit[5];
-
 // ----------------------------------------------------------------------------
 void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 {
@@ -473,15 +481,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
 
             if (CVS->isESMEnabled())
             {
-                ShadowedSunLightShaderESM::getInstance()
-                    ->setTextureUnits(
-                        irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
-                        irr_driver->getDepthStencilTexture(),
-                        m_rtts->getShadowFBO().getRTT()[0]);
-                DrawFullScreenEffect<ShadowedSunLightShaderESM>(shadowSplit[1],
-                                                                shadowSplit[2],
-                                                                shadowSplit[3],
-                                                                shadowSplit[4]);
+                ShadowedSunLightShaderESM::getInstance()->render(m_rtts);
             }
             else
             {

From 30fa3345e4ad64ebbd5c28c1a6fb1baeb6e19ef7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 09:57:28 +1000
Subject: [PATCH 255/331] Removed more references to global function.

---
 src/graphics/render_lighting.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 38d285371..cdc298b68 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -162,6 +162,8 @@ public:
 };
 
 // ============================================================================
+extern float shadowSplit[5];
+// ----------------------------------------------------------------------------
 class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF,
                                                        3,  float, float, float,
                                                        float, float>
@@ -183,11 +185,20 @@ public:
                            8, "shadowtex", ST_SHADOW_SAMPLER);
         assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res");
     }   // ShadowedSunLightShaderPCF
+    // ------------------------------------------------------------------------
+    void render(RTT *rtts)
+    {
+        setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
+                        irr_driver->getDepthStencilTexture(),
+                        rtts->getShadowFBO().getDepthTexture()                );
+       drawFullScreenEffect(shadowSplit[1], shadowSplit[2], shadowSplit[3],
+                            shadowSplit[4], 
+                            float(UserConfigParams::m_shadows_resolution)   );
+
+    }    // render
 };   // ShadowedSunLightShaderPCF
 
 // ============================================================================
-extern float shadowSplit[5];
-// ----------------------------------------------------------------------------
 class ShadowedSunLightShaderESM : public TextureShader<ShadowedSunLightShaderESM,
                                                        3, float, float, float,
                                                        float>
@@ -485,14 +496,7 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
             }
             else
             {
-                ShadowedSunLightShaderPCF::getInstance()->setTextureUnits
-                    (irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
-                     irr_driver->getDepthStencilTexture(),
-                     m_rtts->getShadowFBO().getDepthTexture()                );
-                DrawFullScreenEffect<ShadowedSunLightShaderPCF>
-                    (shadowSplit[1], shadowSplit[2], shadowSplit[3],
-                     shadowSplit[4],
-                     float(UserConfigParams::m_shadows_resolution)   );
+                ShadowedSunLightShaderPCF::getInstance()->render(m_rtts);
             }
         }
         else

From e4f29d4dea2b4d4809f3b3bc732b01a98602ac05 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 10:00:26 +1000
Subject: [PATCH 256/331] Removed one more reference to global functions.

---
 src/graphics/render_lighting.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index cdc298b68..67a92d08d 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -293,6 +293,13 @@ public:
         assignUniforms("density", "col");
         assignSamplerNames(0, "tex", ST_NEAREST_FILTERED);
     }   // FogShader
+    // ------------------------------------------------------------------------
+    void render(float start, const core::vector3df &color)
+    {
+        setTextureUnits(irr_driver->getDepthStencilTexture());
+        drawFullScreenEffect(1.f / (40.f * start), color);
+
+    }   // render
 };   // FogShader
 
 // ============================================================================
@@ -544,9 +551,7 @@ void IrrDriver::renderAmbientScatter()
     glBlendEquation(GL_FUNC_ADD);
     glBlendFunc(GL_ONE, GL_ONE);
 
-    FogShader::getInstance()
-        ->setTextureUnits(irr_driver->getDepthStencilTexture());
-    DrawFullScreenEffect<FogShader>(1.f / (40.f * start), col);
+    FogShader::getInstance()->render(start, col);
 }   // renderAmbientScatter
 
 // ----------------------------------------------------------------------------

From 0a3daf9484c55fa5dfa5053593d24341b04824eb Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 21 May 2015 20:26:28 -0400
Subject: [PATCH 257/331] Scripting work : the tutorial is now completely
 scripting-powered, nothing hardcoded anymore

---
 src/scriptengine/script_track.cpp        | 9 ++++++++-
 src/tracks/track_object_presentation.cpp | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 921e5f440..b99589ac6 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -101,6 +101,12 @@ namespace Scripting
             tobj->setID(*triggerID);
             World::getWorld()->getTrack()->getTrackObjectManager()->insertObject(tobj);
         }
+
+        /** Exits the race to the main menu */
+        void exitRace()
+        {
+            World::getWorld()->scheduleExitRace();
+        }
     }
 
     /** \cond DOXYGEN_IGNORE */
@@ -245,7 +251,8 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)",
                 asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
-            
+            r = engine->RegisterGlobalFunction("void exitRace()", asFUNCTION(exitRace), asCALL_CDECL); assert(r >= 0);
+
             // TrackObject
             r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "SoundEmitter@ getSoundEmitter()", asMETHOD(TrackObject, getSoundEmitter), asCALL_THISCALL); assert(r >= 0);
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index cf4be74ef..35bb110a1 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -940,12 +940,6 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
                   _("Complete all challenges to unlock the big door!"), true);
         }
     }
-    else if (m_action == "tutorial_exit")
-    {
-        // TODO: move to scripting
-        World::getWorld()->scheduleExitRace();
-        return;
-    }
     else
     {	
         Scripting::ScriptEngine* script_engine =

From cbd5670764606dfb449968ff1093448b85390a54 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 11:09:51 +1000
Subject: [PATCH 258/331] DIE global function - rest in peace, push up the
 daisies, kick the bucket.

---
 src/graphics/shaders.hpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 6cd255306..3b1800660 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -68,17 +68,6 @@ public:
 }
 
 
-
-template<typename T, typename... Args>
-static void DrawFullScreenEffect(Args...args)
-{
-    T::getInstance()->use();
-    glBindVertexArray(SharedGPUObjects::getFullScreenQuadVAO());
-    T::getInstance()->setUniforms(args...);
-    glDrawArrays(GL_TRIANGLES, 0, 3);
-}
-
-
 #define FOREACH_SHADER(ACT) \
     ACT(ES_NORMAL_MAP) \
     ACT(ES_NORMAL_MAP_LIGHTMAP) \

From ced9e556392e39a6c4b611eb802701a4346549da Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 16:26:30 +1000
Subject: [PATCH 259/331] Moved shared shaders into Shaders class.

---
 src/graphics/render_geometry.cpp  |  28 +++----
 src/graphics/shaders.cpp          | 120 ++++++++++++++----------------
 src/graphics/shaders.hpp          |  72 +++++++++---------
 src/graphics/stkmesh.cpp          |   4 +-
 src/graphics/stkmeshscenenode.cpp |  77 +++++++++++++------
 5 files changed, 160 insertions(+), 141 deletions(-)

diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 84852fecf..c33a93188 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -519,8 +519,8 @@ struct DefaultMaterial
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDefault InstancedList;
-    typedef MeshShader::ObjectPass1Shader FirstPassShader;
-    typedef MeshShader::ObjectPass2Shader SecondPassShader;
+    typedef Shaders::ObjectPass1Shader FirstPassShader;
+    typedef Shaders::ObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatDefault List;
@@ -579,7 +579,7 @@ struct SphereMap
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatSphereMap InstancedList;
-    typedef MeshShader::ObjectPass1Shader FirstPassShader;
+    typedef Shaders::ObjectPass1Shader FirstPassShader;
     typedef SphereMapShader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
@@ -844,7 +844,7 @@ struct NormalMat
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatNormalMap InstancedList;
     typedef NormalMapShader FirstPassShader;
-    typedef MeshShader::ObjectPass2Shader SecondPassShader;
+    typedef Shaders::ObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
     typedef ListMatNormalMap List;
@@ -874,7 +874,7 @@ struct DetailMat
     typedef InstancedShadowShader InstancedShadowPassShader;
     typedef CInstancedRSMShader InstancedRSMShader;
     typedef ListInstancedMatDetails InstancedList;
-    typedef MeshShader::ObjectPass1Shader FirstPassShader;
+    typedef Shaders::ObjectPass1Shader FirstPassShader;
     typedef DetailedObjectPass2Shader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef CRSMShader RSMShader;
@@ -899,7 +899,7 @@ const STK::Tuple<size_t> DetailMat::RSMTextures = STK::Tuple<size_t>(0);
 // ----------------------------------------------------------------------------
 struct SplattingMat
 {
-    typedef MeshShader::ObjectPass1Shader FirstPassShader;
+    typedef Shaders::ObjectPass1Shader FirstPassShader;
     typedef SplattingShader SecondPassShader;
     typedef ShadowShader ShadowPassShader;
     typedef SplattingRSMShader RSMShader;
@@ -1312,22 +1312,22 @@ void IrrDriver::renderSolidSecondPass()
     if (CVS->isAZDOEnabled())
     {
         DiffuseHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_DIFFUSE),
-                          MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
+                          Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
         if (!glIsTextureHandleResidentARB(DiffuseHandle))
             glMakeTextureHandleResidentARB(DiffuseHandle);
 
         SpecularHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_SPECULAR),
-                           MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
+                           Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
         if (!glIsTextureHandleResidentARB(SpecularHandle))
             glMakeTextureHandleResidentARB(SpecularHandle);
 
         SSAOHandle = glGetTextureSamplerHandleARB(m_rtts->getRenderTarget(RTT_HALF1_R),
-                        MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
+                        Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
         if (!glIsTextureHandleResidentARB(SSAOHandle))
             glMakeTextureHandleResidentARB(SSAOHandle);
 
         DepthHandle = glGetTextureSamplerHandleARB(getDepthStencilTexture(),
-                     MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[3]);
+                     Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[3]);
         if (!glIsTextureHandleResidentARB(DepthHandle))
             glMakeTextureHandleResidentARB(DepthHandle);
     }
@@ -1530,12 +1530,12 @@ void IrrDriver::renderTransparent()
     if (World::getWorld() && World::getWorld()->isFogEnabled())
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderTransparenPass<MeshShader::TransparentFogShader, video::EVT_STANDARD,
+        renderTransparenPass<Shaders::TransparentFogShader, video::EVT_STANDARD,
                              8, 7, 6, 5, 4, 3, 2, 1>(
                              TexUnits(RenderGeometry::TexUnit(0, true)),
                               ListBlendTransparentFog::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderTransparenPass<MeshShader::TransparentFogShader, 
+        renderTransparenPass<Shaders::TransparentFogShader, 
                              video::EVT_STANDARD, 8, 7, 6, 5, 4, 3, 2, 1>(
                              TexUnits(RenderGeometry::TexUnit(0, true)), 
                                        ListAdditiveTransparentFog::getInstance());
@@ -1543,12 +1543,12 @@ void IrrDriver::renderTransparent()
     else
     {
         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        renderTransparenPass<MeshShader::TransparentShader,
+        renderTransparenPass<Shaders::TransparentShader,
                              video::EVT_STANDARD, 2, 1>(
                                   TexUnits(RenderGeometry::TexUnit(0, true)),
                                            ListBlendTransparent::getInstance());
         glBlendFunc(GL_ONE, GL_ONE);
-        renderTransparenPass<MeshShader::TransparentShader, video::EVT_STANDARD, 2, 1>(
+        renderTransparenPass<Shaders::TransparentShader, video::EVT_STANDARD, 2, 1>(
                              TexUnits(RenderGeometry::TexUnit(0, true)),
                                       ListAdditiveTransparent::getInstance());
     }
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index fff958c4e..0f86e7f9f 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -225,25 +225,6 @@ GLuint LoadShader(const char * file, unsigned type)
 }
 
 
-
-Shaders::ColoredLine::ColoredLine()
-{
-    loadProgram(OBJECT, GL_VERTEX_SHADER,   "object_pass.vert",
-                        GL_FRAGMENT_SHADER, "coloredquad.frag");
-
-    assignUniforms("color");
-
-    glGenVertexArrays(1, &m_vao);
-    glBindVertexArray(m_vao);
-    glGenBuffers(1, &m_vbo);
-    glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
-    glBufferData(GL_ARRAY_BUFFER, 6 * 1024 * sizeof(float), 0, GL_DYNAMIC_DRAW);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-    glBindVertexArray(0);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-}   // Shaders::ColoredLine
-
 void Shaders::loadShaders()
 {
     const std::string &dir = file_manager->getAsset(FileManager::SHADER, "");
@@ -350,55 +331,66 @@ unsigned getGLSLVersion()
     return CVS->getGLSLVersion();
 }
 
-namespace MeshShader
+// ============================================================================
+// Solid Normal and depth pass shaders
+Shaders::ObjectPass1Shader::ObjectPass1Shader()
 {
-    // Solid Normal and depth pass shaders
-    ObjectPass1Shader::ObjectPass1Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
-            GL_FRAGMENT_SHADER, "object_pass1.frag");
-        assignUniforms("ModelMatrix", "InverseModelMatrix");
-        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "utils/encode_normal.frag",
+                        GL_FRAGMENT_SHADER, "object_pass1.frag");
+    assignUniforms("ModelMatrix", "InverseModelMatrix");
+    assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+}   // ObjectPass1Shader
 
+// ============================================================================
+// Solid Lit pass shaders
+Shaders::ObjectPass2Shader::ObjectPass2Shader()
+{
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
+                        GL_FRAGMENT_SHADER, "object_pass2.frag");
+    assignUniforms("ModelMatrix", "TextureMatrix");
+    assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
+                       1, "SpecularMap", ST_NEAREST_FILTERED,
+                       2, "SSAO", ST_BILINEAR_FILTERED,
+                       3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
+                       4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+}   // ObjectPass2Shader
 
-    // Solid Lit pass shaders
-    ObjectPass2Shader::ObjectPass2Shader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "utils/getLightFactor.frag",
-            GL_FRAGMENT_SHADER, "object_pass2.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix");
-            assignSamplerNames(0, "DiffuseMap", ST_NEAREST_FILTERED,
-                               1, "SpecularMap", ST_NEAREST_FILTERED,
-                               2, "SSAO", ST_BILINEAR_FILTERED,
-                               3, "Albedo", ST_TRILINEAR_ANISOTROPIC_FILTERED,
-                               4, "SpecMap", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
+// ============================================================================
+Shaders::TransparentShader::TransparentShader()
+{
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "transparent.frag");
+    assignUniforms("ModelMatrix", "TextureMatrix");
+    assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+}   // TransparentShader
 
+// ============================================================================
+Shaders::TransparentFogShader::TransparentFogShader()
+{
+    loadProgram(OBJECT, GL_VERTEX_SHADER, "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "transparentfog.frag");
+    assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH",
+                   "endH", "start", "end", "col");
+    assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
+}   // TransparentFogShader
 
+// ============================================================================
+Shaders::ColoredLine::ColoredLine()
+{
+    loadProgram(OBJECT, GL_VERTEX_SHADER,   "object_pass.vert",
+                        GL_FRAGMENT_SHADER, "coloredquad.frag");
 
-    TransparentShader::TransparentShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "transparent.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix");
-        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-    TransparentFogShader::TransparentFogShader()
-    {
-        loadProgram(OBJECT,
-            GL_VERTEX_SHADER, "object_pass.vert",
-            GL_FRAGMENT_SHADER, "transparentfog.frag");
-        assignUniforms("ModelMatrix", "TextureMatrix", "fogmax", "startH",
-                       "endH", "start", "end", "col");
-        assignSamplerNames(0, "tex", ST_TRILINEAR_ANISOTROPIC_FILTERED);
-    }
-
-}
+    assignUniforms("color");
 
+    glGenVertexArrays(1, &m_vao);
+    glBindVertexArray(m_vao);
+    glGenBuffers(1, &m_vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
+    glBufferData(GL_ARRAY_BUFFER, 6 * 1024 * sizeof(float), 0, GL_DYNAMIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+    glBindVertexArray(0);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+}   // Shaders::ColoredLine
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 3b1800660..1f72c1287 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -31,43 +31,6 @@
 using namespace irr;
 class ParticleSystemProxy;
 
-
-namespace MeshShader
-{
-class ObjectPass1Shader : public TextureShader<ObjectPass1Shader, 1,
-                                             core::matrix4, core::matrix4>
-{
-public:
-    ObjectPass1Shader();
-};
-
-
-
-class ObjectPass2Shader : public TextureShader<ObjectPass2Shader, 5, core::matrix4, core::matrix4>
-{
-public:
-    ObjectPass2Shader();
-};
-
-
-
-
-class TransparentShader : public TextureShader<TransparentShader, 1, core::matrix4, core::matrix4>
-{
-public:
-    TransparentShader();
-};
-
-class TransparentFogShader : public TextureShader<TransparentFogShader, 1, core::matrix4, core::matrix4, float, float, 
-                                           float, float, float, video::SColorf>
-{
-public:
-    TransparentFogShader();
-};
-
-}
-
-
 #define FOREACH_SHADER(ACT) \
     ACT(ES_NORMAL_MAP) \
     ACT(ES_NORMAL_MAP_LIGHTMAP) \
@@ -166,6 +129,41 @@ public:
         }   // bindBuffer
     };   // class ColoredLine
 
+    // ========================================================================
+    class TransparentShader : public TextureShader<TransparentShader, 1,
+                                                   core::matrix4, core::matrix4 >
+    {
+    public:
+        TransparentShader();
+    };   // TransparentShader
+
+    // ========================================================================
+    class TransparentFogShader : public TextureShader<TransparentFogShader, 1,
+                                     core::matrix4, core::matrix4, float, float,
+                                     float, float, float, video::SColorf >
+    {
+    public:
+        TransparentFogShader();
+    };   // TransparentFogShader
+    // ========================================================================
+    class ObjectPass1Shader : public TextureShader<ObjectPass1Shader, 1,
+                                                  core::matrix4, core::matrix4>
+    {
+    public:
+        ObjectPass1Shader();
+    };   // ObjectPass1Shader
+
+    // ========================================================================
+    class ObjectPass2Shader : public TextureShader < ObjectPass2Shader, 5,
+                                                 core::matrix4, core::matrix4 >
+    {
+    public:
+        ObjectPass2Shader();
+    };   // ObjectPass2Shader
+
+    // ========================================================================
+
+
 };   // class Shaders
 
 #undef ENUM
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp
index d7f5d69d6..7c9372298 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stkmesh.cpp
@@ -347,7 +347,7 @@ static void setTexture(GLMesh &mesh, unsigned i, bool is_srgb,
         {
             mesh.TextureHandles[i] = glGetTextureSamplerHandleARB(
                 getTextureGLuint(mesh.textures[i]),
-                MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+                Shaders::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
         }
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[i]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[i]);
@@ -426,7 +426,7 @@ void initTexturesTransparent(GLMesh &mesh)
         {
             mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(
                 getTextureGLuint(mesh.textures[0]),
-                MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+                Shaders::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
         }
         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
index 4d27c8cae..d2f43ed32 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stkmeshscenenode.cpp
@@ -290,7 +290,7 @@ void STKMeshSceneNode::render()
         glDisable(GL_CULL_FACE);
         if (update_each_frame)
             updatevbo();
-        MeshShader::ObjectPass1Shader::getInstance()->use();
+        Shaders::ObjectPass1Shader::getInstance()->use();
         // Only untextured
         for (unsigned i = 0; i < GLmeshes.size(); i++)
         {
@@ -304,14 +304,19 @@ void STKMeshSceneNode::render()
             if (CVS->isAZDOEnabled())
             {
                 if (!mesh.TextureHandles[0])
-                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass1Shader::getInstance()->m_sampler_ids[0]);
+                {
+                    mesh.TextureHandles[0] = 
+                        glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), 
+                                                     Shaders::ObjectPass1Shader
+                                                     ::getInstance()->m_sampler_ids[0]);
+                }
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                MeshShader::ObjectPass1Shader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
+                Shaders::ObjectPass1Shader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
             }
             else
-                MeshShader::ObjectPass1Shader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
-            MeshShader::ObjectPass1Shader::getInstance()->setUniforms(AbsoluteTransformation, invmodel);
+                Shaders::ObjectPass1Shader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
+            Shaders::ObjectPass1Shader::getInstance()->setUniforms(AbsoluteTransformation, invmodel);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);
             glDrawElements(ptype, count, itype, 0);
@@ -329,7 +334,7 @@ void STKMeshSceneNode::render()
         glDisable(GL_CULL_FACE);
         if (update_each_frame && !CVS->isDefferedEnabled())
             updatevbo();
-        MeshShader::ObjectPass2Shader::getInstance()->use();
+        Shaders::ObjectPass2Shader::getInstance()->use();
         // Only untextured
         for (unsigned i = 0; i < GLmeshes.size(); i++)
         {
@@ -341,36 +346,50 @@ void STKMeshSceneNode::render()
 
             if (CVS->isAZDOEnabled())
             {
-                GLuint64 DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
+                GLuint64 DiffuseHandle =
+                    glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), 
+                                                 Shaders::ObjectPass2Shader
+                                                    ::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(DiffuseHandle))
                     glMakeTextureHandleResidentARB(DiffuseHandle);
 
-                GLuint64 SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
+                GLuint64 SpecularHandle =
+                    glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR),
+                                        Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[1]);
                 if (!glIsTextureHandleResidentARB(SpecularHandle))
                     glMakeTextureHandleResidentARB(SpecularHandle);
 
-                GLuint64 SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
+                GLuint64 SSAOHandle =
+                    glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R),
+                                    Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[2]);
                 if (!glIsTextureHandleResidentARB(SSAOHandle))
                     glMakeTextureHandleResidentARB(SSAOHandle);
 
                 if (!mesh.TextureHandles[0])
-                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
+                    mesh.TextureHandles[0] = 
+                    glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), 
+                                Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
                 if (!mesh.TextureHandles[1])
-                    mesh.TextureHandles[1] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[1]), MeshShader::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
+                    mesh.TextureHandles[1] =
+                    glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[1]),
+                                Shaders::ObjectPass2Shader::getInstance()->m_sampler_ids[0]);
                 if (!glIsTextureHandleResidentARB(mesh.TextureHandles[1]))
                     glMakeTextureHandleResidentARB(mesh.TextureHandles[1]);
-                MeshShader::ObjectPass2Shader::getInstance()->setTextureHandles(DiffuseHandle, SpecularHandle, SSAOHandle, mesh.TextureHandles[0], mesh.TextureHandles[1]);
+                Shaders::ObjectPass2Shader::getInstance()
+                    ->setTextureHandles(DiffuseHandle, SpecularHandle, SSAOHandle,
+                                        mesh.TextureHandles[0], mesh.TextureHandles[1]);
             }
             else
-                MeshShader::ObjectPass2Shader::getInstance()->setTextureUnits(
+                Shaders::ObjectPass2Shader::getInstance()->setTextureUnits(
                 irr_driver->getRenderTargetTexture(RTT_DIFFUSE),
                 irr_driver->getRenderTargetTexture(RTT_SPECULAR),
                 irr_driver->getRenderTargetTexture(RTT_HALF1_R),
                 getTextureGLuint(mesh.textures[0]),
                 getTextureGLuint(mesh.textures[1]));
-            MeshShader::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
+            Shaders::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation,
+                                                                   mesh.TextureMatrix);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);
             glDrawElements(ptype, count, itype, 0);
@@ -411,7 +430,7 @@ void STKMeshSceneNode::render()
 
             if (World::getWorld() && World::getWorld()->isFogEnabled())
             {
-                MeshShader::TransparentFogShader::getInstance()->use();
+                Shaders::TransparentFogShader::getInstance()->use();
                 for (unsigned i = 0; i < GLmeshes.size(); i++)
                 {
                     GLMesh &mesh = GLmeshes[i];
@@ -438,14 +457,22 @@ void STKMeshSceneNode::render()
                     if (CVS->isAZDOEnabled())
                     {
                         if (!mesh.TextureHandles[0])
-                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->m_sampler_ids[0]);
+                            mesh.TextureHandles[0] =
+                            glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]),
+                                   Shaders::TransparentFogShader::getInstance()->m_sampler_ids[0]);
                         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                        MeshShader::TransparentFogShader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
+                        Shaders::TransparentFogShader::getInstance()
+                                    ->setTextureHandles(mesh.TextureHandles[0]);
                     }
                     else
-                        MeshShader::TransparentFogShader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
-                    MeshShader::TransparentFogShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix, fogmax, startH, endH, start, end, col);
+                    {
+                        Shaders::TransparentFogShader::getInstance()
+                            ->setTextureUnits(getTextureGLuint(mesh.textures[0]));
+                    }
+                    Shaders::TransparentFogShader::getInstance()
+                           ->setUniforms(AbsoluteTransformation, mesh.TextureMatrix,
+                                         fogmax, startH, endH, start, end, col);
 
                     assert(mesh.vao);
                     glBindVertexArray(mesh.vao);
@@ -455,7 +482,7 @@ void STKMeshSceneNode::render()
             }
             else
             {
-                MeshShader::TransparentShader::getInstance()->use();
+                Shaders::TransparentShader::getInstance()->use();
                 for (unsigned i = 0; i < GLmeshes.size(); i++)
                 {
                     irr_driver->IncreaseObjectCount();
@@ -468,15 +495,17 @@ void STKMeshSceneNode::render()
                     if (CVS->isAZDOEnabled())
                     {
                         if (!mesh.TextureHandles[0])
-                            mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentShader::getInstance()->m_sampler_ids[0]);
+                            mesh.TextureHandles[0] =
+                            glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]),
+                            Shaders::TransparentShader::getInstance()->m_sampler_ids[0]);
                         if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
                             glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
-                        MeshShader::TransparentShader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
+                        Shaders::TransparentShader::getInstance()->setTextureHandles(mesh.TextureHandles[0]);
                     }
                     else
-                        MeshShader::TransparentShader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
+                        Shaders::TransparentShader::getInstance()->setTextureUnits(getTextureGLuint(mesh.textures[0]));
 
-                    MeshShader::TransparentShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
+                    Shaders::TransparentShader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
                     assert(mesh.vao);
                     glBindVertexArray(mesh.vao);
                     glDrawElements(ptype, count, itype, 0);

From 5ba3dee1224b600ecf2ad0ce2df3b401a020bc31 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 16:37:54 +1000
Subject: [PATCH 260/331] Moved global variable at least into a class.

---
 src/graphics/render_lighting.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 67a92d08d..abcd8f7f2 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -24,6 +24,7 @@
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shadow_matrixes.hpp"
 #include "graphics/shared_gpu_objects.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
@@ -162,8 +163,6 @@ public:
 };
 
 // ============================================================================
-extern float shadowSplit[5];
-// ----------------------------------------------------------------------------
 class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF,
                                                        3,  float, float, float,
                                                        float, float>
@@ -191,8 +190,10 @@ public:
         setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
                         irr_driver->getDepthStencilTexture(),
                         rtts->getShadowFBO().getDepthTexture()                );
-       drawFullScreenEffect(shadowSplit[1], shadowSplit[2], shadowSplit[3],
-                            shadowSplit[4], 
+       drawFullScreenEffect(ShadowMatrices::m_shadow_split[1],
+                            ShadowMatrices::m_shadow_split[2],
+                            ShadowMatrices::m_shadow_split[3],
+                            ShadowMatrices::m_shadow_split[4], 
                             float(UserConfigParams::m_shadows_resolution)   );
 
     }    // render
@@ -227,8 +228,10 @@ public:
         setTextureUnits(irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH),
                         irr_driver->getDepthStencilTexture(),
                         rtt->getShadowFBO().getRTT()[0]);
-        drawFullScreenEffect(shadowSplit[1], shadowSplit[2],
-                             shadowSplit[3], shadowSplit[4]);
+        drawFullScreenEffect(ShadowMatrices::m_shadow_split[1],
+                             ShadowMatrices::m_shadow_split[2],
+                             ShadowMatrices::m_shadow_split[3],
+                             ShadowMatrices::m_shadow_split[4]);
     }   // render
 };   // ShadowedSunLightShaderESM
 

From 0b2c44ed71e0c374e806847f5ded58ff64b69816 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 16:44:22 +1000
Subject: [PATCH 261/331] Removed unused function, minor coding style cleanup.

---
 src/graphics/shaders.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 0f86e7f9f..9974098e9 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -167,8 +167,9 @@ static std::string LoadHeader()
     return result;
 }
 
+// ----------------------------------------------------------------------------
 // Mostly from shader tutorial
-GLuint LoadShader(const char * file, unsigned type)
+GLuint loadShader(const char * file, unsigned type)
 {
     GLuint Id = glCreateShader(type);
     char versionString[20];
@@ -222,14 +223,15 @@ GLuint LoadShader(const char * file, unsigned type)
     glGetError();
 
     return Id;
-}
-
+}   // loadShader
 
+// ----------------------------------------------------------------------------
 void Shaders::loadShaders()
 {
     const std::string &dir = file_manager->getAsset(FileManager::SHADER, "");
 
-    IGPUProgrammingServices * const gpu = irr_driver->getVideoDriver()->getGPUProgrammingServices();
+    IGPUProgrammingServices * const gpu = irr_driver->getVideoDriver()
+                                        ->getGPUProgrammingServices();
 
 #define glsl(a, b, c) gpu->addHighLevelShaderMaterialFromFiles((a).c_str(), (b).c_str(), (IShaderConstantSetCallBack*) c)
 #define glslmat(a, b, c, d) gpu->addHighLevelShaderMaterialFromFiles((a).c_str(), (b).c_str(), (IShaderConstantSetCallBack*) c, d)
@@ -304,7 +306,7 @@ void Shaders::loadShaders()
     initGL();
     CleanTable.clear();
     SharedGPUObjects::init();
-}
+}   // loadShaders
 
 // ----------------------------------------------------------------------------
 /** C
@@ -320,17 +322,12 @@ void Shaders::check(const int num)
 {
     if (m_shaders[num] == -1)
     {
-        Log::error("shaders", "Shader %s failed to load. Update your drivers, if the issue "
+        Log::error("shaders",
+                   "Shader %s failed to load. Update your drivers, if the issue "
                    "persists, report a bug to us.", shader_names[num] + 3);
     }
 }   // check
 
-
-unsigned getGLSLVersion()
-{
-    return CVS->getGLSLVersion();
-}
-
 // ============================================================================
 // Solid Normal and depth pass shaders
 Shaders::ObjectPass1Shader::ObjectPass1Shader()

From 855c59db09f57e531c425842b5729d1e58e539a4 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 22 May 2015 16:45:09 +1000
Subject: [PATCH 262/331] Removed global variable shadowSplit (missing in
 previous commit).

---
 src/graphics/shadow_matrixes.cpp | 60 ++++++++++++++------------------
 src/graphics/shadow_matrixes.hpp | 29 +++++++++++++++
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 7e94b9729..7a371a29a 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -15,6 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "graphics/shadow_matrixes.hpp"
 
 #include "graphics/central_settings.hpp"
 #include "graphics/irr_driver.hpp"
@@ -34,6 +35,8 @@
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
 
+float ShadowMatrices::m_shadow_split[5] = { 1., 5., 20., 50., 150 };
+
 // ============================================================================
 class LightspaceBoundingBoxShader 
     : public TextureShader<LightspaceBoundingBoxShader, 1,
@@ -139,30 +142,6 @@ static core::matrix4 getTighestFitOrthoProj(const core::matrix4 &transform,
     return tmp_matrix;
 }   // getTighestFitOrthoProj
 
-// ----------------------------------------------------------------------------
-float shadowSplit[5] = { 1., 5., 20., 50., 150 };
-
-struct CascadeBoundingBox
-{
-    int xmin;
-    int xmax;
-    int ymin;
-    int ymax;
-    int zmin;
-    int zmax;
-};
-
-static size_t currentCBB = 0;
-static CascadeBoundingBox *CBB[2];
-
-struct Histogram
-{
-    int bin[1024];
-    int mindepth;
-    int maxdepth;
-    int count;
-};
-
 // ----------------------------------------------------------------------------
 /** Update shadowSplit values and make Cascade Bounding Box pointer valid.
  *  The function aunches two compute kernel that generates an histogram of the 
@@ -178,6 +157,16 @@ struct Histogram
 void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
                                                                 size_t height)
 {
+    struct CascadeBoundingBox
+    {
+        int xmin;
+        int xmax;
+        int ymin;
+        int ymax;
+        int zmin;
+        int zmax;
+    };   // struct CascadeBoundingBox
+
     // Value that should be kept between multiple calls
     static bool ssboInit = false;
     static GLuint CBBssbo, tempShadowMatssbo;
@@ -205,8 +194,11 @@ void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
     LightspaceBoundingBoxShader::getInstance()
         ->setTextureUnits(getDepthStencilTexture());
     LightspaceBoundingBoxShader::getInstance()
-        ->setUniforms(m_suncam->getViewMatrix(), shadowSplit[1],
-                      shadowSplit[2], shadowSplit[3], shadowSplit[4]);
+        ->setUniforms(m_suncam->getViewMatrix(),
+                      ShadowMatrices::m_shadow_split[1],
+                      ShadowMatrices::m_shadow_split[2],
+                      ShadowMatrices::m_shadow_split[3],
+                      ShadowMatrices::m_shadow_split[4]);
     glDispatchCompute((int)width / 64, (int)height / 64, 1);
 
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
@@ -257,17 +249,17 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
     const float oldnear = camnode->getNearValue();
     float FarValues[] =
     {
-        shadowSplit[1],
-        shadowSplit[2],
-        shadowSplit[3],
-        shadowSplit[4],
+        ShadowMatrices::m_shadow_split[1],
+        ShadowMatrices::m_shadow_split[2],
+        ShadowMatrices::m_shadow_split[3],
+        ShadowMatrices::m_shadow_split[4],
     };
     float NearValues[] =
     {
-        shadowSplit[0],
-        shadowSplit[1],
-        shadowSplit[2],
-        shadowSplit[3]
+        ShadowMatrices::m_shadow_split[0],
+        ShadowMatrices::m_shadow_split[1],
+        ShadowMatrices::m_shadow_split[2],
+        ShadowMatrices::m_shadow_split[3]
     };
 
     float tmp[16 * 9 + 2];
diff --git a/src/graphics/shadow_matrixes.hpp b/src/graphics/shadow_matrixes.hpp
index e69de29bb..25f31b01c 100644
--- a/src/graphics/shadow_matrixes.hpp
+++ b/src/graphics/shadow_matrixes.hpp
@@ -0,0 +1,29 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015 SuperTuxKart-Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#ifndef HEADER_SHADOW_MATRICES_HPP
+#define HEADER_SHADOW_MATRICES_HPP
+
+class ShadowMatrices
+{
+public:
+     static float m_shadow_split[5];
+
+};   // class ShadowMatrices
+
+#endif

From 4c02204eff726e104d8029cd8fb0fe62ca44f618 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 24 May 2015 18:34:01 -0400
Subject: [PATCH 263/331] Start porting the overworld to scripting

---
 src/scriptengine/script_challenges.cpp   | 76 ++++++++++++++++++++++++
 src/scriptengine/script_challenges.hpp   | 35 +++++++++++
 src/scriptengine/script_engine.cpp       |  2 +
 src/scriptengine/script_track.cpp        |  7 +++
 src/scriptengine/script_track.hpp        |  2 -
 src/tracks/track_object_presentation.cpp | 48 +++------------
 6 files changed, 129 insertions(+), 41 deletions(-)
 create mode 100644 src/scriptengine/script_challenges.cpp
 create mode 100644 src/scriptengine/script_challenges.hpp

diff --git a/src/scriptengine/script_challenges.cpp b/src/scriptengine/script_challenges.cpp
new file mode 100644
index 000000000..3c619a318
--- /dev/null
+++ b/src/scriptengine/script_challenges.cpp
@@ -0,0 +1,76 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "script_track.hpp"
+
+#include "animations/three_d_animation.hpp"
+#include "input/device_manager.hpp"
+#include "input/input_device.hpp"
+#include "input/input_manager.hpp"
+#include "modes/world.hpp"
+#include "states_screens/dialogs/tutorial_message_dialog.hpp"
+#include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
+#include "tracks/track_object_manager.hpp"
+
+#include <angelscript.h>
+#include <assert.h>
+
+/** \cond DOXYGEN_IGNORE */
+namespace Scripting
+{
+    /** \endcond */
+    namespace Challenges
+    {
+        /** \addtogroup Scripting
+        * @{
+        */
+        /** \addtogroup Scripting_Challenges Challenges
+        * @{
+        */
+
+        int getCompletedChallengesCount()
+        {
+            ::Track* track = World::getWorld()->getTrack();
+            return track->getNumOfCompletedChallenges();
+        }
+
+        int getChallengeCount()
+        {
+            ::Track* track = World::getWorld()->getTrack();
+            return track->getChallengeList().size();
+        }
+
+        /** @}*/
+        /** @}*/
+
+        void registerScriptFunctions(asIScriptEngine *engine)
+        {
+            int r; // of type asERetCodes
+
+            engine->SetDefaultNamespace("Challenges");
+
+            r = engine->RegisterGlobalFunction("int getCompletedChallengesCount()", asFUNCTION(getCompletedChallengesCount), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("int getChallengeCount()", asFUNCTION(getChallengeCount), asCALL_CDECL); assert(r >= 0);
+        }
+
+/** \cond DOXYGEN_IGNORE */
+    }
+}
+/** \endcond */
+
diff --git a/src/scriptengine/script_challenges.hpp b/src/scriptengine/script_challenges.hpp
new file mode 100644
index 000000000..6f872b0aa
--- /dev/null
+++ b/src/scriptengine/script_challenges.hpp
@@ -0,0 +1,35 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SCRIPT_CHALLENGES_HPP
+#define HEADER_SCRIPT_CHALLENGES_HPP
+
+#include <angelscript.h>
+
+#include <string>
+
+namespace Scripting
+{
+    namespace Challenges
+    {
+        //script engine functions
+        void registerScriptFunctions(asIScriptEngine *engine);
+    }
+
+}
+#endif
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 6601d0072..250204d5e 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -21,6 +21,7 @@
 #include "io/file_manager.hpp"
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
+#include "scriptengine/script_challenges.hpp"
 #include "scriptengine/script_engine.hpp"
 #include "scriptengine/script_gui.hpp"
 #include "scriptengine/script_track.hpp"
@@ -335,6 +336,7 @@ namespace Scripting
         RegisterVec3(engine);      //register Vec3
 
         Scripting::Track::registerScriptFunctions(m_engine);
+        Scripting::Challenges::registerScriptFunctions(m_engine);
         Scripting::Kart::registerScriptFunctions(m_engine);
         Scripting::Physics::registerScriptFunctions(m_engine);
         Scripting::Utils::registerScriptFunctions(m_engine);
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index b99589ac6..8f69ec709 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -24,6 +24,7 @@
 #include "input/input_manager.hpp"
 #include "modes/world.hpp"
 #include "states_screens/dialogs/tutorial_message_dialog.hpp"
+#include "states_screens/dialogs/race_paused_dialog.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_object.hpp"
 #include "tracks/track_object_manager.hpp"
@@ -107,6 +108,11 @@ namespace Scripting
         {
             World::getWorld()->scheduleExitRace();
         }
+
+        void pauseRace()
+        {
+            new RacePausedDialog(0.8f, 0.6f);
+        }
     }
 
     /** \cond DOXYGEN_IGNORE */
@@ -252,6 +258,7 @@ namespace Scripting
                 asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void exitRace()", asFUNCTION(exitRace), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void pauseRace()", asFUNCTION(pauseRace), asCALL_CDECL); assert(r >= 0);
 
             // TrackObject
             r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
diff --git a/src/scriptengine/script_track.hpp b/src/scriptengine/script_track.hpp
index 4f33d4fe8..69824b7d1 100644
--- a/src/scriptengine/script_track.hpp
+++ b/src/scriptengine/script_track.hpp
@@ -29,8 +29,6 @@ namespace Scripting
     {
         //script engine functions
         void registerScriptFunctions(asIScriptEngine *engine);
-        asIScriptFunction*
-            registerScriptCallbacks(asIScriptEngine *engine , std::string scriptName);
     }
 
 }
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 35bb110a1..3fcbeee1f 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -38,7 +38,6 @@
 #include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"
 #include "scriptengine/script_engine.hpp"
-#include "states_screens/dialogs/race_paused_dialog.hpp"
 #include "states_screens/dialogs/tutorial_message_dialog.hpp"
 #include "tracks/model_definition_loader.hpp"
 #include "tracks/track.hpp"
@@ -914,42 +913,13 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
 {
     if (!m_action_active) return;
 
-    // TODO: replace all of these hardcoded actions with scripting
-
-    if (m_action == "garage")
-    {
-        m_action_active = false;
-
-        new RacePausedDialog(0.8f, 0.6f);
-        //dynamic_cast<OverWorld*>(World::getWorld())->scheduleSelectKart();
-    }
-    //action trigger near big doors in the overword to notify players that
-    // they'll open once they finish all the challenges
-    else if (m_action == "big_door")
-    {
-        m_action_active = false;
-
-        Track* m_track = World::getWorld()->getTrack();
-        unsigned int unlocked_challenges = m_track->getNumOfCompletedChallenges();
-        std::vector<OverworldChallenge> m_challenges = m_track->getChallengeList();
-
-        // allow ONE unsolved challenge : the last one
-        if (unlocked_challenges < m_challenges.size() - 1)
-        {
-            new TutorialMessageDialog(
-                  _("Complete all challenges to unlock the big door!"), true);
-        }
-    }
-    else
-    {	
-        Scripting::ScriptEngine* script_engine =
-            World::getWorld()->getScriptEngine();
-        m_action_active = false;
-        int idKart = 0;
-        Camera* camera = Camera::getActiveCamera();
-        if (camera != NULL && camera->getKart() != NULL)
-            idKart = camera->getKart()->getWorldKartId();
-        script_engine->runFunction("void " + m_action + "(int)",
-            [=](asIScriptContext* ctx) { ctx->SetArgDWord(0, idKart); });
-    }
+    Scripting::ScriptEngine* script_engine =
+        World::getWorld()->getScriptEngine();
+    m_action_active = false; // TODO: allow auto re-activating?
+    int idKart = 0;
+    Camera* camera = Camera::getActiveCamera();
+    if (camera != NULL && camera->getKart() != NULL)
+        idKart = camera->getKart()->getWorldKartId();
+    script_engine->runFunction("void " + m_action + "(int)",
+        [=](asIScriptContext* ctx) { ctx->SetArgDWord(0, idKart); });
 }   // onTriggerItemApproached

From 1ada542fa5a74da7a6020bb03677e9299eb1a86c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 24 May 2015 19:15:50 -0400
Subject: [PATCH 264/331] Continue porting overworld to scripting

---
 src/scriptengine/script_engine.cpp | 23 +++++++++++++++++----
 src/scriptengine/script_engine.hpp |  6 +++++-
 src/tracks/track.cpp               | 32 ++++++++++++++++--------------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 250204d5e..a851dbe67 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -177,7 +177,17 @@ namespace Scripting
     void ScriptEngine::runFunction(std::string function_name)
     {
         std::function<void(asIScriptContext*)> callback;
-        runFunction(function_name, callback);
+        std::function<void(asIScriptContext*)> get_return_value;
+        runFunction(function_name, callback, get_return_value);
+    }
+
+    //-----------------------------------------------------------------------------
+
+    void ScriptEngine::runFunction(std::string function_name,
+        std::function<void(asIScriptContext*)> callback)
+    {
+        std::function<void(asIScriptContext*)> get_return_value;
+        runFunction(function_name, callback, get_return_value);
     }
 
     //-----------------------------------------------------------------------------
@@ -185,7 +195,9 @@ namespace Scripting
     /** runs the specified script
     *  \param string scriptName = name of script to run
     */
-    void ScriptEngine::runFunction(std::string function_name, std::function<void(asIScriptContext*)> callback)
+    void ScriptEngine::runFunction(std::string function_name,
+        std::function<void(asIScriptContext*)> callback,
+        std::function<void(asIScriptContext*)> get_return_value)
     {
         int r; //int for error checking
 
@@ -199,11 +211,11 @@ namespace Scripting
         if (cached_script == m_loaded_files.end())
         {
             // Compile the script code
-            Log::debug("Scripting", "Compiling script '%s' (was not in cache)", script_filename.c_str());
+            Log::info("Scripting", "Checking for script file '%s'", script_filename.c_str());
             r = compileScript(m_engine, script_filename);
             if (r < 0)
             {
-                Log::debug("Scripting", "Script '%s' is not available", script_filename.c_str());
+                Log::info("Scripting", "Script '%s' is not available", script_filename.c_str());
                 m_loaded_files[script_filename] = false;
                 m_functions_cache[function_name] = NULL; // remember that this script is unavailable
                 return;
@@ -306,6 +318,9 @@ namespace Scripting
             // Retrieve the return value from the context here (for scripts that return values)
             // <type> returnValue = ctx->getReturnType(); for example
             //float returnValue = ctx->GetReturnFloat();
+
+            if (get_return_value)
+                get_return_value(ctx);
         }
 
         // We must release the contexts when no longer using them
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 5a7e01e88..d3b304178 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -53,7 +53,11 @@ namespace Scripting
         ~ScriptEngine();
 
         void runFunction(std::string function_name);
-        void runFunction(std::string function_name, std::function<void(asIScriptContext*)> callback);
+        void runFunction(std::string function_name,
+            std::function<void(asIScriptContext*)> callback);
+        void runFunction(std::string function_name,
+            std::function<void(asIScriptContext*)> callback,
+            std::function<void(asIScriptContext*)> get_return_value);
         void evalScript(std::string script_fragment);
         void cleanupCache();
 
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index b5d447bb1..42b9c87b8 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1116,6 +1116,8 @@ bool Track::loadMainTrack(const XMLNode &root)
         // some static meshes are conditional
         std::string condition;
         n->get("if", &condition);
+
+        // TODO: convert "if" and "ifnot" to scripting.
         if (condition == "splatting")
         {
             if (!irr_driver->supportsSplatting()) continue;
@@ -1193,15 +1195,15 @@ bool Track::loadMainTrack(const XMLNode &root)
 
             if (!shown) continue;
         }
-        else if (condition == "allchallenges")
-        {
-            // allow ONE unsolved challenge : the last one
-            if (getNumOfCompletedChallenges() < m_challenges.size() - 1)
-                continue;
-        }
         else if (condition.size() > 0)
         {
-            Log::error("track", "Unknown condition <%s>\n", condition.c_str());
+            unsigned char result = -1;
+            Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+            std::function<void(asIScriptContext*)> null_callback;
+            script_engine->runFunction("bool " + condition + "()", null_callback,
+                [&](asIScriptContext* ctx) { result = ctx->GetReturnByte(); });
+            if (result == 0)
+                continue;
         }
 
         std::string neg_condition;
@@ -1210,18 +1212,18 @@ bool Track::loadMainTrack(const XMLNode &root)
         {
             if (irr_driver->supportsSplatting()) continue;
         }
-        else if (neg_condition == "allchallenges")
-        {
-            // allow ONE unsolved challenge : the last one
-            if (getNumOfCompletedChallenges() >= m_challenges.size() - 1)
-                continue;
-        }
         else if (neg_condition.size() > 0)
         {
-            Log::error("track", "Unknown condition <%s>\n",
-                       neg_condition.c_str());
+            unsigned char result = -1;
+            Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+            std::function<void(asIScriptContext*)> null_callback;
+            script_engine->runFunction("bool " + neg_condition + "()", null_callback,
+                [&](asIScriptContext* ctx) { result = ctx->GetReturnByte(); });
+            if (result != 0)
+                continue;
         }
 
+
         bool tangent = false;
         n->get("tangents", &tangent);
 

From 40ea7f94f0e46da406bbad00db508c7659415df0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 28 May 2015 19:57:36 -0400
Subject: [PATCH 265/331] Scripting work : improve object-kart collision
 callbacks

---
 src/physics/physical_object.cpp |  2 ++
 src/physics/physical_object.hpp | 10 ++++++++++
 src/physics/physics.cpp         | 20 +++++++++++---------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 7ed9c7d49..67dd705a5 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -63,6 +63,7 @@ PhysicalObject::Settings::Settings(const XMLNode &xml_node)
     xml_node.get("reset",   &m_crash_reset );
     xml_node.get("explode", &m_knock_kart  );
     xml_node.get("flatten", &m_flatten_kart);
+    xml_node.get("on-kart-collision", &m_on_kart_collision);
     m_reset_when_too_low =
         xml_node.get("reset-when-below", &m_reset_height) == 1;
 
@@ -140,6 +141,7 @@ PhysicalObject::PhysicalObject(bool is_dynamic,
     m_flatten_kart       = settings.m_flatten_kart;
     m_reset_when_too_low = settings.m_reset_when_too_low;
     m_reset_height       = settings.m_reset_height;
+    m_on_kart_collision  = settings.m_on_kart_collision;
 
     m_init_pos.setIdentity();
     Vec3 radHpr(m_init_hpr);
diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 7cebcec6d..ff5f3711d 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -67,6 +67,10 @@ public:
         /** If the item is below that height, it is reset (when
          *  m_reset_when_too_low is true). */
         float                     m_reset_height;
+        /** If non-empty, the name of the scripting function to call
+          * when a kart collides with this object
+          */
+        std::string               m_on_kart_collision;
     private:
         void init();
     public:
@@ -140,6 +144,10 @@ private:
     /** If m_reset_when_too_low this object is set back to its start
      *  position if its height is below this value. */
     float                 m_reset_height;
+    /** If non-empty, the name of the scripting function to call
+    * when a kart collides with this object
+    */
+    std::string           m_on_kart_collision;
 
     /** If this body is a bullet dynamic body, i.e. affected by physics
      *  or not (static (not moving) or kinematic (animated outside
@@ -194,6 +202,8 @@ public:
     /** Add body to dynamic world */
     void addBody();
     // ------------------------------------------------------------------------
+    const std::string& getOnKartCollisionFunction() const { return m_on_kart_collision; }
+    // ------------------------------------------------------------------------
     // Methods usable by scripts
 
     /**
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index d399a1727..1c2a04a9a 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -186,15 +186,17 @@ void Physics::update(float dt)
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
             AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
             int kartId = kart->getWorldKartId();
-            std::string obj_id = p->getUserPointer(0)->getPointerPhysicalObject()->getID();
-            
-            // TODO: pass obj_id as arguent
-            script_engine->runFunction("void onKartObjectCollision(int)",
-                [=](asIScriptContext* ctx) {
-                    ctx->SetArgDWord(0, kartId);
-                });
-            PhysicalObject *obj = p->getUserPointer(0)
-                                   ->getPointerPhysicalObject();
+            PhysicalObject* obj = p->getUserPointer(0)->getPointerPhysicalObject();
+            std::string obj_id = obj->getID();
+            std::string scripting_function = obj->getOnKartCollisionFunction();
+            if (scripting_function.size() > 0)
+            {
+                script_engine->runFunction("void " + scripting_function + "(int, const string)",
+                    [&](asIScriptContext* ctx) {
+                        ctx->SetArgDWord(0, kartId);
+                        ctx->SetArgObject(1, &obj_id);
+                    });
+            }
             if (obj->isCrashReset())
             {
                 new RescueAnimation(kart);

From 48235a5d7752d560e91ce9dfd2b2aa700f33e7ff Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 30 May 2015 11:29:08 +1000
Subject: [PATCH 266/331] Turned ShadowMatrices into a stand-alone proper
 class.

---
 src/graphics/irr_driver.cpp      |  31 +++---
 src/graphics/irr_driver.hpp      |  20 ++--
 src/graphics/render.cpp          |  72 ++-----------
 src/graphics/render_geometry.cpp |  19 ++--
 src/graphics/render_lighting.cpp |  17 ++--
 src/graphics/shadow_matrixes.cpp | 169 ++++++++++++++++++++++++-------
 src/graphics/shadow_matrixes.hpp |  81 ++++++++++++++-
 src/graphics/stkscenemanager.cpp |  32 +++---
 8 files changed, 285 insertions(+), 156 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 24df1148f..7f21a42cd 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -31,6 +31,7 @@
 #include "graphics/post_processing.hpp"
 #include "graphics/referee.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shadow_matrixes.hpp"
 #include "graphics/stkanimatedmesh.hpp"
 #include "graphics/stkbillboard.hpp"
 #include "graphics/stkmeshscenenode.hpp"
@@ -105,6 +106,7 @@ const int MIN_SUPPORTED_WIDTH  = 800;
  */
 IrrDriver::IrrDriver()
 {
+    m_shadow_matrices     = NULL;
     m_resolution_changing = RES_CHANGE_NONE;
     m_phase               = SOLID_NORMAL_AND_DEPTH_PASS;
     m_device              = createDevice(video::EDT_NULL,
@@ -121,10 +123,6 @@ IrrDriver::IrrDriver()
     m_mipviz = m_wireframe = m_normals = m_ssaoviz = \
         m_lightviz = m_shadowviz = m_distortviz = m_rsm = m_rh = m_gi = m_boundingboxesviz = false;
     SkyboxCubeMap = m_last_light_bucket_distance = 0;
-    m_shadow_camnodes[0] = NULL;
-    m_shadow_camnodes[1] = NULL;
-    m_shadow_camnodes[2] = NULL;
-    m_shadow_camnodes[3] = NULL;
     memset(object_count, 0, sizeof(object_count));
 }   // IrrDriver
 
@@ -152,6 +150,8 @@ IrrDriver::~IrrDriver()
     m_device = NULL;
     m_modes.clear();
 
+    delete m_shadow_matrices;
+    m_shadow_matrices = NULL;
     Shaders::destroy();
     delete m_wind;
 }   // ~IrrDriver
@@ -194,6 +194,14 @@ GPUTimer &IrrDriver::getGPUTimer(unsigned i)
     return m_perf_query[i];
 }
 
+// ----------------------------------------------------------------------------
+void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode *const camnode,
+                                          size_t width, size_t height)
+{
+    m_current_screen_size = core::vector2df(float(width), float(height));
+    m_shadow_matrices->computeMatrixesAndCameras(camnode, width, height);
+}   // computeMatrixesAndCameras
+
 // ----------------------------------------------------------------------------
 
 #if defined(__linux__) && !defined(ANDROID)
@@ -519,9 +527,6 @@ void IrrDriver::initDevice()
         m_mrt.clear();
         m_mrt.reallocate(2);
 
-        m_suncam = m_scene_manager->addCameraSceneNode(0, vector3df(0), vector3df(0), -1, false);
-        m_suncam->grab();
-        m_suncam->setParent(NULL);
     }
     else
     {
@@ -588,6 +593,7 @@ void IrrDriver::initDevice()
     // so let's decide ourselves...)
     m_device->getCursorControl()->setVisible(true);
     m_pointer_shown = true;
+    m_shadow_matrices = new ShadowMatrices();
 }   // initDevice
 
 // ----------------------------------------------------------------------------
@@ -1701,7 +1707,7 @@ video::ITexture* IrrDriver::applyMask(video::ITexture* texture,
 // ----------------------------------------------------------------------------
 void IrrDriver::setRTT(RTT* rtt)
 {
-    memset(m_shadow_camnodes, 0, 4 * sizeof(void*));
+    m_shadow_matrices->resetShadowCamNodes();
     m_rtts = rtt;
 }
 // ----------------------------------------------------------------------------
@@ -1710,7 +1716,8 @@ void IrrDriver::onLoadWorld()
     if (CVS->isGLSL())
     {
         const core::recti &viewport = Camera::getCamera(0)->getViewport();
-        size_t width = viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X, height = viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y;
+        size_t width = viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X;
+        size_t height = viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y;
         m_rtts = new RTT(width, height);
     }
 }
@@ -2514,11 +2521,7 @@ scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy,
         {
             //m_sun_interposer->setPosition(pos);
             //m_sun_interposer->updateAbsolutePosition();
-
-            m_suncam->setPosition(pos);
-            m_suncam->updateAbsolutePosition();
-
-            m_rsm_matrix_initialized = false;
+            m_shadow_matrices->addLight(pos);
 
             ((WaterShaderProvider *) Shaders::getCallback(ES_WATER) )->setSunPosition(pos);
         }
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
index 26d84babd..a5657790d 100644
--- a/src/graphics/irr_driver.hpp
+++ b/src/graphics/irr_driver.hpp
@@ -62,6 +62,7 @@ class PerCameraNode;
 class PostProcessing;
 class LightNode;
 class ShadowImportance;
+class ShadowMatrices;
 
 enum STKRenderingPass
 {
@@ -200,12 +201,6 @@ private:
     Wind                 *m_wind;
     /** RTTs. */
     RTT                *m_rtts;
-    std::vector<core::matrix4> sun_ortho_matrix;
-    core::vector3df    rh_extend;
-    core::matrix4      rh_matrix;
-    core::matrix4      rsm_matrix;
-    bool               m_rsm_matrix_initialized;
-    bool               m_rsm_map_available;
     core::vector2df    m_current_screen_size;
     core::dimension2du m_actual_screen_size;
 
@@ -240,6 +235,8 @@ private:
     enum {RES_CHANGE_NONE, RES_CHANGE_YES,
           RES_CHANGE_CANCEL}                m_resolution_changing;
 
+    ShadowMatrices *m_shadow_matrices;
+
 public:
     GLuint SkyboxCubeMap;
     GLuint SkyboxSpecularProbe;
@@ -298,12 +295,8 @@ private:
     unsigned             poly_count[PASS_COUNT];
     u32                  m_renderpass;
     class STKMeshSceneNode *m_sun_interposer;
-    scene::ICameraSceneNode *m_suncam;
     core::vector3df m_sun_direction;
     video::SColorf m_suncolor;
-    std::pair<float, float> m_shadow_scales[4];
-    scene::ICameraSceneNode *m_shadow_camnodes[4];
-    float m_shadows_cam[4][24];
 
     std::vector<GlowData> m_glowing;
 
@@ -361,10 +354,6 @@ public:
     void renderSkybox(const scene::ICameraSceneNode *camera);
     void setPhase(STKRenderingPass);
     STKRenderingPass getPhase() const;
-    const std::vector<core::matrix4> &getShadowViewProj() const
-    {
-        return sun_ortho_matrix;
-    }
     void IncreaseObjectCount();
     void IncreasePolyCount(unsigned);
     core::array<video::IRenderTarget> &getMainSetup();
@@ -670,6 +659,9 @@ public:
     // ------------------------------------------------------------------------
     class STKMeshSceneNode *getSunInterposer() { return m_sun_interposer; }
     // ------------------------------------------------------------------------
+    ShadowMatrices *getShadowMatrices() { return m_shadow_matrices;  }
+    // ------------------------------------------------------------------------
+    
     void cleanSunInterposer();
     void createSunInterposer();
     // ------------------------------------------------------------------------
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 8ad400230..c91e611ec 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -30,6 +30,7 @@
 #include "graphics/rtts.hpp"
 #include "graphics/screenquad.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shadow_matrixes.hpp"
 #include "graphics/stkmeshscenenode.hpp"
 #include "items/item_manager.hpp"
 #include "modes/world.hpp"
@@ -57,36 +58,6 @@ public:
     }   // InstancedColorizeShader
 };   // InstancedColorizeShader
 
-// ============================================================================
-class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
-{
-private:
-    GLuint m_frustrum_vao;
-
-public:    ViewFrustrumShader()
-    {
-        loadProgram(OBJECT, GL_VERTEX_SHADER, "frustrum.vert",
-                            GL_FRAGMENT_SHADER, "coloredquad.frag");
-
-        assignUniforms("color", "idx");
-
-        glGenVertexArrays(1, &m_frustrum_vao);
-        glBindVertexArray(m_frustrum_vao);
-        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
-        glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
-                     SharedGPUObjects::getFrustrumIndices());
-        glBindVertexArray(0);
-    }   // ViewFrustrumShader
-    // ------------------------------------------------------------------------
-    void bindVertexArray()
-    {
-        glBindVertexArray(m_frustrum_vao);
-    }   // bindVertexArray
-
-};   // ViewFrustrumShader
-
 // ============================================================================
 
 extern std::vector<float> BoundingBoxes;
@@ -313,7 +284,7 @@ void IrrDriver::renderGLSL(float dt)
             }
             else if (irr_driver->getShadowViz())
             {
-                renderShadowsDebug();
+                getShadowMatrices()->renderShadowsDebug();
             }
             else
             {
@@ -401,7 +372,7 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
     // Shadows
     {
         // To avoid wrong culling, use the largest view possible
-        m_scene_manager->setActiveCamera(m_suncam);
+        m_scene_manager->setActiveCamera(getShadowMatrices()->getSunCam());
         if (CVS->isDefferedEnabled() &&
             CVS->isShadowEnabled() && hasShadow)
         {
@@ -528,14 +499,17 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
         m_post_processing->renderRHDebug(m_rtts->getRH().getRTT()[0],
                                          m_rtts->getRH().getRTT()[1], 
                                          m_rtts->getRH().getRTT()[2],
-                                         rh_matrix, rh_extend);
+                                         getShadowMatrices()->getRHMatrix(),
+                                         getShadowMatrices()->getRHExtend());
     }
 
     if (getGI())
     {
         glDisable(GL_BLEND);
         m_rtts->getFBO(FBO_COLORS).bind();
-        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
+        m_post_processing->renderGI(getShadowMatrices()->getRHMatrix(),
+                                    getShadowMatrices()->getRHExtend(),
+                                    m_rtts->getRH());
     }
 
     PROFILER_PUSH_CPU_MARKER("- Glow", 0xFF, 0xFF, 0x00);
@@ -677,36 +651,6 @@ void IrrDriver::renderParticles()
 //    m_scene_manager->drawAll(scene::ESNRP_TRANSPARENT_EFFECT);
 }
 
-static void renderWireFrameFrustrum(float *tmp, unsigned i)
-{
-    ViewFrustrumShader::getInstance()->use();
-    ViewFrustrumShader::getInstance()->bindVertexArray();
-    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
-
-    glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * 3 * sizeof(float), (void *)tmp);
-    ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
-    glDrawElements(GL_LINES, 24, GL_UNSIGNED_INT, 0);
-}
-
-
-void IrrDriver::renderShadowsDebug()
-{
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    glViewport(0, UserConfigParams::m_height / 2, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-    m_post_processing->renderTextureLayer(m_rtts->getShadowFBO().getRTT()[0], 0);
-    renderWireFrameFrustrum(m_shadows_cam[0], 0);
-    glViewport(UserConfigParams::m_width / 2, UserConfigParams::m_height / 2, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-    m_post_processing->renderTextureLayer(m_rtts->getShadowFBO().getRTT()[0], 1);
-    renderWireFrameFrustrum(m_shadows_cam[1], 1);
-    glViewport(0, 0, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-    m_post_processing->renderTextureLayer(m_rtts->getShadowFBO().getRTT()[0], 2);
-    renderWireFrameFrustrum(m_shadows_cam[2], 2);
-    glViewport(UserConfigParams::m_width / 2, 0, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-    m_post_processing->renderTextureLayer(m_rtts->getShadowFBO().getRTT()[0], 3);
-    renderWireFrameFrustrum(m_shadows_cam[3], 3);
-    glViewport(0, 0, UserConfigParams::m_width, UserConfigParams::m_height);
-}
-
 // ----------------------------------------------------------------------------
 
 void IrrDriver::renderGlow(std::vector<GlowData>& glows)
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index c33a93188..8d93874e1 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -16,19 +16,20 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/irr_driver.hpp"
-#include "central_settings.hpp"
+
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/shadow_matrixes.hpp"
+#include "graphics/stkscenemanager.hpp"
 #include "modes/world.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
 #include "utils/tuple.hpp"
-#include "stkscenemanager.hpp"
-#include "utils/profiler.hpp"
 
 #include <S3DVertex.h>
 
@@ -1815,11 +1816,14 @@ void IrrDriver::renderShadows()
 
         if (CVS->isARBTextureViewUsable())
         {
+            const std::pair<float, float>* shadow_scales 
+                = getShadowMatrices()->getShadowScales();
+
             for (unsigned i = 0; i < 2; i++)
             {
                 m_post_processing->renderGaussian6BlurLayer(m_rtts->getShadowFBO(), i,
-                    2.f * m_shadow_scales[0].first / m_shadow_scales[i].first,
-                    2.f * m_shadow_scales[0].second / m_shadow_scales[i].second);
+                    2.f * shadow_scales[0].first / shadow_scales[i].first,
+                    2.f * shadow_scales[0].second / shadow_scales[i].second);
             }
         }
         glBindTexture(GL_TEXTURE_2D_ARRAY, m_rtts->getShadowFBO().getRTT()[0]);
@@ -1920,12 +1924,13 @@ void multidrawRSM(Args...args)
 // ----------------------------------------------------------------------------
 void IrrDriver::renderRSM()
 {
-    if (m_rsm_map_available)
+    if (getShadowMatrices()->isRSMMapAvail())
         return;
     ScopedGPUTimer Timer(getGPUTimer(Q_RSM));
     m_rtts->getRSM().bind();
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+    const core::matrix4 &rsm_matrix = getShadowMatrices()->getRSMMatrix();
     drawRSM<DefaultMaterial, 3, 1>(rsm_matrix);
     drawRSM<AlphaRef, 3, 1>(rsm_matrix);
     drawRSM<NormalMat, 3, 1>(rsm_matrix);
@@ -1953,5 +1958,5 @@ void IrrDriver::renderRSM()
         renderRSMShadow<NormalMat>(rsm_matrix);
         renderRSMShadow<DetailMat>(rsm_matrix);
     }
-    m_rsm_map_available = true;
+    getShadowMatrices()->setRSMMapAvail(true);
 }   // renderRSM
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index abcd8f7f2..3287c7707 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -447,8 +447,9 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
             for (unsigned i = 0; i < 32; i++)
             {
                 NVWorkaroundRadianceHintsConstructionShader::getInstance()
-                    ->setUniforms(rsm_matrix, rh_matrix,
-                                  rh_extend, i,
+                    ->setUniforms(getShadowMatrices()->getRSMMatrix(), 
+                                  getShadowMatrices()->getRHMatrix(),
+                                  getShadowMatrices()->getRHExtend(), i,
                                   irr_driver->getSunColor());
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             }
@@ -463,14 +464,14 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
                     m_rtts->getRSM().getDepthTexture()
             );
             RadianceHintsConstructionShader::getInstance()
-                ->setUniforms(rsm_matrix, rh_matrix, rh_extend,
+                ->setUniforms(getShadowMatrices()->getRSMMatrix(),
+                              getShadowMatrices()->getRHMatrix(), 
+                              getShadowMatrices()->getRHExtend(),
                               irr_driver->getSunColor());
             glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, 32);
         }
     }
-
-    for (unsigned i = 0; i < sun_ortho_matrix.size(); i++)
-        sun_ortho_matrix[i] *= getInvViewMatrix();
+    getShadowMatrices()->updateSunOrthoMatrices();
     m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).bind();
     glClear(GL_COLOR_BUFFER_BIT);
 
@@ -478,7 +479,9 @@ void IrrDriver::renderLights(unsigned pointlightcount, bool hasShadow)
     if (CVS->isGlobalIlluminationEnabled() && hasShadow)
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_GI));
-        m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH());
+        m_post_processing->renderGI(getShadowMatrices()->getRHMatrix(),
+                                    getShadowMatrices()->getRHExtend(),
+                                    m_rtts->getRH());
     }
 
     m_rtts->getFBO(FBO_COMBINED_DIFFUSE_SPECULAR).bind();
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrixes.cpp
index 7a371a29a..f4333909f 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrixes.cpp
@@ -18,7 +18,10 @@
 #include "graphics/shadow_matrixes.hpp"
 
 #include "graphics/central_settings.hpp"
+#include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/post_processing.hpp"
+#include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/shared_gpu_objects.hpp"
 #include "modes/world.hpp"
@@ -35,8 +38,6 @@
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
 
-float ShadowMatrices::m_shadow_split[5] = { 1., 5., 20., 50., 150 };
-
 // ============================================================================
 class LightspaceBoundingBoxShader 
     : public TextureShader<LightspaceBoundingBoxShader, 1,
@@ -78,6 +79,68 @@ public:
 
 };   // ShadowMatricesGenerationShader
 
+float ShadowMatrices:: m_shadow_split[5] = { 1., 5., 20., 50., 150 };
+
+// ============================================================================
+class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
+{
+private:
+    GLuint m_frustrum_vao;
+
+public:    ViewFrustrumShader()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "frustrum.vert",
+                            GL_FRAGMENT_SHADER, "coloredquad.frag");
+
+        assignUniforms("color", "idx");
+
+        glGenVertexArrays(1, &m_frustrum_vao);
+        glBindVertexArray(m_frustrum_vao);
+        glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
+        glEnableVertexAttribArray(0);
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), 0);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
+                     SharedGPUObjects::getFrustrumIndices());
+        glBindVertexArray(0);
+    }   // ViewFrustrumShader
+    // ------------------------------------------------------------------------
+    void bindVertexArray()
+    {
+        glBindVertexArray(m_frustrum_vao);
+    }   // bindVertexArray
+
+};   // ViewFrustrumShader
+
+// ============================================================================
+ShadowMatrices::ShadowMatrices()
+{
+    m_sun_cam = irr_driver->getSceneManager()
+              ->addCameraSceneNode(0, vector3df(0), vector3df(0), -1, false);
+    m_sun_cam->grab();
+    m_sun_cam->setParent(NULL);
+
+    m_shadow_cam_nodes[0] = NULL;
+    m_shadow_cam_nodes[1] = NULL;
+    m_shadow_cam_nodes[2] = NULL;
+    m_shadow_cam_nodes[3] = NULL;
+}   // ShadowMatrices
+// ----------------------------------------------------------------------------
+void ShadowMatrices::addLight(const core::vector3df &pos)
+{
+    m_sun_cam->setPosition(pos);
+    m_sun_cam->updateAbsolutePosition();
+
+    m_rsm_matrix_initialized = false;
+
+}   // addLight
+
+// ----------------------------------------------------------------------------
+void ShadowMatrices::updateSunOrthoMatrices()
+{
+    for (unsigned i = 0; i < m_sun_ortho_matrices.size(); i++)
+        m_sun_ortho_matrices[i] *= irr_driver->getInvViewMatrix();
+}   // updateSunOrthoMatrices
+
 // ============================================================================
 static std::vector<vector3df> getFrustrumVertex(const scene::SViewFrustum &frustrum)
 {
@@ -101,7 +164,7 @@ static std::vector<vector3df> getFrustrumVertex(const scene::SViewFrustum &frust
  *  \param pointsInside a vector of point in 3d space.
  *  \param size returns the size (width, height) of shadowmap coverage
  */
-static core::matrix4 getTighestFitOrthoProj(const core::matrix4 &transform,
+core::matrix4 ShadowMatrices::getTighestFitOrthoProj(const core::matrix4 &transform,
                                     const std::vector<vector3df> &pointsInside,
                                     std::pair<float, float> &size)
 {
@@ -154,8 +217,8 @@ static core::matrix4 getTighestFitOrthoProj(const core::matrix4 &transform,
  *  TODO : The depth histogram part is commented out, needs to tweak it when 
  *         I have some motivation
  */
-void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
-                                                                size_t height)
+void ShadowMatrices::updateSplitAndLightcoordRangeFromComputeShaders(unsigned int width,
+                                                                     unsigned int height)
 {
     struct CascadeBoundingBox
     {
@@ -192,9 +255,9 @@ void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
 
     LightspaceBoundingBoxShader::getInstance()->use();
     LightspaceBoundingBoxShader::getInstance()
-        ->setTextureUnits(getDepthStencilTexture());
+        ->setTextureUnits(irr_driver->getDepthStencilTexture());
     LightspaceBoundingBoxShader::getInstance()
-        ->setUniforms(m_suncam->getViewMatrix(),
+        ->setUniforms(m_sun_cam->getViewMatrix(),
                       ShadowMatrices::m_shadow_split[1],
                       ShadowMatrices::m_shadow_split[2],
                       ShadowMatrices::m_shadow_split[3],
@@ -210,7 +273,7 @@ void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
 
     ShadowMatricesGenerationShader::getInstance()->use();
     ShadowMatricesGenerationShader::getInstance()
-        ->setUniforms(m_suncam->getViewMatrix());
+        ->setUniforms(m_sun_cam->getViewMatrix());
     glDispatchCompute(4, 1, 1);
 
     glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT);
@@ -229,12 +292,12 @@ void IrrDriver::updateSplitAndLightcoordRangeFromComputeShaders(size_t width,
  *   \param width of the rendering viewport
  *   \param height of the rendering viewport
  */
-void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnode,
-                                          size_t width, size_t height)
+void ShadowMatrices::computeMatrixesAndCameras(scene::ICameraSceneNode *const camnode,
+                                               unsigned int width, unsigned int height)
 {
     if (CVS->isSDSMEnabled())
         updateSplitAndLightcoordRangeFromComputeShaders(width, height);
-    static_cast<scene::CSceneManager *>(m_scene_manager)
+    static_cast<scene::CSceneManager *>(irr_driver->getSceneManager())
         ->OnAnimate(os::Timer::getTime());
     camnode->render();
     irr_driver->setProjMatrix(irr_driver->getVideoDriver()
@@ -243,7 +306,6 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
                               ->getTransform(video::ETS_VIEW));
     irr_driver->genProjViewMatrix();
 
-    m_current_screen_size = core::vector2df(float(width), float(height));
 
     const float oldfar = camnode->getFarValue();
     const float oldnear = camnode->getNearValue();
@@ -269,15 +331,15 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
     memcpy(&tmp[48], irr_driver->getInvProjMatrix().pointer(),  16 * sizeof(float));
     memcpy(&tmp[64], irr_driver->getProjViewMatrix().pointer(), 16 * sizeof(float));
 
-    m_suncam->render();
+    m_sun_cam->render();
     for (unsigned i = 0; i < 4; i++)
     {
-        if (m_shadow_camnodes[i])
-            delete m_shadow_camnodes[i];
-        m_shadow_camnodes[i] = (scene::ICameraSceneNode *) m_suncam->clone();
+        if (m_shadow_cam_nodes[i])
+            delete m_shadow_cam_nodes[i];
+        m_shadow_cam_nodes[i] = (scene::ICameraSceneNode *) m_sun_cam->clone();
     }
-    sun_ortho_matrix.clear();
-    const core::matrix4 &SunCamViewMatrix = m_suncam->getViewMatrix();
+    m_sun_ortho_matrices.clear();
+    const core::matrix4 &sun_cam_view_matrix = m_sun_cam->getViewMatrix();
 
     if (World::getWorld() && World::getWorld()->getTrack())
     {
@@ -330,16 +392,16 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
             memcpy(m_shadows_cam[i], tmp, 24 * sizeof(float));
 
             std::vector<vector3df> vectors = getFrustrumVertex(*frustrum);
-            tmp_matrix = getTighestFitOrthoProj(SunCamViewMatrix, vectors,
+            tmp_matrix = getTighestFitOrthoProj(sun_cam_view_matrix, vectors,
                                                 m_shadow_scales[i]);
 
 
-            m_shadow_camnodes[i]->setProjectionMatrix(tmp_matrix, true);
-            m_shadow_camnodes[i]->render();
+            m_shadow_cam_nodes[i]->setProjectionMatrix(tmp_matrix, true);
+            m_shadow_cam_nodes[i]->render();
 
-            sun_ortho_matrix.push_back(
-                  getVideoDriver()->getTransform(video::ETS_PROJECTION) 
-                * getVideoDriver()->getTransform(video::ETS_VIEW)       );
+            m_sun_ortho_matrices.push_back(
+                  irr_driver->getVideoDriver()->getTransform(video::ETS_PROJECTION) 
+                * irr_driver->getVideoDriver()->getTransform(video::ETS_VIEW)       );
         }
 
         // Rsm Matrix and camera
@@ -347,42 +409,42 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
         {
             if (trackbox.MinEdge.X != trackbox.MaxEdge.X &&
                 trackbox.MinEdge.Y != trackbox.MaxEdge.Y &&
-                // Cover the case where SunCamViewMatrix is null
-                SunCamViewMatrix.getScale() != core::vector3df(0., 0., 0.))
+                // Cover the case where sun_cam_view_matrix is null
+                sun_cam_view_matrix.getScale() != core::vector3df(0., 0., 0.))
             {
-                SunCamViewMatrix.transformBoxEx(trackbox);
+                sun_cam_view_matrix.transformBoxEx(trackbox);
                 core::matrix4 tmp_matrix;
                 tmp_matrix.buildProjectionMatrixOrthoLH(trackbox.MinEdge.X,
                                                         trackbox.MaxEdge.X,
                                                         trackbox.MaxEdge.Y,
                                                         trackbox.MinEdge.Y,
                                                         30, trackbox.MaxEdge.Z);
-                m_suncam->setProjectionMatrix(tmp_matrix, true);
-                m_suncam->render();
+                m_sun_cam->setProjectionMatrix(tmp_matrix, true);
+                m_sun_cam->render();
             }
-            rsm_matrix = getVideoDriver()->getTransform(video::ETS_PROJECTION) 
-                       * getVideoDriver()->getTransform(video::ETS_VIEW);
+            m_rsm_matrix = irr_driver->getVideoDriver()->getTransform(video::ETS_PROJECTION) 
+                         * irr_driver->getVideoDriver()->getTransform(video::ETS_VIEW);
             m_rsm_matrix_initialized = true;
             m_rsm_map_available = false;
         }
-        rh_extend = core::vector3df(128, 64, 128);
+        m_rh_extend = core::vector3df(128, 64, 128);
         core::vector3df campos = camnode->getAbsolutePosition();
         core::vector3df translation(8 * floor(campos.X / 8), 
                                     8 * floor(campos.Y / 8),
                                     8 * floor(campos.Z / 8));
-        rh_matrix.setTranslation(translation);
+        m_rh_matrix.setTranslation(translation);
 
 
-        assert(sun_ortho_matrix.size() == 4);
+        assert(m_sun_ortho_matrices.size() == 4);
         // reset normal camera
         camnode->setNearValue(oldnear);
         camnode->setFarValue(oldfar);
         camnode->render();
 
-        size_t size = irr_driver->getShadowViewProj().size();
+        size_t size = m_sun_ortho_matrices.size();
         for (unsigned i = 0; i < size; i++)
             memcpy(&tmp[16 * i + 80],
-                   irr_driver->getShadowViewProj()[i].pointer(),
+                   m_sun_ortho_matrices[i].pointer(),
                    16 * sizeof(float));
     }
 
@@ -400,3 +462,38 @@ void IrrDriver::computeMatrixesAndCameras(scene::ICameraSceneNode * const camnod
         glBufferSubData(GL_UNIFORM_BUFFER, 0, (16 * 9 + 2) * sizeof(float),
                         tmp);
 }   // computeMatrixesAndCameras
+
+// ----------------------------------------------------------------------------
+void ShadowMatrices::renderWireFrameFrustrum(float *tmp, unsigned i)
+{
+    ViewFrustrumShader::getInstance()->use();
+    ViewFrustrumShader::getInstance()->bindVertexArray();
+    glBindBuffer(GL_ARRAY_BUFFER, SharedGPUObjects::getFrustrumVBO());
+
+    glBufferSubData(GL_ARRAY_BUFFER, 0, 8 * 3 * sizeof(float), (void *)tmp);
+    ViewFrustrumShader::getInstance()->setUniforms(video::SColor(255, 0, 255, 0), i);
+    glDrawElements(GL_LINES, 24, GL_UNSIGNED_INT, 0);
+}
+// ----------------------------------------------------------------------------
+void ShadowMatrices::renderShadowsDebug()
+{
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    glViewport(0, UserConfigParams::m_height / 2,
+               UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
+    PostProcessing *post_processing = irr_driver->getPostProcessing();
+    RTT *rtt = irr_driver->getRTT();
+    post_processing->renderTextureLayer(rtt->getShadowFBO().getRTT()[0], 0);
+    renderWireFrameFrustrum(m_shadows_cam[0], 0);
+    glViewport(UserConfigParams::m_width / 2, UserConfigParams::m_height / 2,
+               UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
+    post_processing->renderTextureLayer(rtt->getShadowFBO().getRTT()[0], 1);
+    renderWireFrameFrustrum(m_shadows_cam[1], 1);
+    glViewport(0, 0, UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
+    post_processing->renderTextureLayer(rtt->getShadowFBO().getRTT()[0], 2);
+    renderWireFrameFrustrum(m_shadows_cam[2], 2);
+    glViewport(UserConfigParams::m_width / 2, 0, UserConfigParams::m_width / 2,
+               UserConfigParams::m_height / 2);
+    post_processing->renderTextureLayer(rtt->getShadowFBO().getRTT()[0], 3);
+    renderWireFrameFrustrum(m_shadows_cam[3], 3);
+    glViewport(0, 0, UserConfigParams::m_width, UserConfigParams::m_height);
+}
diff --git a/src/graphics/shadow_matrixes.hpp b/src/graphics/shadow_matrixes.hpp
index 25f31b01c..ad64374a7 100644
--- a/src/graphics/shadow_matrixes.hpp
+++ b/src/graphics/shadow_matrixes.hpp
@@ -19,10 +19,89 @@
 #ifndef HEADER_SHADOW_MATRICES_HPP
 #define HEADER_SHADOW_MATRICES_HPP
 
+#include "matrix4.h"
+#include "vector3d.h"
+
+#include <tuple>
+#include <vector>
+
+namespace irr
+{
+    namespace scene { class ICameraSceneNode; }
+}
+
+using namespace irr;
+
+
+
 class ShadowMatrices
 {
 public:
-     static float m_shadow_split[5];
+    static float m_shadow_split[5];
+
+private:
+    std::vector<core::matrix4> m_sun_ortho_matrices;
+    scene::ICameraSceneNode   *m_sun_cam;
+    scene::ICameraSceneNode   *m_shadow_cam_nodes[4];
+    std::pair<float, float>    m_shadow_scales[4];
+    core::matrix4              m_rsm_matrix;
+    bool                       m_rsm_matrix_initialized;
+    float                      m_shadows_cam[4][24];
+    bool                       m_rsm_map_available;
+    core::vector3df            m_rh_extend;
+    core::matrix4              m_rh_matrix;
+
+
+    void updateSplitAndLightcoordRangeFromComputeShaders(unsigned int width,
+                                                         unsigned int height);
+    core::matrix4 getTighestFitOrthoProj(const core::matrix4 &transform,
+                              const std::vector<core::vector3df> &pointsInside,
+                              std::pair<float, float> &size);
+    void renderWireFrameFrustrum(float *tmp, unsigned i);
+public:
+
+    ShadowMatrices();
+
+    void computeMatrixesAndCameras(scene::ICameraSceneNode *const camnode,
+                                   unsigned int width, unsigned int height);
+    void addLight(const core::vector3df &pos);
+    void updateSunOrthoMatrices();
+    void renderShadowsDebug();
+
+    // ------------------------------------------------------------------------
+    void resetShadowCamNodes()
+    {
+        memset(m_shadow_cam_nodes, 0, 4 * sizeof(void*));
+    }   // resetShadowCamNodes
+    // ------------------------------------------------------------------------
+    scene::ICameraSceneNode** getShadowCamNodes()
+    {
+        return m_shadow_cam_nodes;
+    }   // getShadowCamNodes
+    // ------------------------------------------------------------------------
+    scene::ICameraSceneNode* getSunCam() { return m_sun_cam; }
+    // ------------------------------------------------------------------------
+    core::matrix4& getRHMatrix() { return m_rh_matrix;  }
+    // ------------------------------------------------------------------------
+    core::vector3df& getRHExtend() { return m_rh_extend;  }
+    // ------------------------------------------------------------------------
+    core::matrix4& getRSMMatrix() { return m_rsm_matrix; }
+    // ------------------------------------------------------------------------
+    std::vector<core::matrix4>& getSunOrthoMatrices()
+    {
+        return m_sun_ortho_matrices;
+    }
+    // ------------------------------------------------------------------------
+    void setRSMMapAvail(bool b) { m_rsm_map_available = b; }
+    // ------------------------------------------------------------------------
+    bool isRSMMapAvail() const { return m_rsm_map_available; }
+    // ------------------------------------------------------------------------
+    const std::pair<float, float>* getShadowScales() const
+    {
+        return m_shadow_scales;
+    }
+    // ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
 
 };   // class ShadowMatrices
 
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
index 0b76b8d6e..32a500cde 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stkscenemanager.cpp
@@ -15,26 +15,28 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/glwrap.hpp"
 #include "graphics/stkscenemanager.hpp"
-#include "graphics/stkmesh.hpp"
-#include "graphics/irr_driver.hpp"
+
+#include "graphics/callbacks.hpp"
 #include "graphics/central_settings.hpp"
-#include "stkanimatedmesh.hpp"
-#include "stkmeshscenenode.hpp"
-#include "utils/ptr_vector.hpp"
-#include <ICameraSceneNode.h>
-#include <SViewFrustum.h>
-#include "callbacks.hpp"
-#include "utils/cpp2011.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/lod_node.hpp"
+#include "graphics/shadow_matrixes.hpp"
+#include "graphics/stkanimatedmesh.hpp"
+#include "graphics/stkmesh.hpp"
+#include "graphics/stkmeshscenenode.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
-#include "lod_node.hpp"
+#include "utils/cpp2011.hpp"
 #include "utils/profiler.hpp"
+#include "utils/ptr_vector.hpp"
 #include "utils/time.hpp"
 
+#include <ICameraSceneNode.h>
 #include <ISceneManager.h>
 #include <ISceneNode.h>
+#include <SViewFrustum.h>
 
 #include <unordered_map>
 #include <SViewFrustum.h>
@@ -601,7 +603,11 @@ PROFILER_PUSH_CPU_MARKER("- culling", 0xFF, 0xFF, 0x0);
 
     bool cam = false, rsmcam = false;
     bool shadowcam[4] = { false, false, false, false };
-    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, m_shadow_camnodes, m_suncam, cam, shadowcam, rsmcam, !m_rsm_map_available);
+    parseSceneManager(List, ImmediateDrawList::getInstance(), camnode, 
+                      getShadowMatrices()->getShadowCamNodes(),
+                      getShadowMatrices()->getSunCam(), cam,
+                      shadowcam, rsmcam,
+                      !getShadowMatrices()->isRSMMapAvail());
 PROFILER_POP_CPU_MARKER();
 
     // Add a 1 s timeout
@@ -809,7 +815,7 @@ PROFILER_POP_CPU_MARKER();
             }
         }
 #pragma omp section
-        if (!m_rsm_map_available)
+        if (!getShadowMatrices()->isRSMMapAvail())
         {
             size_t offset = 0, current_cmd = 0;
             if (!CVS->supportsAsyncInstanceUpload())

From e5a7f27f19ea695a57ccc2c939eb04ccb0dd4ee1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 30 May 2015 12:16:11 +1000
Subject: [PATCH 267/331] Renamed files to follow our coding style.

---
 sources.cmake                                 |  2 +-
 src/graphics/glwrap.cpp                       |  2 +-
 src/graphics/glwrap.hpp                       |  7 +++----
 .../{gpuparticles.cpp => gpu_particles.cpp}   |  2 +-
 .../{gpuparticles.hpp => gpu_particles.hpp}   |  0
 src/graphics/irr_driver.cpp                   | 12 +++++------
 src/graphics/light.cpp                        |  4 ++--
 src/graphics/particle_emitter.cpp             |  6 ++++--
 src/graphics/post_processing.cpp              |  4 ++--
 src/graphics/render.cpp                       | 14 ++++++-------
 src/graphics/render_geometry.cpp              |  4 ++--
 src/graphics/render_lighting.cpp              |  8 ++++----
 .../{screenquad.cpp => screen_quad.cpp}       |  2 +-
 .../{screenquad.hpp => screen_quad.hpp}       |  0
 src/graphics/shaders.cpp                      |  5 +++--
 ...hadow_matrixes.cpp => shadow_matrices.cpp} |  5 ++---
 ...hadow_matrixes.hpp => shadow_matrices.hpp} |  0
 src/graphics/skid_marks.cpp                   |  2 +-
 src/graphics/slip_stream.cpp                  |  2 +-
 ...animatedmesh.cpp => stk_animated_mesh.cpp} | 18 +++++++++--------
 ...animatedmesh.hpp => stk_animated_mesh.hpp} |  5 +++--
 .../{stkbillboard.cpp => stk_billboard.cpp}   |  2 +-
 .../{stkbillboard.hpp => stk_billboard.hpp}   |  0
 src/graphics/{stkmesh.cpp => stk_mesh.cpp}    |  2 +-
 src/graphics/{stkmesh.hpp => stk_mesh.hpp}    |  0
 ...hscenenode.cpp => stk_mesh_scene_node.cpp} | 20 ++++++++++---------
 ...hscenenode.hpp => stk_mesh_scene_node.hpp} |  6 +++---
 ...scenemanager.cpp => stk_scene_manager.cpp} | 10 +++++-----
 ...scenemanager.hpp => stk_scene_manager.hpp} | 10 +++++-----
 src/graphics/stk_text_billboard.cpp           |  4 ++--
 src/graphics/stk_text_billboard.hpp           |  7 ++++---
 src/graphics/sun.cpp                          |  2 +-
 ...texturemanager.cpp => texture_manager.cpp} | 11 ++++++----
 ...texturemanager.hpp => texture_manager.hpp} |  0
 .../{vaomanager.cpp => vao_manager.cpp}       | 11 +++++-----
 .../{vaomanager.hpp => vao_manager.hpp}       |  0
 src/items/rubber_band.cpp                     |  6 ++----
 src/tracks/quad_graph.cpp                     |  2 +-
 src/tracks/track_object_presentation.cpp      |  5 +++--
 39 files changed, 106 insertions(+), 96 deletions(-)
 rename src/graphics/{gpuparticles.cpp => gpu_particles.cpp} (99%)
 rename src/graphics/{gpuparticles.hpp => gpu_particles.hpp} (100%)
 rename src/graphics/{screenquad.cpp => screen_quad.cpp} (97%)
 rename src/graphics/{screenquad.hpp => screen_quad.hpp} (100%)
 rename src/graphics/{shadow_matrixes.cpp => shadow_matrices.cpp} (99%)
 rename src/graphics/{shadow_matrixes.hpp => shadow_matrices.hpp} (100%)
 rename src/graphics/{stkanimatedmesh.cpp => stk_animated_mesh.cpp} (99%)
 rename src/graphics/{stkanimatedmesh.hpp => stk_animated_mesh.hpp} (98%)
 rename src/graphics/{stkbillboard.cpp => stk_billboard.cpp} (99%)
 rename src/graphics/{stkbillboard.hpp => stk_billboard.hpp} (100%)
 rename src/graphics/{stkmesh.cpp => stk_mesh.cpp} (99%)
 rename src/graphics/{stkmesh.hpp => stk_mesh.hpp} (100%)
 rename src/graphics/{stkmeshscenenode.cpp => stk_mesh_scene_node.cpp} (99%)
 rename src/graphics/{stkmeshscenenode.hpp => stk_mesh_scene_node.hpp} (96%)
 rename src/graphics/{stkscenemanager.cpp => stk_scene_manager.cpp} (99%)
 rename src/graphics/{stkscenemanager.hpp => stk_scene_manager.hpp} (93%)
 rename src/graphics/{texturemanager.cpp => texture_manager.cpp} (98%)
 rename src/graphics/{texturemanager.hpp => texture_manager.hpp} (100%)
 rename src/graphics/{vaomanager.cpp => vao_manager.cpp} (98%)
 rename src/graphics/{vaomanager.hpp => vao_manager.hpp} (100%)

diff --git a/sources.cmake b/sources.cmake
index 8f7f40bbb..c16c9c60c 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.     
+# This will then trigger a new cmake run automatically.      
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index f2141c22d..1b5ad28a7 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -22,7 +22,7 @@
 #include "config/user_config.hpp"
 #include "graphics/central_settings.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/stkmesh.hpp"
+#include "graphics/stk_mesh.hpp"
 #include "utils/profiler.hpp"
 #include "utils/cpp2011.hpp"
 
diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index 1b7ffdabc..e97e7284f 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -21,8 +21,10 @@
 #include "graphics/gl_headers.hpp"
 
 #include "graphics/irr_driver.hpp"
-#include "graphics/vaomanager.hpp"
+#include "graphics/texture_manager.hpp"
+#include "graphics/vao_manager.hpp"
 #include "utils/log.hpp"
+#include "utils/vec3.hpp"
 
 #include <vector>
 
@@ -143,9 +145,6 @@ public:
     }
 };
 
-#include "utils/vec3.hpp"
-#include "texturemanager.hpp"
-
 void draw3DLine(const core::vector3df& start,
     const core::vector3df& end, irr::video::SColor color);
 
diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpu_particles.cpp
similarity index 99%
rename from src/graphics/gpuparticles.cpp
rename to src/graphics/gpu_particles.cpp
index d668814f3..e63363de5 100644
--- a/src/graphics/gpuparticles.cpp
+++ b/src/graphics/gpu_particles.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/gpuparticles.hpp"
+#include "graphics/gpu_particles.hpp"
 
 #include "config/user_config.hpp"
 #include "graphics/glwrap.hpp"
diff --git a/src/graphics/gpuparticles.hpp b/src/graphics/gpu_particles.hpp
similarity index 100%
rename from src/graphics/gpuparticles.hpp
rename to src/graphics/gpu_particles.hpp
diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 7f21a42cd..dcf6f5661 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -31,14 +31,14 @@
 #include "graphics/post_processing.hpp"
 #include "graphics/referee.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/shadow_matrixes.hpp"
-#include "graphics/stkanimatedmesh.hpp"
-#include "graphics/stkbillboard.hpp"
-#include "graphics/stkmeshscenenode.hpp"
-#include "graphics/stkscenemanager.hpp"
+#include "graphics/shadow_matrices.hpp"
+#include "graphics/stk_animated_mesh.hpp"
+#include "graphics/stk_billboard.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
+#include "graphics/stk_scene_manager.hpp"
 #include "graphics/sun.hpp"
 #include "graphics/rtts.hpp"
-#include "graphics/texturemanager.hpp"
+#include "graphics/texture_manager.hpp"
 #include "graphics/water.hpp"
 #include "graphics/wind.hpp"
 #include "guiengine/engine.hpp"
diff --git a/src/graphics/light.cpp b/src/graphics/light.cpp
index f3e7f1d5a..d271c68b2 100644
--- a/src/graphics/light.cpp
+++ b/src/graphics/light.cpp
@@ -21,11 +21,11 @@
 #include "graphics/callbacks.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/material_manager.hpp"
 #include "graphics/material.hpp"
+#include "graphics/material_manager.hpp"
 #include "graphics/rtts.hpp"
+#include "graphics/screen_quad.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/screenquad.hpp"
 
 using namespace video;
 using namespace scene;
diff --git a/src/graphics/particle_emitter.cpp b/src/graphics/particle_emitter.cpp
index ecad6ece1..680741c8e 100644
--- a/src/graphics/particle_emitter.cpp
+++ b/src/graphics/particle_emitter.cpp
@@ -17,18 +17,19 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/particle_emitter.hpp"
+
 #include "graphics/central_settings.hpp"
+#include "graphics/gpu_particles.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/particle_kind.hpp"
-#include "graphics/irr_driver.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/wind.hpp"
 #include "io/file_manager.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 #include "utils/helpers.hpp"
-#include "graphics/gpuparticles.hpp"
 
 #include <SParticle.h>
 #include <IParticleAffector.h>
@@ -36,6 +37,7 @@
 #include <IParticleSystemSceneNode.h>
 #include <IParticleBoxEmitter.h>
 #include <ISceneManager.h>
+
 #include <algorithm>
 
 class FadeAwayAffector : public scene::IParticleAffector
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 87c0af4d0..a835e7f98 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -19,14 +19,14 @@
 
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
-#include "central_settings.hpp"
 #include "graphics/camera.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/mlaa_areamap.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/shared_gpu_objects.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "io/file_manager.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_model.hpp"
diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index c91e611ec..118f53e6f 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -20,25 +20,25 @@
 
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
-#include "graphics/shared_gpu_objects.hpp"
-#include "central_settings.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/graphics_restrictions.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/referee.hpp"
 #include "graphics/rtts.hpp"
-#include "graphics/screenquad.hpp"
+#include "graphics/screen_quad.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/shadow_matrixes.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/shadow_matrices.hpp"
+#include "graphics/shared_gpu_objects.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
+#include "graphics/stk_scene_manager.hpp"
 #include "items/item_manager.hpp"
+#include "items/powerup_manager.hpp"
 #include "modes/world.hpp"
 #include "physics/physics.hpp"
 #include "tracks/track.hpp"
 #include "utils/profiler.hpp"
-#include "stkscenemanager.hpp"
-#include "items/powerup_manager.hpp"
 
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp
index 8d93874e1..15fba47a5 100644
--- a/src/graphics/render_geometry.cpp
+++ b/src/graphics/render_geometry.cpp
@@ -24,8 +24,8 @@
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/shadow_matrixes.hpp"
-#include "graphics/stkscenemanager.hpp"
+#include "graphics/shadow_matrices.hpp"
+#include "graphics/stk_scene_manager.hpp"
 #include "modes/world.hpp"
 #include "utils/log.hpp"
 #include "utils/profiler.hpp"
diff --git a/src/graphics/render_lighting.cpp b/src/graphics/render_lighting.cpp
index 3287c7707..ef2e274fa 100644
--- a/src/graphics/render_lighting.cpp
+++ b/src/graphics/render_lighting.cpp
@@ -16,20 +16,20 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#include "graphics/irr_driver.hpp"
-#include "central_settings.hpp"
 #include "config/user_config.hpp"
+#include "graphics/callbacks.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/light.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/rtts.hpp"
 #include "graphics/shaders.hpp"
-#include "graphics/shadow_matrixes.hpp"
+#include "graphics/shadow_matrices.hpp"
 #include "graphics/shared_gpu_objects.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "utils/profiler.hpp"
-#include "callbacks.hpp"
 
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
diff --git a/src/graphics/screenquad.cpp b/src/graphics/screen_quad.cpp
similarity index 97%
rename from src/graphics/screenquad.cpp
rename to src/graphics/screen_quad.cpp
index c855a283c..16c94a515 100644
--- a/src/graphics/screenquad.cpp
+++ b/src/graphics/screen_quad.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/screenquad.hpp"
+#include "graphics/screen_quad.hpp"
 
 // Just the static parts to our screenquad
 
diff --git a/src/graphics/screenquad.hpp b/src/graphics/screen_quad.hpp
similarity index 100%
rename from src/graphics/screenquad.hpp
rename to src/graphics/screen_quad.hpp
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 9974098e9..654bff83f 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -96,12 +96,13 @@
 
 #include "graphics/callbacks.hpp"
 #include "graphics/central_settings.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/gpu_particles.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/gpuparticles.hpp"
 #include "graphics/shared_gpu_objects.hpp"
 #include "io/file_manager.hpp"
 #include "utils/log.hpp"
-#include "graphics/glwrap.hpp"
+
 #include <assert.h>
 #include <IGPUProgrammingServices.h>
 
diff --git a/src/graphics/shadow_matrixes.cpp b/src/graphics/shadow_matrices.cpp
similarity index 99%
rename from src/graphics/shadow_matrixes.cpp
rename to src/graphics/shadow_matrices.cpp
index f4333909f..0b4dc1597 100644
--- a/src/graphics/shadow_matrixes.cpp
+++ b/src/graphics/shadow_matrices.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/shadow_matrixes.hpp"
+#include "graphics/shadow_matrices.hpp"
 
 #include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
@@ -37,6 +37,7 @@
 #define MAX2(a, b) ((a) > (b) ? (a) : (b))
 #define MIN2(a, b) ((a) > (b) ? (b) : (a))
 
+float ShadowMatrices:: m_shadow_split[5] = { 1., 5., 20., 50., 150 };
 
 // ============================================================================
 class LightspaceBoundingBoxShader 
@@ -79,8 +80,6 @@ public:
 
 };   // ShadowMatricesGenerationShader
 
-float ShadowMatrices:: m_shadow_split[5] = { 1., 5., 20., 50., 150 };
-
 // ============================================================================
 class ViewFrustrumShader : public Shader<ViewFrustrumShader, video::SColor, int>
 {
diff --git a/src/graphics/shadow_matrixes.hpp b/src/graphics/shadow_matrices.hpp
similarity index 100%
rename from src/graphics/shadow_matrixes.hpp
rename to src/graphics/shadow_matrices.hpp
diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp
index 228ca3ad9..9d45af521 100644
--- a/src/graphics/skid_marks.cpp
+++ b/src/graphics/skid_marks.cpp
@@ -21,11 +21,11 @@
 
 #include "config/stk_config.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "karts/controller/controller.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/skidding.hpp"
 #include "physics/btKart.hpp"
-#include "graphics/stkmeshscenenode.hpp"
 
 #include <IMeshSceneNode.h>
 #include <SMesh.h>
diff --git a/src/graphics/slip_stream.cpp b/src/graphics/slip_stream.cpp
index 57a9c61f3..1cb52b9da 100644
--- a/src/graphics/slip_stream.cpp
+++ b/src/graphics/slip_stream.cpp
@@ -23,7 +23,7 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "io/file_manager.hpp"
 #include "karts/controller/controller.hpp"
 #include "karts/abstract_kart.hpp"
diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stk_animated_mesh.cpp
similarity index 99%
rename from src/graphics/stkanimatedmesh.cpp
rename to src/graphics/stk_animated_mesh.cpp
index 634f005d7..a251803f1 100644
--- a/src/graphics/stkanimatedmesh.cpp
+++ b/src/graphics/stk_animated_mesh.cpp
@@ -15,21 +15,23 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "central_settings.hpp"
 #include "graphics/glwrap.hpp"
-#include "graphics/stkanimatedmesh.hpp"
-#include <ISceneManager.h>
-#include <IMaterialRenderer.h>
-#include <ISkinnedMesh.h>
-#include "graphics/irr_driver.hpp"
-#include "graphics/material_manager.hpp"
+
 #include "config/user_config.hpp"
+#include "central_settings.hpp"
+#include "graphics/camera.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/stk_animated_mesh.hpp"
+#include "graphics/material_manager.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
-#include "graphics/camera.hpp"
 #include "utils/profiler.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <IMaterialRenderer.h>
+#include <ISceneManager.h>
+#include <ISkinnedMesh.h>
+
 using namespace irr;
 
 STKAnimatedMesh::STKAnimatedMesh(irr::scene::IAnimatedMesh* mesh, irr::scene::ISceneNode* parent,
diff --git a/src/graphics/stkanimatedmesh.hpp b/src/graphics/stk_animated_mesh.hpp
similarity index 98%
rename from src/graphics/stkanimatedmesh.hpp
rename to src/graphics/stk_animated_mesh.hpp
index 6eb23ac0c..68d6b50f9 100644
--- a/src/graphics/stkanimatedmesh.hpp
+++ b/src/graphics/stk_animated_mesh.hpp
@@ -18,11 +18,12 @@
 #ifndef STKANIMATEDMESH_HPP
 #define STKANIMATEDMESH_HPP
 
+#include "graphics/stk_mesh.hpp"
+#include "utils/ptr_vector.hpp"
+
 #include "../lib/irrlicht/source/Irrlicht/CAnimatedMeshSceneNode.h"
 #include <IAnimatedMesh.h>
 #include <irrTypes.h>
-#include "graphics/stkmesh.hpp"
-#include "utils/ptr_vector.hpp"
 
 class STKAnimatedMesh : public irr::scene::CAnimatedMeshSceneNode, public STKMeshCommon
 {
diff --git a/src/graphics/stkbillboard.cpp b/src/graphics/stk_billboard.cpp
similarity index 99%
rename from src/graphics/stkbillboard.cpp
rename to src/graphics/stk_billboard.cpp
index ef0ac290f..35f5b492d 100644
--- a/src/graphics/stkbillboard.cpp
+++ b/src/graphics/stk_billboard.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/stkbillboard.hpp"
+#include "graphics/stk_billboard.hpp"
 
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
diff --git a/src/graphics/stkbillboard.hpp b/src/graphics/stk_billboard.hpp
similarity index 100%
rename from src/graphics/stkbillboard.hpp
rename to src/graphics/stk_billboard.hpp
diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stk_mesh.cpp
similarity index 99%
rename from src/graphics/stkmesh.cpp
rename to src/graphics/stk_mesh.cpp
index 7c9372298..1c1532e25 100644
--- a/src/graphics/stkmesh.cpp
+++ b/src/graphics/stk_mesh.cpp
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/stkmesh.hpp"
+#include "graphics/stk_mesh.hpp"
 
 #include "config/user_config.hpp"
 #include "central_settings.hpp"
diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stk_mesh.hpp
similarity index 100%
rename from src/graphics/stkmesh.hpp
rename to src/graphics/stk_mesh.hpp
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stk_mesh_scene_node.cpp
similarity index 99%
rename from src/graphics/stkmeshscenenode.cpp
rename to src/graphics/stk_mesh_scene_node.cpp
index d2f43ed32..d2bd3c864 100644
--- a/src/graphics/stkmeshscenenode.cpp
+++ b/src/graphics/stk_mesh_scene_node.cpp
@@ -15,22 +15,24 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "central_settings.hpp"
-#include "stkmeshscenenode.hpp"
-#include "stkmesh.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/glwrap.hpp"
-#include "tracks/track.hpp"
-#include <ISceneManager.h>
-#include <IMaterialRenderer.h>
+#include "graphics/stk_mesh_scene_node.hpp"
+
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/camera.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
+#include "graphics/stk_mesh.hpp"
+#include "tracks/track.hpp"
 #include "modes/world.hpp"
+#include "utils/cpp2011.hpp"
 #include "utils/helpers.hpp"
 #include "utils/tuple.hpp"
-#include "utils/cpp2011.hpp"
+
+#include <ISceneManager.h>
+#include <IMaterialRenderer.h>
 
 
 // ============================================================================
diff --git a/src/graphics/stkmeshscenenode.hpp b/src/graphics/stk_mesh_scene_node.hpp
similarity index 96%
rename from src/graphics/stkmeshscenenode.hpp
rename to src/graphics/stk_mesh_scene_node.hpp
index 8a7d54ee9..38ea151a5 100644
--- a/src/graphics/stkmeshscenenode.hpp
+++ b/src/graphics/stk_mesh_scene_node.hpp
@@ -15,10 +15,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef STKMESHSCENENODE_H
-#define STKMESHSCENENODE_H
+#ifndef HEADER_STK_MESH_SCENE_NODE
+#define HEADER_STK_MESH_SCENE_NODE
 
-#include "stkmesh.hpp"
+#include "graphics/stk_mesh.hpp"
 
 #include "graphics/shaders.hpp"
 #include "utils/ptr_vector.hpp"
diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stk_scene_manager.cpp
similarity index 99%
rename from src/graphics/stkscenemanager.cpp
rename to src/graphics/stk_scene_manager.cpp
index 32a500cde..009136859 100644
--- a/src/graphics/stkscenemanager.cpp
+++ b/src/graphics/stk_scene_manager.cpp
@@ -15,17 +15,17 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/stkscenemanager.hpp"
+#include "graphics/stk_scene_manager.hpp"
 
 #include "graphics/callbacks.hpp"
 #include "graphics/central_settings.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
-#include "graphics/shadow_matrixes.hpp"
-#include "graphics/stkanimatedmesh.hpp"
-#include "graphics/stkmesh.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/shadow_matrices.hpp"
+#include "graphics/stk_animated_mesh.hpp"
+#include "graphics/stk_mesh.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "modes/world.hpp"
 #include "tracks/track.hpp"
 #include "utils/cpp2011.hpp"
diff --git a/src/graphics/stkscenemanager.hpp b/src/graphics/stk_scene_manager.hpp
similarity index 93%
rename from src/graphics/stkscenemanager.hpp
rename to src/graphics/stk_scene_manager.hpp
index bec913066..c57e55183 100644
--- a/src/graphics/stkscenemanager.hpp
+++ b/src/graphics/stk_scene_manager.hpp
@@ -22,12 +22,12 @@
 #ifndef HEADER_STKSCENEMANAGER_HPP
 #define HEADER_STKSCENEMANAGER_HPP
 
+#include "graphics/central_settings.hpp"
+#include "graphics/gl_headers.hpp"
+#include "graphics/gpu_particles.hpp"
+#include "graphics/stk_billboard.hpp"
+#include "graphics/stk_mesh.hpp"
 #include "utils/singleton.hpp"
-#include "central_settings.hpp"
-#include "gl_headers.hpp"
-#include "stkmesh.hpp"
-#include "gpuparticles.hpp"
-#include "stkbillboard.hpp"
 
 template<typename T>
 class CommandBuffer : public Singleton<T>
diff --git a/src/graphics/stk_text_billboard.cpp b/src/graphics/stk_text_billboard.cpp
index fd2f0bcf4..b0340c216 100644
--- a/src/graphics/stk_text_billboard.cpp
+++ b/src/graphics/stk_text_billboard.cpp
@@ -19,8 +19,8 @@
 #include "graphics/glwrap.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/stkbillboard.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_billboard.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "glwrap.hpp"
diff --git a/src/graphics/stk_text_billboard.hpp b/src/graphics/stk_text_billboard.hpp
index 090f6166e..6bcce436f 100644
--- a/src/graphics/stk_text_billboard.hpp
+++ b/src/graphics/stk_text_billboard.hpp
@@ -18,13 +18,14 @@
 #ifndef STK_TEXT_BILLBOARD_HPP
 #define STK_TEXT_BILLBOARD_HPP
 
+#include "graphics/stk_mesh_scene_node.hpp"
+#include "guiengine/scalable_font.hpp"
+#include "utils/cpp2011.hpp"
+
 #include "../lib/irrlicht/source/Irrlicht/CBillboardSceneNode.h"
 #include <IBillboardSceneNode.h>
 #include <irrTypes.h>
 #include <IMesh.h>
-#include "graphics/stkmeshscenenode.hpp"
-#include "guiengine/scalable_font.hpp"
-#include "utils/cpp2011.hpp"
 
 class STKTextBillboardChar
 {
diff --git a/src/graphics/sun.cpp b/src/graphics/sun.cpp
index 9481d760d..300316dac 100644
--- a/src/graphics/sun.cpp
+++ b/src/graphics/sun.cpp
@@ -24,7 +24,7 @@
 #include "graphics/material_manager.hpp"
 #include "graphics/material.hpp"
 #include "graphics/rtts.hpp"
-#include "graphics/screenquad.hpp"
+#include "graphics/screen_quad.hpp"
 #include "graphics/shaders.hpp"
 #include "io/file_manager.hpp"
 #include "modes/world.hpp"
diff --git a/src/graphics/texturemanager.cpp b/src/graphics/texture_manager.cpp
similarity index 98%
rename from src/graphics/texturemanager.cpp
rename to src/graphics/texture_manager.cpp
index 6a567f9f6..d4d87a44a 100644
--- a/src/graphics/texturemanager.cpp
+++ b/src/graphics/texture_manager.cpp
@@ -15,12 +15,15 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "central_settings.hpp"
-#include "texturemanager.hpp"
+#include "graphics/texture_manager.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/irr_driver.hpp"
+
+#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
+
 #include <fstream>
 #include <sstream>
-#include "../../lib/irrlicht/source/Irrlicht/COpenGLTexture.h"
-#include "irr_driver.hpp"
 
 
 GLuint getTextureGLuint(irr::video::ITexture *tex)
diff --git a/src/graphics/texturemanager.hpp b/src/graphics/texture_manager.hpp
similarity index 100%
rename from src/graphics/texturemanager.hpp
rename to src/graphics/texture_manager.hpp
diff --git a/src/graphics/vaomanager.cpp b/src/graphics/vao_manager.cpp
similarity index 98%
rename from src/graphics/vaomanager.cpp
rename to src/graphics/vao_manager.cpp
index bf3360f9d..affeae782 100644
--- a/src/graphics/vaomanager.cpp
+++ b/src/graphics/vao_manager.cpp
@@ -15,11 +15,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "vaomanager.hpp"
-#include "irr_driver.hpp"
-#include "stkmesh.hpp"
-#include "glwrap.hpp"
-#include "central_settings.hpp"
+#include "graphics/vao_manager.hpp"
+
+#include "graphics/central_settings.hpp"
+#include "graphics/glwrap.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/stk_mesh.hpp"
 
 VAOManager::VAOManager()
 {
diff --git a/src/graphics/vaomanager.hpp b/src/graphics/vao_manager.hpp
similarity index 100%
rename from src/graphics/vaomanager.hpp
rename to src/graphics/vao_manager.hpp
diff --git a/src/items/rubber_band.cpp b/src/items/rubber_band.cpp
index 88625d26e..0c000012b 100644
--- a/src/items/rubber_band.cpp
+++ b/src/items/rubber_band.cpp
@@ -20,9 +20,10 @@
 
 #include <IMeshSceneNode.h>
 
+#include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "items/plunger.hpp"
 #include "items/projectile_manager.hpp"
 #include "karts/abstract_kart.hpp"
@@ -32,9 +33,6 @@
 #include "physics/physics.hpp"
 #include "race/race_manager.hpp"
 #include "utils/string_utils.hpp"
-#include "graphics/glwrap.hpp"
-
-#include "utils/log.hpp" //TODO: remove after debugging is done
 
 #include <IMesh.h>
 
diff --git a/src/tracks/quad_graph.cpp b/src/tracks/quad_graph.cpp
index 7c4e7197b..ef78004df 100644
--- a/src/tracks/quad_graph.cpp
+++ b/src/tracks/quad_graph.cpp
@@ -26,7 +26,7 @@
 #include "config/user_config.hpp"
 #include "graphics/callbacks.hpp"
 #include "graphics/irr_driver.hpp"
-#include "graphics/screenquad.hpp"
+#include "graphics/screen_quad.hpp"
 #include "graphics/shaders.hpp"
 #include "graphics/rtts.hpp"
 #include "io/file_manager.hpp"
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 5e2ba515a..5b7a2dca8 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -17,17 +17,18 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "tracks/track_object_presentation.hpp"
-#include "graphics/central_settings.hpp"
+
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_buffer.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/central_settings.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/mesh_tools.hpp"
 #include "graphics/particle_emitter.hpp"
 #include "graphics/particle_kind_manager.hpp"
-#include "graphics/stkmeshscenenode.hpp"
+#include "graphics/stk_mesh_scene_node.hpp"
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
 #include "input/device_manager.hpp"

From 642216da837e076e3b7f7fae83700be3bd553100 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 30 May 2015 12:16:38 +1000
Subject: [PATCH 268/331] Minor coding style change.

---
 src/graphics/shaders.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 654bff83f..a79e38b88 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -152,7 +152,7 @@ void Shaders::destroy()
 // ----------------------------------------------------------------------------
 // Shader loading  related hook
 
-static std::string LoadHeader()
+static std::string loadHeader()
 {
     std::string result;
     std::ifstream Stream("header.txt", std::ios::in);
@@ -166,7 +166,7 @@ static std::string LoadHeader()
     }
 
     return result;
-}
+}   // loadHeader
 
 // ----------------------------------------------------------------------------
 // Mostly from shader tutorial
@@ -191,7 +191,7 @@ GLuint loadShader(const char * file, unsigned type)
         Code += "#define VSLayer\n";
     if (CVS->needsRGBBindlessWorkaround())
         Code += "#define SRGBBindlessFix\n";
-    Code += LoadHeader();
+    Code += loadHeader();
     if (Stream.is_open())
     {
         std::string Line = "";

From 51fb6934559a161fca5b93401e86b8255ca3c59a Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 30 May 2015 12:37:39 +1000
Subject: [PATCH 269/331] Remove all kill functions for shader reloading after
 all shaders have been deleted.

---
 src/graphics/shader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index f7a56e0d3..9baf07ca4 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -209,6 +209,7 @@ void ShaderBase::updateShaders()
     {
         m_all_kill_functions[i]();
     }
+    m_all_kill_functions.clear();
 }   // updateShaders
 
 // ----------------------------------------------------------------------------

From 8ef16c146e8262890a78f81a2aef6ae93bafe5ee Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 31 May 2015 18:09:51 -0400
Subject: [PATCH 270/331] Scripting work : improve flyable vs object collision
 callbacks. More work to do still.

---
 src/physics/physics.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 1c2a04a9a..1563b77bb 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -257,15 +257,17 @@ void Physics::update(float dt)
             // Projectile hits physical object
             // -------------------------------
             Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-            // TODO: pass arguments
-            //Scripting::Physics::setColl0ision(
-            //    p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
-            //    "item"
-            //);
-            script_engine->runFunction("void onItemObjectCollision()");
-            p->getUserPointer(0)->getPointerFlyable()
-                ->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
+            Flyable* flyable = p->getUserPointer(0)->getPointerFlyable();
             PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
+            std::string obj_id = obj->getID();
+            // TODO: attach this callback directly to a specific track object
+            script_engine->runFunction("void onItemObjectCollision(int, int, const string)",
+                [&](asIScriptContext* ctx) {
+                    ctx->SetArgDWord(0, (int)flyable->getType());
+                    ctx->SetArgDWord(1, flyable->getOwnerId());
+                    ctx->SetArgObject(2, &obj_id);
+                });
+            flyable->hit(NULL, obj);
 
             if (obj->isSoccerBall() && 
                 race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)

From 2f287fbee624b53c9f0d927dcab05660dd7eccb7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 1 Jun 2015 08:14:56 +1000
Subject: [PATCH 271/331] Removed unused clean-shader functionality (which is
 now done by shader.?pp), removed global shader name variable.

---
 src/graphics/shaders.cpp | 20 ++++++--------------
 src/graphics/shaders.hpp | 18 ++----------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index a79e38b88..606fc74e5 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -90,8 +90,6 @@
 
 */
 
-#define SHADER_NAMES
-
 #include "graphics/shaders.hpp"
 
 #include "graphics/callbacks.hpp"
@@ -111,9 +109,13 @@ bool                               Shaders::m_has_been_initialised = false;
 video::IShaderConstantSetCallBack *Shaders::m_callbacks[ES_COUNT];
 int                                Shaders::m_shaders[ES_COUNT];
 
-using namespace video;
+// Use macro FOREACH_SHADER from shaders.hpp to create an array
+// with all shader names.
+#define STR(a) #a,
+const char *Shaders::shader_names[] = { FOREACH_SHADER(STR) };  
+#undef STR
 
-std::vector<void(*)()> CleanTable;
+using namespace video;
 
 void Shaders::init()
 {
@@ -305,19 +307,9 @@ void Shaders::loadShaders()
     }
 
     initGL();
-    CleanTable.clear();
     SharedGPUObjects::init();
 }   // loadShaders
 
-// ----------------------------------------------------------------------------
-/** C
-*/
-void Shaders::killShaders()
-{
-    for (unsigned i = 0; i < CleanTable.size(); i++)
-        CleanTable[i]();
-}   // killShaders
-
 // ----------------------------------------------------------------------------
 void Shaders::check(const int num)
 {
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 1f72c1287..8b051c7de 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -52,24 +52,19 @@ class ParticleSystemProxy;
     ACT(ES_DISPLACE) \
 
 #define ENUM(a) a,
-#define STR(a) #a,
 
 enum ShaderType
 {
     FOREACH_SHADER(ENUM)
-
     ES_COUNT
 };
+#undef ENUM
 
-#ifdef SHADER_NAMES
-static const char *shader_names[] = {
-    FOREACH_SHADER(STR)
-};
-#endif
 
 class Shaders
 {
 private:
+    static const char *shader_names[];
     static bool m_has_been_initialised;
 
     static int m_shaders[ES_COUNT];
@@ -99,11 +94,6 @@ public:
     {
         return m_has_been_initialised ? m_callbacks[num] : NULL;
     }   // getCallback
-    // ------------------------------------------------------------------------
-
-
-
-    void killShaders();
 
     // ========================================================================
     /** Shader to draw a colored line.
@@ -166,8 +156,4 @@ public:
 
 };   // class Shaders
 
-#undef ENUM
-#undef STR
-#undef FOREACH_SHADER
-
 #endif

From 9b2994c975c3202f0b92e9ca2c401896c3175b90 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 1 Jun 2015 08:19:31 +1000
Subject: [PATCH 272/331] Added documentation to shader base classes.

---
 src/graphics/shader.hpp         | 13 ++++++++++++-
 src/graphics/texture_shader.hpp |  7 ++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/graphics/shader.hpp b/src/graphics/shader.hpp
index ad83d6a67..adfc64cde 100644
--- a/src/graphics/shader.hpp
+++ b/src/graphics/shader.hpp
@@ -30,6 +30,12 @@
 #include <string>
 #include <vector>
 
+/** A simple non-templated base class. It is used to store some enums used in 
+ *  templates, the actual header for a shader, and a statis list of all kill
+ *  functions (which delete all singletons, and therefore forces a reload of all
+ *  shaders).
+ *  It has some conventient templated functions to load a set of shaders.
+ */
 class ShaderBase
 {
 private:
@@ -104,6 +110,11 @@ public:
 };   // ShaderBase
 
 // ============================================================================
+/** The main templated base class for all shaders that do not use textures.
+ *  The template arguments are the types of the shader's uniforms. This allows
+ *  compile time checks for the number of arguments when setting the name of
+ *  the shader arguments.
+ */
 template<typename T, typename... Args>
 class Shader : public ShaderBase, public Singleton<T>
 {
@@ -282,7 +293,7 @@ private:
     }   // printFileList
 
 
-    // Variadic template implementation of assignTextureUnig
+    // Variadic template implementation of assignTextureUnit
     // ========================================================================
 public:
     /** Variadic top level/public interface. It does the calls to glUseProgram
diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index 578bff92a..16222fa7c 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -43,7 +43,12 @@ enum SamplerTypeNew
     ST_MAX = ST_SEMI_TRILINEAR
 };   // SamplerTypeNew
 
-
+// ============================================================================
+/** A simple non-templated base class for a shader that uses textures. A non
+ *  templated base class is necessary to easily handle static objects (like 
+ *  list of all bind functions to call) - with templates each instance is a 
+ *  different class (with different static values).
+ */
 class TextureShaderBase
 {
 public:

From 501dd14bb69cdb8b3772eba82d87d6ac2dee4235 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 31 May 2015 18:20:52 -0400
Subject: [PATCH 273/331] More scripting work on item-object collisions

---
 src/physics/physical_object.cpp |  2 ++
 src/physics/physical_object.hpp | 11 ++++++++++-
 src/physics/physics.cpp         | 17 ++++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 67dd705a5..181167cfb 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -64,6 +64,7 @@ PhysicalObject::Settings::Settings(const XMLNode &xml_node)
     xml_node.get("explode", &m_knock_kart  );
     xml_node.get("flatten", &m_flatten_kart);
     xml_node.get("on-kart-collision", &m_on_kart_collision);
+    xml_node.get("on-item-collision", &m_on_item_collision);
     m_reset_when_too_low =
         xml_node.get("reset-when-below", &m_reset_height) == 1;
 
@@ -142,6 +143,7 @@ PhysicalObject::PhysicalObject(bool is_dynamic,
     m_reset_when_too_low = settings.m_reset_when_too_low;
     m_reset_height       = settings.m_reset_height;
     m_on_kart_collision  = settings.m_on_kart_collision;
+    m_on_item_collision  = settings.m_on_item_collision;
 
     m_init_pos.setIdentity();
     Vec3 radHpr(m_init_hpr);
diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index ff5f3711d..41a8b8823 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -71,6 +71,10 @@ public:
           * when a kart collides with this object
           */
         std::string               m_on_kart_collision;
+        /** If non-empty, the name of the scripting function to call
+        * when a (flyable) item collides with this object
+        */
+        std::string               m_on_item_collision;
     private:
         void init();
     public:
@@ -148,7 +152,10 @@ private:
     * when a kart collides with this object
     */
     std::string           m_on_kart_collision;
-
+    /** If non-empty, the name of the scripting function to call
+    * when a (flyable) item collides with this object
+    */
+    std::string           m_on_item_collision;
     /** If this body is a bullet dynamic body, i.e. affected by physics
      *  or not (static (not moving) or kinematic (animated outside
      *  of physics). */
@@ -204,6 +211,8 @@ public:
     // ------------------------------------------------------------------------
     const std::string& getOnKartCollisionFunction() const { return m_on_kart_collision; }
     // ------------------------------------------------------------------------
+    const std::string& getOnItemCollisionFunction() const { return m_on_item_collision; }
+    // ------------------------------------------------------------------------
     // Methods usable by scripts
 
     /**
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 1563b77bb..ee2549e12 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -260,13 +260,16 @@ void Physics::update(float dt)
             Flyable* flyable = p->getUserPointer(0)->getPointerFlyable();
             PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
             std::string obj_id = obj->getID();
-            // TODO: attach this callback directly to a specific track object
-            script_engine->runFunction("void onItemObjectCollision(int, int, const string)",
-                [&](asIScriptContext* ctx) {
-                    ctx->SetArgDWord(0, (int)flyable->getType());
-                    ctx->SetArgDWord(1, flyable->getOwnerId());
-                    ctx->SetArgObject(2, &obj_id);
-                });
+            std::string scripting_function = obj->getOnItemCollisionFunction();
+            if (scripting_function.size() > 0)
+            {
+                script_engine->runFunction("void " + scripting_function + "(int, int, const string)",
+                        [&](asIScriptContext* ctx) {
+                        ctx->SetArgDWord(0, (int)flyable->getType());
+                        ctx->SetArgDWord(1, flyable->getOwnerId());
+                        ctx->SetArgObject(2, &obj_id);
+                    });
+            }
             flyable->hit(NULL, obj);
 
             if (obj->isSoccerBall() && 

From b3d97241d77ea63be4b765447793c6f48cf04b55 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 31 May 2015 18:39:40 -0400
Subject: [PATCH 274/331] Scripting : cleanup, add poweruptype enum

---
 src/scriptengine/script_engine.cpp |  3 +++
 src/scriptengine/script_engine.hpp | 18 ------------------
 src/scriptengine/script_kart.cpp   | 17 +++++++++++++++++
 src/scriptengine/script_kart.hpp   |  5 ++---
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index a851dbe67..dfd215edb 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -22,8 +22,10 @@
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
 #include "scriptengine/script_challenges.hpp"
+#include "scriptengine/script_kart.hpp"
 #include "scriptengine/script_engine.hpp"
 #include "scriptengine/script_gui.hpp"
+#include "scriptengine/script_physics.hpp"
 #include "scriptengine/script_track.hpp"
 #include "scriptengine/script_utils.hpp"
 #include "scriptengine/scriptstdstring.hpp"
@@ -353,6 +355,7 @@ namespace Scripting
         Scripting::Track::registerScriptFunctions(m_engine);
         Scripting::Challenges::registerScriptFunctions(m_engine);
         Scripting::Kart::registerScriptFunctions(m_engine);
+        Scripting::Kart::registerScriptEnums(m_engine);
         Scripting::Physics::registerScriptFunctions(m_engine);
         Scripting::Utils::registerScriptFunctions(m_engine);
         Scripting::GUI::registerScriptFunctions(m_engine);
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index d3b304178..961d16ecb 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -27,24 +27,6 @@ class TrackObjectPresentation;
 
 namespace Scripting
 {
-
-    namespace Physics
-    {
-        void registerScriptFunctions(asIScriptEngine *engine);
-    }
-
-    namespace Kart
-    {
-        void registerScriptFunctions(asIScriptEngine *engine);
-    }
-
-    namespace Track
-    {
-        void registerScriptFunctions(asIScriptEngine *engine);
-
-        void registerScriptEnums(asIScriptEngine *engine);
-    }
-    
     class ScriptEngine
     {
     public:
diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index a13b05039..9e827c65a 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -123,6 +123,23 @@ namespace Scripting
             //r = engine->RegisterGlobalFunction("void jumpTo(int id, float x, float y)", asFUNCTION(jumpTo), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("Vec3 getLocation(int id)", asFUNCTION(getLocation), asCALL_CDECL); assert(r >= 0);
         }
+
+        void registerScriptEnums(asIScriptEngine *engine)
+        {
+            // TODO: document enum in doxygen-generated scripting docs
+            engine->SetDefaultNamespace("Kart");
+            engine->RegisterEnum("PowerupType");
+            engine->RegisterEnumValue("PowerupType", "ANVIL", PowerupManager::PowerupType::POWERUP_ANVIL);
+            engine->RegisterEnumValue("PowerupType", "BOWLING", PowerupManager::PowerupType::POWERUP_BOWLING);
+            engine->RegisterEnumValue("PowerupType", "BUBBLEGUM", PowerupManager::PowerupType::POWERUP_BUBBLEGUM);
+            engine->RegisterEnumValue("PowerupType", "CAKE", PowerupManager::PowerupType::POWERUP_CAKE);
+            engine->RegisterEnumValue("PowerupType", "PARACHUTE", PowerupManager::PowerupType::POWERUP_PARACHUTE);
+            engine->RegisterEnumValue("PowerupType", "PLUNGER", PowerupManager::PowerupType::POWERUP_PLUNGER);
+            engine->RegisterEnumValue("PowerupType", "RUBBERBALL", PowerupManager::PowerupType::POWERUP_RUBBERBALL);
+            engine->RegisterEnumValue("PowerupType", "SWATTER", PowerupManager::PowerupType::POWERUP_SWATTER);
+            engine->RegisterEnumValue("PowerupType", "SWITCH", PowerupManager::PowerupType::POWERUP_SWITCH);
+            engine->RegisterEnumValue("PowerupType", "ZIPPER", PowerupManager::PowerupType::POWERUP_ZIPPER);
+        }
     }
 
 /** \cond DOXYGEN_IGNORE */
diff --git a/src/scriptengine/script_kart.hpp b/src/scriptengine/script_kart.hpp
index 5ddca0e09..f2fbad653 100644
--- a/src/scriptengine/script_kart.hpp
+++ b/src/scriptengine/script_kart.hpp
@@ -23,13 +23,12 @@
 
 namespace Scripting
 {
-
     namespace Kart
     {
-
         void registerScriptFunctions(asIScriptEngine *engine);
-        
+        void registerScriptEnums(asIScriptEngine *engine);
     }
 
 }
+
 #endif

From cfbec1f47014c4869d9d79d40822b4d077c9c92d Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 2 Jun 2015 04:36:30 +0300
Subject: [PATCH 275/331] Include cerrno for errno; fixes clang compilation
 error

---
 src/audio/sfx_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index 31ba9f2d1..5078b9293 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -28,6 +28,7 @@
 #include <pthread.h>
 #include <stdexcept>
 #include <algorithm>
+#include <cerrno>
 #include <map>
 
 #include <stdio.h>

From 1dabb39ed4d5dc2caab500d9e7981a7d4eb62231 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Jun 2015 14:19:15 +1000
Subject: [PATCH 276/331] Fixed warnings most likely caused by copying a frame
 buffer object (missing &), added several const to frame buffer references.

---
 src/graphics/post_processing.cpp | 26 +++++++++++++-------------
 src/graphics/post_processing.hpp | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index a835e7f98..e7ad591ea 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -98,7 +98,7 @@ public:
     // ------------------------------------------------------------------------
     void render(GLuint layer_tex, int width, int height, float sigma_v)
     {
-        Gaussian6VBlurShader::getInstance()->setTextureUnits(layer_tex);
+        setTextureUnits(layer_tex);
         drawFullScreenEffect(core::vector2df(1.f / width, 1.f / height),
                              sigma_v);
     }   // render
@@ -106,7 +106,7 @@ public:
 
 // ============================================================================
 class Gaussian3VBlurShader : public TextureShader<Gaussian3VBlurShader, 1,
-                                           core::vector2df>
+                                                  core::vector2df>
 {
 public:
     Gaussian3VBlurShader()
@@ -118,7 +118,7 @@ public:
         assignSamplerNames(0, "tex", ST_BILINEAR_CLAMPED_FILTERED);
     }   // Gaussian3VBlurShader
     // ------------------------------------------------------------------------
-    void render(FrameBuffer in_fbo, float inv_width, float inv_height)
+    void render(const FrameBuffer &in_fbo, float inv_width, float inv_height)
     {
         setTextureUnits(in_fbo.getRTT()[0]);
         drawFullScreenEffect(core::vector2df(inv_width, inv_height));
@@ -394,7 +394,7 @@ public:
         assignSamplerNames(0, "text", ST_NEAREST_FILTERED);
     }   // ToneMapShader
     // ----------------------------------------------------------------------------
-    void render(FrameBuffer &fbo, GLuint rtt, float vignette_weight)
+    void render(const FrameBuffer &fbo, GLuint rtt, float vignette_weight)
     {
         fbo.bind();
         setTextureUnits(rtt);
@@ -1081,8 +1081,8 @@ static std::vector<float> getGaussianWeight(float sigma, size_t count)
 }   // getGaussianWeight
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderGaussian3Blur(FrameBuffer &in_fbo, 
-                                         FrameBuffer &auxiliary)
+void PostProcessing::renderGaussian3Blur(const FrameBuffer &in_fbo, 
+                                         const FrameBuffer &auxiliary)
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() && 
            in_fbo.getHeight() == auxiliary.getHeight());
@@ -1161,8 +1161,8 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
 }   // renderGaussian6BlurLayer
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
-                                         FrameBuffer &auxiliary, float sigma_v,
+void PostProcessing::renderGaussian6Blur(const FrameBuffer &in_fbo,
+                                         const FrameBuffer &auxiliary, float sigma_v,
                                          float sigma_h)
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() && 
@@ -1218,8 +1218,8 @@ void PostProcessing::renderGaussian6Blur(FrameBuffer &in_fbo,
 }   // renderGaussian6Blur
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
-                                          FrameBuffer &auxiliary)
+void PostProcessing::renderHorizontalBlur(const FrameBuffer &in_fbo,
+                                          const FrameBuffer &auxiliary)
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() &&
            in_fbo.getHeight() == auxiliary.getHeight());
@@ -1236,8 +1236,8 @@ void PostProcessing::renderHorizontalBlur(FrameBuffer &in_fbo,
 
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderGaussian17TapBlur(FrameBuffer &in_fbo,
-                                             FrameBuffer &auxiliary)
+void PostProcessing::renderGaussian17TapBlur(const FrameBuffer &in_fbo,
+                                             const FrameBuffer &auxiliary)
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() &&
            in_fbo.getHeight() == auxiliary.getHeight());
@@ -1324,7 +1324,7 @@ void PostProcessing::renderSSAO()
 }   // renderSSAO
 
 // ----------------------------------------------------------------------------
-void PostProcessing::renderMotionBlur(unsigned , FrameBuffer &in_fbo,
+void PostProcessing::renderMotionBlur(unsigned , const FrameBuffer &in_fbo,
                                       FrameBuffer &out_fbo)
 {
     MotionBlurProvider * const cb =
diff --git a/src/graphics/post_processing.hpp b/src/graphics/post_processing.hpp
index d91f7fc72..83291aba4 100644
--- a/src/graphics/post_processing.hpp
+++ b/src/graphics/post_processing.hpp
@@ -88,22 +88,22 @@ public:
                   const core::vector3df &rh_extend,
                   const FrameBuffer &fb);
     /** Blur the in texture */
-    void renderGaussian3Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
+    void renderGaussian3Blur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
 
-    void renderGaussian6Blur(FrameBuffer &in_fbo, FrameBuffer &auxiliary,
+    void renderGaussian6Blur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary,
                               float sigmaV, float sigmaH);
-	void renderHorizontalBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
+	void renderHorizontalBlur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
 
     void renderGaussian6BlurLayer(FrameBuffer &in_fbo, size_t layer,
                                   float sigmaH, float sigmaV);
-    void renderGaussian17TapBlur(FrameBuffer &in_fbo, FrameBuffer &auxiliary);
+    void renderGaussian17TapBlur(const FrameBuffer &in_fbo, const FrameBuffer &auxiliary);
 
     /** Render tex. Used for blit/texture resize */
     void renderPassThrough(unsigned tex, unsigned width, unsigned height);
     void renderTextureLayer(unsigned tex, unsigned layer);
     void applyMLAA();
 
-    void renderMotionBlur(unsigned cam, FrameBuffer &in_fbo,
+    void renderMotionBlur(unsigned cam, const FrameBuffer &in_fbo,
                           FrameBuffer &out_fbo);
     void renderGlow(unsigned tex);
 

From d4f3fc88d63662b865001c6352b543e67b446a00 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 2 Jun 2015 14:50:32 +1000
Subject: [PATCH 277/331] Merged pull requests #2191.

---
 data/achievements.xml                         |    2 +-
 data/gui/challenges.stkgui                    |    2 +-
 data/gui/help1.stkgui                         |  Bin 7162 -> 7162 bytes
 data/gui/help2.stkgui                         |  Bin 9390 -> 9388 bytes
 data/gui/help3.stkgui                         |  Bin 8564 -> 8562 bytes
 data/gui/online/lobby.stkgui                  |    2 +-
 data/gui/online/profile_settings.stkgui       |    2 +-
 data/gui/select_challenge.stkgui              |    2 +-
 data/gui/tutorial.stkgui                      |    2 +-
 data/po/gui_strings.h                         |  834 +--
 data/po/supertuxkart.pot                      | 5884 +++++++++--------
 src/input/input_manager.cpp                   |    2 +-
 .../dialogs/select_challenge.cpp              |    8 +-
 src/states_screens/options_screen_input2.cpp  |    4 +-
 src/states_screens/options_screen_video.cpp   |   28 +-
 src/states_screens/race_setup_screen.cpp      |    4 +-
 src/states_screens/tracks_screen.cpp          |    2 +-
 17 files changed, 3405 insertions(+), 3373 deletions(-)

diff --git a/data/achievements.xml b/data/achievements.xml
index 064255c71..3673a160c 100644
--- a/data/achievements.xml
+++ b/data/achievements.xml
@@ -40,7 +40,7 @@
     <skidding goal="5"/>
   </achievement>
   <achievement id="6" check-type="all-at-least" reset-type="never"
-               name="Gold driver" description="Win in all single player modes, against at least 3 opponents.">
+               name="Gold driver" description="Win against at least 3 opponents in all single player modes.">
     <standard goal="1"/>
     <std_timetrial goal="1"/>
     <follow_leader goal="1"/>
diff --git a/data/gui/challenges.stkgui b/data/gui/challenges.stkgui
index a109ad5a8..76fb5c19f 100644
--- a/data/gui/challenges.stkgui
+++ b/data/gui/challenges.stkgui
@@ -4,7 +4,7 @@
 
     <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
 
-        <header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
+        <header I18N="Title for challenges screen" text="Challenges - Trophy Room" text_align="center" align="center" width="80%" />
 
         <spacer height="5" width="100%"/>
 
diff --git a/data/gui/help1.stkgui b/data/gui/help1.stkgui
index 3b9be504b3dfde21eea60061525d8fd12908be8f..ee9d19613dff0c46b54029af8e8e75861e65b27b 100644
GIT binary patch
delta 36
scmexm{>ywr1P`kog91ay<anNNM!m@kxq2sGVB(l;z?HOl4X+;`0OV8)(EtDd

delta 36
scmexm{>ywr1P{9cgB61UL&@Y=p76<wxOygEVB(l;z?HOl4X+;`0OX?!?f?J)

diff --git a/data/gui/help2.stkgui b/data/gui/help2.stkgui
index 4eff122aabb2019f2ebc736ae0e957829dd0819e..0e27dd413963cdcfcd6de31db87434ec5cfefcd6 100644
GIT binary patch
delta 64
zcmZ4IxyEzD4-Q7F$sZY|Hx~#AFm6`k3KCFGXDDJwWk_TwVaQ>qWKduz2GaQq<v?12
OAqC9J+dNxJm<s@GT@cd%

delta 51
zcmV-30L=faNv=t-_y_|a06LTL0UMJr7z&dR9+I=L3C0kU#1|F~X8>{lWdLCSbO3As
Jd9#@s6AH~95Fh{m

diff --git a/data/gui/help3.stkgui b/data/gui/help3.stkgui
index cda9a79914efbcbf5d374c6482f8cf4c635eedc8..dfe2f9dfd63b73f651da601147bf18effc3b44b8 100644
GIT binary patch
delta 12
Tcmez3^vP)hm+)pD;S4?iB^CsL

delta 14
Vcmez5^u=idmoTHkW=`QuJ^(B~1fKu^

diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/lobby.stkgui
index a86e226d7..6daff0e57 100644
--- a/data/gui/online/lobby.stkgui
+++ b/data/gui/online/lobby.stkgui
@@ -7,7 +7,7 @@
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
                     <div width="100%" height="fit" layout="horizontal-row" >
-                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name :"/>
+                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name:"/>
                         <label proportion="2" text_align="left" id="server_name" text=""/>
                     </div>
                 </box>
diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/online/profile_settings.stkgui
index 5b86964e3..d89d52c23 100644
--- a/data/gui/online/profile_settings.stkgui
+++ b/data/gui/online/profile_settings.stkgui
@@ -17,7 +17,7 @@
         <box proportion="1" width="100%" layout="vertical-row">
             <div x="1%" y="2%" width="98%" height="96%" layout="vertical-row" >
                 <div width="fit" height="fit" layout="horizontal-row" >
-                    <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password :"/>
+                    <label proportion="1" height="fit" text_align="left" I18N="In the online account settings screen" text="Password:"/>
                     <spacer width="20" height="1"/>
                     <button id="change_password_button" height="100%" width="fit" text="Change" />
                 </div>
diff --git a/data/gui/select_challenge.stkgui b/data/gui/select_challenge.stkgui
index 931b51db8..2d8e562b8 100644
--- a/data/gui/select_challenge.stkgui
+++ b/data/gui/select_challenge.stkgui
@@ -7,7 +7,7 @@
         <spacer height="2%" width="1"/>
 
         <div width="100%" layout="horizontal-row" height="fit">
-            <label id="race_type" text="Type :" I18N="Type of race, in a challenge"/>
+            <label id="race_type" text="Type:" I18N="Type of race, in a challenge"/>
             <spacer width="5" height="1"/>
             <label id="race_type_val" proportion="1"/>
         </div>
diff --git a/data/gui/tutorial.stkgui b/data/gui/tutorial.stkgui
index a8b92bc03..7ed7da256 100644
--- a/data/gui/tutorial.stkgui
+++ b/data/gui/tutorial.stkgui
@@ -4,7 +4,7 @@
 
     <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
 
-        <header I18N="Title for tutorials screen" text="Tutorial : Selection Room" text_align="center" width="100%" />
+        <header I18N="Title for tutorials screen" text="Tutorial - Selection Room" text_align="center" width="100%" />
 
         <spacer proportion="1" width="100%"/>
 
diff --git a/data/po/gui_strings.h b/data/po/gui_strings.h
index 6fed3abcb..c1411e6a5 100644
--- a/data/po/gui_strings.h
+++ b/data/po/gui_strings.h
@@ -1,70 +1,4 @@
-//I18N: ./data/achievements.xml
-_("Christoffel Columbus")
-
-//I18N: ./data/achievements.xml
-_("Play every official track at least once.")
-
-//I18N: ./data/achievements.xml
-_("Strike!")
-
-//I18N: ./data/achievements.xml
-_("Hit 10 karts with a bowling-ball.")
-
-//I18N: ./data/achievements.xml
-_("Arch Enemy")
-
-//I18N: ./data/achievements.xml
-_("Hit the same kart at least 5 times in one race.")
-
-//I18N: ./data/achievements.xml
-_("Marathoner")
-
-//I18N: ./data/achievements.xml
-_("Make a race with 5 laps or more.")
-
-//I18N: ./data/achievements.xml
-_("Skid-row")
-
-//I18N: ./data/achievements.xml
-_("Make 5 skidding in a single lap.")
-
-//I18N: ./data/achievements.xml
-_("Gold driver")
-
-//I18N: ./data/achievements.xml
-_("Win in all single player modes, against at least 3 opponents.")
-
-//I18N: ./data/achievements.xml
-_("Powerup Love")
-
-//I18N: ./data/achievements.xml
-_("Use 10 or more powerups in a race.")
-
-//I18N: ./data/achievements.xml
-_("Unstoppable")
-
-//I18N: ./data/achievements.xml
-_("Win 5 single races in a row.")
-
-//I18N: ./data/achievements.xml
-_("Banana Lover")
-
-//I18N: ./data/achievements.xml
-_("Collect at least 5 bananas in one race.")
-
-//I18N: ./data/achievements.xml
-_("It's secret")
-
-//I18N: ./data/achievements.xml
-_("Really ... a secret.")
-
-//I18N: ./data/achievements.xml
-_("Mosquito Hunter")
-
-//I18N: ./data/achievements.xml
-_("Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.")
-
-//I18N: ./data/grandprix/1_penguinplayground.grandprix
+//I18N: ./data/grandprix/1_penguinplayground.grandprix
 _("Penguin Playground")
 
 //I18N: ./data/grandprix/2_offthebeatentrack.grandprix
@@ -127,10 +61,6 @@ _("Add-Ons");
 //I18N: track group
 _("All");
 
-//I18N: ./data/gui/challenges.stkgui
-//I18N: Title for challenges screen
-_("Challenges : Trophy Room");
-
 //I18N: ./data/gui/confirm_dialog.stkgui
 //I18N: In a 'are you sure?' dialog
 _("Yes");
@@ -286,6 +216,30 @@ _("Cancel");
 //I18N: ./data/gui/feature_unlocked.stkgui
 _("Continue")
 
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("AI karts");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Reverse");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Tracks");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Track group");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Start Race");
+
+//I18N: ./data/gui/gp_info.stkgui
+//I18N: In the grand prix info screen
+_("Continue saved GP");
+
 //I18N: ./data/gui/gpedit.stkgui
 //I18N: Title in edit grand prix screen
 _("Edit Grand Prix");
@@ -338,30 +292,6 @@ _("Remove");
 //I18N: Menu item
 _("Rename");
 
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("AI karts");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Reverse");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Tracks");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Track group");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Start Race");
-
-//I18N: ./data/gui/gp_info.stkgui
-//I18N: In the grand prix info screen
-_("Continue saved GP");
-
 //I18N: ./data/gui/grand_prix_lose.stkgui
 _("Continue")
 
@@ -374,152 +304,6 @@ _("Continue")
 //I18N: ./data/gui/grand_prix_win.stkgui
 _("Save Grand Prix")
 
-//I18N: ./data/gui/help1.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help1.stkgui
-_("Click here to play the tutorial")
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("Collect blue boxes : they will give you weapons or other powerups");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("Avoid bananas!");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("Collecting nitro allows you to get speed boosts whenever you wish by pressing the appropriate key. You can see your current level of nitro in the bar at the right of the game screen.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: In the help menu
-_("If you see a button with a lock like this one, you need to complete a challenge to unlock it.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: in the help menu
-_("The 'skidding' key allows you to skid in sharp turns and get a boost.");
-
-//I18N: ./data/gui/help1.stkgui
-//I18N: in the help screen
-_("* Current key bindings can be seen/changed in menu Options");
-
-//I18N: ./data/gui/help2.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help2.stkgui
-//I18N: In the help menu
-_("To help you win, there are some powerups you can collect :");
-
-//I18N: ./data/gui/help2.stkgui
-_("BubbleGum - protect yourself with a shield, or use while looking back to leave a sticky pink puddle behind you.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Cake - thrown at the closest rival, best on short ranges and long straights.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Parachute - slows down all karts in a better position.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Anchor - slows down greatly the kart in the first position.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Swapper - gift boxes are transformed into bananas and vice versa for a short time.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Basket Ball - bounces after the leader, and might squash and slow down karts down on the way.")
-
-//I18N: ./data/gui/help2.stkgui
-_("Swatter - will squash karts close by, slowing them down.")
-
-//I18N: ./data/gui/help3.stkgui
-_("SuperTuxKart Help")
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("General");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Weapons");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Game Modes");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: Tab in help menu
-_("Multi­player");
-
-//I18N: ./data/gui/help3.stkgui
-_("SuperTuxKart features several game modes")
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Regular Race: All blows allowed, so catch weapons and make clever use of them!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Time Trial: Contains no powerups, so only your driving skills matter!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Follow the leader: Run for second place, as the last kart will be disqualified every time the counter hits zero. Beware : going in front of the leader will get you eliminated too!");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("3 Strikes Battle: Only in multiplayer games. Hit others with weapons until they lose all their lives.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Soccer: Only in multiplayer games. Use your kart to push the ball into the goal.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("Egg hunt: Explore tracks to find all hidden eggs.");
-
-//I18N: ./data/gui/help3.stkgui
-//I18N: In the help menu
-_("* Most of these game modes can also be played in a Grand Prix fashion: instead of playing a single race, you play many in a row. The better you rank, the more points you get. In the end, the player with the most points wins the cup.");
-
 //I18N: ./data/gui/help4.stkgui
 _("SuperTuxKart Help")
 
@@ -684,22 +468,6 @@ _("Log In");
 //I18N: In the login dialog
 _("Close");
 
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In networking lobby
-_("Lobby");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In the networking lobby
-_("Server name :");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In networking lobby
-_("actions");
-
-//I18N: ./data/gui/online/lobby.stkgui
-//I18N: In the networking lobby
-_("Exit");
-
 //I18N: ./data/gui/online/lobby_settings.stkgui
 //I18N: In the lobby settings screen
 _("Lobby Settings");
@@ -775,20 +543,6 @@ _("...")
 //I18N: Section in the profile screen
 _("Overview");
 
-//I18N: ./data/gui/online/profile_settings.stkgui
-_("...")
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-//I18N: Section in the profile screen
-_("Account Settings");
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-//I18N: In the online account settings screen
-_("Password :");
-
-//I18N: ./data/gui/online/profile_settings.stkgui
-_("Change")
-
 //I18N: ./data/gui/online/recovery_info.stkgui
 //I18N: In the recovery dialog
 _("Account Recovery");
@@ -953,6 +707,36 @@ _("Vote");
 //I18N: Vote dialog
 _("Close");
 
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("Lobby");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Server name:");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In networking lobby
+_("actions");
+
+//I18N: ./data/gui/online/lobby.stkgui
+//I18N: In the networking lobby
+_("Exit");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("...")
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: Section in the profile screen
+_("Account Settings");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+//I18N: In the online account settings screen
+_("Password:");
+
+//I18N: ./data/gui/online/profile_settings.stkgui
+_("Change")
+
 //I18N: ./data/gui/options_audio.stkgui
 _("SuperTuxKart Options")
 
@@ -1015,7 +799,8 @@ _("Press enter or double-click on a device to configure it");
 _("Add a device");
 
 //I18N: ./data/gui/options_input.stkgui
-_("* Which config to use will be inferred from which 'Select' key is pressed to join the game.")
+//I18N: In the input configuration screen
+_("* Which config to use will be inferred from which 'Select' key is pressed to join the game.");
 
 //I18N: ./data/gui/options_players.stkgui
 _("SuperTuxKart Options")
@@ -1139,31 +924,6 @@ _("Assign nothing");
 //I18N: When configuring input
 _("Press ESC to cancel");
 
-//I18N: ./data/gui/racesetup.stkgui
-_("Race Setup")
-
-//I18N: ./data/gui/racesetup.stkgui
-_("Select a difficulty")
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Novice");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Intermediate");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("Expert");
-
-//I18N: ./data/gui/racesetup.stkgui
-//I18N: Difficulty
-_("SuperTux");
-
-//I18N: ./data/gui/racesetup.stkgui
-_("Select a game mode")
-
 //I18N: ./data/gui/race_paused_dialog.stkgui
 _("Paused")
 
@@ -1195,25 +955,31 @@ _("Help");
 //I18N: Race paused button
 _("Exit Race");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 _("Race Setup")
 
-//I18N: ./data/gui/select_challenge.stkgui
-//I18N: Type of race, in a challenge
-_("Type :");
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a difficulty")
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Novice");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Intermediate");
 
-//I18N: ./data/gui/select_challenge.stkgui
+//I18N: ./data/gui/racesetup.stkgui
 //I18N: Difficulty
 _("Expert");
 
+//I18N: ./data/gui/racesetup.stkgui
+//I18N: Difficulty
+_("SuperTux");
+
+//I18N: ./data/gui/racesetup.stkgui
+_("Select a game mode")
+
 //I18N: ./data/gui/soccer_setup.stkgui
 _("Race Setup")
 
@@ -1240,14 +1006,6 @@ _("VS")
 //I18N: In soccer setup screen
 _("Continue");
 
-//I18N: ./data/gui/tracks.stkgui
-//I18N: In the track selection screen
-_("Grand Prix");
-
-//I18N: ./data/gui/tracks.stkgui
-//I18N: In the track selection screen
-_("All Tracks");
-
 //I18N: ./data/gui/track_info.stkgui
 _("= Highscores =")
 
@@ -1276,12 +1034,13 @@ _("Drive in reverse");
 //I18N: In the track info screen
 _("Start Race");
 
-//I18N: ./data/gui/tutorial.stkgui
-//I18N: Title for tutorials screen
-_("Tutorial : Selection Room");
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("Grand Prix");
 
-//I18N: ./data/gui/tutorial.stkgui
-_("Play all")
+//I18N: ./data/gui/tracks.stkgui
+//I18N: In the track selection screen
+_("All Tracks");
 
 //I18N: ./data/gui/tutorial_message_dialog.stkgui
 //I18N: Button in tutorial
@@ -1369,74 +1128,343 @@ _("Rename");
 //I18N: In the user screen
 _("Cancel");
 
-//I18N: ../stk-assets/tracks/battleisland/track.xml
-_("Battle Island")
+//I18N: ./data/gui/challenges.stkgui
+//I18N: Title for challenges screen
+_("Challenges - Trophy Room");
 
-//I18N: ../stk-assets/tracks/cave/track.xml
-_("Cave X")
+//I18N: ./data/gui/tutorial.stkgui
+//I18N: Title for tutorials screen
+_("Tutorial - Selection Room");
 
-//I18N: ../stk-assets/tracks/city/track.xml
-_("Shiny Suburbs")
+//I18N: ./data/gui/tutorial.stkgui
+_("Play all")
 
-//I18N: ../stk-assets/tracks/cocoa_temple/track.xml
-_("Cocoa Temple")
+//I18N: ./data/gui/help1.stkgui
+_("SuperTuxKart Help")
 
-//I18N: ../stk-assets/tracks/farm/track.xml
-_("Bovine Barnyard")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("General");
 
-//I18N: ../stk-assets/tracks/fortmagma/track.xml
-_("Fort Magma")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Weapons");
 
-//I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
-_("Gran Paradiso Island")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
 
-//I18N: ../stk-assets/tracks/greenvalley/track.xml
-_("Green Valley")
+//I18N: ./data/gui/help1.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
 
-//I18N: ../stk-assets/tracks/hacienda/track.xml
-_("Hacienda")
+//I18N: ./data/gui/help1.stkgui
+_("Click here to play the tutorial")
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("What's wrong, little hippies? Your great gnu leader is missing?")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Collect blue boxes. They will give you weapons or other powerups.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("What's wrong, little hippies? Your great gnu leader is missing?")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Avoid bananas!");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("Oh yes, see, he's in my castle now and will be served for supper...")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("Collecting nitro allows you to get speed boosts whenever you wish by pressing the appropriate key. You can see your current level of nitro in the bar at the right of the game screen.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("Oh yes, see, he's in my castle now and will be served for supper...")
+//I18N: ./data/gui/help1.stkgui
+//I18N: In the help menu
+_("If you see a button with a lock like this one, you need to complete a challenge to unlock it.");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("But I'm a fair creature, so I'll make you a deal.")
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help menu
+_("The 'skidding' key allows you to skid in sharp turns and get a boost.");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("But I'm a fair creature, so I'll make you a deal.")
+//I18N: ./data/gui/help1.stkgui
+//I18N: in the help screen
+_("* Current key bindings can be seen/changed in menu Options");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_("If you can beat me at racing, I will free the old codger.")
+//I18N: ./data/gui/help2.stkgui
+_("SuperTuxKart Help")
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_("If you can beat me at racing, I will free the old codger.")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("General");
 
-//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Weapons");
 
-//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
 
-//I18N: ../stk-assets/tracks/lighthouse/track.xml
-_("Around the lighthouse")
+//I18N: ./data/gui/help2.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help2.stkgui
+//I18N: In the help menu
+_("To help you win, there are some powerups you can collect:");
+
+//I18N: ./data/gui/help2.stkgui
+_("BubbleGum - protect yourself with a shield, or use while looking back to leave a sticky pink puddle behind you.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Cake - thrown at the closest rival, best on short ranges and long straights.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Plunger - throw straight to pull an opponent back, or throw while looking back to make one lose sight.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Bowling Ball - bounces off walls. If you are looking back, it will be thrown backwards.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Parachute - slows down all karts in a better position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Anchor - greatly slows down the kart in the first position.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swapper - gift boxes are transformed into bananas and vice versa for a short time.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Basket Ball - bounces after the leader, and might squash and slow down karts down on the way.")
+
+//I18N: ./data/gui/help2.stkgui
+_("Swatter - will squash karts close by, slowing them down.")
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart Help")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("General");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Weapons");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Game Modes");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: Tab in help menu
+_("Multi­player");
+
+//I18N: ./data/gui/help3.stkgui
+_("SuperTuxKart features several game modes")
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Regular Race: All blows allowed, so catch weapons and make clever use of them!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Time Trial: Contains no powerups, so only your driving skills matter!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Follow the leader: Run for second place, as the last kart will be disqualified every time the counter hits zero. Beware: going in front of the leader will get you eliminated too!");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("3 Strikes Battle: Only in multiplayer games. Hit others with weapons until they lose all their lives.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Soccer: Only in multiplayer games. Use your kart to push the ball into the goal.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("Egg hunt: Explore tracks to find all hidden eggs.");
+
+//I18N: ./data/gui/help3.stkgui
+//I18N: In the help menu
+_("* Most of these game modes can also be played in a Grand Prix fashion: instead of playing a single race, you play many in a row. The better you rank, the more points you get. In the end, the player with the most points wins the cup.");
+
+//I18N: ./data/gui/select_challenge.stkgui
+_("Race Setup")
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Type of race, in a challenge
+_("Type:");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Novice");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Intermediate");
+
+//I18N: ./data/gui/select_challenge.stkgui
+//I18N: Difficulty
+_("Expert");
+
+//I18N: ./data/achievements.xml
+_("Christoffel Columbus")
+
+//I18N: ./data/achievements.xml
+_("Play every official track at least once.")
+
+//I18N: ./data/achievements.xml
+_("Strike!")
+
+//I18N: ./data/achievements.xml
+_("Hit 10 karts with a bowling-ball.")
+
+//I18N: ./data/achievements.xml
+_("Arch Enemy")
+
+//I18N: ./data/achievements.xml
+_("Hit the same kart at least 5 times in one race.")
+
+//I18N: ./data/achievements.xml
+_("Marathoner")
+
+//I18N: ./data/achievements.xml
+_("Make a race with 5 laps or more.")
+
+//I18N: ./data/achievements.xml
+_("Skid-row")
+
+//I18N: ./data/achievements.xml
+_("Make 5 skidding in a single lap.")
+
+//I18N: ./data/achievements.xml
+_("Gold driver")
+
+//I18N: ./data/achievements.xml
+_("Win against at least 3 opponents in all single player modes.")
+
+//I18N: ./data/achievements.xml
+_("Powerup Love")
+
+//I18N: ./data/achievements.xml
+_("Use 10 or more powerups in a race.")
+
+//I18N: ./data/achievements.xml
+_("Unstoppable")
+
+//I18N: ./data/achievements.xml
+_("Win 5 single races in a row.")
+
+//I18N: ./data/achievements.xml
+_("Banana Lover")
+
+//I18N: ./data/achievements.xml
+_("Collect at least 5 bananas in one race.")
+
+//I18N: ./data/achievements.xml
+_("It's secret")
+
+//I18N: ./data/achievements.xml
+_("Really ... a secret.")
+
+//I18N: ./data/achievements.xml
+_("Mosquito Hunter")
+
+//I18N: ./data/achievements.xml
+_("Take your opponents for mosquitos! With the swatter, squash at least 5 of them in a race.")
+
+//I18N: ../stk-assets/tracks/soccer_field/track.xml
+_("Soccer field")
+
+//I18N: ../stk-assets/tracks/subsea/track.xml
+_("Subsea")
+
+//I18N: ../stk-assets/tracks/snowmountain/track.xml
+_("Northern Resort")
+
+//I18N: ../stk-assets/tracks/minigolf/track.xml
+_("Minigolf")
 
 //I18N: ../stk-assets/tracks/mansion/track.xml
 _("Blackhill Mansion")
 
+//I18N: ../stk-assets/tracks/stadium/track.xml
+_("The Stadium")
+
+//I18N: ../stk-assets/tracks/battleisland/track.xml
+_("Battle Island")
+
+//I18N: ../stk-assets/tracks/scotland/track.xml
+_("Nessie's pond")
+
+//I18N: ../stk-assets/tracks/city/track.xml
+_("Shiny Suburbs")
+
+//I18N: ../stk-assets/tracks/lighthouse/track.xml
+_("Around the lighthouse")
+
 //I18N: ../stk-assets/tracks/mines/track.xml
 _("Old Mine")
 
-//I18N: ../stk-assets/tracks/minigolf/track.xml
-_("Minigolf")
+//I18N: ../stk-assets/tracks/zengarden/track.xml
+_("Zen Garden")
+
+//I18N: ../stk-assets/tracks/greenvalley/track.xml
+_("Green Valley")
+
+//I18N: ../stk-assets/tracks/fortmagma/track.xml
+_("Fort Magma")
+
+//I18N: ../stk-assets/tracks/farm/track.xml
+_("Bovine Barnyard")
+
+//I18N: ../stk-assets/tracks/temple/track.xml
+_("Temple")
+
+//I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+_("Snow Peak")
+
+//I18N: ../stk-assets/tracks/xr591/track.xml
+_("XR591")
+
+//I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+_("Cocoa Temple")
+
+//I18N: ../stk-assets/tracks/hacienda/track.xml
+_("Hacienda")
+
+//I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+_("STK Enterprise")
+
+//I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+_("Gran Paradiso Island")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("What's wrong, little hippies? Your great gnu leader is missing?")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("Oh yes, see, he's in my castle now and will be served for supper...")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("But I'm a fair creature, so I'll make you a deal.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_("If you can beat me at racing, I will free the old codger.")
+
+//I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
+
+//I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+_(" But you pathetic little twerps will never be able to beat me - King of the Karts!")
 
 //I18N: ../stk-assets/tracks/olivermath/track.xml
 _("Oliver's Math Class")
@@ -1444,56 +1472,17 @@ _("Oliver's Math Class")
 //I18N: ../stk-assets/tracks/sandtrack/track.xml
 _("Shifting Sands")
 
-//I18N: ../stk-assets/tracks/scotland/track.xml
-_("Nessie's pond")
+//I18N: ../stk-assets/tracks/cave/track.xml
+_("Cave X")
 
-//I18N: ../stk-assets/tracks/snowmountain/track.xml
-_("Northern Resort")
-
-//I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-_("Snow Peak")
-
-//I18N: ../stk-assets/tracks/soccer_field/track.xml
-_("Soccer field")
-
-//I18N: ../stk-assets/tracks/stadium/track.xml
-_("The Stadium")
-
-//I18N: ../stk-assets/tracks/stk_enterprise/track.xml
-_("STK Enterprise")
-
-//I18N: ../stk-assets/tracks/subsea/track.xml
-_("Subsea")
-
-//I18N: ../stk-assets/tracks/temple/track.xml
-_("Temple")
-
-//I18N: ../stk-assets/tracks/xr591/track.xml
-_("XR591")
-
-//I18N: ../stk-assets/tracks/zengarden/track.xml
-_("Zen Garden")
-
-//I18N: ../stk-assets/karts/adiumy/kart.xml
-_("Adiumy")
-
-//I18N: ../stk-assets/karts/amanda/kart.xml
-_("Amanda")
-
-//I18N: ../stk-assets/karts/beastie/kart.xml
-_("Beastie")
+//I18N: ../stk-assets/karts/tux/kart.xml
+_("Tux")
 
 //I18N: ../stk-assets/karts/elephpant/kart.xml
 _("Elephpant")
 
-//I18N: ../stk-assets/karts/emule/kart.xml
-_("Emule")
-
-//I18N: ../stk-assets/karts/gnu/kart.xml
-_("Gnu")
-
-//I18N: ../stk-assets/karts/hexley/kart.xml
-_("Hexley")
+//I18N: ../stk-assets/karts/amanda/kart.xml
+_("Amanda")
 
 //I18N: ../stk-assets/karts/konqi/kart.xml
 _("Konqi")
@@ -1501,27 +1490,42 @@ _("Konqi")
 //I18N: ../stk-assets/karts/nolok/kart.xml
 _("Nolok")
 
-//I18N: ../stk-assets/karts/pidgin/kart.xml
-_("Pidgin")
+//I18N: ../stk-assets/karts/suzanne/kart.xml
+_("Suzanne")
+
+//I18N: ../stk-assets/karts/wilber/kart.xml
+_("Wilber")
+
+//I18N: ../stk-assets/karts/adiumy/kart.xml
+_("Adiumy")
+
+//I18N: ../stk-assets/karts/gnu/kart.xml
+_("Gnu")
 
 //I18N: ../stk-assets/karts/puffy/kart.xml
 _("Puffy")
 
+//I18N: ../stk-assets/karts/gavroche/kart.xml
+_("Gavroche")
+
+//I18N: ../stk-assets/karts/hexley/kart.xml
+_("Hexley")
+
+//I18N: ../stk-assets/karts/xue/kart.xml
+_("Xue")
+
 //I18N: ../stk-assets/karts/sara_the_racer/kart.xml
 _("Sara the Racer")
 
 //I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
 _("Sara the Wizard")
 
-//I18N: ../stk-assets/karts/suzanne/kart.xml
-_("Suzanne")
+//I18N: ../stk-assets/karts/emule/kart.xml
+_("Emule")
 
-//I18N: ../stk-assets/karts/tux/kart.xml
-_("Tux")
+//I18N: ../stk-assets/karts/pidgin/kart.xml
+_("Pidgin")
 
-//I18N: ../stk-assets/karts/wilber/kart.xml
-_("Wilber")
-
-//I18N: ../stk-assets/karts/xue/kart.xml
-_("Xue")
+//I18N: ../stk-assets/karts/beastie/kart.xml
+_("Beastie")
 
diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot
index 68b27d40f..012e67632 100644
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: supertuxkart\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-13 21:42-0400\n"
+"POT-Creation-Date: 2015-05-14 21:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,291 +18,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. I18N: Do NOT literally translate this string!! Please enter Y as the
-#. translation if your language is a RTL (right-to-left) language,
-#. N (or nothing) otherwise
-#: src/utils/translation.cpp:262
-msgid "   Is this a RTL language?"
+#. I18N: ./data/grandprix/1_penguinplayground.grandprix
+msgid "Penguin Playground"
 msgstr ""
 
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-msgid ""
-" But you pathetic little twerps will never be able to beat me - King of the "
-"Karts!"
+#. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
+msgid "Off the beaten track"
 msgstr ""
 
-#. I18N: Only used for count > 3
-#: src/online/online_player_profile.cpp:429
-#, c-format
-msgid "%d friend is now online."
-msgid_plural "%d friends are now online."
-msgstr[0] ""
-msgstr[1] ""
-
-#. I18N: 'handicapped' indicates that per-player handicaps are
-#. activated for this kart (i.e. it will drive slower)
-#: src/guiengine/widgets/player_kart_widget.cpp:360
-#, c-format
-msgid "%s (handicapped)"
+#. I18N: ./data/grandprix/3_tothemoonandback.grandprix
+msgid "To the moon and back"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:172
-#: src/states_screens/dialogs/addons_loading.cpp:176
-#, c-format
-msgid "%s KB"
+#. I18N: ./data/grandprix/4_atworldsend.grandprix
+msgid "At World's End"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:165
-#, c-format
-msgid "%s MB"
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Install"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:418
-#, c-format
-msgid "%s and %s are now online."
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+msgid "Uninstall"
 msgstr ""
 
-#. I18N: as in: The Old Island by Johannes Sjolund
-#: src/states_screens/addons_screen.cpp:306
-#, c-format
-msgctxt "addons"
-msgid "%s by %s"
+#. I18N: ./data/gui/addons_loading.stkgui
+#. I18N: Add-on screen action
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:216
+#: src/states_screens/dialogs/addons_loading.cpp:284
+msgid "Back"
 msgstr ""
 
-#: src/modes/linear_world.cpp:358
-#, c-format
-msgctxt "fastest_lap"
-msgid "%s by %s"
+#. I18N: ./data/gui/addons_screen.stkgui
+msgid "SuperTuxKart Addons"
 msgstr ""
 
-#: src/online/online_player_profile.cpp:414
-#, c-format
-msgid "%s is now online."
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
+msgid "Updated"
 msgstr ""
 
-#: src/guiengine/widgets/player_kart_widget.cpp:420
-#, c-format
-msgid "%s is ready"
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
+msgid "Rating >="
 msgstr ""
 
-#: src/states_screens/online_profile_base.cpp:108
-#, c-format
-msgid "%s's profile"
-msgstr ""
-
-#: src/states_screens/create_server_screen.cpp:60
-#, c-format
-msgid "%s's server"
-msgstr ""
-
-#: src/online/online_player_profile.cpp:423
-#, c-format
-msgid "%s, %s and %s are now online."
-msgstr ""
-
-#: src/modes/world.cpp:1147
-#, c-format
-msgid "'%s' has been eliminated."
-msgstr ""
-
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: for empty highscores entries
-#: src/states_screens/track_info_screen.cpp:252
-msgid "(Empty)"
-msgstr ""
-
-#. I18N: ./data/gui/help4.stkgui
-msgid "(network play is not yet available)"
-msgstr ""
-
-#: src/states_screens/options_screen_input2.cpp:372
-msgid "* A blue item means a conflict with another configuration"
-msgstr ""
-
-#: src/states_screens/options_screen_input2.cpp:377
-msgid "* A red item means a conflict in the current configuration"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: in the help screen
-msgid "* Current key bindings can be seen/changed in menu Options"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid ""
-"* Most of these game modes can also be played in a Grand Prix fashion: "
-"instead of playing a single race, you play many in a row. The better you "
-"rank, the more points you get. In the end, the player with the most points "
-"wins the cup."
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "* Restart STK to apply new settings"
-msgstr ""
-
-#. I18N: ./data/gui/options_input.stkgui
-msgid ""
-"* Which config to use will be inferred from which 'Select' key is pressed to "
-"join the game."
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_achievements.stkgui
-#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#. I18N: ./data/gui/online/profile_friends.stkgui
-#. I18N: ./data/gui/online/profile_overview.stkgui
-#. I18N: ./data/gui/online/profile_settings.stkgui
-msgid "..."
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:52
-msgid "1 month"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:50
-msgid "1 week"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:56
-msgid "1 year"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:51
-msgid "2 weeks"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:57
-msgid "2 years"
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:182
-msgid "3 Strikes Battle"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid ""
-"3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
-"they lose all their lives."
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:53
-msgid "3 months"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:54
-msgid "6 months"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:55
-msgid "9 months"
-msgstr ""
-
-#. I18N: ./data/gui/track_info.stkgui
-msgid "= Highscores ="
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+msgid "Karts"
 msgstr ""
 
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
 #. I18N: ./data/gui/gp_info.stkgui
 #. I18N: In the grand prix info screen
-msgid "AI karts"
+msgid "Tracks"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:189
-msgid "Abort Grand Prix"
+#. I18N: ./data/gui/addons_screen.stkgui
+#. I18N: In the addons screen
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: Section in arena tracks selection screen
+msgid "Arenas"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-msgid "About"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:236
-msgid "Accelerate"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:975
-#, c-format
-msgid ""
-"Accelerate and press the <%s> key while turning to skid. Skidding for a "
-"short while can help you turn faster to take sharp turns."
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:897
-#, c-format
-msgid "Accelerate with <%s> and steer with <%s> and <%s>"
-msgstr ""
-
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-msgid "Accept"
-msgstr ""
-
-#. I18N: ./data/gui/online/recovery_info.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-msgid "Account Recovery"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:101
-msgid "Account Settings"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
-#. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:100
-msgid "Achievements"
-msgstr ""
-
-#: src/states_screens/options_screen_input2.cpp:71
-msgid "Action"
-msgstr ""
-
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-msgid "Add"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-msgid "Add Friend"
-msgstr ""
-
-#. I18N: In the 'add new input device' dialog
-#: src/states_screens/dialogs/add_device_dialog.cpp:111
-msgid "Add Keyboard Configuration"
-msgstr ""
-
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: In the player configuration screen
-msgid "Add Player"
-msgstr ""
-
-#. I18N: In the 'add new input device' dialog
-#: src/states_screens/dialogs/add_device_dialog.cpp:90
-msgid "Add Wiimote"
-msgstr ""
-
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: In the input configuration screen
-msgid "Add a device"
-msgstr ""
-
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-msgid "Add user"
+#. I18N: ./data/gui/arenas.stkgui
+#. I18N: track group
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: track group
+#: src/states_screens/grand_prix_editor_screen.cpp:334
+msgid "Standard"
 msgstr ""
 
 #. I18N: ./data/gui/arenas.stkgui
@@ -321,24 +109,6 @@ msgstr ""
 msgid "Add-Ons"
 msgstr ""
 
-#: src/states_screens/addons_screen.cpp:110
-msgid "Add-on name"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-msgid "Addons"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/adiumy/kart.xml
-msgid "Adiumy"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Advanced pipeline (lights, etc.)"
-msgstr ""
-
 #. I18N: ./data/gui/arenas.stkgui
 #. I18N: track group
 #. I18N: ./data/gui/easter_egg.stkgui
@@ -347,7 +117,6 @@ msgstr ""
 #. I18N: name of the tab that will show arenas from all groups
 #. I18N: name of the tab that will show tracks from all groups
 #. I18N: if all kart animations are enabled
-#. I18N: name of the tab that will show tracks from all groups
 #: src/states_screens/addons_screen.cpp:49
 #: src/states_screens/arenas_screen.cpp:75
 #: src/states_screens/easter_egg_screen.cpp:137
@@ -355,309 +124,15 @@ msgstr ""
 #: src/states_screens/gp_info_screen.cpp:76
 #: src/states_screens/grand_prix_editor_screen.cpp:333
 #: src/states_screens/kart_selection.cpp:278
-#: src/states_screens/options_screen_video.cpp:434
 #: src/states_screens/tracks_screen.cpp:145
+#: src/states_screens/options_screen_video.cpp:436
 msgid "All"
 msgstr ""
 
-#. I18N: ./data/gui/easter_egg.stkgui
-#. I18N: Section in easter egg tracks selection screen
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
-msgid "All Tracks"
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:202
-msgid "All blows allowed, so catch weapons and make clever use of them!"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Always show login screen"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/amanda/kart.xml
-msgid "Amanda"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Ambient Occlusion"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:464
-#, c-format
-msgid "Ambient occlusion : %s"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:323
-msgid "An error occurred while trying to save your grand prix."
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid "Anchor - slows down greatly the kart in the first position."
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Animated Characters"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:450
-#, c-format
-msgid "Animated Characters : %s"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Animated Scenery"
-msgstr ""
-
-#. I18N: in graphical options
-#. tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
-#. UserConfigParams::m_pixel_shaders ? enabled : disabled);
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:444
-#, c-format
-msgid "Animated Scenery : %s"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:81
-msgid "Anisotropic x16"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:78
-msgid "Anisotropic x2"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:79
-msgid "Anisotropic x4"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:80
-msgid "Anisotropic x8"
-msgstr ""
-
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
-msgid "Another grand prix with this name already exists."
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Anti-aliasing"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:461
-#, c-format
-msgid "Anti-aliasing : %s"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-msgid "Apply"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Apply new resolution"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Arch Enemy"
-msgstr ""
-
-#. I18N: shown before deleting an input configuration
-#: src/states_screens/options_screen_input2.cpp:575
-msgid "Are you sure you want to permanently delete this configuration?"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:123
-#: src/states_screens/grand_prix_editor_screen.cpp:109
-#, c-format
-msgid "Are you sure you want to remove '%s'?"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In the addons screen
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: Section in arena tracks selection screen
-msgid "Arenas"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/lighthouse/track.xml
-msgid "Around the lighthouse"
-msgstr ""
-
-#. I18N: ./data/gui/press_a_key_dialog.stkgui
-#. I18N: When configuring input
-msgid "Assign nothing"
-msgstr ""
-
-#. I18N: ./data/gui/press_a_key_dialog.stkgui
-#. I18N: When configuring input
-msgid "Assign to ESC key"
-msgstr ""
-
-#. I18N: ./data/grandprix/4_atworldsend.grandprix
-msgid "At World's End"
-msgstr ""
-
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: Section in the settings menu
-#: src/states_screens/options_screen_input.cpp:139
-#: src/states_screens/options_screen_input2.cpp:86
-#: src/states_screens/options_screen_ui.cpp:118
-#: src/states_screens/options_screen_video.cpp:163
-#: src/states_screens/user_screen.cpp:647
-msgid "Audio"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-#: src/tracks/track_object_presentation.cpp:906
-msgid "Avoid bananas!"
-msgstr ""
-
-#. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/binding.cpp:284
-#, c-format
-msgid "Axis %d"
-msgstr ""
-
-#. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/binding.cpp:272
-#, c-format
-msgid "Axis %d %s"
-msgstr ""
-
-#. I18N: to appear in input configuration screen, for gamepad axes
-#: src/input/binding.cpp:279
-#, c-format
-msgid "Axis %d inverted"
-msgstr ""
-
-#. I18N: ./data/gui/addons_loading.stkgui
-#. I18N: Add-on screen action
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:216
-#: src/states_screens/dialogs/addons_loading.cpp:284
-msgid "Back"
-msgstr ""
-
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
-msgid "Back to Game"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-msgid "Back to Race"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:205
-msgid "Back to challenge selection"
-msgstr ""
-
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: In the input configuration screen
-msgid "Back to device list"
-msgstr ""
-
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
-msgid "Back to menu"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:211
-msgid "Back to the menu"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Banana Lover"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid ""
-"Basket Ball - bounces after the leader, and might squash and slow down karts "
-"down on the way."
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/battleisland/track.xml
-msgid "Battle Island"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/beastie/kart.xml
-msgid "Beastie"
-msgstr ""
-
-#. I18N: when failing a GP
-#: src/states_screens/grand_prix_lose.cpp:161
-msgid "Better luck next time!"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:76
-msgid "Bilinear"
-msgstr ""
-
-#. I18N: Name of the black button on xbox controller
-#: src/input/gamepad_config.cpp:167
-msgid "Black"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/mansion/track.xml
-msgid "Blackhill Mansion"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Bloom"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:473
-#, c-format
-msgid "Bloom : %s"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:969
-msgid "Blue Team Wins"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/farm/track.xml
-msgid "Bovine Barnyard"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid ""
-"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
-"backwards."
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:239
-msgid "Brake"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid ""
-"BubbleGum - protect yourself with a shield, or use while looking back to "
-"leave a sticky pink puddle behind you."
-msgstr ""
-
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-msgid "But I'm a fair creature, so I'll make you a deal."
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid ""
-"Cake - thrown at the closest rival, best on short ranges and long straights."
-msgstr ""
-
-#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
-msgid "Can't access stkaddons server..."
+#. I18N: ./data/gui/confirm_dialog.stkgui
+#. I18N: In a 'are you sure?' dialog
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "Yes"
 msgstr ""
 
 #. I18N: ./data/gui/confirm_dialog.stkgui
@@ -683,938 +158,44 @@ msgstr ""
 #. I18N: In the user screen
 #. I18N: ./data/gui/user_screen_tab.stkgui
 #. I18N: In the user screen
-#: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/dialogs/add_device_dialog.cpp:128
+#: src/states_screens/dialogs/addons_loading.cpp:227
 #: src/states_screens/user_screen.cpp:112
 msgid "Cancel"
 msgstr ""
 
-#: src/states_screens/dialogs/user_info_dialog.cpp:56
-msgid "Cancel Request"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:277
-msgid "Cancel/Back"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/cave/track.xml
-msgid "Cave X"
-msgstr ""
-
-#: src/states_screens/feature_unlocked.cpp:493
-msgid "Challenge Completed"
-msgstr ""
-
-#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
-msgid "Challenge Failed"
-msgstr ""
-
-#. I18N: ./data/gui/challenges.stkgui
-#. I18N: Title for challenges screen
-msgid "Challenges : Trophy Room"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_settings.stkgui
-msgid "Change"
-msgstr ""
-
-#. I18N: ./data/gui/karts.stkgui
-#. I18N: In the kart selection (player setup) screen
-#. I18N: ./data/gui/karts_online.stkgui
-#. I18N: In the kart selection (player setup) screen
-msgid "Choose a Kart"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Christoffel Columbus"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-msgid "Click here to play the tutorial"
-msgstr ""
-
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-#. I18N: ./data/gui/online/notification_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/recovery_info.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: Vote dialog
-msgid "Close"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
-msgid "Cocoa Temple"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Collect at least 5 bananas in one race."
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-msgid "Collect blue boxes : they will give you weapons or other powerups"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:916
-#, c-format
-msgid ""
-"Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:938
-msgid "Collect nitro bottles (we will use them after the curve)"
-msgstr ""
-
-#: src/states_screens/race_gui_base.cpp:648
-msgid "Collect nitro!"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-msgid ""
-"Collecting nitro allows you to get speed boosts whenever you wish by "
-"pressing the appropriate key. You can see your current level of nitro in the "
-"bar at the right of the game screen."
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:880
-msgid "Complete all challenges to unlock the big door!"
-msgstr ""
-
-#: src/achievements/achievement.cpp:202
-#, c-format
-msgid "Completed achievement \"%s\"."
-msgstr ""
-
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-msgid "Confirm"
-msgstr ""
-
-#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-#: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
-#, c-format
-msgid "Confirm resolution within %i seconds"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Connect to the Internet"
-msgstr ""
-
-#: src/input/wiimote_manager.cpp:387
-msgid ""
-"Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
-"instructions at supertuxkart.net/Wiimote"
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:209
-msgid "Contains no powerups, so only your driving skills matter!"
-msgstr ""
-
-#. I18N: ./data/gui/feature_unlocked.stkgui
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
-#. I18N: ./data/gui/tutorial_message_dialog.stkgui
-#. I18N: Button in tutorial
-#: src/states_screens/dialogs/gp_info_dialog.cpp:212
-#: src/states_screens/race_result_gui.cpp:186
-msgid "Continue"
-msgstr ""
-
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
-#: src/states_screens/gp_info_screen.cpp:146
-msgid "Continue saved GP"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:156
-msgid "Continue."
-msgstr ""
-
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: Section in the settings menu
-#: src/states_screens/options_screen_audio.cpp:67
-#: src/states_screens/options_screen_ui.cpp:120
-#: src/states_screens/options_screen_video.cpp:166
-#: src/states_screens/user_screen.cpp:649
-msgid "Controls"
-msgstr ""
-
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
-msgid "Copy"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:217
-#: src/states_screens/register_screen.cpp:224
-#, c-format
-msgid "Could not create player '%s'."
-msgstr ""
-
-#: src/input/wiimote_manager.cpp:418
-msgid "Could not detect any wiimote :/"
-msgstr ""
-
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-msgid "Create"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Create Server"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-msgid "Create User"
-msgstr ""
-
-#: src/states_screens/create_server_screen.cpp:117
-msgid "Creating server"
-msgstr ""
-
-#. I18N: ./data/gui/credits.stkgui
-#. I18N: Title in credits screen
-msgid "Credits"
-msgstr ""
-
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-msgid "Current Password"
-msgstr ""
-
-#: src/states_screens/dialogs/change_password_dialog.cpp:134
-msgid "Current password invalid."
-msgstr ""
-
-#: src/config/player_manager.cpp:91
-msgid "Currently not signed in"
-msgstr ""
-
-#. I18N: custom video settings
-#: src/states_screens/options_screen_video.cpp:411
-msgid "Custom"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Custom settings..."
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
-msgid "DPad down"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
-msgid "DPad left"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
-msgid "DPad right"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
-msgid "DPad up"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-msgid "Decline"
-msgstr ""
-
-#: src/states_screens/gp_info_screen.cpp:74
-msgid "Default"
-msgstr ""
-
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-msgid "Delete"
-msgstr ""
-
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: In the input configuration screen
-#: src/states_screens/options_screen_input2.cpp:111
-msgid "Delete Configuration"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Depth of field"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:485
-#, c-format
-msgid "Depth of field : %s"
-msgstr ""
-
-#. I18N: button to disable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:96
-#: src/states_screens/options_screen_input2.cpp:587
-msgid "Disable Device"
-msgstr ""
-
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is disabled
-#: src/states_screens/dialogs/custom_video_settings.cpp:62
-#: src/states_screens/dialogs/custom_video_settings.cpp:86
-#: src/states_screens/options_screen_video.cpp:432
-msgid "Disabled"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Display FPS"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:354
-msgid "Do you really want to abort the Grand Prix?"
-msgstr ""
-
-#. I18N: In the player info dialog (when deleting)
-#: src/states_screens/user_screen.cpp:583
-#, c-format
-msgid "Do you really want to delete player '%s' ?"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:140
-msgid "Do you want to save your changes?"
-msgstr ""
-
-#: src/karts/controller/network_player_controller.cpp:283
-#: src/karts/controller/player_controller.cpp:340
-msgid "Don't accelerate before go"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:265
-msgid "Down"
-msgstr ""
-
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
-msgid "Drive in reverse"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:455
-#, c-format
-msgid "Dynamic lights : %s"
-msgstr ""
-
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
-msgid "Edit"
-msgstr ""
-
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Title in edit grand prix screen
-msgid "Edit Grand Prix"
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:184
-msgid "Egg Hunt"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid "Egg hunt: Explore tracks to find all hidden eggs."
-msgstr ""
-
-#: src/modes/easter_egg_hunt.cpp:202
-#, c-format
-msgid "Eggs: %d / %d"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/elephpant/kart.xml
-msgid "Elephpant"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:474
-#: src/states_screens/race_result_gui.cpp:833
-msgid "Eliminated"
-msgstr ""
-
-#. I18N: ./data/gui/online/recovery_input.stkgui
-#. I18N: In the recovery dialog
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-msgid "Email"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:292
-msgid "Email has to be between 5 and 254 characters long!"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:298
-msgid "Email is invalid!"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:276
-msgid "Emails don't match!"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/emule/kart.xml
-msgid "Emule"
-msgstr ""
-
-#. I18N: button to enable a gamepad configuration
-#: src/states_screens/options_screen_input2.cpp:98
-#: src/states_screens/options_screen_input2.cpp:588
-msgid "Enable Device"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Enable per-player handicaps"
-msgstr ""
-
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: In the audio options screen
-#. I18N: in the graphical options tooltip;
-#. indicates a graphical feature is enabled
-#: src/states_screens/options_screen_video.cpp:429
-msgid "Enabled"
-msgstr ""
-
-#. I18N: animations setting (all karts are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:66
-msgid "Enabled for all"
-msgstr ""
-
-#. I18N: ./data/gui/enter_player_name_dialog.stkgui
-#. I18N: In the 'add new player' dialog
-msgid "Enter the new player's name"
-msgstr ""
-
-#: src/addons/news_manager.cpp:172
-#, c-format
-msgid "Error downloading news: '%s'."
-msgstr ""
-
-#: src/states_screens/kart_selection.cpp:923
-msgid ""
-"Everyone:\n"
-"Press 'Select' now to join the game!"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: Section in the register screen
-msgid "Existing Online Account"
-msgstr ""
-
-#. I18N: ./data/gui/online/lobby.stkgui
-#. I18N: In the networking lobby
-msgid "Exit"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-msgid "Exit Race"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:111
-msgid "Exit game"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
-msgid "Expert"
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:252
-msgid "Explore tracks to find all hidden eggs"
-msgstr ""
-
-#: src/graphics/irr_driver.cpp:1795
-#, c-format
-msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
-msgstr ""
-
-#: src/graphics/irr_driver.cpp:1804
-#, c-format
-msgid "FPS: %d/%d/%d - %d KTris"
-msgstr ""
-
-#: src/states_screens/online_profile_achievements.cpp:128
-#: src/states_screens/online_profile_achievements.cpp:168
-msgid "Fetching achievements"
-msgstr ""
-
-#: src/states_screens/online_profile_friends.cpp:88
-#: src/states_screens/online_profile_friends.cpp:174
-msgid "Fetching friends"
-msgstr ""
-
-#: src/states_screens/dialogs/vote_dialog.cpp:171
-msgid "Fetching last vote"
-msgstr ""
-
-#: src/states_screens/server_selection.cpp:67
-#: src/states_screens/server_selection.cpp:210
-msgid "Fetching servers"
-msgstr ""
-
-#. I18N: ./data/gui/online/recovery_input.stkgui
-msgid ""
-"Fill in the username and email address you supplied at registration to be "
-"able to reset your password."
-msgstr ""
-
-#: src/modes/linear_world.cpp:276
-msgid "Final lap!"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Find Server"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:242
-msgid "Fire"
-msgstr ""
-
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: In the help menu
-msgid ""
-"First, you will need several input devices (having multiple gamepads or "
-"joysticks is the best way to play with several people). Go in the input "
-"configuration screen and setup the gamepads. It is also possible to play on "
-"keyboard(s), however each player will need a different set of keys, and keep "
-"in mind that most keyboards are not appropriate for multiplayer gameplay "
-"because they do not support large number of keypresses."
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:180
-msgid "Follow the Leader"
-msgstr ""
-
-#: src/states_screens/race_gui_base.cpp:650
-msgid "Follow the leader!"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid ""
-"Follow the leader: Run for second place, as the last kart will be "
-"disqualified every time the counter hits zero. Beware : going in front of "
-"the leader will get you eliminated too!"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/fortmagma/track.xml
-msgid "Fort Magma"
-msgstr ""
-
-#: src/input/wiimote_manager.cpp:413
-#, c-format
-msgid "Found %d wiimote"
-msgid_plural "Found %d wiimotes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:313
-msgid "Friend removed!"
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:215
-msgid "Friend request accepted!"
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:364
-msgid "Friend request cancelled!"
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:267
-msgid "Friend request declined!"
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:158
-msgid "Friend request sent!"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_friends.stkgui
-#. I18N: Section in the profile screen
-#: src/states_screens/online_profile_base.cpp:99
-msgid "Friends"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Fullscreen"
-msgstr ""
-
-#. I18N: Shown when a goal is scored
-#: src/states_screens/race_gui_base.cpp:70
-msgid "GOAL!"
-msgstr ""
-
-#. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:144
-msgid "Game Keys"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-msgid "Game Modes"
-msgstr ""
-
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
-msgid "Game type (Goals limit / Time limit)"
-msgstr ""
-
-#. I18N: to appear in input configuration screen, for gamepad buttons
-#: src/input/binding.cpp:292
-#, c-format
-msgid "Gamepad button %d"
-msgstr ""
-
-#. I18N: to appear in input configuration screen, for gamepad hats
-#: src/input/binding.cpp:260 src/input/binding.cpp:265
-#, c-format
-msgid "Gamepad hat %d"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-msgid "General"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-msgid "Give Up Race"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Global illumination"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:489
-#, c-format
-msgid "Global illumination : %s"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Glow (outlines)"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:477
-#, c-format
-msgid "Glow (outlines) : %s"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/gnu/kart.xml
-msgid "Gnu"
-msgstr ""
-
-#. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui_base.cpp:68
-msgid "Go!"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Gold driver"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
-msgid "Gran Paradiso Island"
-msgstr ""
-
-#. I18N: ./data/gui/tracks.stkgui
-#. I18N: In the track selection screen
-#: src/states_screens/dialogs/select_challenge.cpp:145
-msgid "Grand Prix"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-msgid "Grand Prix Editor"
-msgstr ""
-
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Title in grand prix editor screen
-msgid "Grand Prix editor"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:1214
-msgid "Grand Prix progress:"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Graphical Effects Level"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: Section in the settings menu
-#: src/states_screens/options_screen_audio.cpp:64
-#: src/states_screens/options_screen_input.cpp:138
-#: src/states_screens/options_screen_input2.cpp:85
-#: src/states_screens/options_screen_ui.cpp:117
-#: src/states_screens/user_screen.cpp:646
-msgid "Graphics"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-msgid "Graphics Settings"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/greenvalley/track.xml
-msgid "Green Valley"
-msgstr ""
-
-#. I18N: Name of first guest player (without number)
-#: src/config/player_manager.cpp:392
-msgid "Guest"
-msgstr ""
-
-#. I18N: Name of further guest players, with a 1, 2, ... attached
-#: src/config/player_manager.cpp:397
-#, c-format
-msgid "Guest %d"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-msgid "Guest Log in"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/hacienda/track.xml
-msgid "Hacienda"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-msgid "Help"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/hexley/kart.xml
-msgid "Hexley"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:1252
-msgid "Highscores"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Hit 10 karts with a bowling-ball."
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:231
-msgid ""
-"Hit others with weapons until they lose all their lives. (Only in "
-"multiplayer games)"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Hit the same kart at least 5 times in one race."
-msgstr ""
-
-#. I18N: animations setting (only karts with human players are animated)
-#: src/states_screens/dialogs/custom_video_settings.cpp:64
-msgid "Human players only"
-msgstr ""
-
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-msgid "I agree to the above terms and am 13 years or older. "
-msgstr ""
-
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-msgid "If you can beat me at racing, I will free the old codger."
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: In the help menu
-msgid ""
-"If you see a button with a lock like this one, you need to complete a "
-"challenge to unlock it."
-msgstr ""
-
-#: src/input/input_manager.cpp:729
-#, c-format
-msgid "Ignoring '%s', you needed to join earlier to play!"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Image-based lighting"
-msgstr ""
-
-#. I18N: ./data/gui/addons_loading.stkgui
-#. I18N: Add-on screen action
-msgid "Install"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
-msgid "Intermediate"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:401
-#: src/states_screens/user_screen.cpp:328
-msgid "Internet access is disabled, please enable it in the options"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:974
-msgid "It's a draw"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "It's secret"
-msgstr ""
-
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
-msgid "Join"
-msgstr ""
-
-#: src/states_screens/dialogs/server_info_dialog.cpp:155
-msgid "Joining server"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In the addons screen
-msgid "Karts"
-msgstr ""
-
 #. I18N: ./data/gui/confirm_resolution_dialog.stkgui
 #. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
 msgid "Keep this resolution"
 msgstr ""
 
-#. I18N: short definition for follow-the-leader game mode
-#: src/states_screens/race_setup_screen.cpp:222
-msgid "Keep up with the leader kart but don't overtake it!"
+#. I18N: ./data/gui/credits.stkgui
+#. I18N: Title in credits screen
+msgid "Credits"
 msgstr ""
 
-#: src/states_screens/options_screen_input2.cpp:72
-msgid "Key binding"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Graphics Settings"
 msgstr ""
 
-#: src/states_screens/options_screen_input.cpp:97
-#, c-format
-msgid "Keyboard %i"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Advanced pipeline (lights, etc.)"
 msgstr ""
 
-#. I18N: ../stk-assets/karts/konqi/kart.xml
-msgid "Konqi"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Shadows"
 msgstr ""
 
-#. I18N: Shown at the end of a race
-#: src/states_screens/race_gui_overworld.cpp:108
-msgid "Lap"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Image-based lighting"
 msgstr ""
 
-#: src/modes/linear_world.cpp:303
-#, c-format
-msgid "Lap %i"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:67
-msgid "Laps"
-msgstr ""
-
-#. I18N: number of laps to race in a challenge
-#: src/challenges/challenge_data.cpp:249
-#, c-format
-msgid "Laps : %i"
-msgstr ""
-
-#: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
-msgid "Leader"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:268
-msgid "Left"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:212
-msgid "Left bumper"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:220
-msgid "Left thumb button"
-msgstr ""
-
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:235
-msgid "Left thumb down"
-msgstr ""
-
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:233
-msgid "Left thumb left"
-msgstr ""
-
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:231
-msgid "Left thumb right"
-msgstr ""
-
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:237
-msgid "Left thumb up"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
-msgid "Left trigger"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Bloom"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
@@ -1622,148 +203,24 @@ msgstr ""
 msgid "Light shaft (God rays)"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:481
-#, c-format
-msgid "Light shaft (God rays) : %s"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Ambient Occlusion"
 msgstr ""
 
-#: src/guiengine/engine.cpp:1330
-msgid "Loading"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Global illumination"
 msgstr ""
 
-#. I18N: ./data/gui/online/lobby.stkgui
-#. I18N: In networking lobby
-msgid "Lobby"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Glow (outlines)"
 msgstr ""
 
-#. I18N: ./data/gui/online/lobby_settings.stkgui
-#. I18N: In the lobby settings screen
-msgid "Lobby Settings"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-msgid "Local Name"
-msgstr ""
-
-#: src/states_screens/kart_selection.cpp:853
-msgid "Locked"
-msgstr ""
-
-#: src/states_screens/arenas_screen.cpp:237
-#: src/states_screens/arenas_screen.cpp:267
-#: src/states_screens/easter_egg_screen.cpp:225
-#: src/states_screens/easter_egg_screen.cpp:256
-#: src/states_screens/kart_selection.cpp:858
-#: src/states_screens/kart_selection.cpp:1449
-#: src/states_screens/race_setup_screen.cpp:214
-#: src/states_screens/tracks_screen.cpp:283
-msgid "Locked : solve active challenges to gain access to more!"
-msgstr ""
-
-#: src/states_screens/tracks_screen.cpp:201
-msgid "Locked!"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-msgid "Log In"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Log Out"
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:139
-#, c-format
-msgid "Logged in as: %s."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:155
-msgid "Logging in"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:494
-#, c-format
-msgid "Logging in '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: In the login dialog
-msgid ""
-"Logging in as a guest allows you to participate in online races, but it does "
-"not allow you to vote for addons, or collect any achievements while being "
-"online."
-msgstr ""
-
-#: src/states_screens/online_screen.cpp:160
-msgid "Logging out"
-msgstr ""
-
-#: src/states_screens/user_screen.cpp:493
-#, c-format
-msgid "Logging out '%s'"
-msgstr ""
-
-#. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: ./data/gui/user_screen.stkgui
-#: src/states_screens/main_menu_screen.cpp:175
-#: src/states_screens/main_menu_screen.cpp:186
-msgid "Login"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:251
-msgid "Look Back"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_friends.stkgui
-#. I18N: In the profile screen
-msgid "Look for more friends:"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Make 5 skidding in a single lap."
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Make a race with 5 laps or more."
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Marathoner"
-msgstr ""
-
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/lobby_settings.stkgui
-#. I18N: In the lobby settings screen
-msgid "Max. number of players"
-msgstr ""
-
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
-msgid "Maximum time (min.)"
-msgstr ""
-
-#. I18N: if some kart animations are enabled
-#: src/states_screens/options_screen_video.cpp:436
-msgid "Me Only"
-msgstr ""
-
-#. I18N: Key binding section
-#: src/states_screens/options_screen_input2.cpp:158
-msgid "Menu Keys"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/minigolf/track.xml
-msgid "Minigolf"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Mosquito Hunter"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Anti-aliasing"
 msgstr ""
 
 #. I18N: ./data/gui/custom_video_settings.stkgui
@@ -1771,199 +228,55 @@ msgstr ""
 msgid "Motion blur"
 msgstr ""
 
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:458
-#, c-format
-msgid "Motion blur: %s"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Depth of field"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/binding.cpp:299
-#, c-format
-msgid "Mouse axis %d %s"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Weather Effects"
 msgstr ""
 
-#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
-#: src/input/binding.cpp:295
-#, c-format
-msgid "Mouse button %d"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Scenery"
 msgstr ""
 
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-msgid "Move down"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture compression"
 msgstr ""
 
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-msgid "Move up"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Use high definition textures"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-msgid "Multiplayer"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Animated Characters"
 msgstr ""
 
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-msgid "Multi­player"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "Texture filtering"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: In the audio options screen
-msgid "Music"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+#. I18N: Video settings
+msgid "* Restart STK to apply new settings"
 msgstr ""
 
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-#: src/states_screens/online_profile_achievements.cpp:73
-#: src/states_screens/server_selection.cpp:91
-msgid "Name"
+#. I18N: ./data/gui/custom_video_settings.stkgui
+msgid "Apply"
 msgstr ""
 
-#: src/states_screens/create_server_screen.cpp:132
-msgid "Name has to be between 4 and 30 characters long!"
-msgstr ""
-
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
-msgid "Name is empty."
-msgstr ""
-
-#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
-msgid "Name is too long."
-msgstr ""
-
-#. I18N: ./data/gui/online/create_server.stkgui
-#. I18N: In the server creation screen
-#. I18N: ./data/gui/online/lobby_settings.stkgui
-#. I18N: In the lobby settings screen
-msgid "Name of the server"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/scotland/track.xml
-msgid "Nessie's pond"
-msgstr ""
-
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
-msgid "New"
-msgstr ""
-
-#: src/challenges/challenge_data.cpp:502
-#, c-format
-msgid "New Grand Prix '%s' now available"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: Section in the register screen
-msgid "New Online Account"
-msgstr ""
-
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-msgid "New Password"
-msgstr ""
-
-#: src/states_screens/online_profile_friends.cpp:145
-msgid "New Request"
-msgstr ""
-
-#: src/challenges/challenge_data.cpp:506
-#, c-format
-msgid "New difficulty '%s' now available"
-msgstr ""
-
-#: src/modes/linear_world.cpp:363
-msgid "New fastest lap"
-msgstr ""
-
-#: src/challenges/challenge_data.cpp:492
-#, c-format
-msgid "New game mode '%s' now available"
-msgstr ""
-
-#: src/challenges/challenge_data.cpp:516
-#, c-format
-msgid "New kart '%s' now available"
-msgstr ""
-
-#: src/challenges/challenge_data.cpp:486
-#, c-format
-msgid "New track '%s' now available"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:245
-msgid "Nitro"
-msgstr ""
-
-#: src/states_screens/dialogs/select_challenge.cpp:147
-msgid "Nitro challenge"
-msgstr ""
-
-#: src/states_screens/dialogs/message_dialog.cpp:128
-#: src/states_screens/edit_gp_screen.cpp:253
-msgid "No"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/nolok/kart.xml
-msgid "Nolok"
-msgstr ""
-
-#. I18N: if no kart animations are enabled
-#: src/states_screens/gp_info_screen.cpp:75
-#: src/states_screens/options_screen_video.cpp:438
-msgid "None"
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:176
-msgid "Normal Race"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/snowmountain/track.xml
-msgid "Northern Resort"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:986
-msgid ""
-"Note that if you manage to skid for several seconds, you will receive a "
-"bonus speedup as a reward!"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Difficulty
-msgid "Novice"
-msgstr ""
-
-#: src/states_screens/dialogs/select_challenge.cpp:68
-#, c-format
-msgid "Number of AI Karts : %i"
-msgstr ""
-
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
-msgid "Number of AI karts"
-msgstr ""
-
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
-msgid "Number of goals to win"
-msgstr ""
-
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
-msgid "Number of laps"
+#. I18N: ./data/gui/easter_egg.stkgui
+#. I18N: Section in easter egg tracks selection screen
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+msgid "All Tracks"
 msgstr ""
 
 #. I18N: ./data/gui/edit_track.stkgui
@@ -1971,6 +284,11 @@ msgstr ""
 msgid "Number of laps:"
 msgstr ""
 
+#. I18N: ./data/gui/edit_track.stkgui
+#. I18N: In the edit track screen
+msgid "Reverse:"
+msgstr ""
+
 #. I18N: ./data/gui/edit_track.stkgui
 #. I18N: ./data/gui/enter_gp_name_dialog.stkgui
 #. I18N: In the 'add new grand prix' dialog
@@ -1987,30 +305,227 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#. I18N: ./data/grandprix/2_offthebeatentrack.grandprix
-msgid "Off the beaten track"
+#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
+#. I18N: In the 'add new grand prix' dialog
+msgid "Please enter the name of the grand prix"
 msgstr ""
 
-#: src/states_screens/online_profile_friends.cpp:150
-msgid "Offline"
+#. I18N: ./data/gui/enter_player_name_dialog.stkgui
+#. I18N: In the 'add new player' dialog
+msgid "Enter the new player's name"
 msgstr ""
 
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: Section in the register screen
-msgid "Offline Account"
+#. I18N: ./data/gui/feature_unlocked.stkgui
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+#. I18N: ./data/gui/tutorial_message_dialog.stkgui
+#. I18N: Button in tutorial
+#: src/states_screens/dialogs/gp_info_dialog.cpp:214
+#: src/states_screens/race_result_gui.cpp:186
+msgid "Continue"
 msgstr ""
 
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "AI karts"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/mines/track.xml
-msgid "Old Mine"
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Reverse"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/olivermath/track.xml
-msgid "Oliver's Math Class"
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+msgid "Track group"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Start Race"
+msgstr ""
+
+#. I18N: ./data/gui/gp_info.stkgui
+#. I18N: In the grand prix info screen
+#: src/states_screens/gp_info_screen.cpp:146
+msgid "Continue saved GP"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Title in edit grand prix screen
+msgid "Edit Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move up"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Move down"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Add"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Edit"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Remove"
+msgstr ""
+
+#. I18N: ./data/gui/gpedit.stkgui
+#. I18N: Menu item
+msgid "Save"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Title in grand prix editor screen
+msgid "Grand Prix editor"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "New"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+msgid "Copy"
+msgstr ""
+
+#. I18N: ./data/gui/gpeditor.stkgui
+#. I18N: Menu item
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Rename"
+msgstr ""
+
+#. I18N: ./data/gui/grand_prix_lose.stkgui
+#. I18N: ./data/gui/grand_prix_win.stkgui
+msgid "Save Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/help3.stkgui
+msgid "SuperTuxKart Help"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+msgid "General"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+msgid "Weapons"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+msgid "Game Modes"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: Tab in help menu
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: Tab in help menu
+msgid "Multi­player"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+msgid "(network play is not yet available)"
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"First, you will need several input devices (having multiple gamepads or "
+"joysticks is the best way to play with several people). Go in the input "
+"configuration screen and setup the gamepads. It is also possible to play on "
+"keyboard(s), however each player will need a different set of keys, and keep "
+"in mind that most keyboards are not appropriate for multiplayer gameplay "
+"because they do not support large number of keypresses."
+msgstr ""
+
+#. I18N: ./data/gui/help4.stkgui
+#. I18N: In the help menu
+msgid ""
+"When input devices are configured, you are ready to play. Select the "
+"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
+"each player can press on the 'fire' key of their gamepad or keyboard to join "
+"the game. Each player can use their input device to select their kart. The "
+"game continues when everyone selected their kart. Note that the mouse may "
+"not be used for this operation."
+msgstr ""
+
+#. I18N: ./data/gui/karts.stkgui
+#. I18N: In the kart selection (player setup) screen
+#. I18N: ./data/gui/karts_online.stkgui
+#. I18N: In the kart selection (player setup) screen
+msgid "Choose a Kart"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Story Mode"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Singleplayer"
+msgstr ""
+
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Multiplayer"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
@@ -2025,31 +540,9 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Online Multiplayer"
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-msgid "Online Username"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:280
-msgid "Online username has to be between 3 and 30 characters long!"
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:284
-msgid "Online username must not start with a number!"
-msgstr ""
-
-#: src/input/input_manager.cpp:759
-msgid "Only the Game Master may act at this point!"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:960
-#, c-format
-msgid "Oops! When you're in trouble, press <%s> to be rescued"
+#. I18N: ./data/gui/main.stkgui
+#. I18N: Main menu button
+msgid "Addons"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
@@ -2061,218 +554,37 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#. I18N: ./data/gui/online/profile_overview.stkgui
-#. I18N: Section in the profile screen
-msgid "Overview"
-msgstr ""
-
-#: src/guiengine/widgets/kart_stats_widget.cpp:93
-msgid "POWER"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid "Parachute - slows down all karts in a better position."
-msgstr ""
-
-#. I18N: ./data/gui/online/register.stkgui
-#. I18N: In the registration dialog
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the registration dialog
-msgid "Password"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_settings.stkgui
-#. I18N: In the online account settings screen
-msgid "Password :"
-msgstr ""
-
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
-msgid "Password Change"
-msgstr ""
-
-#: src/states_screens/dialogs/change_password_dialog.cpp:140
-#: src/states_screens/register_screen.cpp:288
-msgid "Password has to be between 8 and 30 characters long!"
-msgstr ""
-
-#: src/states_screens/dialogs/change_password_dialog.cpp:210
-msgid "Password successfully changed."
-msgstr ""
-
-#: src/states_screens/dialogs/change_password_dialog.cpp:147
-#: src/states_screens/register_screen.cpp:272
-msgid "Passwords don't match!"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:257
-msgid "Pause Game"
-msgstr ""
-
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
 #. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
 #. I18N: ./data/gui/race_paused_dialog.stkgui
-msgid "Paused"
+#. I18N: Race paused button
+msgid "Help"
 msgstr ""
 
-#: src/karts/controller/network_player_controller.cpp:281
-#: src/karts/controller/player_controller.cpp:338
-msgid "Penalty time!!"
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#: src/states_screens/race_gui_overworld.cpp:455
+msgid "Tutorial"
 msgstr ""
 
-#: src/states_screens/online_profile_friends.cpp:146
-msgid "Pending"
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:100
+msgid "Achievements"
 msgstr ""
 
-#. I18N: ./data/grandprix/1_penguinplayground.grandprix
-msgid "Penguin Playground"
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "Grand Prix Editor"
 msgstr ""
 
-#: src/states_screens/dialogs/vote_dialog.cpp:247
-msgid "Performing vote"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/pidgin/kart.xml
-msgid "Pidgin"
-msgstr ""
-
-#. I18N: ./data/gui/tutorial.stkgui
-msgid "Play all"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Play every official track at least once."
-msgstr ""
-
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: Section in the settings menu
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: Section in the settings menu
-#: src/states_screens/options_screen_audio.cpp:66
-#: src/states_screens/options_screen_input.cpp:141
-#: src/states_screens/options_screen_input2.cpp:88
-#: src/states_screens/options_screen_ui.cpp:119
-#: src/states_screens/options_screen_video.cpp:165
-#: src/states_screens/server_selection.cpp:92
-msgid "Players"
-msgstr ""
-
-#: src/states_screens/options_screen_ui.cpp:154
-msgid ""
-"Players can select handicapped (more difficult) profiles on the kart "
-"selection screen"
-msgstr ""
-
-#. I18N: ./data/gui/enter_gp_name_dialog.stkgui
-#. I18N: In the 'add new grand prix' dialog
-msgid "Please enter the name of the grand prix"
-msgstr ""
-
-#. I18N: shown when config file is too old
-#: src/input/device_manager.cpp:500
-msgid "Please re-configure your key bindings."
-msgstr ""
-
-#: src/states_screens/dialogs/registration_dialog.cpp:42
-msgid "Please read the terms and conditions "
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:437
-msgid "Please wait while addons are updated"
-msgstr ""
-
-#: src/states_screens/main_menu_screen.cpp:557
-msgid "Please wait while the add-ons are loading"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid ""
-"Plunger - throw straight to pull an opponent back, or throw while looking "
-"back to make one lose sight."
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Powerup Love"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:930
-#, c-format
-msgid ""
-"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
-"to fire behind!"
-msgstr ""
-
-#. I18N: ./data/gui/press_a_key_dialog.stkgui
-#. I18N: When configuring input
-msgid "Press ESC to cancel"
-msgstr ""
-
-#. I18N: ./data/gui/press_a_key_dialog.stkgui
-msgid "Press a key"
-msgstr ""
-
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: In the input configuration screen
-msgid "Press enter or double-click on a device to configure it"
-msgstr ""
-
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: In the player configuration screen
-msgid "Press enter or double-click on a player to edit him/her"
-msgstr ""
-
-#: src/states_screens/race_gui_overworld.cpp:462
-msgid "Press fire to play the tutorial"
-msgstr ""
-
-#: src/states_screens/race_gui_overworld.cpp:532
-msgid "Press fire to start the challenge"
-msgstr ""
-
-#: src/input/wiimote_manager.cpp:390
-msgid ""
-"Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
-"mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
-msgstr ""
-
-#: src/states_screens/dialogs/addons_loading.cpp:357
-#, c-format
-msgid "Problems installing the addon '%s'."
-msgstr ""
-
-#: src/states_screens/dialogs/addons_loading.cpp:394
-#, c-format
-msgid "Problems removing the addon '%s'."
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:474
-msgid "Processing"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Profile"
-msgstr ""
-
-#: src/states_screens/online_profile_achievements.cpp:79
-msgid "Progress"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/puffy/kart.xml
-msgid "Puffy"
-msgstr ""
-
-#: src/states_screens/race_setup_screen.cpp:240
-msgid ""
-"Push the ball to the opposite cage to score goals. (Only in multiplayer "
-"games)"
-msgstr ""
-
-#. I18N: ./data/gui/online/main.stkgui
-#. I18N: In the online multiplayer screen
-msgid "Quick Play"
+#. I18N: ./data/gui/main.stkgui
+#. I18N: In the main screen
+msgid "About"
 msgstr ""
 
 #. I18N: ./data/gui/main.stkgui
@@ -2280,261 +592,48 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:159
-msgid "Quit the server."
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Password Change"
 msgstr ""
 
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: ./data/gui/soccer_setup.stkgui
-msgid "Race Setup"
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "Current Password"
 msgstr ""
 
-#: src/states_screens/gp_info_screen.cpp:77
-msgid "Random"
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+msgid "New Password"
 msgstr ""
 
-#: src/states_screens/arenas_screen.cpp:277
-msgid "Random Arena"
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Confirm"
 msgstr ""
 
-#: src/race/grand_prix_data.hpp:171
-msgid "Random Grand Prix"
-msgstr ""
-
-#: src/states_screens/kart_selection.cpp:839
-#: src/states_screens/kart_selection.cpp:1467
-msgid "Random Kart"
-msgstr ""
-
-#: src/states_screens/easter_egg_screen.cpp:270
-#: src/states_screens/tracks_screen.cpp:297
-msgid "Random Track"
-msgstr ""
-
-#: src/states_screens/race_gui_overworld.cpp:109
-msgid "Rank"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only items with good rating
-msgid "Rating >="
-msgstr ""
-
-#. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui_base.cpp:64
-msgid "Ready!"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Really ... a secret."
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:965
-msgid "Red Team Wins"
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+msgid "Submit"
 msgstr ""
 
+#. I18N: ./data/gui/online/change_password.stkgui
+#. I18N: In the change password dialog
 #. I18N: ./data/gui/online/guest_login.stkgui
-#. I18N: Tab in login menu
-msgid "Register"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid ""
-"Regular Race: All blows allowed, so catch weapons and make clever use of "
-"them!"
-msgstr ""
-
-#: src/states_screens/gp_info_screen.cpp:153
-#: src/states_screens/gp_info_screen.cpp:178
-msgid "Reload"
-msgstr ""
-
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-msgid "Remember password"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Remember window location"
-msgstr ""
-
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
+#. I18N: In the login dialog
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/user_info_dialog.stkgui
 #. I18N: User info dialog
-msgid "Remove"
-msgstr ""
-
-#. I18N: ./data/gui/gpeditor.stkgui
-#. I18N: Menu item
-#. I18N: ./data/gui/user_screen.stkgui
-#. I18N: In the user screen
-#. I18N: ./data/gui/user_screen_tab.stkgui
-#. I18N: In the user screen
-msgid "Rename"
-msgstr ""
-
-#: src/states_screens/dialogs/select_challenge.cpp:64
-#, c-format
-msgid "Required Nitro Points : %i"
-msgstr ""
-
-#: src/states_screens/dialogs/select_challenge.cpp:53
-#, c-format
-msgid "Required Rank : %i"
-msgstr ""
-
-#: src/states_screens/dialogs/select_challenge.cpp:58
-#, c-format
-msgid "Required Time : %i"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:254
-msgid "Rescue"
-msgstr ""
-
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Resolution"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:199
-msgid "Restart"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-msgid "Restart Race"
-msgstr ""
-
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
-msgid "Reverse"
-msgstr ""
-
-#. I18N: ./data/gui/edit_track.stkgui
-#. I18N: In the edit track screen
-msgid "Reverse:"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:68
-msgid "Reversed"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:271
-msgid "Right"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:214
-msgid "Right bumper"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:222
-msgid "Right thumb button"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
-msgid "Right thumb down"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
-msgid "Right thumb left"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
-msgid "Right thumb right"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
-msgid "Right thumb up"
-msgstr ""
-
-#. I18N: name of buttons on gamepads
-#. I18N: name of stick on gamepads
-#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
-msgid "Right trigger"
-msgstr ""
-
-#: src/guiengine/widgets/kart_stats_widget.cpp:89
-msgid "SPEED"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
-msgid "STK Enterprise"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
-msgid "Sara the Racer"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
-msgid "Sara the Wizard"
-msgstr ""
-
-#. I18N: ./data/gui/gpedit.stkgui
-#. I18N: Menu item
-msgid "Save"
-msgstr ""
-
-#. I18N: ./data/gui/grand_prix_lose.stkgui
-#. I18N: ./data/gui/grand_prix_win.stkgui
-msgid "Save Grand Prix"
-msgstr ""
-
-#. I18N: ./data/gui/online/profile_friends.stkgui
-#. I18N: ./data/gui/online/user_search.stkgui
-msgid "Search"
-msgstr ""
-
-#: src/states_screens/online_user_search.cpp:208
-#: src/states_screens/online_user_search.cpp:288
-msgid "Searching"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:274
-msgid "Select"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-msgid "Select a difficulty"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-msgid "Select a game mode"
-msgstr ""
-
-#: src/states_screens/edit_track_screen.cpp:238
-msgid "Select a track"
-msgstr ""
-
-#. I18N: ./data/gui/overworld_dialog.stkgui
-#. I18N: In the in-game dialog
-msgid "Select kart"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Send anonymous HW statistics"
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: Vote dialog
+msgid "Close"
 msgstr ""
 
 #. I18N: ./data/gui/online/create_server.stkgui
@@ -2542,56 +641,30 @@ msgstr ""
 msgid "Server Creation"
 msgstr ""
 
-#. I18N: ./data/gui/online/server_info_dialog.stkgui
-#. I18N: In the server info dialog
-msgid "Server Info"
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Name of the server"
 msgstr ""
 
-#. I18N: ./data/gui/online/server_selection.stkgui
-msgid "Server Selection"
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Max. number of players"
 msgstr ""
 
-#. I18N: ./data/gui/online/lobby.stkgui
-#. I18N: In the networking lobby
-msgid "Server name :"
+#. I18N: ./data/gui/online/create_server.stkgui
+#. I18N: In the server creation screen
+msgid "Create"
 msgstr ""
 
-#: src/states_screens/dialogs/server_info_dialog.cpp:58
-msgid "Server successfully created. You can now join it."
-msgstr ""
-
-#. I18N: as in "ready, set, go", shown at the beginning of the race
-#: src/states_screens/race_gui_base.cpp:66
-msgid "Set!"
-msgstr ""
-
-#. I18N: ./data/gui/race_paused_dialog.stkgui
-#. I18N: Race paused button
-#: src/states_screens/race_result_gui.cpp:209
-msgid "Setup New Race"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Shadows"
-msgstr ""
-
-#: src/states_screens/options_screen_video.cpp:470
-#, c-format
-msgid "Shadows: %i"
-msgstr ""
-
-#: src/states_screens/options_screen_video.cpp:468
-#, c-format
-msgid "Shadows: %s"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/sandtrack/track.xml
-msgid "Shifting Sands"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/city/track.xml
-msgid "Shiny Suburbs"
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: ./data/gui/user_screen.stkgui
+#: src/states_screens/main_menu_screen.cpp:175
+#: src/states_screens/main_menu_screen.cpp:186
+msgid "Login"
 msgstr ""
 
 #. I18N: ./data/gui/online/guest_login.stkgui
@@ -2604,416 +677,118 @@ msgstr ""
 msgid "Sign In As Guest"
 msgstr ""
 
-#: src/states_screens/online_profile_friends.cpp:70
-msgid "Since"
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: Tab in login menu
+msgid "Register"
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-msgid "Singleplayer"
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Guest Log in"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:177
-#, c-format
-msgid "Size: %s"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Skid-row"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:248
-msgid "Skidding"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: In the ui settings
-msgid "Skin"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
-msgid "Snow Peak"
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:186
-msgid "Soccer"
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/soccer_field/track.xml
-msgid "Soccer field"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
 msgid ""
-"Soccer: Only in multiplayer games. Use your kart to push the ball into the "
-"goal."
+"Logging in as a guest allows you to participate in online races, but it does "
+"not allow you to vote for addons, or collect any achievements while being "
+"online."
 msgstr ""
 
-#: src/states_screens/addons_screen.cpp:514
-#: src/states_screens/main_menu_screen.cpp:550
-msgid ""
-"Sorry, an error occurred while contacting the add-ons website. Make sure you "
-"are connected to the Internet and that SuperTuxKart is not blocked by a "
-"firewall"
+#. I18N: ./data/gui/online/guest_login.stkgui
+#. I18N: In the login dialog
+msgid "Log In"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:279
-msgid "Sorry, downloading the add-on failed"
+#. I18N: ./data/gui/online/lobby_settings.stkgui
+#. I18N: In the lobby settings screen
+msgid "Lobby Settings"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: In the audio options screen
-msgid "Sound Effects"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Online Multiplayer"
 msgstr ""
 
-#. I18N: ./data/gui/arenas.stkgui
-#. I18N: track group
-#. I18N: ./data/gui/easter_egg.stkgui
-#. I18N: track group
-#: src/states_screens/grand_prix_editor_screen.cpp:334
-msgid "Standard"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Quick Play"
 msgstr ""
 
-#. I18N: name of buttons on gamepads
-#: src/input/gamepad_config.cpp:218
-msgid "Start"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Find Server"
 msgstr ""
 
-#: src/states_screens/dialogs/gp_info_dialog.cpp:209
-msgid "Start Grand Prix"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Create Server"
 msgstr ""
 
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
-#. I18N: ./data/gui/track_info.stkgui
-#. I18N: In the track info screen
-msgid "Start Race"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Profile"
 msgstr ""
 
-#: src/states_screens/online_profile_friends.cpp:71
-msgid "Status"
+#. I18N: ./data/gui/online/main.stkgui
+#. I18N: In the online multiplayer screen
+msgid "Log Out"
 msgstr ""
 
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:230
-msgid "Steer Left"
+#. I18N: ./data/gui/online/notification_dialog.stkgui
+#. I18N: User info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "View"
 msgstr ""
 
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:233
-msgid "Steer Right"
+#. I18N: ./data/gui/online/profile_achievements.stkgui
+#. I18N: ./data/gui/online/profile_achievements_tab.stkgui
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "..."
 msgstr ""
 
-#. I18N: ./data/gui/main.stkgui
-#. I18N: Main menu button
-msgid "Story Mode"
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:99
+msgid "Friends"
 msgstr ""
 
-#. I18N: ./data/achievements.xml
-msgid "Strike!"
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: In the profile screen
+msgid "Look for more friends:"
 msgstr ""
 
-#. I18N: ./data/gui/online/change_password.stkgui
-#. I18N: In the change password dialog
+#. I18N: ./data/gui/online/profile_friends.stkgui
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "Search"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_overview.stkgui
+#. I18N: Section in the profile screen
+msgid "Overview"
+msgstr ""
+
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
 #. I18N: ./data/gui/online/recovery_input.stkgui
 #. I18N: In the recovery dialog
-msgid "Submit"
+msgid "Account Recovery"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/subsea/track.xml
-msgid "Subsea"
-msgstr ""
-
-#. I18N: ./data/gui/racesetup.stkgui
-#. I18N: Difficulty
-msgid "SuperTux"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-msgid "SuperTuxKart Addons"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: ./data/gui/help4.stkgui
-msgid "SuperTuxKart Help"
-msgstr ""
-
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: ./data/gui/options_device.stkgui
-#. I18N: ./data/gui/options_input.stkgui
-#. I18N: ./data/gui/options_players.stkgui
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: ./data/gui/user_screen_tab.stkgui
-msgid "SuperTuxKart Options"
-msgstr ""
-
-#. I18N: ./data/gui/help4.stkgui
-msgid "SuperTuxKart can be played in multiplayer mode on the same computer"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-msgid "SuperTuxKart features several game modes"
-msgstr ""
-
-#: src/main.cpp:1201
+#. I18N: ./data/gui/online/recovery_info.stkgui
+#. I18N: In the recovery dialog
 msgid ""
-"SuperTuxKart may connect to a server to download add-ons and notify you of "
-"updates. We also collect anonymous hardware statistics to help with the "
-"development of STK. Please read our privacy policy at http://privacy."
-"supertuxkart.net. Would you like this feature to be enabled? (To change this "
-"setting at a later time, go to options, select tab 'User Interface', and "
-"edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+"You will receive an email with further instructions on how to reset your "
+"password. Please be patient and be sure to check your spam folder."
 msgstr ""
 
-#. I18N: ../stk-assets/karts/suzanne/kart.xml
-msgid "Suzanne"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
+#. I18N: ./data/gui/online/recovery_input.stkgui
 msgid ""
-"Swapper - gift boxes are transformed into bananas and vice versa for a short "
-"time."
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-msgid "Swatter - will squash karts close by, slowing them down."
-msgstr ""
-
-#. I18N: in the language choice, to select the same language as the OS
-#: src/states_screens/options_screen_ui.cpp:186
-msgid "System Language"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid ""
-"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
-"them in a race."
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/temple/track.xml
-msgid "Temple"
-msgstr ""
-
-#. I18N: ./data/gui/online/registration_terms.stkgui
-#. I18N: In the registration dialog
-msgid "Terms and Agreement"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Texture compression"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Texture filtering"
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: in the help menu
-msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/stadium/track.xml
-msgid "The Stadium"
-msgstr ""
-
-#: src/states_screens/main_menu_screen.cpp:545
-msgid "The add-ons module is currently disabled in the Options screen"
-msgstr ""
-
-#: src/race/highscore_manager.cpp:101
-msgid ""
-"The highscore file was too old,\n"
-"all highscores have been erased."
-msgstr ""
-
-#: src/states_screens/create_server_screen.cpp:136
-msgid "The maxinum number of players has to be between 2 and 12."
-msgstr ""
-
-#. I18N: Game mode
-#: src/race/race_manager.hpp:178
-msgid "Time Trial"
-msgstr ""
-
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: In the help menu
-msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
-msgstr ""
-
-#: src/states_screens/dialogs/add_device_dialog.cpp:64
-msgid ""
-"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
-"connected and it will appear in the list.\n"
-"\n"
-"To add a keyboard config, you can use the button below, HOWEVER please note "
-"that most keyboards only support a limited amount of simultaneous keypresses "
-"and are thus inappropriate for multiplayer gameplay. (You can, however, "
-"connect multiple keyboards to the computer. Remember that everyone still "
-"needs different keybindings in this case.)"
-msgstr ""
-
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: In the help menu
-msgid "To help you win, there are some powerups you can collect :"
-msgstr ""
-
-#. I18N: ./data/grandprix/3_tothemoonandback.grandprix
-msgid "To the moon and back"
-msgstr ""
-
-#: src/states_screens/dialogs/user_info_dialog.cpp:154
-#: src/states_screens/dialogs/user_info_dialog.cpp:211
-msgid "Today"
-msgstr ""
-
-#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
-#: src/states_screens/race_gui_base.cpp:103
-#, c-format
-msgid "Top %i"
-msgstr ""
-
-#: src/states_screens/edit_gp_screen.cpp:66
-msgid "Track"
-msgstr ""
-
-#: src/states_screens/race_result_gui.cpp:1130
-#, c-format
-msgid "Track %i/%i"
-msgstr ""
-
-#. I18N: when showing who is the author of track '%s'
-#. I18N: (place %s where the name of the author should appear)
-#: src/states_screens/track_info_screen.cpp:107
-#, c-format
-msgid "Track by %s"
-msgstr ""
-
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
-msgid "Track group"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In the addons screen
-#. I18N: ./data/gui/gp_info.stkgui
-#. I18N: In the grand prix info screen
-msgid "Tracks"
-msgstr ""
-
-#: src/states_screens/dialogs/custom_video_settings.cpp:77
-msgid "Trilinear"
-msgstr ""
-
-#: src/states_screens/dialogs/addons_loading.cpp:369
-#: src/states_screens/dialogs/addons_loading.cpp:406
-msgid "Try again"
-msgstr ""
-
-#. I18N: ./data/gui/main.stkgui
-#. I18N: In the main screen
-#: src/states_screens/race_gui_overworld.cpp:455
-msgid "Tutorial"
-msgstr ""
-
-#. I18N: ./data/gui/tutorial.stkgui
-#. I18N: Title for tutorials screen
-msgid "Tutorial : Selection Room"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/tux/kart.xml
-msgid "Tux"
-msgstr ""
-
-#. I18N: ./data/gui/select_challenge.stkgui
-#. I18N: Type of race, in a challenge
-msgid "Type :"
-msgstr ""
-
-#: src/states_screens/race_gui_overworld.cpp:502
-msgid "Type: Grand Prix"
-msgstr ""
-
-#: src/online/xml_request.cpp:83
-msgid ""
-"Unable to connect to the server. Check your internet connection or try again "
-"later."
-msgstr ""
-
-#. I18N: ./data/gui/addons_loading.stkgui
-#. I18N: Add-on screen action
-msgid "Uninstall"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Unstoppable"
-msgstr ""
-
-#. I18N: Key binding name
-#: src/states_screens/options_screen_input2.cpp:262
-msgid "Up"
-msgstr ""
-
-#: src/states_screens/dialogs/addons_loading.cpp:96
-msgid "Update"
-msgstr ""
-
-#. I18N: ./data/gui/addons_screen.stkgui
-#. I18N: In addons screen, in the filtering bar, to enable a filter that will show only recently updated items
-msgid "Updated"
-msgstr ""
-
-#: src/states_screens/addons_screen.cpp:111
-msgid "Updated date"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Use 10 or more powerups in a race."
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Use high definition textures"
-msgstr ""
-
-#. I18N: ./data/gui/soccer_setup.stkgui
-#. I18N: In soccer setup screen
-msgid "Use left/right to choose your team and press fire"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:949
-#, c-format
-msgid "Use the nitro you collected by pressing <%s>!"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog' dialog
-msgid "User Info"
-msgstr ""
-
-#. I18N: ./data/gui/options_ui.stkgui
-#. I18N: Section in the settings menu
-#: src/states_screens/options_screen_audio.cpp:65
-#: src/states_screens/options_screen_input.cpp:140
-#: src/states_screens/options_screen_input2.cpp:87
-#: src/states_screens/options_screen_video.cpp:164
-#: src/states_screens/user_screen.cpp:648
-msgid "User Interface"
-msgstr ""
-
-#: src/states_screens/grand_prix_editor_screen.cpp:335
-msgid "User defined"
-msgstr ""
-
-#. I18N: ./data/gui/online/user_search.stkgui
-msgid "User search"
+"Fill in the username and email address you supplied at registration to be "
+"able to reset your password."
 msgstr ""
 
 #. I18N: ./data/gui/online/recovery_input.stkgui
@@ -3027,159 +802,50 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: src/states_screens/dialogs/recovery_dialog.cpp:121
-msgid "Username and/or email address invalid."
+#. I18N: ./data/gui/online/recovery_input.stkgui
+#. I18N: In the recovery dialog
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Email"
 msgstr ""
 
-#. I18N: ./data/gui/soccer_setup.stkgui
-msgid "VS"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Create User"
 msgstr ""
 
-#: src/states_screens/dialogs/change_password_dialog.cpp:235
-#: src/states_screens/dialogs/recovery_dialog.cpp:209
-#: src/states_screens/register_screen.cpp:353
-msgid "Validating info"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "New Online Account"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:108
-#, c-format
-msgid "Version: %d"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Existing Online Account"
 msgstr ""
 
-#. I18N: ./data/gui/options_video.stkgui
-#. I18N: In the video settings
-msgid "Vertical Sync (requires restart)"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: Section in the register screen
+msgid "Offline Account"
 msgstr ""
 
-#. I18N: ./data/gui/online/notification_dialog.stkgui
-#. I18N: User info dialog
-#. I18N: ./data/gui/online/user_info_dialog.stkgui
-#. I18N: User info dialog
-msgid "View"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Local Name"
 msgstr ""
 
-#. I18N: ./data/gui/options_audio.stkgui
-#. I18N: In the audio options screen
-msgid "Volume"
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+msgid "Online Username"
 msgstr ""
 
-#. I18N: ./data/gui/online/vote_dialog.stkgui
-#. I18N: In the vote dialog
-msgid "Vote"
-msgstr ""
-
-#: src/states_screens/dialogs/vote_dialog.cpp:230
-msgid "Vote successful! You can now close the window."
-msgstr ""
-
-#: src/guiengine/widgets/kart_stats_widget.cpp:85
-msgid "WEIGHT"
-msgstr ""
-
-#: src/modes/linear_world.cpp:882
-msgid "WRONG WAY!"
-msgstr ""
-
-#: src/states_screens/options_screen_input2.cpp:479
-msgid ""
-"Warning, 'Shift' is not a recommended key : when shift is pressed down, all "
-"keys that contain a character that is different in upper-case will stop "
-"working."
-msgstr ""
-
-#. I18N: ./data/gui/help1.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help2.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help3.stkgui
-#. I18N: Tab in help menu
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: Tab in help menu
-msgid "Weapons"
-msgstr ""
-
-#. I18N: ./data/gui/custom_video_settings.stkgui
-#. I18N: Video settings
-msgid "Weather Effects"
-msgstr ""
-
-#. I18N: in graphical options
-#: src/states_screens/options_screen_video.cpp:447
-#, c-format
-msgid "Weather Effects : %s"
-msgstr ""
-
-#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
-#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
-msgid "What's wrong, little hippies? Your great gnu leader is missing?"
-msgstr ""
-
-#. I18N: ./data/gui/help4.stkgui
-#. I18N: In the help menu
-msgid ""
-"When input devices are configured, you are ready to play. Select the "
-"'multiplayer race' icon in the main menu. When it is time to choose a kart, "
-"each player can press on the 'fire' key of their gamepad or keyboard to join "
-"the game. Each player can use their input device to select their kart. The "
-"game continues when everyone selected their kart. Note that the mouse may "
-"not be used for this operation."
-msgstr ""
-
-#. I18N: Name of the white button on xbox controller
-#: src/input/gamepad_config.cpp:171
-msgid "White"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/wilber/kart.xml
-msgid "Wilber"
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Win 5 single races in a row."
-msgstr ""
-
-#. I18N: ./data/achievements.xml
-msgid "Win in all single player modes, against at least 3 opponents."
-msgstr ""
-
-#. I18N: ../stk-assets/tracks/xr591/track.xml
-msgid "XR591"
-msgstr ""
-
-#. I18N: ../stk-assets/karts/xue/kart.xml
-msgid "Xue"
-msgstr ""
-
-#. I18N: ./data/gui/confirm_dialog.stkgui
-#. I18N: In a 'are you sure?' dialog
-#: src/states_screens/edit_gp_screen.cpp:253
-msgid "Yes"
-msgstr ""
-
-#: src/tracks/track_object_presentation.cpp:996
-msgid "You are now ready to race. Good luck!"
-msgstr ""
-
-#. I18N: ./data/gui/options_players.stkgui
-msgid "You are playing as"
-msgstr ""
-
-#: src/states_screens/dialogs/vote_dialog.cpp:190
-msgid "You can adapt your previous rating by clicking the stars beneath."
-msgstr ""
-
-#: src/states_screens/main_menu_screen.cpp:513
-msgid ""
-"You can not download addons without internet access. If you want to download "
-"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
-"the Internet\"."
-msgstr ""
-
-#: src/states_screens/main_menu_screen.cpp:488
-msgid ""
-"You can not play online without internet access. If you want to play online, "
-"go to options, select  tab 'User Interface', and edit \"Connect to the "
-"Internet\"."
+#. I18N: ./data/gui/online/register.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the registration dialog
+msgid "Password"
 msgstr ""
 
 #. I18N: ./data/gui/online/register.stkgui
@@ -3190,102 +856,989 @@ msgid ""
 "Please read our privacy statement at http://privacy.supertuxkart.net"
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:124
-#: src/states_screens/race_result_gui.cpp:175
-msgid "You completed a challenge!"
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "Terms and Agreement"
 msgstr ""
 
-#: src/states_screens/race_result_gui.cpp:176
-msgid "You completed challenges!"
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+msgid "I agree to the above terms and am 13 years or older. "
 msgstr ""
 
-#: src/states_screens/grand_prix_win.cpp:279
-msgid "You completed the Grand Prix!"
+#. I18N: ./data/gui/online/registration_terms.stkgui
+#. I18N: In the registration dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Accept"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:208
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Server Info"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+#: src/states_screens/online_profile_achievements.cpp:73
+#: src/states_screens/server_selection.cpp:91
+msgid "Name"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_info_dialog.stkgui
+#. I18N: In the server info dialog
+msgid "Join"
+msgstr ""
+
+#. I18N: ./data/gui/online/server_selection.stkgui
+msgid "Server Selection"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog' dialog
+msgid "User Info"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Add Friend"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_info_dialog.stkgui
+#. I18N: User info dialog
+msgid "Decline"
+msgstr ""
+
+#. I18N: ./data/gui/online/user_search.stkgui
+msgid "User search"
+msgstr ""
+
+#. I18N: ./data/gui/online/vote_dialog.stkgui
+#. I18N: In the vote dialog
+msgid "Vote"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "Lobby"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Server name:"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In networking lobby
+msgid "actions"
+msgstr ""
+
+#. I18N: ./data/gui/online/lobby.stkgui
+#. I18N: In the networking lobby
+msgid "Exit"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: Section in the profile screen
+#: src/states_screens/online_profile_base.cpp:101
+msgid "Account Settings"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+#. I18N: In the online account settings screen
+msgid "Password:"
+msgstr ""
+
+#. I18N: ./data/gui/online/profile_settings.stkgui
+msgid "Change"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: ./data/gui/user_screen_tab.stkgui
+msgid "SuperTuxKart Options"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_input.cpp:139
+#: src/states_screens/options_screen_ui.cpp:118
+#: src/states_screens/user_screen.cpp:647
+#: src/states_screens/options_screen_input2.cpp:86
+#: src/states_screens/options_screen_video.cpp:164
+msgid "Audio"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Music"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is enabled
+#: src/states_screens/options_screen_video.cpp:431
+msgid "Enabled"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Volume"
+msgstr ""
+
+#. I18N: ./data/gui/options_audio.stkgui
+#. I18N: In the audio options screen
+msgid "Sound Effects"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:67
+#: src/states_screens/options_screen_ui.cpp:120
+#: src/states_screens/user_screen.cpp:649
+#: src/states_screens/options_screen_video.cpp:167
+msgid "Controls"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+#: src/states_screens/options_screen_input2.cpp:111
+msgid "Delete Configuration"
+msgstr ""
+
+#. I18N: ./data/gui/options_device.stkgui
+#. I18N: In the input configuration screen
+msgid "Back to device list"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Press enter or double-click on a device to configure it"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid "Add a device"
+msgstr ""
+
+#. I18N: ./data/gui/options_input.stkgui
+#. I18N: In the input configuration screen
+msgid ""
+"* Which config to use will be inferred from which 'Select' key is pressed to "
+"join the game."
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: Section in the settings menu
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:66
+#: src/states_screens/options_screen_input.cpp:141
+#: src/states_screens/options_screen_ui.cpp:119
+#: src/states_screens/server_selection.cpp:92
+#: src/states_screens/options_screen_input2.cpp:88
+#: src/states_screens/options_screen_video.cpp:166
+msgid "Players"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+msgid "You are playing as"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Press enter or double-click on a player to edit him/her"
+msgstr ""
+
+#. I18N: ./data/gui/options_players.stkgui
+#. I18N: In the player configuration screen
+msgid "Add Player"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:65
+#: src/states_screens/options_screen_input.cpp:140
+#: src/states_screens/user_screen.cpp:648
+#: src/states_screens/options_screen_input2.cpp:87
+#: src/states_screens/options_screen_video.cpp:165
+msgid "User Interface"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Skin"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Display FPS"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Always show login screen"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Send anonymous HW statistics"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Enable per-player handicaps"
+msgstr ""
+
+#. I18N: ./data/gui/options_ui.stkgui
+#. I18N: In the ui settings
+msgid "Connect to the Internet"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: Section in the settings menu
+#: src/states_screens/options_screen_audio.cpp:64
+#: src/states_screens/options_screen_input.cpp:138
+#: src/states_screens/options_screen_ui.cpp:117
+#: src/states_screens/user_screen.cpp:646
+#: src/states_screens/options_screen_input2.cpp:85
+msgid "Graphics"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Graphical Effects Level"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Custom settings..."
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Vertical Sync (requires restart)"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Resolution"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Fullscreen"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Remember window location"
+msgstr ""
+
+#. I18N: ./data/gui/options_video.stkgui
+#. I18N: In the video settings
+msgid "Apply new resolution"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+msgid "Paused"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to Game"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Select kart"
+msgstr ""
+
+#. I18N: ./data/gui/overworld_dialog.stkgui
+#. I18N: In the in-game dialog
+msgid "Back to menu"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+msgid "Press a key"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign to ESC key"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Assign nothing"
+msgstr ""
+
+#. I18N: ./data/gui/press_a_key_dialog.stkgui
+#. I18N: When configuring input
+msgid "Press ESC to cancel"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Back to Race"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+#: src/states_screens/race_result_gui.cpp:209
+msgid "Setup New Race"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Restart Race"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:292
+msgid "Email has to be between 5 and 254 characters long!"
+msgstr ""
+
+#. I18N: ./data/gui/race_paused_dialog.stkgui
+#. I18N: Race paused button
+msgid "Exit Race"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: ./data/gui/select_challenge.stkgui
+msgid "Race Setup"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a difficulty"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Novice"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Intermediate"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Difficulty
+msgid "Expert"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+#. I18N: Difficulty
+msgid "SuperTux"
+msgstr ""
+
+#. I18N: ./data/gui/racesetup.stkgui
+msgid "Select a game mode"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Number of goals to win"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Maximum time (min.)"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Game type (Goals limit / Time limit)"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+#. I18N: In soccer setup screen
+msgid "Use left/right to choose your team and press fire"
+msgstr ""
+
+#. I18N: ./data/gui/soccer_setup.stkgui
+msgid "VS"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+msgid "= Highscores ="
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: for empty highscores entries
+#: src/states_screens/track_info_screen.cpp:253
+msgid "(Empty)"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of laps"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Number of AI karts"
+msgstr ""
+
+#. I18N: ./data/gui/track_info.stkgui
+#. I18N: In the track info screen
+msgid "Drive in reverse"
+msgstr ""
+
+#. I18N: ./data/gui/tracks.stkgui
+#. I18N: In the track selection screen
+#: src/states_screens/dialogs/select_challenge.cpp:145
+msgid "Grand Prix"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Remember password"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Add user"
+msgstr ""
+
+#. I18N: ./data/gui/user_screen.stkgui
+#. I18N: In the user screen
+#. I18N: ./data/gui/user_screen_tab.stkgui
+#. I18N: In the user screen
+msgid "Delete"
+msgstr ""
+
+#. I18N: ./data/gui/challenges.stkgui
+#. I18N: Title for challenges screen
+msgid "Challenges - Trophy Room"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+#. I18N: Title for tutorials screen
+msgid "Tutorial - Selection Room"
+msgstr ""
+
+#. I18N: ./data/gui/tutorial.stkgui
+msgid "Play all"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+msgid "Click here to play the tutorial"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid "Collect blue boxes. They will give you weapons or other powerups."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+#: src/tracks/track_object_presentation.cpp:947
+msgid "Avoid bananas!"
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"Collecting nitro allows you to get speed boosts whenever you wish by "
+"pressing the appropriate key. You can see your current level of nitro in the "
+"bar at the right of the game screen."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: In the help menu
+msgid ""
+"If you see a button with a lock like this one, you need to complete a "
+"challenge to unlock it."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help menu
+msgid "The 'skidding' key allows you to skid in sharp turns and get a boost."
+msgstr ""
+
+#. I18N: ./data/gui/help1.stkgui
+#. I18N: in the help screen
+msgid "* Current key bindings can be seen/changed in menu Options"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+#. I18N: In the help menu
+msgid "To help you win, there are some powerups you can collect:"
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"BubbleGum - protect yourself with a shield, or use while looking back to "
+"leave a sticky pink puddle behind you."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Cake - thrown at the closest rival, best on short ranges and long straights."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Plunger - throw straight to pull an opponent back, or throw while looking "
+"back to make one lose sight."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Bowling Ball - bounces off walls. If you are looking back, it will be thrown "
+"backwards."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Parachute - slows down all karts in a better position."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Anchor - greatly slows down the kart in the first position."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Swapper - gift boxes are transformed into bananas and vice versa for a short "
+"time."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid ""
+"Basket Ball - bounces after the leader, and might squash and slow down karts "
+"down on the way."
+msgstr ""
+
+#. I18N: ./data/gui/help2.stkgui
+msgid "Swatter - will squash karts close by, slowing them down."
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+msgid "SuperTuxKart features several game modes"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Regular Race: All blows allowed, so catch weapons and make clever use of "
+"them!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Time Trial: Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Follow the leader: Run for second place, as the last kart will be "
+"disqualified every time the counter hits zero. Beware: going in front of the "
+"leader will get you eliminated too!"
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"3 Strikes Battle: Only in multiplayer games. Hit others with weapons until "
+"they lose all their lives."
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"Soccer: Only in multiplayer games. Use your kart to push the ball into the "
+"goal."
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid "Egg hunt: Explore tracks to find all hidden eggs."
+msgstr ""
+
+#. I18N: ./data/gui/help3.stkgui
+#. I18N: In the help menu
+msgid ""
+"* Most of these game modes can also be played in a Grand Prix fashion: "
+"instead of playing a single race, you play many in a row. The better you "
+"rank, the more points you get. In the end, the player with the most points "
+"wins the cup."
+msgstr ""
+
+#. I18N: ./data/gui/select_challenge.stkgui
+#. I18N: Type of race, in a challenge
+msgid "Type:"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Christoffel Columbus"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Play every official track at least once."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Strike!"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit 10 karts with a bowling-ball."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Arch Enemy"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Hit the same kart at least 5 times in one race."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Marathoner"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make a race with 5 laps or more."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Skid-row"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Make 5 skidding in a single lap."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Gold driver"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win against at least 3 opponents in all single player modes."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Powerup Love"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Use 10 or more powerups in a race."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Unstoppable"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Win 5 single races in a row."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Banana Lover"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Collect at least 5 bananas in one race."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "It's secret"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Really ... a secret."
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid "Mosquito Hunter"
+msgstr ""
+
+#. I18N: ./data/achievements.xml
+msgid ""
+"Take your opponents for mosquitos! With the swatter, squash at least 5 of "
+"them in a race."
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/soccer_field/track.xml
+msgid "Soccer field"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/subsea/track.xml
+msgid "Subsea"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowmountain/track.xml
+msgid "Northern Resort"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/minigolf/track.xml
+msgid "Minigolf"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mansion/track.xml
+msgid "Blackhill Mansion"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stadium/track.xml
+msgid "The Stadium"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/battleisland/track.xml
+msgid "Battle Island"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/scotland/track.xml
+msgid "Nessie's pond"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/city/track.xml
+msgid "Shiny Suburbs"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/lighthouse/track.xml
+msgid "Around the lighthouse"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/mines/track.xml
+msgid "Old Mine"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/zengarden/track.xml
+msgid "Zen Garden"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/greenvalley/track.xml
+msgid "Green Valley"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/fortmagma/track.xml
+msgid "Fort Magma"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/farm/track.xml
+msgid "Bovine Barnyard"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/temple/track.xml
+msgid "Temple"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/snowtuxpeak/track.xml
+msgid "Snow Peak"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/xr591/track.xml
+msgid "XR591"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cocoa_temple/track.xml
+msgid "Cocoa Temple"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/hacienda/track.xml
+msgid "Hacienda"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/stk_enterprise/track.xml
+msgid "STK Enterprise"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/gran_paradiso_island/track.xml
+msgid "Gran Paradiso Island"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "What's wrong, little hippies? Your great gnu leader is missing?"
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "Oh yes, see, he's in my castle now and will be served for supper..."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "But I'm a fair creature, so I'll make you a deal."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid "If you can beat me at racing, I will free the old codger."
+msgstr ""
+
+#. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml
+#. I18N: ../stk-assets/tracks/introcutscene2/scene.xml
+msgid ""
+" But you pathetic little twerps will never be able to beat me - King of the "
+"Karts!"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/olivermath/track.xml
+msgid "Oliver's Math Class"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/sandtrack/track.xml
+msgid "Shifting Sands"
+msgstr ""
+
+#. I18N: ../stk-assets/tracks/cave/track.xml
+msgid "Cave X"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/tux/kart.xml
+msgid "Tux"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/elephpant/kart.xml
+msgid "Elephpant"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/amanda/kart.xml
+msgid "Amanda"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/konqi/kart.xml
+msgid "Konqi"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/nolok/kart.xml
+msgid "Nolok"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/suzanne/kart.xml
+msgid "Suzanne"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/wilber/kart.xml
+msgid "Wilber"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/adiumy/kart.xml
+msgid "Adiumy"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/gnu/kart.xml
+msgid "Gnu"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/puffy/kart.xml
+msgid "Puffy"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/gavroche/kart.xml
+msgid "Gavroche"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/hexley/kart.xml
+msgid "Hexley"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/xue/kart.xml
+msgid "Xue"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_racer/kart.xml
+msgid "Sara the Racer"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/sara_the_wizard/kart.xml
+msgid "Sara the Wizard"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/emule/kart.xml
+msgid "Emule"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/pidgin/kart.xml
+msgid "Pidgin"
+msgstr ""
+
+#. I18N: ../stk-assets/karts/beastie/kart.xml
+msgid "Beastie"
+msgstr ""
+
+#: src/achievements/achievement.cpp:209
 #, c-format
-msgid ""
-"You completed the difficult challenge! Points earned on this level: %i/%i"
+msgid "Completed achievement \"%s\"."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:200
+#: src/addons/addons_manager.cpp:97 src/addons/news_manager.cpp:315
+msgid "Can't access stkaddons server..."
+msgstr ""
+
+#: src/addons/news_manager.cpp:172
 #, c-format
-msgid "You completed the easy challenge! Points earned on this level: %i/%i"
+msgid "Error downloading news: '%s'."
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:204
+#. I18N: number of laps to race in a challenge
+#: src/challenges/challenge_data.cpp:249
 #, c-format
-msgid ""
-"You completed the intermediate challenge! Points earned on this level: %i/%i"
+msgid "Laps : %i"
 msgstr ""
 
-#: src/karts/kart.cpp:856
-msgid "You finished the race!"
-msgstr ""
-
-#: src/online/online_player_profile.cpp:466
+#: src/challenges/challenge_data.cpp:486
 #, c-format
-msgid "You have %d new friend request!"
-msgid_plural "You have %d new friend requests!"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/online/online_player_profile.cpp:472
-msgid "You have a new friend request!"
+msgid "New track '%s' now available"
 msgstr ""
 
-#: src/modes/world.cpp:1144
-msgid "You have been eliminated!"
+#: src/challenges/challenge_data.cpp:491
+#, c-format
+msgid "New game mode '%s' now available"
 msgstr ""
 
-#: src/states_screens/dialogs/vote_dialog.cpp:195
-msgid ""
-"You have not yet voted for this addon. Select your desired rating by "
-"clicking the stars beneath"
+#: src/challenges/challenge_data.cpp:501
+#, c-format
+msgid "New Grand Prix '%s' now available"
 msgstr ""
 
-#: src/karts/kart.cpp:1913
-msgid ""
-"You need more points\n"
-"to enter this challenge!\n"
-"Check the minimap for\n"
-"available challenges."
+#: src/challenges/challenge_data.cpp:505
+#, c-format
+msgid "New difficulty '%s' now available"
 msgstr ""
 
-#: src/states_screens/user_screen.cpp:472
-msgid "You need to enter a password."
+#: src/challenges/challenge_data.cpp:515
+#, c-format
+msgid "New kart '%s' now available"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:568
-msgid "You unlocked grand prix %0"
+#: src/config/player_manager.cpp:91
+msgid "Currently not signed in"
 msgstr ""
 
-#: src/states_screens/feature_unlocked.cpp:530
-msgid "You unlocked track %0"
+#. I18N: Name of first guest player (without number)
+#: src/config/player_manager.cpp:392
+msgid "Guest"
 msgstr ""
 
-#. I18N: ./data/gui/online/recovery_info.stkgui
-#. I18N: In the recovery dialog
-msgid ""
-"You will receive an email with further instructions on how to reset your "
-"password. Please be patient and be sure to check your spam folder."
-msgstr ""
-
-#: src/states_screens/register_screen.cpp:361
-msgid ""
-"You will receive an email with further instructions regarding account "
-"activation. Please be patient and be sure to check your spam folder."
-msgstr ""
-
-#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
-msgid "You won the race!"
-msgstr ""
-
-#: src/main.cpp:1375
-msgid ""
-"Your OpenGL version appears to be too old. Please verify if an update for "
-"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+#. I18N: Name of further guest players, with a 1, 2, ... attached
+#: src/config/player_manager.cpp:397
+#, c-format
+msgid "Guest %d"
 msgstr ""
 
 #: src/config/user_config.cpp:700
@@ -3300,22 +1853,42 @@ msgid ""
 "created."
 msgstr ""
 
-#: src/main.cpp:1367
-msgid ""
-"Your driver version is too old. Please install the latest video drivers."
+#: src/graphics/irr_driver.cpp:1817
+#, c-format
+msgid "FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d"
 msgstr ""
 
-#: src/input/device_manager.cpp:501
-msgid "Your input config file is not compatible with this version of STK."
+#: src/graphics/irr_driver.cpp:1826
+#, c-format
+msgid "FPS: %d/%d/%d - %d KTris"
 msgstr ""
 
-#: src/states_screens/online_profile_base.cpp:105
-#: src/states_screens/online_profile_base.cpp:115
-msgid "Your profile"
+#: src/guiengine/engine.cpp:1330
+msgid "Loading"
 msgstr ""
 
-#. I18N: ../stk-assets/tracks/zengarden/track.xml
-msgid "Zen Garden"
+#: src/guiengine/widgets/kart_stats_widget.cpp:85
+msgid "WEIGHT"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:89
+msgid "SPEED"
+msgstr ""
+
+#: src/guiengine/widgets/kart_stats_widget.cpp:93
+msgid "POWER"
+msgstr ""
+
+#. I18N: 'handicapped' indicates that per-player handicaps are
+#. activated for this kart (i.e. it will drive slower)
+#: src/guiengine/widgets/player_kart_widget.cpp:361
+#, c-format
+msgid "%s (handicapped)"
+msgstr ""
+
+#: src/guiengine/widgets/player_kart_widget.cpp:421
+#, c-format
+msgid "%s is ready"
 msgstr ""
 
 #. I18N: Unbound key binding
@@ -3323,31 +1896,425 @@ msgstr ""
 msgid "[none]"
 msgstr ""
 
-#. I18N: ./data/gui/online/lobby.stkgui
-#. I18N: In networking lobby
-msgid "actions"
+#. I18N: to appear in input configuration screen, for gamepad hats
+#: src/input/binding.cpp:260 src/input/binding.cpp:265
+#, c-format
+msgid "Gamepad hat %d"
 msgstr ""
 
-#. I18N: track group name
-#: src/states_screens/tracks_screen.cpp:151
-msgid "all"
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:272
+#, c-format
+msgid "Axis %d %s"
 msgstr ""
 
-#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
-#: src/states_screens/race_gui_base.cpp:540
-msgid "by"
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:279
+#, c-format
+msgid "Axis %d inverted"
 msgstr ""
 
-#: src/states_screens/dialogs/addons_loading.cpp:139
-msgid "featured"
+#. I18N: to appear in input configuration screen, for gamepad axes
+#: src/input/binding.cpp:284
+#, c-format
+msgid "Axis %d"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:88
-msgid "high"
+#. I18N: to appear in input configuration screen, for gamepad buttons
+#: src/input/binding.cpp:292
+#, c-format
+msgid "Gamepad button %d"
 msgstr ""
 
-#: src/states_screens/dialogs/custom_video_settings.cpp:87
-msgid "low"
+#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#: src/input/binding.cpp:295
+#, c-format
+msgid "Mouse button %d"
+msgstr ""
+
+#. I18N: to appear in input configuration screen, for mouse (might not be used at all)
+#: src/input/binding.cpp:299
+#, c-format
+msgid "Mouse axis %d %s"
+msgstr ""
+
+#. I18N: shown when config file is too old
+#: src/input/device_manager.cpp:500
+msgid "Please re-configure your key bindings."
+msgstr ""
+
+#: src/input/device_manager.cpp:501
+msgid "Your input config file is not compatible with this version of STK."
+msgstr ""
+
+#. I18N: Name of the black button on xbox controller
+#: src/input/gamepad_config.cpp:167
+msgid "Black"
+msgstr ""
+
+#. I18N: Name of the white button on xbox controller
+#: src/input/gamepad_config.cpp:171
+msgid "White"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:179 src/input/gamepad_config.cpp:239
+msgid "Left trigger"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:181 src/input/gamepad_config.cpp:247
+msgid "Right thumb right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:183 src/input/gamepad_config.cpp:249
+msgid "Right thumb left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:185 src/input/gamepad_config.cpp:243
+msgid "Right thumb down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:187 src/input/gamepad_config.cpp:245
+msgid "Right thumb up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:189 src/input/gamepad_config.cpp:241
+msgid "Right trigger"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:191 src/input/gamepad_config.cpp:255
+msgid "DPad right"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:193 src/input/gamepad_config.cpp:257
+msgid "DPad left"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:195 src/input/gamepad_config.cpp:253
+msgid "DPad down"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:197 src/input/gamepad_config.cpp:251
+msgid "DPad up"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:212
+msgid "Left bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:214
+msgid "Right bumper"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:218
+msgid "Start"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:220
+msgid "Left thumb button"
+msgstr ""
+
+#. I18N: name of buttons on gamepads
+#: src/input/gamepad_config.cpp:222
+msgid "Right thumb button"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:231
+msgid "Left thumb right"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:233
+msgid "Left thumb left"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:235
+msgid "Left thumb down"
+msgstr ""
+
+#. I18N: name of stick on gamepads
+#: src/input/gamepad_config.cpp:237
+msgid "Left thumb up"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:387
+msgid ""
+"Connect your wiimote to the Bluetooth manager, then click on Ok.Detailed "
+"instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:390
+msgid ""
+"Press the buttons 1+2 simultaneously on your wiimote to put it in discovery "
+"mode, then click on Ok.Detailed instructions at supertuxkart.net/Wiimote"
+msgstr ""
+
+#: src/input/wiimote_manager.cpp:413
+#, c-format
+msgid "Found %d wiimote"
+msgid_plural "Found %d wiimotes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/input/wiimote_manager.cpp:418
+msgid "Could not detect any wiimote :/"
+msgstr ""
+
+#: src/input/input_manager.cpp:751
+#, c-format
+msgid "Ignoring '%s'. You needed to join earlier to play!"
+msgstr ""
+
+#: src/input/input_manager.cpp:781
+msgid "Only the Game Master may act at this point!"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:281
+#: src/karts/controller/player_controller.cpp:338
+msgid "Penalty time!!"
+msgstr ""
+
+#: src/karts/controller/network_player_controller.cpp:283
+#: src/karts/controller/player_controller.cpp:340
+msgid "Don't accelerate before go"
+msgstr ""
+
+#: src/karts/kart.cpp:856 src/karts/kart.cpp:875
+msgid "You won the race!"
+msgstr ""
+
+#: src/karts/kart.cpp:856
+msgid "You finished the race!"
+msgstr ""
+
+#: src/karts/kart.cpp:1913
+msgid ""
+"You need more points\n"
+"to enter this challenge!\n"
+"Check the minimap for\n"
+"available challenges."
+msgstr ""
+
+#: src/main.cpp:1222
+msgid ""
+"SuperTuxKart may connect to a server to download add-ons and notify you of "
+"updates. We also collect anonymous hardware statistics to help with the "
+"development of STK. Please read our privacy policy at http://privacy."
+"supertuxkart.net. Would you like this feature to be enabled? (To change this "
+"setting at a later time, go to options, select tab 'User Interface', and "
+"edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")."
+msgstr ""
+
+#: src/main.cpp:1394
+msgid ""
+"Your driver version is too old. Please install the latest video drivers."
+msgstr ""
+
+#: src/main.cpp:1406
+msgid ""
+"Your OpenGL version appears to be too old. Please verify if an update for "
+"your video driver is available. SuperTuxKart requires OpenGL 3.1 or better."
+msgstr ""
+
+#: src/modes/easter_egg_hunt.cpp:202
+#, c-format
+msgid "Eggs: %d / %d"
+msgstr ""
+
+#: src/modes/follow_the_leader.cpp:57 src/modes/follow_the_leader.cpp:252
+msgid "Leader"
+msgstr ""
+
+#: src/modes/linear_world.cpp:276
+msgid "Final lap!"
+msgstr ""
+
+#: src/modes/linear_world.cpp:303
+#, c-format
+msgid "Lap %i"
+msgstr ""
+
+#: src/modes/linear_world.cpp:358
+#, c-format
+msgctxt "fastest_lap"
+msgid "%s by %s"
+msgstr ""
+
+#: src/modes/linear_world.cpp:363
+msgid "New fastest lap"
+msgstr ""
+
+#: src/modes/linear_world.cpp:882
+msgid "WRONG WAY!"
+msgstr ""
+
+#: src/modes/world.cpp:1144
+msgid "You have been eliminated!"
+msgstr ""
+
+#: src/modes/world.cpp:1147
+#, c-format
+msgid "'%s' has been eliminated."
+msgstr ""
+
+#: src/online/online_player_profile.cpp:414
+#, c-format
+msgid "%s is now online."
+msgstr ""
+
+#: src/online/online_player_profile.cpp:418
+#, c-format
+msgid "%s and %s are now online."
+msgstr ""
+
+#: src/online/online_player_profile.cpp:423
+#, c-format
+msgid "%s, %s and %s are now online."
+msgstr ""
+
+#. I18N: Only used for count > 3
+#: src/online/online_player_profile.cpp:429
+#, c-format
+msgid "%d friend is now online."
+msgid_plural "%d friends are now online."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/online/online_player_profile.cpp:466
+#, c-format
+msgid "You have %d new friend request!"
+msgid_plural "You have %d new friend requests!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/online/online_player_profile.cpp:472
+msgid "You have a new friend request!"
+msgstr ""
+
+#: src/online/xml_request.cpp:83
+msgid ""
+"Unable to connect to the server. Check your internet connection or try again "
+"later."
+msgstr ""
+
+#: src/race/grand_prix_data.hpp:171
+msgid "Random Grand Prix"
+msgstr ""
+
+#: src/race/highscore_manager.cpp:101
+msgid ""
+"The highscore file was too old,\n"
+"all highscores have been erased."
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:176
+msgid "Normal Race"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:178
+msgid "Time Trial"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:180
+msgid "Follow the Leader"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:182
+msgid "3 Strikes Battle"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:184
+msgid "Egg Hunt"
+msgstr ""
+
+#. I18N: Game mode
+#: src/race/race_manager.hpp:186
+msgid "Soccer"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:50
+msgid "1 week"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:51
+msgid "2 weeks"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:52
+msgid "1 month"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:53
+msgid "3 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:54
+msgid "6 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:55
+msgid "9 months"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:56
+msgid "1 year"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:57
+msgid "2 years"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:110
+msgid "Add-on name"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:111
+msgid "Updated date"
+msgstr ""
+
+#. I18N: as in: The Old Island by Johannes Sjolund
+#: src/states_screens/addons_screen.cpp:306
+#, c-format
+msgctxt "addons"
+msgid "%s by %s"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:437
+msgid "Please wait while addons are updated"
+msgstr ""
+
+#: src/states_screens/addons_screen.cpp:514
+#: src/states_screens/main_menu_screen.cpp:550
+msgid ""
+"Sorry, an error occurred while contacting the add-ons website. Make sure you "
+"are connected to the Internet and that SuperTuxKart is not blocked by a "
+"firewall"
 msgstr ""
 
 #. I18N: arena group name
@@ -3361,6 +2328,1067 @@ msgstr ""
 msgid "standard"
 msgstr ""
 
-#: src/states_screens/credits.cpp:209
+#: src/states_screens/arenas_screen.cpp:237
+#: src/states_screens/arenas_screen.cpp:267
+#: src/states_screens/easter_egg_screen.cpp:225
+#: src/states_screens/easter_egg_screen.cpp:256
+#: src/states_screens/kart_selection.cpp:858
+#: src/states_screens/kart_selection.cpp:1452
+#: src/states_screens/race_setup_screen.cpp:214
+msgid "Locked : solve active challenges to gain access to more!"
+msgstr ""
+
+#: src/states_screens/arenas_screen.cpp:277
+msgid "Random Arena"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:60
+#, c-format
+msgid "%s's server"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:117
+msgid "Creating server"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:132
+msgid "Name has to be between 4 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/create_server_screen.cpp:136
+msgid "The maxinum number of players has to be between 2 and 12."
+msgstr ""
+
+#: src/states_screens/credits.cpp:217
 msgid "translator-credits"
 msgstr ""
+
+#: src/states_screens/dialogs/add_device_dialog.cpp:64
+msgid ""
+"To add a new Gamepad/Joystick device, simply start SuperTuxKart with it "
+"connected and it will appear in the list.\n"
+"\n"
+"To add a keyboard config, you can use the button below, HOWEVER please note "
+"that most keyboards only support a limited amount of simultaneous keypresses "
+"and are thus inappropriate for multiplayer gameplay. (You can, however, "
+"connect multiple keyboards to the computer. Remember that everyone still "
+"needs different keybindings in this case.)"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:90
+msgid "Add Wiimote"
+msgstr ""
+
+#. I18N: In the 'add new input device' dialog
+#: src/states_screens/dialogs/add_device_dialog.cpp:111
+msgid "Add Keyboard Configuration"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:96
+msgid "Update"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:108
+#, c-format
+msgid "Version: %d"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:139
+msgid "featured"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:165
+#, c-format
+msgid "%s MB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:172
+#: src/states_screens/dialogs/addons_loading.cpp:176
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:177
+#, c-format
+msgid "Size: %s"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:279
+msgid "Sorry, downloading the add-on failed"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:357
+#, c-format
+msgid "Problems installing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:369
+#: src/states_screens/dialogs/addons_loading.cpp:406
+msgid "Try again"
+msgstr ""
+
+#: src/states_screens/dialogs/addons_loading.cpp:394
+#, c-format
+msgid "Problems removing the addon '%s'."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:134
+msgid "Current password invalid."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:140
+#: src/states_screens/register_screen.cpp:288
+msgid "Password has to be between 8 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:147
+#: src/states_screens/register_screen.cpp:272
+msgid "Passwords don't match!"
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:210
+msgid "Password successfully changed."
+msgstr ""
+
+#: src/states_screens/dialogs/change_password_dialog.cpp:235
+#: src/states_screens/dialogs/recovery_dialog.cpp:209
+#: src/states_screens/register_screen.cpp:353
+msgid "Validating info"
+msgstr ""
+
+#. I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
+#: src/states_screens/dialogs/confirm_resolution_dialog.cpp:81
+#, c-format
+msgid "Confirm resolution within %i seconds"
+msgstr ""
+
+#. I18N: in the graphical options tooltip;
+#. indicates a graphical feature is disabled
+#: src/states_screens/dialogs/custom_video_settings.cpp:62
+#: src/states_screens/dialogs/custom_video_settings.cpp:86
+#: src/states_screens/options_screen_video.cpp:434
+msgid "Disabled"
+msgstr ""
+
+#. I18N: animations setting (only karts with human players are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:64
+msgid "Human players only"
+msgstr ""
+
+#. I18N: animations setting (all karts are animated)
+#: src/states_screens/dialogs/custom_video_settings.cpp:66
+msgid "Enabled for all"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:76
+msgid "Bilinear"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:77
+msgid "Trilinear"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:78
+msgid "Anisotropic x2"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:79
+msgid "Anisotropic x4"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:80
+msgid "Anisotropic x8"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:81
+msgid "Anisotropic x16"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:87
+msgid "low"
+msgstr ""
+
+#: src/states_screens/dialogs/custom_video_settings.cpp:88
+msgid "high"
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:125
+msgid "Name is empty."
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:132
+msgid "Another grand prix with this name already exists."
+msgstr ""
+
+#: src/states_screens/dialogs/enter_gp_name_dialog.cpp:137
+msgid "Name is too long."
+msgstr ""
+
+#: src/states_screens/dialogs/gp_info_dialog.cpp:211
+msgid "Start Grand Prix"
+msgstr ""
+
+#: src/states_screens/dialogs/message_dialog.cpp:128
+#: src/states_screens/edit_gp_screen.cpp:253
+msgid "No"
+msgstr ""
+
+#: src/states_screens/dialogs/recovery_dialog.cpp:121
+msgid "Username and/or email address invalid."
+msgstr ""
+
+#: src/states_screens/dialogs/registration_dialog.cpp:42
+#, c-format
+msgid ""
+"Please read the terms and conditions for SuperTuxKart at '%s'. You must "
+"agree to these terms in order to register an account for STK. By checking "
+"the box below, you are confirming that you understand these terms. If you "
+"have any questions or comments regarding these terms, one of the members of "
+"the development team would gladly assist you."
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:58
+msgid "Server successfully created. You can now join it."
+msgstr ""
+
+#: src/states_screens/dialogs/server_info_dialog.cpp:155
+msgid "Joining server"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:56
+msgid "Cancel Request"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:154
+#: src/states_screens/dialogs/user_info_dialog.cpp:211
+msgid "Today"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:158
+msgid "Friend request sent!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:215
+msgid "Friend request accepted!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:267
+msgid "Friend request declined!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:313
+msgid "Friend removed!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:364
+msgid "Friend request cancelled!"
+msgstr ""
+
+#: src/states_screens/dialogs/user_info_dialog.cpp:474
+msgid "Processing"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:171
+msgid "Fetching last vote"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:190
+msgid "You can adapt your previous rating by clicking the stars beneath."
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:195
+msgid ""
+"You have not yet voted for this addon. Select your desired rating by "
+"clicking the stars beneath"
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:230
+msgid "Vote successful! You can now close the window."
+msgstr ""
+
+#: src/states_screens/dialogs/vote_dialog.cpp:247
+msgid "Performing vote"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:53
+#, c-format
+msgid "Required Rank: %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:58
+#, c-format
+msgid "Required Time: %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:64
+#, c-format
+msgid "Required Nitro Points: %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:68
+#, c-format
+msgid "Number of AI Karts: %i"
+msgstr ""
+
+#: src/states_screens/dialogs/select_challenge.cpp:147
+msgid "Nitro challenge"
+msgstr ""
+
+#: src/states_screens/easter_egg_screen.cpp:270
+#: src/states_screens/tracks_screen.cpp:299
+msgid "Random Track"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:66
+msgid "Track"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:67
+msgid "Laps"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:68
+msgid "Reversed"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:123
+#: src/states_screens/grand_prix_editor_screen.cpp:109
+#, c-format
+msgid "Are you sure you want to remove '%s'?"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:140
+msgid "Do you want to save your changes?"
+msgstr ""
+
+#. I18N: Indicate that the grand prix is modified and not saved
+#: src/states_screens/edit_gp_screen.cpp:285
+#, c-format
+msgid "%s (+)"
+msgstr ""
+
+#: src/states_screens/edit_gp_screen.cpp:324
+msgid "An error occurred while trying to save your grand prix."
+msgstr ""
+
+#: src/states_screens/edit_track_screen.cpp:238
+msgid "Select a track"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:200
+#, c-format
+msgid "You completed the easy challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:204
+#, c-format
+msgid ""
+"You completed the intermediate challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:208
+#, c-format
+msgid ""
+"You completed the difficult challenge! Points earned on this level: %i/%i"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:493
+msgid "Challenge Completed"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:530
+msgid "You unlocked track %0"
+msgstr ""
+
+#: src/states_screens/feature_unlocked.cpp:568
+msgid "You unlocked grand prix %0"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:74
+msgid "Default"
+msgstr ""
+
+#. I18N: if no kart animations are enabled
+#: src/states_screens/gp_info_screen.cpp:75
+#: src/states_screens/options_screen_video.cpp:440
+msgid "None"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:77
+msgid "Random"
+msgstr ""
+
+#: src/states_screens/gp_info_screen.cpp:153
+#: src/states_screens/gp_info_screen.cpp:178
+msgid "Reload"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:164
+msgid "Please select a Grand Prix"
+msgstr ""
+
+#: src/states_screens/grand_prix_editor_screen.cpp:335
+msgid "User defined"
+msgstr ""
+
+#. I18N: when failing a GP
+#: src/states_screens/grand_prix_lose.cpp:161
+msgid "Better luck next time!"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:124
+#: src/states_screens/race_result_gui.cpp:175
+msgid "You completed a challenge!"
+msgstr ""
+
+#: src/states_screens/grand_prix_win.cpp:279
+msgid "You completed the Grand Prix!"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:839
+#: src/states_screens/kart_selection.cpp:1470
+msgid "Random Kart"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:853
+msgid "Locked"
+msgstr ""
+
+#: src/states_screens/kart_selection.cpp:923
+msgid ""
+"Everyone:\n"
+"Press 'Select' now to join the game!"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:488
+msgid ""
+"You can not play online without internet access. If you want to play online, "
+"go to options, select  tab 'User Interface', and edit \"Connect to the "
+"Internet\"."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:513
+msgid ""
+"You can not download addons without internet access. If you want to download "
+"addons, go to options, select  tab 'User Interface', and edit \"Connect to "
+"the Internet\"."
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:545
+msgid "The add-ons module is currently disabled in the Options screen"
+msgstr ""
+
+#: src/states_screens/main_menu_screen.cpp:557
+msgid "Please wait while the add-ons are loading"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:79
+msgid "Progress"
+msgstr ""
+
+#: src/states_screens/online_profile_achievements.cpp:128
+#: src/states_screens/online_profile_achievements.cpp:168
+msgid "Fetching achievements"
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:105
+#: src/states_screens/online_profile_base.cpp:115
+msgid "Your profile"
+msgstr ""
+
+#: src/states_screens/online_profile_base.cpp:108
+#, c-format
+msgid "%s's profile"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:70
+msgid "Since"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:71
+msgid "Status"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:88
+#: src/states_screens/online_profile_friends.cpp:174
+msgid "Fetching friends"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:145
+msgid "New Request"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:146
+msgid "Pending"
+msgstr ""
+
+#: src/states_screens/online_profile_friends.cpp:150
+msgid "Offline"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:139
+#, c-format
+msgid "Logged in as: %s."
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:155
+msgid "Logging in"
+msgstr ""
+
+#: src/states_screens/online_screen.cpp:160
+msgid "Logging out"
+msgstr ""
+
+#: src/states_screens/online_user_search.cpp:208
+#: src/states_screens/online_user_search.cpp:288
+msgid "Searching"
+msgstr ""
+
+#: src/states_screens/options_screen_input.cpp:97
+#, c-format
+msgid "Keyboard %i"
+msgstr ""
+
+#: src/states_screens/options_screen_ui.cpp:154
+msgid ""
+"Players can select handicapped (more difficult) profiles on the kart "
+"selection screen"
+msgstr ""
+
+#. I18N: in the language choice, to select the same language as the OS
+#: src/states_screens/options_screen_ui.cpp:186
+msgid "System Language"
+msgstr ""
+
+#: src/states_screens/race_gui.cpp:313 src/states_screens/race_gui.cpp:315
+msgid "Challenge Failed"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:64
+msgid "Ready!"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:66
+msgid "Set!"
+msgstr ""
+
+#. I18N: as in "ready, set, go", shown at the beginning of the race
+#: src/states_screens/race_gui_base.cpp:68
+msgid "Go!"
+msgstr ""
+
+#. I18N: Shown when a goal is scored
+#: src/states_screens/race_gui_base.cpp:70
+msgid "GOAL!"
+msgstr ""
+
+#. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it
+#: src/states_screens/race_gui_base.cpp:103
+#, c-format
+msgid "Top %i"
+msgstr ""
+
+#. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe")
+#: src/states_screens/race_gui_base.cpp:540
+msgid "by"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:648
+msgid "Collect nitro!"
+msgstr ""
+
+#: src/states_screens/race_gui_base.cpp:650
+msgid "Follow the leader!"
+msgstr ""
+
+#. I18N: Shown at the end of a race
+#: src/states_screens/race_gui_overworld.cpp:108
+msgid "Lap"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:109
+msgid "Rank"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:462
+msgid "Press fire to play the tutorial"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:501
+msgid "Type: Grand Prix"
+msgstr ""
+
+#: src/states_screens/race_gui_overworld.cpp:532
+msgid "Press fire to start the challenge"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:156
+msgid "Continue."
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:159
+msgid "Quit the server."
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:176
+msgid "You completed challenges!"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:189
+msgid "Abort Grand Prix"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:199
+msgid "Restart"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:205
+msgid "Back to challenge selection"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:211
+msgid "Back to the menu"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:354
+msgid "Do you really want to abort the Grand Prix?"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:474
+#: src/states_screens/race_result_gui.cpp:833
+msgid "Eliminated"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:965
+msgid "Red Team Wins"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:969
+msgid "Blue Team Wins"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:974
+msgid "It's a draw"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1130
+#, c-format
+msgid "Track %i/%i"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1214
+msgid "Grand Prix progress:"
+msgstr ""
+
+#: src/states_screens/race_result_gui.cpp:1252
+msgid "Highscores"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:217
+#: src/states_screens/register_screen.cpp:224
+#, c-format
+msgid "Could not create player '%s'."
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:276
+msgid "Emails don't match!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:280
+msgid "Online username has to be between 3 and 30 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:284
+msgid "Online username must not start with a number!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:292
+msgid "Email has to be between 4 and 50 characters long!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:298
+msgid "Email is invalid!"
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:361
+msgid ""
+"You will receive an email with further instructions regarding account "
+"activation. Please be patient and be sure to check your spam folder."
+msgstr ""
+
+#: src/states_screens/register_screen.cpp:401
+#: src/states_screens/user_screen.cpp:328
+msgid "Internet access is disabled, please enable it in the options"
+msgstr ""
+
+#: src/states_screens/server_selection.cpp:67
+#: src/states_screens/server_selection.cpp:210
+msgid "Fetching servers"
+msgstr ""
+
+#. I18N: when showing who is the author of track '%s'
+#. I18N: (place %s where the name of the author should appear)
+#: src/states_screens/track_info_screen.cpp:107
+#, c-format
+msgid "Track by %s"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:111
+msgid "Exit game"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:472
+msgid "You need to enter a password."
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:493
+#, c-format
+msgid "Logging out '%s'"
+msgstr ""
+
+#: src/states_screens/user_screen.cpp:494
+#, c-format
+msgid "Logging in '%s'"
+msgstr ""
+
+#. I18N: In the player info dialog (when deleting)
+#: src/states_screens/user_screen.cpp:583
+#, c-format
+msgid "Do you really want to delete player '%s' ?"
+msgstr ""
+
+#. I18N: track group name
+#: src/states_screens/tracks_screen.cpp:151
+msgid "all"
+msgstr ""
+
+#: src/states_screens/tracks_screen.cpp:202
+msgid "Locked!"
+msgstr ""
+
+#: src/states_screens/tracks_screen.cpp:285
+msgid "Locked: solve active challenges to gain access to more!"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:71
+msgid "Action"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:72
+msgid "Key binding"
+msgstr ""
+
+#. I18N: button to disable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:96
+#: src/states_screens/options_screen_input2.cpp:587
+msgid "Disable Device"
+msgstr ""
+
+#. I18N: button to enable a gamepad configuration
+#: src/states_screens/options_screen_input2.cpp:98
+#: src/states_screens/options_screen_input2.cpp:588
+msgid "Enable Device"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:144
+msgid "Game Keys"
+msgstr ""
+
+#. I18N: Key binding section
+#: src/states_screens/options_screen_input2.cpp:158
+msgid "Menu Keys"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:230
+msgid "Steer Left"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:233
+msgid "Steer Right"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:236
+msgid "Accelerate"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:239
+msgid "Brake"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:242
+msgid "Fire"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:245
+msgid "Nitro"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:248
+msgid "Skidding"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:251
+msgid "Look Back"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:254
+msgid "Rescue"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:257
+msgid "Pause Game"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:262
+msgid "Up"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:265
+msgid "Down"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:268
+msgid "Left"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:271
+msgid "Right"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:274
+msgid "Select"
+msgstr ""
+
+#. I18N: Key binding name
+#: src/states_screens/options_screen_input2.cpp:277
+msgid "Cancel/Back"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:372
+msgid "* A blue item means a conflict with another configuration"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:377
+msgid "* A red item means a conflict in the current configuration"
+msgstr ""
+
+#: src/states_screens/options_screen_input2.cpp:479
+msgid ""
+"Warning: The 'Shift' is not a recommended key. When 'Shift' is pressed down, "
+"all keys that contain a character that is different in upper-case will stop "
+"working."
+msgstr ""
+
+#. I18N: shown before deleting an input configuration
+#: src/states_screens/options_screen_input2.cpp:575
+msgid "Are you sure you want to permanently delete this configuration?"
+msgstr ""
+
+#. I18N: custom video settings
+#: src/states_screens/options_screen_video.cpp:413
+msgid "Custom"
+msgstr ""
+
+#. I18N: if some kart animations are enabled
+#: src/states_screens/options_screen_video.cpp:438
+msgid "Me Only"
+msgstr ""
+
+#. I18N: in graphical options
+#. tooltip = tooltip + L"\n" + _("Pixel shaders: %s",
+#. UserConfigParams::m_pixel_shaders ? enabled : disabled);
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:446
+#, c-format
+msgid "Animated Scenery: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:449
+#, c-format
+msgid "Weather Effects: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:452
+#, c-format
+msgid "Animated Characters: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:457
+#, c-format
+msgid "Dynamic lights: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:460
+#, c-format
+msgid "Motion blur: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:463
+#, c-format
+msgid "Anti-aliasing: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:466
+#, c-format
+msgid "Ambient occlusion: %s"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:470
+#, c-format
+msgid "Shadows: %s"
+msgstr ""
+
+#: src/states_screens/options_screen_video.cpp:472
+#, c-format
+msgid "Shadows: %i"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:475
+#, c-format
+msgid "Bloom: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:479
+#, c-format
+msgid "Glow (outlines): %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:483
+#, c-format
+msgid "Light shaft (God rays): %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:487
+#, c-format
+msgid "Depth of field: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:491
+#, c-format
+msgid "Global illumination: %s"
+msgstr ""
+
+#. I18N: in graphical options
+#: src/states_screens/options_screen_video.cpp:495
+#, c-format
+msgid "Use high definition textures: %s"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:202
+msgid "All blows allowed, so catch weapons and make clever use of them!"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:209
+msgid "Contains no powerups, so only your driving skills matter!"
+msgstr ""
+
+#. I18N: short definition for follow-the-leader game mode
+#: src/states_screens/race_setup_screen.cpp:222
+msgid "Keep up with the leader kart but don't overtake it!"
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:231
+msgid ""
+"Hit others with weapons until they lose all their lives (only in multiplayer "
+"games)."
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:240
+msgid ""
+"Push the ball to the opposite cage to score goals (only in multiplayer "
+"games)."
+msgstr ""
+
+#: src/states_screens/race_setup_screen.cpp:252
+msgid "Explore tracks to find all hidden eggs"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:921
+msgid "Complete all challenges to unlock the big door!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:938
+#, c-format
+msgid "Accelerate with <%s>, and steer with <%s> and <%s>."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:957
+#, c-format
+msgid ""
+"Collect gift boxes, and fire the weapon with <%s> to blow away these boxes!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:971
+#, c-format
+msgid ""
+"Press <%s> to look behind, and fire the weapon with <%s> while pressing <%s> "
+"to fire behind!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:979
+msgid "Collect nitro bottles (we will use them after the curve)."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:990
+#, c-format
+msgid "Use the nitro you collected by pressing <%s>!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:1001
+#, c-format
+msgid "Oops! When you're in trouble, press <%s> to be rescued."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:1016
+#, c-format
+msgid ""
+"Accelerate and press the <%s> key while turning to skid. Skidding for a "
+"short while can help you turn faster to take sharp turns."
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:1027
+msgid ""
+"Note that if you manage to skid for several seconds, you will receive a "
+"bonus speedup as a reward!"
+msgstr ""
+
+#: src/tracks/track_object_presentation.cpp:1037
+msgid "You are now ready to race. Good luck!"
+msgstr ""
+
+#. I18N: Do NOT literally translate this string!! Please enter Y as the
+#. translation if your language is a RTL (right-to-left) language,
+#. N (or nothing) otherwise
+#: src/utils/translation.cpp:364
+msgid "   Is this a RTL language?"
+msgstr ""
diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 636703ffa..67a2d7ec6 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -748,7 +748,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
                         //I18N: message shown when an input device is used but
                         // is not associated to any player
                         GUIEngine::showMessage(
-                            _("Ignoring '%s', you needed to join earlier to play!",
+                            _("Ignoring '%s'. You needed to join earlier to play!",
                             core::stringw(gp->getName().c_str())));
                     }
                 }
diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp
index ea8583a9c..30e14e87f 100644
--- a/src/states_screens/dialogs/select_challenge.cpp
+++ b/src/states_screens/dialogs/select_challenge.cpp
@@ -50,22 +50,22 @@ core::stringw getLabel(RaceManager::Difficulty difficulty, const ChallengeData*
         if (c->getMinorMode() == RaceManager::MINOR_MODE_FOLLOW_LEADER) r--;
 
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Rank : %i", r) );
+        label.append( _("Required Rank: %i", r) );
     }
     if (c->getTime(difficulty) > 0)
     {
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Time : %i",
+        label.append( _("Required Time: %i",
                         StringUtils::timeToString(c->getTime(difficulty)).c_str()) );
     }
     if (c->getEnergy(difficulty) > 0)
     {
         if (label.size() > 0) label.append(L"\n");
-        label.append( _("Required Nitro Points : %i", c->getEnergy(difficulty)) );
+        label.append( _("Required Nitro Points: %i", c->getEnergy(difficulty)) );
     }
 
     if (label.size() > 0) label.append(L"\n");
-    label.append(_("Number of AI Karts : %i", c->getNumKarts(difficulty) - 1));
+    label.append(_("Number of AI Karts: %i", c->getNumKarts(difficulty) - 1));
 
     return label;
 }
diff --git a/src/states_screens/options_screen_input2.cpp b/src/states_screens/options_screen_input2.cpp
index a9031dcd1..527b05c79 100644
--- a/src/states_screens/options_screen_input2.cpp
+++ b/src/states_screens/options_screen_input2.cpp
@@ -476,8 +476,8 @@ void OptionsScreenInput2::gotSensedInput(const Input& sensed_input)
                      sensed_input.m_button_id == irr::KEY_LSHIFT ||
                      sensed_input.m_button_id == irr::KEY_RSHIFT))
     {
-        new MessageDialog(_("Warning, 'Shift' is not a recommended key : when "
-                            "shift is pressed down, all keys that contain a "
+        new MessageDialog(_("Warning: The 'Shift' is not a recommended key. When "
+                            "'Shift' is pressed down, all keys that contain a "
                             "character that is different in upper-case will "
                             "stop working."));
     }
diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index 3d293d0de..054ca8ec2 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -440,30 +440,30 @@ void OptionsScreenVideo::updateTooltip()
     const core::stringw none = _LTR("None");
 
     //I18N: in graphical options
-//    tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
+//    tooltip = tooltip + L"\n" + _("Pixel shaders: %s",
 //                                  UserConfigParams::m_pixel_shaders ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = _("Animated Scenery : %s",
+    tooltip = _("Animated Scenery: %s",
         UserConfigParams::m_graphical_effects ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Weather Effects : %s",
+    tooltip = tooltip + L"\n" + _("Weather Effects: %s",
         UserConfigParams::m_weather_effects ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Animated Characters : %s",
+    tooltip = tooltip + L"\n" + _("Animated Characters: %s",
         UserConfigParams::m_show_steering_animations == 2
         ? all
         : (UserConfigParams::m_show_steering_animations == 1 ? me : none));
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Dynamic lights : %s",
+    tooltip = tooltip + L"\n" + _("Dynamic lights: %s",
         UserConfigParams::m_dynamic_lights ? enabled : disabled);
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Motion blur: %s",
         UserConfigParams::m_motionblur ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Anti-aliasing : %s",
+    tooltip = tooltip + L"\n" + _("Anti-aliasing: %s",
         UserConfigParams::m_mlaa ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Ambient occlusion : %s",
+    tooltip = tooltip + L"\n" + _("Ambient occlusion: %s",
         UserConfigParams::m_ssao ? enabled : disabled);
     //I18N: in graphical options
     if (UserConfigParams::m_shadows_resolution == 0)
@@ -472,28 +472,28 @@ void OptionsScreenVideo::updateTooltip()
         tooltip = tooltip + L"\n" + _("Shadows: %i", UserConfigParams::m_shadows_resolution);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Bloom : %s",
+    tooltip = tooltip + L"\n" + _("Bloom: %s",
         UserConfigParams::m_bloom ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Glow (outlines) : %s",
+    tooltip = tooltip + L"\n" + _("Glow (outlines): %s",
         UserConfigParams::m_glow ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Light shaft (God rays) : %s",
+    tooltip = tooltip + L"\n" + _("Light shaft (God rays): %s",
         UserConfigParams::m_light_shaft ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Depth of field : %s",
+    tooltip = tooltip + L"\n" + _("Depth of field: %s",
         UserConfigParams::m_dof ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Global illumination : %s",
+    tooltip = tooltip + L"\n" + _("Global illumination: %s",
         UserConfigParams::m_gi ? enabled : disabled);
     
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Use high definition textures") + L" : " +
-        ((UserConfigParams::m_high_definition_textures & 0x1) == 0 ? disabled : enabled);
+    tooltip = tooltip + L"\n" + _("Use high definition textures: %s",
+        (UserConfigParams::m_high_definition_textures & 0x1) == 0 ? disabled : enabled);
     
     gfx->setTooltip(tooltip);
 }   // updateTooltip
diff --git a/src/states_screens/race_setup_screen.cpp b/src/states_screens/race_setup_screen.cpp
index cc9780e10..ffaf02721 100644
--- a/src/states_screens/race_setup_screen.cpp
+++ b/src/states_screens/race_setup_screen.cpp
@@ -228,7 +228,7 @@ void RaceSetupScreen::init()
         irr::core::stringw name4 = irr::core::stringw(
             RaceManager::getNameOf(RaceManager::MINOR_MODE_3_STRIKES)) + L"\n";
         //FIXME: avoid duplicating descriptions from the help menu!
-        name4 += _("Hit others with weapons until they lose all their lives. (Only in multiplayer games)");
+        name4 += _("Hit others with weapons until they lose all their lives (only in multiplayer games).");
         w2->addItem( name4, IDENT_STRIKES, RaceManager::getIconOf(RaceManager::MINOR_MODE_3_STRIKES));
     }
 
@@ -237,7 +237,7 @@ void RaceSetupScreen::init()
     {
         irr::core::stringw name5 = irr::core::stringw(
             RaceManager::getNameOf(RaceManager::MINOR_MODE_SOCCER)) + L"\n";
-        name5 += _("Push the ball to the opposite cage to score goals. (Only in multiplayer games)");
+        name5 += _("Push the ball to the opposite cage to score goals (only in multiplayer games).");
         w2->addItem( name5, IDENT_SOCCER, RaceManager::getIconOf(RaceManager::MINOR_MODE_SOCCER));
     }
 #endif
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index aeb8693b7..9736e0fd9 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -282,7 +282,7 @@ void TracksScreen::buildTrackList()
             race_manager->getNumLocalPlayers() == 1)
         {
             tracks_widget->addItem(
-                _("Locked : solve active challenges to gain access to more!"),
+                _("Locked: solve active challenges to gain access to more!"),
                 "locked", curr->getScreenshotFile(), LOCKED_BADGE,
                 IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
         }

From f59d277f3e06d15e7a1be83f0cc37a48ad01f1f1 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Jun 2015 09:03:40 +1000
Subject: [PATCH 278/331] Improve handling of sudden steeper uphill section by
 increasing the suspension force, which makes it less likely for the kart to
 hit the terrain.

---
 src/physics/btKart.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
index 785a2a8aa..398fce17d 100644
--- a/src/physics/btKart.cpp
+++ b/src/physics/btKart.cpp
@@ -663,7 +663,13 @@ void btKart::updateSuspension(btScalar deltaTime)
         btScalar length_diff    = (susp_length - current_length);
         if(m_kart->getKartProperties()->getExpSpringResponse())
             length_diff *= fabsf(length_diff)/susp_length;
-
+        float f = (1.0f + fabsf(length_diff) / susp_length);
+        // Scale the length diff. This results that in uphill sections, when
+        // the suspension is more compressed (i.e. length is bigger), more
+        // force is used, which makes it much less likely for the kart to hit
+        // the terrain, while when driving on flat terrain (length small),
+        // there is hardly any difference
+        length_diff *= f*f;
         force = wheel_info.m_suspensionStiffness * length_diff
               * wheel_info.m_clippedInvContactDotSuspension;
 

From 9094cbd31a8f45ae0d82d1f7efca0ba3d5bc36b7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 3 Jun 2015 15:10:11 +1000
Subject: [PATCH 279/331] Added NoCopy to FrameBuffer objects (copying a frame
 buffer e.g. as a parameter to a function can lead to incorrect results,
 likely because on exit of the function, data in the (copied) frame buffer
 object is freed, and then not available for OpenGL anymore.

---
 src/graphics/glwrap.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/glwrap.hpp b/src/graphics/glwrap.hpp
index e97e7284f..6cf4789e8 100644
--- a/src/graphics/glwrap.hpp
+++ b/src/graphics/glwrap.hpp
@@ -24,6 +24,7 @@
 #include "graphics/texture_manager.hpp"
 #include "graphics/vao_manager.hpp"
 #include "utils/log.hpp"
+#include "utils/no_copy.hpp"
 #include "utils/vec3.hpp"
 
 #include <vector>
@@ -59,7 +60,7 @@ public:
     unsigned elapsedTimeus();
 };
 
-class FrameBuffer
+class FrameBuffer : public NoCopy
 {
 private:
     GLuint fbo, fbolayer;

From bd006c875ebbcbfef838623e8c61cd70f6de6b4d Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 3 Jun 2015 20:34:58 -0400
Subject: [PATCH 280/331] Let track objects know what library object they are
 part of, paving the way for scripting to interact with library objects

---
 src/tracks/track.cpp                     | 11 ++++++-----
 src/tracks/track.hpp                     |  7 +++++--
 src/tracks/track_object.cpp              | 13 ++++++++-----
 src/tracks/track_object.hpp              | 11 +++++++++--
 src/tracks/track_object_manager.cpp      |  5 +++--
 src/tracks/track_object_manager.hpp      |  3 ++-
 src/tracks/track_object_presentation.cpp |  9 +++++----
 src/tracks/track_object_presentation.hpp |  4 +++-
 8 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 42b9c87b8..3390959c3 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -1787,7 +1787,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
         }
     }
 
-    loadObjects(root, path, model_def_loader, true, NULL);
+    loadObjects(root, path, model_def_loader, true, NULL, NULL);
 
     model_def_loader.cleanLibraryNodesAfterLoad();
 
@@ -1958,7 +1958,8 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
 //-----------------------------------------------------------------------------
 
 void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefinitionLoader& model_def_loader,
-                        bool create_lod_definitions, scene::ISceneNode* parent)
+                        bool create_lod_definitions, scene::ISceneNode* parent,
+                        TrackObject* parent_library)
 {
     unsigned int start_position_counter = 0;
 
@@ -1972,7 +1973,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         if (name == "track" || name == "default-start") continue;
         if (name == "object" || name == "library")
         {
-            m_track_object_manager->add(*node, parent, model_def_loader);
+            m_track_object_manager->add(*node, parent, model_def_loader, parent_library);
         }
         else if (name == "water")
         {
@@ -2016,7 +2017,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         {
             if (UserConfigParams::m_graphical_effects)
             {
-                m_track_object_manager->add(*node, parent, model_def_loader);
+                m_track_object_manager->add(*node, parent, model_def_loader, parent_library);
             }
         }
         else if (name == "sky-dome" || name == "sky-box" || name == "sky-color")
@@ -2029,7 +2030,7 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
         }
         else if (name == "light")
         {
-            m_track_object_manager->add(*node, parent, model_def_loader);
+            m_track_object_manager->add(*node, parent, model_def_loader, parent_library);
         }
         else if (name == "weather")
         {
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index 8eb856b2f..23b88e997 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -60,6 +60,8 @@ class TrackObjectManager;
 class TriangleMesh;
 class World;
 class XMLNode;
+class TrackObject;
+
 namespace Scripting
 {
     class ScriptEngine;
@@ -481,8 +483,9 @@ public:
     /** Returns true if this track has easter eggs. */
     bool hasEasterEggs() const { return m_has_easter_eggs; }
     // ------------------------------------------------------------------------
-    void loadObjects(const XMLNode* root, const std::string& path, ModelDefinitionLoader& lod_loader,
-        bool create_lod_definitions, scene::ISceneNode* parent);
+    void loadObjects(const XMLNode* root, const std::string& path,
+        ModelDefinitionLoader& lod_loader, bool create_lod_definitions,
+        scene::ISceneNode* parent, TrackObject* parent_library);
     // ------------------------------------------------------------------------
     bool               isSoccer             () const { return m_is_soccer; }
     // ------------------------------------------------------------------------
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index ad8fc9da6..c4e8ba9b2 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -39,9 +39,10 @@
  * \param lod_node Lod node (defaults to NULL).
  */
 TrackObject::TrackObject(const XMLNode &xml_node, scene::ISceneNode* parent,
-                         ModelDefinitionLoader& model_def_loader)
+                         ModelDefinitionLoader& model_def_loader,
+                         TrackObject* parent_library)
 {
-    init(xml_node, parent, model_def_loader);
+    init(xml_node, parent, model_def_loader, parent_library);
 }   // TrackObject
 
 // ----------------------------------------------------------------------------
@@ -63,6 +64,7 @@ TrackObject::TrackObject(const core::vector3df& xyz, const core::vector3df& hpr,
     m_presentation    = NULL;
     m_animator        = NULL;
     m_physical_object = NULL;
+    m_parent_library  = NULL;
     m_interaction     = interaction;
     m_presentation    = presentation;
     m_is_driveable    = false;
@@ -89,7 +91,8 @@ TrackObject::TrackObject(const core::vector3df& xyz, const core::vector3df& hpr,
  *  \param model_def_loader Used to load level-of-detail nodes.
  */
 void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
-                       ModelDefinitionLoader& model_def_loader)
+                       ModelDefinitionLoader& model_def_loader,
+                       TrackObject* parent_library)
 {
     m_init_xyz   = core::vector3df(0,0,0);
     m_init_hpr   = core::vector3df(0,0,0);
@@ -97,7 +100,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     m_enabled    = true;
     m_presentation = NULL;
     m_animator = NULL;
-
+    m_parent_library = parent_library;
     m_physical_object = NULL;
 
     xml_node.get("id",      &m_id        );
@@ -141,7 +144,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     }
     else if (xml_node.getName() == "library")
     {
-        m_presentation = new TrackObjectPresentationLibraryNode(xml_node, model_def_loader);
+        m_presentation = new TrackObjectPresentationLibraryNode(this, xml_node, model_def_loader);
     }
     else if (type == "sfx-emitter")
     {
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index db0c39ebc..4647b6ef1 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -89,11 +89,18 @@ protected:
     PhysicalObject*                m_physical_object;
 
     ThreeDAnimation*               m_animator;
+
+    TrackObject* m_parent_library;
     
-    void init(const XMLNode &xml_node, scene::ISceneNode* parent, ModelDefinitionLoader& model_def_loader);
+    void init(const XMLNode &xml_node, scene::ISceneNode* parent,
+        ModelDefinitionLoader& model_def_loader,
+        TrackObject* parent_library);
 
 public:
-                 TrackObject(const XMLNode &xml_node, scene::ISceneNode* parent, ModelDefinitionLoader& model_def_loader);
+                 TrackObject(const XMLNode &xml_node,
+                             scene::ISceneNode* parent,
+                             ModelDefinitionLoader& model_def_loader,
+                             TrackObject* parent_library);
 
                  TrackObject(const core::vector3df& xyz,
                              const core::vector3df& hpr,
diff --git a/src/tracks/track_object_manager.cpp b/src/tracks/track_object_manager.cpp
index 75093f15c..f90531a5d 100644
--- a/src/tracks/track_object_manager.cpp
+++ b/src/tracks/track_object_manager.cpp
@@ -44,11 +44,12 @@ TrackObjectManager::~TrackObjectManager()
  *  in the xml_node.
  */
 void TrackObjectManager::add(const XMLNode &xml_node, scene::ISceneNode* parent,
-                             ModelDefinitionLoader& model_def_loader)
+                             ModelDefinitionLoader& model_def_loader,
+                             TrackObject* parent_library)
 {
     try
     {
-        TrackObject *obj = new TrackObject(xml_node, parent, model_def_loader);
+        TrackObject *obj = new TrackObject(xml_node, parent, model_def_loader, parent_library);
         m_all_objects.push_back(obj);
         if(obj->isDriveable())
             m_driveable_objects.push_back(obj);
diff --git a/src/tracks/track_object_manager.hpp b/src/tracks/track_object_manager.hpp
index bb8b1ef54..ca0224f4b 100644
--- a/src/tracks/track_object_manager.hpp
+++ b/src/tracks/track_object_manager.hpp
@@ -57,7 +57,8 @@ public:
     void reset();
     void init();
     void add(const XMLNode &xml_node, scene::ISceneNode* parent,
-             ModelDefinitionLoader& model_def_loader);
+             ModelDefinitionLoader& model_def_loader,
+             TrackObject* parent_library);
     void update(float dt);
     void handleExplosion(const Vec3 &pos, const PhysicalObject *mp,
                          bool secondary_hits=true);
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 3fcbeee1f..8f4cb0bf2 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -156,9 +156,10 @@ TrackObjectPresentationEmpty::~TrackObjectPresentationEmpty()
 
 // ----------------------------------------------------------------------------
 TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
-                                       const XMLNode& xml_node,
-                                       ModelDefinitionLoader& model_def_loader)
-                                  : TrackObjectPresentationSceneNode(xml_node)
+    TrackObject* parent,
+    const XMLNode& xml_node,
+    ModelDefinitionLoader& model_def_loader)
+    : TrackObjectPresentationSceneNode(xml_node)
 {
     std::string name;
     xml_node.get("name", &name);
@@ -242,7 +243,7 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
 
     assert(libroot != NULL);
     World::getWorld()->getTrack()->loadObjects(libroot, lib_path, model_def_loader,
-        create_lod_definitions, m_node);
+        create_lod_definitions, m_node, parent);
 }   // TrackObjectPresentationLibraryNode
 
 // ----------------------------------------------------------------------------
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index cfda97efa..8293621f0 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -38,6 +38,7 @@ class ThreeDAnimation;
 class ModelDefinitionLoader;
 class STKInstancedSceneNode;
 class XMLNode;
+class TrackObject;
 
 namespace irr
 {
@@ -170,7 +171,8 @@ public:
 class TrackObjectPresentationLibraryNode : public TrackObjectPresentationSceneNode
 {
 public:
-    TrackObjectPresentationLibraryNode(const XMLNode& xml_node,
+    TrackObjectPresentationLibraryNode(TrackObject* parent,
+        const XMLNode& xml_node,
         ModelDefinitionLoader& model_def_loader);
     virtual ~TrackObjectPresentationLibraryNode();
 };   // TrackObjectPresentationLibraryNode

From 238578c9217e506f0b55134fa8c3963a749514c6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 4 Jun 2015 20:12:03 -0400
Subject: [PATCH 281/331] More work towards handling library nodes in scripting

---
 src/physics/physical_object.hpp    |  2 ++
 src/physics/physics.cpp            | 17 +++++++++++++++--
 src/scriptengine/script_engine.cpp |  6 ++----
 src/tracks/track_object.hpp        |  5 +++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 41a8b8823..a06339029 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -213,6 +213,8 @@ public:
     // ------------------------------------------------------------------------
     const std::string& getOnItemCollisionFunction() const { return m_on_item_collision; }
     // ------------------------------------------------------------------------
+    TrackObject* getTrackObject() { return m_object; }
+
     // Methods usable by scripts
 
     /**
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index ee2549e12..1488de877 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -40,6 +40,7 @@
 #include "race/race_manager.hpp"
 #include "scriptengine/script_engine.hpp"
 #include "tracks/track.hpp"
+#include "tracks/track_object.hpp"
 #include "utils/profiler.hpp"
 
 // ----------------------------------------------------------------------------
@@ -189,12 +190,24 @@ void Physics::update(float dt)
             PhysicalObject* obj = p->getUserPointer(0)->getPointerPhysicalObject();
             std::string obj_id = obj->getID();
             std::string scripting_function = obj->getOnKartCollisionFunction();
+
+            TrackObject* to = obj->getTrackObject();
+            TrackObject* library = to->getParentLibrary();
+            std::string lib_id;
+            std::string* lib_id_ptr = NULL;
+            if (library != NULL)
+            {
+                lib_id = library->getID();
+                lib_id_ptr = &lib_id;
+            }
+
             if (scripting_function.size() > 0)
             {
-                script_engine->runFunction("void " + scripting_function + "(int, const string)",
+                script_engine->runFunction("void " + scripting_function + "(int, const string,  const string)",
                     [&](asIScriptContext* ctx) {
                         ctx->SetArgDWord(0, kartId);
-                        ctx->SetArgObject(1, &obj_id);
+                        ctx->SetArgObject(1, lib_id_ptr);
+                        ctx->SetArgObject(2, &obj_id);
                     });
             }
             if (obj->isCrashReset())
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index dfd215edb..7c03d35f4 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -87,11 +87,9 @@ namespace Scripting
     */
     std::string getScript(std::string fileName)
     {
-        std::string script_dir = file_manager->getAsset(FileManager::SCRIPT, "");
-        script_dir += World::getWorld()->getTrack()->getIdent() + "/";
+        std::string script_path = World::getWorld()->getTrack()->getTrackFile(fileName);
 
-        script_dir += fileName;
-        FILE *f = fopen(script_dir.c_str(), "rb");
+        FILE *f = fopen(script_path.c_str(), "rb");
         if (f == NULL)
         {
             Log::debug("Scripting", "File does not exist : {0}.as", fileName.c_str());
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 4647b6ef1..7031e9b7c 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -125,6 +125,11 @@ public:
                  const Material **material, btVector3 *normal,
                  bool interpolate_normal) const;
 
+    TrackObject* getParentLibrary()
+    {
+        return m_parent_library;
+    }
+
     // ------------------------------------------------------------------------
     /** To finish object constructions. Called after the track model
      *  is ready. */

From 41002fc2620759c68d0ee71b208869fda3a68ec5 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Fri, 5 Jun 2015 03:26:24 +0200
Subject: [PATCH 282/331] Strip ICC headers from png files to silence warning

---
 data/optimize_data.sh | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/data/optimize_data.sh b/data/optimize_data.sh
index 675f9db74..6a4fc3ae9 100755
--- a/data/optimize_data.sh
+++ b/data/optimize_data.sh
@@ -20,8 +20,9 @@ jpegtran=true
 advdef=true
 advzip=true
 optipng=true
+convert=true
 
-#WARNING! SETTING TO TRUE MAY POSSIBLY INCREASE LOAD TIMES ON A SLOW CPU (UNTESTED) OR LEAD TO FILE NOT FOUND ERRORS WHEN RUNNING SUPERTUXKART! 
+#WARNING! SETTING TO TRUE MAY POSSIBLY INCREASE LOAD TIMES ON A SLOW CPU (UNTESTED) OR LEAD TO FILE NOT FOUND ERRORS WHEN RUNNING SUPERTUXKART!
 compress_b3d=false
 
 
@@ -58,10 +59,17 @@ then
 	sleep 2
 fi
 
+#check for convert
+if [ ! $(which convert) ]
+then
+	echo "convert is not installed, therefore it will not be used."; convert=false
+	sleep 2
+fi
+
 #check for optipng
 if [ ! $(which optipng) ]
 then
-        echo "optipng is not installed, therefore it will not be used."; optipng=false
+	echo "optipng is not installed, therefore it will not be used."; optipng=false
 	sleep 2
 fi
 
@@ -83,10 +91,18 @@ BEFORE=`du -sk | awk '{print $1}'`
 #functions for xargs multithreading, used instead of GNU parallel for cross-compatibility
 #TODO: let next set of optimization scripts run if one set is stuck on a single file at the end to decrease total runtime
 
+#strip ICC information off PNG's
+strippng () {
+for arg; do
+	convert "$arg" -strip "$arg"
+done
+}
+export -f strippng
+
 #optimize PNG's
 optimpng () {
 for arg; do
-        optipng -quiet -o3 "$arg"
+	optipng -quiet -o3 "$arg"
 #level 3 = 16 trials, which according to http://optipng.sourceforge.net/pngtech/optipng.html (retrieved October 2014) should be satisfactory for all users
 done
 }
@@ -96,7 +112,7 @@ export -f optimpng
 #compress PNG in-stream data
 comprpng () {
 for arg; do
-        advdef -z4 "$arg"
+	advdef -z4 "$arg"
 done
 }
 export -f comprpng
@@ -121,6 +137,12 @@ done
 export -f recomprb3dz
 #END MULTITHREADING FUNCTIONS
 
+#strip png icc information
+if [ "$convert" = true ]; then
+	find . -path .svn -prune -o -name "*.png" -print0 | xargs -0 -n 1 -P "$threads" bash -c 'strippng "$@"' -- #multithread the png stripping
+else echo "convert not installed. Ignoring commands using convert..."; sleep 1
+fi
+
 #lossless png image optimization
 if [ "$optipng" = true ]; then
 	find . -path .svn -prune -o -name "*.png" -print0 | xargs -0 -n 1 -P "$threads" bash -c 'optimpng "$@"' -- #multithread the png optimization
@@ -142,7 +164,7 @@ else echo "jpegtran not installed. Ignoring commands using jpegtran..."; sleep 1
 fi
 
 
-#b3dz to b3dz compression 
+#b3dz to b3dz compression
 #WARNING: BETA, MAY CAUSE MISSING FILE WARNINGS!
 if [ "$compress_b3d" = true ]; then
 	for xmls in $(find . -name "*.xml"); do

From cb510840ae2cce8bc048e54aeb6f2d83d2f34f3f Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 5 Jun 2015 19:34:46 -0400
Subject: [PATCH 283/331] Work on scripting, namely improving interaction with
 library objects

---
 src/physics/physics.cpp             |  6 +-
 src/scriptengine/script_track.cpp   | 40 +++----------
 src/tracks/track_object.cpp         | 31 ++++++++--
 src/tracks/track_object.hpp         |  2 +-
 src/tracks/track_object_manager.cpp | 93 +++++++----------------------
 src/tracks/track_object_manager.hpp |  5 +-
 6 files changed, 57 insertions(+), 120 deletions(-)

diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 1488de877..10e21d5e8 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -196,14 +196,12 @@ void Physics::update(float dt)
             std::string lib_id;
             std::string* lib_id_ptr = NULL;
             if (library != NULL)
-            {
                 lib_id = library->getID();
-                lib_id_ptr = &lib_id;
-            }
+            lib_id_ptr = &lib_id;
 
             if (scripting_function.size() > 0)
             {
-                script_engine->runFunction("void " + scripting_function + "(int, const string,  const string)",
+                script_engine->runFunction("void " + scripting_function + "(int, const string, const string)",
                     [&](asIScriptContext* ctx) {
                         ctx->SetArgDWord(0, kartId);
                         ctx->SetArgObject(1, lib_id_ptr);
diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 8f69ec709..a2c475167 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -57,33 +57,9 @@ namespace Scripting
           * Get a track object by ID.
           * @return An object of type @ref Scripting_TrackObject
           */
-        TrackObject* getTrackObject(std::string* objID)
+        TrackObject* getTrackObject(std::string* libraryInstance, std::string* objID)
         {
-            return World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*objID);
-        }
-
-        /** Hide/disable a track object */
-        void disableTrackObject(std::string* objID)
-        {
-            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*objID);
-        }
-
-        /** Show/enable a track objects */
-        void enableTrackObject(std::string* objID)
-        {
-            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*objID);
-        }
-
-        /** Disables an action trigger of specified ID */
-        void disableTrigger(std::string* triggerID)
-        {
-            World::getWorld()->getTrack()->getTrackObjectManager()->disable(*triggerID);
-        }
-
-        /** Enables an action trigger of specified ID */
-        void enableTrigger(std::string* triggerID)
-        {
-            World::getWorld()->getTrack()->getTrackObjectManager()->enable(*triggerID);
+            return World::getWorld()->getTrack()->getTrackObjectManager()->getTrackObject(*libraryInstance, *objID);
         }
 
         /** Creates a trigger at the specified location */
@@ -250,18 +226,18 @@ namespace Scripting
             r = engine->RegisterObjectType("SoundEmitter", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
             r = engine->RegisterObjectType("Animator", 0, asOBJ_REF | asOBJ_NOCOUNT); assert(r >= 0);
 
-            r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_CDECL); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_CDECL); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_CDECL); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_CDECL); assert(r >= 0);
+            //r = engine->RegisterGlobalFunction("void disableTrackObject(const string &in)", asFUNCTION(disableTrackObject), asCALL_CDECL); assert(r >= 0);
+            //r = engine->RegisterGlobalFunction("void enableTrackObject(const string &in)", asFUNCTION(enableTrackObject), asCALL_CDECL); assert(r >= 0);
+            //r = engine->RegisterGlobalFunction("void enableTrigger(const string &in)", asFUNCTION(enableTrigger), asCALL_CDECL); assert(r >= 0);
+            //r = engine->RegisterGlobalFunction("void disableTrigger(const string &in)", asFUNCTION(disableTrigger), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)",
                 asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
-            r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in, const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void exitRace()", asFUNCTION(exitRace), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void pauseRace()", asFUNCTION(pauseRace), asCALL_CDECL); assert(r >= 0);
 
             // TrackObject
-            r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);
+            r = engine->RegisterObjectMethod("TrackObject", "void setEnabled(bool status)", asMETHOD(TrackObject, setEnabled), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "SoundEmitter@ getSoundEmitter()", asMETHOD(TrackObject, getSoundEmitter), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "PhysicalObject@ getPhysics()", asMETHOD(TrackObject, getPhysics), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "Mesh@ getMesh()", asMETHOD(TrackObject, getMesh), asCALL_THISCALL); assert(r >= 0);
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index c4e8ba9b2..86af10c46 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -284,9 +284,9 @@ TrackObject::~TrackObject()
  */
 void TrackObject::reset()
 {
-    if (m_presentation  ) m_presentation->reset();
-    if (m_animator      ) m_animator->reset();
-    if(m_physical_object) m_physical_object->reset();
+    if (m_presentation   ) m_presentation->reset();
+    if (m_animator       ) m_animator->reset();
+    if (m_physical_object) m_physical_object->reset();
 }   // reset
 
 // ----------------------------------------------------------------------------
@@ -294,10 +294,29 @@ void TrackObject::reset()
  *  disabled objects will not be displayed anymore.
  *  \param mode Enable (true) or disable (false) this object.
  */
-void TrackObject::setEnable(bool mode)
+void TrackObject::setEnabled(bool enabled)
 {
-    m_enabled = mode;
-    if (m_presentation != NULL) m_presentation->setEnable(m_enabled);
+    if (m_enabled == enabled)
+        return;
+
+    m_enabled = enabled;
+
+    if (m_presentation != NULL)
+        m_presentation->setEnable(m_enabled);
+
+    if (enabled)
+        reset(); // TODO: not sure why there is a reset here
+
+    if (getType() == "mesh")
+    {
+        if (m_physical_object != NULL)
+        {
+            if (enabled)
+                m_physical_object->addBody();
+            else
+                m_physical_object->removeBody();
+        }
+    }
 }   // setEnable
 
 // ----------------------------------------------------------------------------
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 7031e9b7c..1dc6c3fe5 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -207,7 +207,7 @@ public:
       */
     PhysicalObject* getPhysics() { return m_physical_object; }
     /** Hide or show the object */
-    void setEnable(bool mode);
+    void setEnabled(bool mode);
     /* @} */
     /* @} */
     /* @} */
diff --git a/src/tracks/track_object_manager.cpp b/src/tracks/track_object_manager.cpp
index f90531a5d..f75d8697b 100644
--- a/src/tracks/track_object_manager.cpp
+++ b/src/tracks/track_object_manager.cpp
@@ -81,95 +81,42 @@ void TrackObjectManager::reset()
     for (TrackObject* curr : m_all_objects)
     {
         curr->reset();
-        if (!curr->isEnabled())
-        {
-            //PhysicalObjects may need to be added
-            if (curr->getType() == "mesh")
-            {
-                if (curr->getPhysicalObject() != NULL)
-                    curr->getPhysicalObject()->addBody();
-            }
-        }
-        curr->setEnable(true);
+        curr->setEnabled(true);
     }
 }   // reset
-
-// ----------------------------------------------------------------------------
-/** disables all track objects with a particular ID
- *  \param name Name or ID for disabling
- */
-void TrackObjectManager::disable(std::string name)
-{
-     for (TrackObject* curr : m_all_objects)
-     {
-        if (curr->getName() == (name) || curr->getID() == (name))
-        {
-
-			curr->setEnable(false);
-            if (curr->getType() == "mesh")
-            {
-                if (curr->getPhysicalObject()!=NULL)
-                    curr->getPhysicalObject()->removeBody();
-            }
-        }
-     }
-}
-// ----------------------------------------------------------------------------
-/** enables all track objects with a particular ID
- *  \param name Name or ID for enabling
- */
-void TrackObjectManager::enable(std::string name)
-{
-    for (TrackObject* curr : m_all_objects)
-    {
-        if (curr->getName() == (name) || curr->getID() == (name))
-        {
-            curr->reset();
-            curr->setEnable(true);
-            if (curr->getType() == "mesh")
-            {
-                if (curr->getPhysicalObject() != NULL)
-                curr->getPhysicalObject()->addBody();
-            }
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-/**  returns activation status for all track objects
- *   with a particular ID
- *   \param name Name or ID of track object
- */
-bool TrackObjectManager::getStatus(std::string name)
-{
-     for (TrackObject* curr : m_all_objects){
-            if (curr->getName() == (name)||curr->getID()==(name))
-            {
-
-				return curr->isEnabled();
-            
-            }
-     }
-     //object not found
-     return false;
-}
 // ----------------------------------------------------------------------------
 /** returns a reference to the track object
  *  with a particular ID
  *  \param name Name or ID of track object
  */
-TrackObject* TrackObjectManager::getTrackObject(std::string name)
+TrackObject* TrackObjectManager::getTrackObject(const std::string& libraryInstance,
+    const std::string& name)
 {
     for (TrackObject* curr : m_all_objects)
     {
-        if (curr->getName() == (name) || curr->getID() == (name))
+        //if (curr->getParentLibrary() != NULL)
+        //    Log::info("TrackObjectManager", "Found %s::%s", curr->getParentLibrary()->getID().c_str(), curr->getID().c_str());
+        //else
+        //    Log::info("TrackObjectManager", "Found ::%s", curr->getID().c_str());
+
+        if (curr->getParentLibrary() == NULL)
         {
+            if (libraryInstance.size() > 0)
+                continue;
+        }
+        else
+        {
+            if (libraryInstance != curr->getParentLibrary()->getID())
+                continue;
+        }
 
+        if (curr->getID() == name)
+        {
             return curr;
-
         }
     }
     //object not found
+    Log::warn("TrackObjectManager", "Object not found : %s::%s", libraryInstance.c_str(), name.c_str());
     return NULL;
 }
 /** Handles an explosion, i.e. it makes sure that all physical objects are
diff --git a/src/tracks/track_object_manager.hpp b/src/tracks/track_object_manager.hpp
index ca0224f4b..24cc17557 100644
--- a/src/tracks/track_object_manager.hpp
+++ b/src/tracks/track_object_manager.hpp
@@ -62,9 +62,6 @@ public:
     void update(float dt);
     void handleExplosion(const Vec3 &pos, const PhysicalObject *mp,
                          bool secondary_hits=true);
-	void disable(std::string name);
-	void enable (std::string name);
-	bool getStatus(std::string name);
     void castRay(const btVector3 &from,
                  const btVector3 &to, btVector3 *hit_point,
                  const Material **material, btVector3 *normal = NULL,
@@ -77,7 +74,7 @@ public:
 
     void removeObject(TrackObject* who);
 
-    TrackObject* getTrackObject(std::string name);
+    TrackObject* getTrackObject(const std::string& libraryInstance, const std::string& name);
 
           PtrVector<TrackObject>& getObjects()       { return m_all_objects; }
     const PtrVector<TrackObject>& getObjects() const { return m_all_objects; }

From 32edaa25fe6324cb63b5bf11b86997d5763b6ff7 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 9 Jun 2015 20:24:17 -0400
Subject: [PATCH 284/331] Adjust load and cleanup sequence for scripts,
 enabling scripts in library objects

---
 src/modes/world.cpp                      |  5 +++
 src/scriptengine/script_engine.cpp       | 57 ++++++++++--------------
 src/scriptengine/script_engine.hpp       |  5 ++-
 src/tracks/track_object_presentation.cpp |  9 ++++
 4 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index d7d71b0f4..5310bdf80 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -163,6 +163,9 @@ void World::init()
         throw std::runtime_error(msg.str());
     }
 
+    std::string script_path = World::getWorld()->getTrack()->getTrackFile("scripting.as");
+    m_script_engine->loadScript(script_path, true);
+
     // Create the physics
     m_physics = new Physics();
 
@@ -207,6 +210,8 @@ void World::init()
         m_weather = new Weather(m_track->getWeatherLightning(),
                           m_track->getWeatherSound());
     }
+
+    m_script_engine->compileLoadedScripts();
 }   // init
 
 //-----------------------------------------------------------------------------
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 7c03d35f4..3b1d387e4 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -85,14 +85,14 @@ namespace Scripting
     *  \param string scriptname = name of script to get
     *  \return      The corresponding script
     */
-    std::string getScript(std::string fileName)
+    std::string getScript(std::string script_path)
     {
-        std::string script_path = World::getWorld()->getTrack()->getTrackFile(fileName);
+        //std::string script_path = World::getWorld()->getTrack()->getTrackFile(fileName);
 
         FILE *f = fopen(script_path.c_str(), "rb");
         if (f == NULL)
         {
-            Log::debug("Scripting", "File does not exist : {0}.as", fileName.c_str());
+            Log::debug("Scripting", "File does not exist : {0}", script_path.c_str());
             return "";
         }
 
@@ -205,29 +205,7 @@ namespace Scripting
 
         // TODO: allow splitting in multiple files
         std::string script_filename = "scripting.as";
-        auto cached_script = m_loaded_files.find(script_filename);
         auto cached_function = m_functions_cache.find(function_name);
-
-        if (cached_script == m_loaded_files.end())
-        {
-            // Compile the script code
-            Log::info("Scripting", "Checking for script file '%s'", script_filename.c_str());
-            r = compileScript(m_engine, script_filename);
-            if (r < 0)
-            {
-                Log::info("Scripting", "Script '%s' is not available", script_filename.c_str());
-                m_loaded_files[script_filename] = false;
-                m_functions_cache[function_name] = NULL; // remember that this script is unavailable
-                return;
-            }
-
-            m_loaded_files[script_filename] = true;
-        }
-        else if (cached_script->second == false)
-        {
-            return; // script file unavailable
-        }
-
         if (cached_function == m_functions_cache.end())
         {
             // Find the function for the function we want to execute.
@@ -239,7 +217,7 @@ namespace Scripting
             if (func == NULL)
             {
                 Log::debug("Scripting", "Scripting function was not found : %s", function_name.c_str());
-                m_loaded_files[function_name] = NULL; // remember that this script is unavailable
+                m_functions_cache[function_name] = NULL; // remember that this function is unavailable
                 return;
             }
 
@@ -337,7 +315,7 @@ namespace Scripting
                 curr.second->Release();
         }
         m_functions_cache.clear();
-        m_loaded_files.clear();
+        m_engine->DiscardModule(MODULE_ID_MAIN_SCRIPT_FILE);
     }
 
     //-----------------------------------------------------------------------------
@@ -369,15 +347,15 @@ namespace Scripting
 
     //-----------------------------------------------------------------------------
 
-    int ScriptEngine::compileScript(asIScriptEngine *engine, std::string scriptName)
+    bool ScriptEngine::loadScript(std::string script_path, bool clear_previous)
     {
         int r;
 
-        std::string script = getScript(scriptName);
+        std::string script = getScript(script_path);
         if (script.size() == 0)
         {
             // No such file
-            return -1;
+            return false;
         }
 
         // Add the script sections that will be compiled into executable code.
@@ -385,14 +363,25 @@ namespace Scripting
         // we can call AddScriptSection() several times for the same module and
         // the script engine will treat them all as if they were one. The script
         // section name, will allow us to localize any errors in the script code.
-        asIScriptModule *mod = engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ALWAYS_CREATE);
+        asIScriptModule *mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE,
+            clear_previous ? asGM_ALWAYS_CREATE : asGM_ONLY_IF_EXISTS);
         r = mod->AddScriptSection("script", &script[0], script.size());
         if (r < 0)
         {
             Log::error("Scripting", "AddScriptSection() failed");
-            return -1;
+            return false;
         }
     
+        return true;
+    }
+
+    //-----------------------------------------------------------------------------
+
+    bool ScriptEngine::compileLoadedScripts()
+    {
+        int r;
+        asIScriptModule *mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ONLY_IF_EXISTS);
+
         // Compile the script. If there are any compiler messages they will
         // be written to the message stream that we set right after creating the 
         // script engine. If there are no errors, and no warnings, nothing will
@@ -401,7 +390,7 @@ namespace Scripting
         if (r < 0)
         {
             Log::error("Scripting", "Build() failed");
-            return -1;
+            return false;
         }
 
         // The engine doesn't keep a copy of the script sections after Build() has
@@ -414,6 +403,6 @@ namespace Scripting
         // scope, so function names, and global variables will not conflict with
         // each other.
 
-        return 0;
+        return true;
     }
 }
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 961d16ecb..1d6aa956d 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -43,13 +43,14 @@ namespace Scripting
         void evalScript(std::string script_fragment);
         void cleanupCache();
 
+        bool loadScript(std::string script_path, bool clear_previous);
+        bool compileLoadedScripts();
+
     private:
         asIScriptEngine *m_engine;
-        std::map<std::string, bool> m_loaded_files;
         std::map<std::string, asIScriptFunction*> m_functions_cache;
 
         void configureEngine(asIScriptEngine *engine);
-        int  compileScript(asIScriptEngine *engine,std::string scriptName);
     };   // class ScriptEngine
 
 }
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index d5faeb0b7..6f97b2636 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -183,18 +183,27 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
         if (world != NULL)
             track = world->getTrack();
         std::string local_lib_node_path;
+        std::string local_script_file_path;
         if (track != NULL)
+        {
             local_lib_node_path = track->getTrackFile("library/" + name + "/node.xml");
+            local_script_file_path = track->getTrackFile("library/" + name + "/scripting.as");
+        }
         std::string lib_node_path = lib_path + "node.xml";
+        std::string lib_script_file_path = lib_path + "scripting.as";
 
         if (local_lib_node_path.size() > 0 && file_manager->fileExists(local_lib_node_path))
         {
             lib_path = track->getTrackFile("library/" + name);
             libroot = file_manager->createXMLTree(local_lib_node_path);
+            if (track != NULL)
+                World::getWorld()->getScriptEngine()->loadScript(lib_script_file_path, false);
         }
         else if (file_manager->fileExists(lib_node_path))
         {
             libroot = file_manager->createXMLTree(lib_node_path);
+            if (track != NULL)
+                World::getWorld()->getScriptEngine()->loadScript(lib_script_file_path, false);
         }
         else
         {

From 0162407ff38f4f57a8c86522996977ab4967b337 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 10 Jun 2015 10:33:06 +1000
Subject: [PATCH 285/331] Added proper ref-counting.

---
 src/graphics/shaders.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 606fc74e5..661d7445c 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -146,7 +146,8 @@ void Shaders::destroy()
     for (i = 0; i < ES_COUNT; i++)
     {
         if (i == ES_GAUSSIAN3V || !m_callbacks[i]) continue;
-        delete m_callbacks[i];
+        m_callbacks[i]->drop();
+        m_callbacks[i] = NULL;
     }
     m_has_been_initialised = false;
 }   // destroy

From 860135376d0b943e836ffcd0857a3ff7c94b7afe Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 10 Jun 2015 10:33:47 +1000
Subject: [PATCH 286/331] Start to fix resolution change by properly freeing
 data.

---
 src/graphics/irr_driver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 87c8060c0..537f097fc 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -798,7 +798,7 @@ void IrrDriver::applyResolutionSettings()
     // FIXME: this load sequence is (mostly) duplicated from main.cpp!!
     // That's just error prone
     // (we're sure to update main.cpp at some point and forget this one...)
-    Shaders::destroy();
+    ShaderBase::updateShaders();
     VAOManager::getInstance()->kill();
     SolidPassCmd::getInstance()->kill();
     ShadowPassCmd::getInstance()->kill();
@@ -806,6 +806,7 @@ void IrrDriver::applyResolutionSettings()
     GlowPassCmd::getInstance()->kill();
     resetTextureTable();
     // initDevice will drop the current device.
+    Shaders::destroy();
     initDevice();
 
     // Re-init GUI engine

From 09227fa19d0cb0fac2cee73c4bff6fd76bfc3452 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 10 Jun 2015 23:18:06 +1000
Subject: [PATCH 287/331] Finally fully fixed #2213.

---
 src/graphics/shaders.cpp            | 1 +
 src/graphics/shared_gpu_objects.cpp | 9 ++++++++-
 src/graphics/shared_gpu_objects.hpp | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 661d7445c..6f3363110 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -150,6 +150,7 @@ void Shaders::destroy()
         m_callbacks[i] = NULL;
     }
     m_has_been_initialised = false;
+    SharedGPUObjects::reset();
 }   // destroy
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/shared_gpu_objects.cpp b/src/graphics/shared_gpu_objects.cpp
index 79013a3c0..549995944 100644
--- a/src/graphics/shared_gpu_objects.cpp
+++ b/src/graphics/shared_gpu_objects.cpp
@@ -195,4 +195,11 @@ void SharedGPUObjects::init()
     initParticleQuadVBO();
 
     m_has_been_initialised = true;
-}   // SharedGPUObjects
\ No newline at end of file
+}   // SharedGPUObjects
+
+// ----------------------------------------------------------------------------
+
+void SharedGPUObjects::reset()
+{
+    m_has_been_initialised = false;
+}
\ No newline at end of file
diff --git a/src/graphics/shared_gpu_objects.hpp b/src/graphics/shared_gpu_objects.hpp
index 8c6b52f4c..edcf5093e 100644
--- a/src/graphics/shared_gpu_objects.hpp
+++ b/src/graphics/shared_gpu_objects.hpp
@@ -49,6 +49,7 @@ private:
 
 public:
     static void init();
+    static void reset();
     // ------------------------------------------------------------------------
     static GLuint getBillboardVBO() 
     {

From b32fff8dad5ef442540f22983ede01fc05ae4087 Mon Sep 17 00:00:00 2001
From: Tobias Markus <tobbi.bugs@googlemail.com>
Date: Fri, 12 Jun 2015 00:28:55 +0200
Subject: [PATCH 288/331] Fix flags on GetModule call

---
 src/scriptengine/script_engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 3b1d387e4..1e94e64c3 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -380,7 +380,7 @@ namespace Scripting
     bool ScriptEngine::compileLoadedScripts()
     {
         int r;
-        asIScriptModule *mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_ONLY_IF_EXISTS);
+        asIScriptModule *mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE, asGM_CREATE_IF_NOT_EXISTS);
 
         // Compile the script. If there are any compiler messages they will
         // be written to the message stream that we set right after creating the 

From e35d5a07b4062a0ad97f329c2b38b4df0210558c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 11 Jun 2015 20:22:30 -0400
Subject: [PATCH 289/331] Little hack : make the kart selection screen seem
 faster by moving the cursor immediately, and loading the kart model only on
 next frame. See #2216

---
 src/states_screens/kart_selection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index a7dd5fddf..5dc89cdf0 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -890,7 +890,7 @@ void KartSelectionScreen::updateKartWidgetModel(uint8_t widget_id,
                 const SpeedWeightedObject&  obj = kart_model.getSpeedWeightedObject((int)i);
                 w3->addModel(obj.m_model, obj.m_position);
             }
-            w3->update(0);
+            //w3->update(0);
 
             m_kart_widgets[widget_id].m_kart_name
             ->setText( selectionText.c_str(), false );

From edbb6892e0239c6f5ee12635d80bab82ad6703d7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Sat, 13 Jun 2015 12:34:33 +1000
Subject: [PATCH 290/331] Added comments.

---
 src/graphics/shared_gpu_objects.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/graphics/shared_gpu_objects.cpp b/src/graphics/shared_gpu_objects.cpp
index 549995944..44482737e 100644
--- a/src/graphics/shared_gpu_objects.cpp
+++ b/src/graphics/shared_gpu_objects.cpp
@@ -198,8 +198,11 @@ void SharedGPUObjects::init()
 }   // SharedGPUObjects
 
 // ----------------------------------------------------------------------------
-
+/** A simple reset function. Atm it actually only resets the
+ *  m_has_been_initialised flag (all opengl data gets reset anyway when this
+ *  function is called).
+ */
 void SharedGPUObjects::reset()
 {
     m_has_been_initialised = false;
-}
\ No newline at end of file
+}   // reset
\ No newline at end of file

From f651321cebdce92cc691bd00e752dac79e23c8f3 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 18:46:06 -0400
Subject: [PATCH 291/331] Using system angelscript must now be explicitely
 requested through an option, shouldn't be enabled by default as this will
 mostly lead to build errors due to finding a different version

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a06913f..7228f719c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
 option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
+option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
 
 if(MSVC)
     # Normally hide the option to build wiiuse on VS, since it depends
@@ -123,7 +124,7 @@ endif()
 
 # Build the angelscript library if not in system
 find_package(Angelscript)
-if(ANGELSCRIPT_FOUND)
+if(USE_SYSTEM_ANGELSCRIPT AND ANGELSCRIPT_FOUND)
     include_directories(${Angelscript_INCLUDE_DIRS})
 else()
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")

From 97100db5073979bd2031beb206008c0d69678942 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 19:21:34 -0400
Subject: [PATCH 292/331] RTT: avoid computing diffuse coefficients every frame

---
 src/graphics/rtts.cpp                       | 9 ++++++++-
 src/graphics/rtts.hpp                       | 2 ++
 src/guiengine/widgets/model_view_widget.cpp | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index 5342ac3e4..f83be6b13 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -290,6 +290,13 @@ RTT::~RTT()
     }
 }
 
+void RTT::prepareRender(scene::ICameraSceneNode* camera)
+{
+    irr_driver->setRTT(this);
+    irr_driver->getSceneManager()->setActiveCamera(camera);
+    irr_driver->generateDiffuseCoefficients();
+}
+
 FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
 {
     irr_driver->setRTT(this);
@@ -298,7 +305,7 @@ FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
 
     std::vector<IrrDriver::GlowData> glows;
     // TODO: put this outside of the rendering loop
-    irr_driver->generateDiffuseCoefficients();
+    //irr_driver->generateDiffuseCoefficients();
     irr_driver->computeMatrixesAndCameras(camera, m_width, m_height);
     unsigned plc = irr_driver->updateLightsInfo(camera, dt);
     irr_driver->uploadLightingData();
diff --git a/src/graphics/rtts.hpp b/src/graphics/rtts.hpp
index f0e428175..a37ba1df7 100644
--- a/src/graphics/rtts.hpp
+++ b/src/graphics/rtts.hpp
@@ -52,6 +52,8 @@ public:
 
     FrameBuffer* render(irr::scene::ICameraSceneNode* camera, float dt);
 
+    void prepareRender(scene::ICameraSceneNode* camera);
+
 private:
     unsigned RenderTargetTextures[RTT_COUNT];
     PtrVector<FrameBuffer> FrameBuffers;
diff --git a/src/guiengine/widgets/model_view_widget.cpp b/src/guiengine/widgets/model_view_widget.cpp
index c369dc580..683b3de4a 100644
--- a/src/guiengine/widgets/model_view_widget.cpp
+++ b/src/guiengine/widgets/model_view_widget.cpp
@@ -281,6 +281,8 @@ void ModelViewWidget::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh,
     m_camera->setTarget(core::vector3df(0, 10, 0.0f));
     m_camera->setFOV(DEGREE_TO_RAD*50.0f);
     m_camera->updateAbsolutePosition();
+
+    m_rtt_provider->prepareRender(m_camera);
 }
 
 void ModelViewWidget::setRotateOff()

From db55c35ed1d515044bfdfafe178989052e0b41c4 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 19:38:12 -0400
Subject: [PATCH 293/331] Disable bloom / depth-of-field when using physics
 debug modes, makes lines easier to see

---
 src/graphics/post_processing.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index e7ad591ea..f003f6962 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -31,6 +31,7 @@
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_model.hpp"
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"
 #include "utils/log.hpp"
@@ -1416,7 +1417,11 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
 
-    if (isRace && UserConfigParams::m_dof)
+    World *world = World::getWorld();
+    Physics *physics = world ? world->getPhysics() : NULL;
+
+
+    if (isRace && UserConfigParams::m_dof && (physics == NULL || !physics->isDebug()))
     {
         PROFILER_PUSH_CPU_MARKER("- DoF", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_DOF));
@@ -1509,7 +1514,8 @@ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode,
     {
         PROFILER_PUSH_CPU_MARKER("- Bloom", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_BLOOM));
-        if (isRace && UserConfigParams::m_bloom)
+
+        if (isRace && UserConfigParams::m_bloom && (physics == NULL || !physics->isDebug()))
         {
             glClear(GL_STENCIL_BUFFER_BIT);
             glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);

From fa027c11dacaa873769fa36d29d48901825ddccd Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 19:44:31 -0400
Subject: [PATCH 294/331] Work on hiding/showing library nodes (especially when
 they contain movable children, which are a special case)

---
 src/tracks/track_object.cpp              | 40 ++++++++++++++++++++++++
 src/tracks/track_object.hpp              |  9 +++++-
 src/tracks/track_object_presentation.hpp |  5 ++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 86af10c46..b9783da6a 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -24,8 +24,10 @@
 #include "io/xml_node.hpp"
 #include "input/device_manager.hpp"
 #include "items/item_manager.hpp"
+#include "modes/world.hpp"
 #include "physics/physical_object.hpp"
 #include "race/race_manager.hpp"
+#include "scriptengine/script_engine.hpp"
 #include "utils/helpers.hpp"
 #include <ISceneManager.h>
 
@@ -220,6 +222,11 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
                 node->setPosition(absTransform.getTranslation());
                 node->setRotation(absTransform.getRotationDegrees());
                 node->setScale(absTransform.getScale());
+
+                if (parent_library != NULL)
+                {
+                    parent_library->addMovableChild(this);
+                }
             }
 
             glownode = node;
@@ -265,6 +272,27 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     }
 
     reset();
+
+    // some static meshes are conditional
+    std::string condition;
+    xml_node.get("if", &condition);
+    if (condition == "false")
+    {
+        // TODO: doesn't work (in all cases), probably it's a bit too early, children are not loaded yet
+        setEnabled(false);
+    }
+    else if (condition.size() > 0)
+    {
+        unsigned char result = -1;
+        Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+        std::function<void(asIScriptContext*)> null_callback;
+        script_engine->runFunction("bool " + condition + "()", null_callback,
+            [&](asIScriptContext* ctx) { result = ctx->GetReturnByte(); });
+
+        // TODO: doesn't work (in all cases), probably it's a bit too early, children are not loaded yet
+        if (result == 0)
+            setEnabled(false);
+    }
 }   // TrackObject
 
 // ----------------------------------------------------------------------------
@@ -317,6 +345,11 @@ void TrackObject::setEnabled(bool enabled)
                 m_physical_object->removeBody();
         }
     }
+
+    for (int i = 0; i < m_movable_children.size(); i++)
+    {
+        m_movable_children[i]->setEnabled(enabled);
+    }
 }   // setEnable
 
 // ----------------------------------------------------------------------------
@@ -426,3 +459,10 @@ const core::vector3df& TrackObject::getScale() const
     else
         return m_init_xyz;
 }   // getScale
+
+// ----------------------------------------------------------------------------
+
+void TrackObject::addMovableChild(TrackObject* child)
+{
+    m_movable_children.push_back(child);
+}
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 1dc6c3fe5..fd21c7aa5 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -90,8 +90,10 @@ protected:
 
     ThreeDAnimation*               m_animator;
 
-    TrackObject* m_parent_library;
+    TrackObject*                   m_parent_library;
     
+    std::vector<TrackObject*>      m_movable_children;
+
     void init(const XMLNode &xml_node, scene::ISceneNode* parent,
         ModelDefinitionLoader& model_def_loader,
         TrackObject* parent_library);
@@ -220,6 +222,11 @@ public:
     // ------------------------------------------------------------------------
     /** Returns if a kart can drive on this object. */
     bool isDriveable() const { return m_is_driveable; }
+    // ------------------------------------------------------------------------
+    /** Used along the "extract movable nodes out of library objects" hack, used
+      * to still preserve the parent-child relationship
+      */
+    void addMovableChild(TrackObject* child);
 
     LEAK_CHECK()
 };   // TrackObject
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 8293621f0..78d862edf 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -80,7 +80,10 @@ public:
     // ------------------------------------------------------------------------
 
     virtual void reset() {}
-    virtual void setEnable(bool enabled) {}
+    virtual void setEnable(bool enabled)
+    {
+        Log::warn("TrackObjectPresentation", "setEnable unimplemented for this presentation type");
+    }
     virtual void update(float dt) {}
     virtual void move(const core::vector3df& xyz, const core::vector3df& hpr,
         const core::vector3df& scale, bool isAbsoluteCoord) {}

From 01b9ee2a63fc92c5cec976a7fbbe77471ef34018 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 19:47:52 -0400
Subject: [PATCH 295/331] RTT: calculate diffuse coefficients only once

---
 src/graphics/rtts.cpp | 8 +++++++-
 src/graphics/rtts.hpp | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index f83be6b13..590972bb8 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -56,6 +56,7 @@ RTT::RTT(size_t width, size_t height)
     m_RH_FBO = NULL;
     m_RSM = NULL;
     m_RH_FBO = NULL;
+    m_diffuse_coefficients_calculated = false;
     using namespace video;
     using namespace core;
 
@@ -294,7 +295,12 @@ void RTT::prepareRender(scene::ICameraSceneNode* camera)
 {
     irr_driver->setRTT(this);
     irr_driver->getSceneManager()->setActiveCamera(camera);
-    irr_driver->generateDiffuseCoefficients();
+
+    if (!m_diffuse_coefficients_calculated)
+    {
+        irr_driver->generateDiffuseCoefficients();
+        m_diffuse_coefficients_calculated = true;
+    }
 }
 
 FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
diff --git a/src/graphics/rtts.hpp b/src/graphics/rtts.hpp
index a37ba1df7..ecc85c5c1 100644
--- a/src/graphics/rtts.hpp
+++ b/src/graphics/rtts.hpp
@@ -62,6 +62,8 @@ private:
     int m_width;
     int m_height;
 
+    bool m_diffuse_coefficients_calculated;
+
     unsigned shadowColorTex, shadowNormalTex, shadowDepthTex;
     unsigned RSM_Color, RSM_Normal, RSM_Depth;
     unsigned RH_Red, RH_Green, RH_Blue;

From b3cc5f9f0de8bfd2766236509618dfa4805dc5fc Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 15 Jun 2015 20:09:22 -0400
Subject: [PATCH 296/331] Try to fix Travis build

---
 src/tracks/track_object_presentation.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 78d862edf..8f2e7f80d 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -24,6 +24,7 @@
 #include "items/item.hpp"
 #include "utils/cpp2011.hpp"
 #include "utils/no_copy.hpp"
+#include "utils/log.hpp"
 #include "utils/vec3.hpp"
 
 #include <vector3d.h>

From 403d61e75422156aff72248d36c24bc3af49881b Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Wed, 17 Jun 2015 19:33:53 -0400
Subject: [PATCH 297/331] Allow creating initially hidden objects, that can
 later be shown through scripting

---
 src/physics/physical_object.cpp     | 14 +++++-
 src/physics/physical_object.hpp     |  2 +
 src/tracks/track_object.cpp         | 75 +++++++++++++++++------------
 src/tracks/track_object.hpp         |  4 ++
 src/tracks/track_object_manager.cpp |  2 +-
 5 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/physics/physical_object.cpp b/src/physics/physical_object.cpp
index 181167cfb..c8d0e2b4b 100644
--- a/src/physics/physical_object.cpp
+++ b/src/physics/physical_object.cpp
@@ -144,6 +144,7 @@ PhysicalObject::PhysicalObject(bool is_dynamic,
     m_reset_height       = settings.m_reset_height;
     m_on_kart_collision  = settings.m_on_kart_collision;
     m_on_item_collision  = settings.m_on_item_collision;
+    m_body_added = false;
 
     m_init_pos.setIdentity();
     Vec3 radHpr(m_init_hpr);
@@ -483,6 +484,7 @@ void PhysicalObject::init()
     }
 
     World::getWorld()->getPhysics()->addBody(m_body);
+    m_body_added = true;
     if(m_triangle_mesh)
         m_triangle_mesh->setBody(m_body);
 }   // init
@@ -611,14 +613,22 @@ void PhysicalObject::setInteraction(std::string interaction){
 /** Remove body from physics dynamic world interaction type for object*/
 void PhysicalObject::removeBody()
 {
-    World::getWorld()->getPhysics()->removeBody(m_body);
+    if (m_body_added)
+    {
+        World::getWorld()->getPhysics()->removeBody(m_body);
+        m_body_added = false;
+    }
 }   // Remove body
 
 // ----------------------------------------------------------------------------
 /** Add body to physics dynamic world */
 void PhysicalObject::addBody()
 {
-    World::getWorld()->getPhysics()->addBody(m_body);
+    if (!m_body_added)
+    {
+        m_body_added = true;
+        World::getWorld()->getPhysics()->addBody(m_body);
+    }
 }   // Add body
 
 // ----------------------------------------------------------------------------
diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index a06339029..02d2580ba 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -113,6 +113,8 @@ private:
     /** The mass of this object. */
     float                 m_mass;
 
+    bool                  m_body_added;
+
     /** The pointer that is stored in the bullet rigid body back to
      *  this object. */
     UserPointer           m_user_pointer;
diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index b9783da6a..08c014dda 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -133,6 +133,26 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
 
     m_type = type;
 
+    m_initially_visible = true;
+    std::string condition;
+    xml_node.get("if", &condition);
+    if (condition == "false")
+    {
+        m_initially_visible = false;
+    }
+    else if (condition.size() > 0)
+    {
+        unsigned char result = -1;
+        Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
+        std::function<void(asIScriptContext*)> null_callback;
+        script_engine->runFunction("bool " + condition + "()", null_callback,
+            [&](asIScriptContext* ctx) { result = ctx->GetReturnByte(); });
+
+        if (result == 0)
+            m_initially_visible = false;
+    }
+    if (!m_initially_visible)
+        setEnabled(false);
 
     if (xml_node.getName() == "particle-emitter")
     {
@@ -180,7 +200,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     else
     {
         scene::ISceneNode *glownode = NULL;
-
+        bool is_movable = false;
         if (lod_instance)
         {
             m_type = "lod";
@@ -222,11 +242,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
                 node->setPosition(absTransform.getTranslation());
                 node->setRotation(absTransform.getRotationDegrees());
                 node->setScale(absTransform.getScale());
-
-                if (parent_library != NULL)
-                {
-                    parent_library->addMovableChild(this);
-                }
+                is_movable = true;
             }
 
             glownode = node;
@@ -243,6 +259,11 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
                                                    this);
         }
 
+        if (is_movable && parent_library != NULL)
+        {
+            parent_library->addMovableChild(this);
+        }
+
         video::SColor glow;
         if (xml_node.get("glow", &glow) && glownode)
         {
@@ -273,26 +294,10 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
 
     reset();
 
-    // some static meshes are conditional
-    std::string condition;
-    xml_node.get("if", &condition);
-    if (condition == "false")
-    {
-        // TODO: doesn't work (in all cases), probably it's a bit too early, children are not loaded yet
+    if (!m_initially_visible)
+        setEnabled(false);
+    if (parent_library != NULL && !parent_library->isEnabled())
         setEnabled(false);
-    }
-    else if (condition.size() > 0)
-    {
-        unsigned char result = -1;
-        Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
-        std::function<void(asIScriptContext*)> null_callback;
-        script_engine->runFunction("bool " + condition + "()", null_callback,
-            [&](asIScriptContext* ctx) { result = ctx->GetReturnByte(); });
-
-        // TODO: doesn't work (in all cases), probably it's a bit too early, children are not loaded yet
-        if (result == 0)
-            setEnabled(false);
-    }
 }   // TrackObject
 
 // ----------------------------------------------------------------------------
@@ -324,16 +329,16 @@ void TrackObject::reset()
  */
 void TrackObject::setEnabled(bool enabled)
 {
-    if (m_enabled == enabled)
-        return;
-
+    //if (m_enabled == enabled)
+    //    return;
+    
     m_enabled = enabled;
 
     if (m_presentation != NULL)
         m_presentation->setEnable(m_enabled);
 
-    if (enabled)
-        reset(); // TODO: not sure why there is a reset here
+    //if (enabled)
+    //    reset();
 
     if (getType() == "mesh")
     {
@@ -353,6 +358,14 @@ void TrackObject::setEnabled(bool enabled)
 }   // setEnable
 
 // ----------------------------------------------------------------------------
+
+void TrackObject::resetEnabled()
+{
+    setEnabled(m_initially_visible);
+}
+
+// ----------------------------------------------------------------------------
+
 void TrackObject::update(float dt)
 {
     if (m_presentation) m_presentation->update(dt);
@@ -464,5 +477,7 @@ const core::vector3df& TrackObject::getScale() const
 
 void TrackObject::addMovableChild(TrackObject* child)
 {
+    if (!m_enabled)
+        child->setEnabled(false);
     m_movable_children.push_back(child);
 }
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index fd21c7aa5..a463e01c2 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -94,6 +94,8 @@ protected:
     
     std::vector<TrackObject*>      m_movable_children;
 
+    bool                           m_initially_visible = true;
+
     void init(const XMLNode &xml_node, scene::ISceneNode* parent,
         ModelDefinitionLoader& model_def_loader,
         TrackObject* parent_library);
@@ -213,6 +215,8 @@ public:
     /* @} */
     /* @} */
     /* @} */
+
+    void resetEnabled();
     // ------------------------------------------------------------------------
     ThreeDAnimation* getAnimator() { return m_animator; }
     // ------------------------------------------------------------------------
diff --git a/src/tracks/track_object_manager.cpp b/src/tracks/track_object_manager.cpp
index f75d8697b..bbb4a445b 100644
--- a/src/tracks/track_object_manager.cpp
+++ b/src/tracks/track_object_manager.cpp
@@ -81,7 +81,7 @@ void TrackObjectManager::reset()
     for (TrackObject* curr : m_all_objects)
     {
         curr->reset();
-        curr->setEnabled(true);
+        curr->resetEnabled();
     }
 }   // reset
 // ----------------------------------------------------------------------------

From 8119b59af0b110cfa9b4934bc1fd5e3326d0fbab Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 18 Jun 2015 19:09:13 -0400
Subject: [PATCH 298/331] More fixes on intially hidden objects

---
 src/tracks/track_object.cpp | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 08c014dda..92e5985db 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -329,17 +329,11 @@ void TrackObject::reset()
  */
 void TrackObject::setEnabled(bool enabled)
 {
-    //if (m_enabled == enabled)
-    //    return;
-    
     m_enabled = enabled;
 
     if (m_presentation != NULL)
         m_presentation->setEnable(m_enabled);
 
-    //if (enabled)
-    //    reset();
-
     if (getType() == "mesh")
     {
         if (m_physical_object != NULL)
@@ -361,7 +355,26 @@ void TrackObject::setEnabled(bool enabled)
 
 void TrackObject::resetEnabled()
 {
-    setEnabled(m_initially_visible);
+    m_enabled = m_initially_visible;
+
+    if (m_presentation != NULL)
+        m_presentation->setEnable(m_initially_visible);
+
+    if (getType() == "mesh")
+    {
+        if (m_physical_object != NULL)
+        {
+            if (m_initially_visible)
+                m_physical_object->addBody();
+            else
+                m_physical_object->removeBody();
+        }
+    }
+
+    for (int i = 0; i < m_movable_children.size(); i++)
+    {
+        m_movable_children[i]->resetEnabled();
+    }
 }
 
 // ----------------------------------------------------------------------------

From 789384a7bf597b0b889296bfa27b38c088188fd5 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 18 Jun 2015 19:24:39 -0400
Subject: [PATCH 299/331] Fix loading scripts in local library nodes

---
 src/tracks/track_object_presentation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 6f97b2636..8259045c4 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -197,7 +197,7 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
             lib_path = track->getTrackFile("library/" + name);
             libroot = file_manager->createXMLTree(local_lib_node_path);
             if (track != NULL)
-                World::getWorld()->getScriptEngine()->loadScript(lib_script_file_path, false);
+                World::getWorld()->getScriptEngine()->loadScript(local_script_file_path, false);
         }
         else if (file_manager->fileExists(lib_node_path))
         {

From 90cf3176d183aa1c434dc5d023039f79c465fdd8 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 21 Jun 2015 18:31:16 -0400
Subject: [PATCH 300/331] Start adding an audio scripting API, and also fix a
 deadlock in sfx_manager due to improper release of locks

---
 src/audio/sfx_manager.cpp          |  4 +--
 src/scriptengine/script_audio.cpp  | 55 ++++++++++++++++++++++++++++++
 src/scriptengine/script_audio.hpp  | 33 ++++++++++++++++++
 src/scriptengine/script_engine.cpp |  4 ++-
 4 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 src/scriptengine/script_audio.cpp
 create mode 100644 src/scriptengine/script_audio.hpp

diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index 5078b9293..aebe6ac2c 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -939,7 +939,7 @@ SFXBase* SFXManager::quickSound(const std::string &sound_type)
 {
     if (!sfxAllowed()) return NULL;
 
-    m_quick_sounds.lock();
+    MutexLockerHelper lock(m_quick_sounds);
     std::map<std::string, SFXBase*>::iterator sound = 
                                      m_quick_sounds.getData().find(sound_type);
 
@@ -950,14 +950,12 @@ SFXBase* SFXManager::quickSound(const std::string &sound_type)
         if (new_sound == NULL) return NULL;
         new_sound->play();
         m_quick_sounds.getData()[sound_type] = new_sound;
-        m_quick_sounds.unlock();
         return new_sound;
     }
     else
     {
         SFXBase *base_sound = sound->second;
         base_sound->play();
-        m_quick_sounds.unlock();
         return base_sound;
     }
 
diff --git a/src/scriptengine/script_audio.cpp b/src/scriptengine/script_audio.cpp
new file mode 100644
index 000000000..4d712aceb
--- /dev/null
+++ b/src/scriptengine/script_audio.cpp
@@ -0,0 +1,55 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "script_audio.hpp"
+#include "audio/sfx_manager.hpp"
+
+#include <angelscript.h>
+#include <assert.h>
+
+/** \cond DOXYGEN_IGNORE */
+namespace Scripting
+{
+    /** \endcond */
+
+    namespace Audio
+    {
+        /** \addtogroup Scripting
+        * @{
+        */
+        /** \addtogroup Audio
+        * @{
+        */
+        void playSound(const std::string* sound_name)
+        {
+            SFXManager::get()->quickSound(*sound_name);
+        }
+        /** @}*/
+        /** @}*/
+
+        void registerScriptFunctions(asIScriptEngine *engine)
+        {
+            int r; // of type asERetCodes
+            engine->SetDefaultNamespace("Audio");
+            r = engine->RegisterGlobalFunction("void playSound(const string &in)", asFUNCTION(playSound), asCALL_CDECL); assert(r >= 0);
+        }
+    }
+
+/** \cond DOXYGEN_IGNORE */
+}
+/** \endcond */
diff --git a/src/scriptengine/script_audio.hpp b/src/scriptengine/script_audio.hpp
new file mode 100644
index 000000000..139988e08
--- /dev/null
+++ b/src/scriptengine/script_audio.hpp
@@ -0,0 +1,33 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2014-2015  SuperTuxKart Team
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SCRIPT_AUDIO_HPP
+#define HEADER_SCRIPT_AUDIO_HPP
+
+#include <angelscript.h>
+
+#include <string>
+
+namespace Scripting
+{
+    namespace Audio
+    {
+        void registerScriptFunctions(asIScriptEngine *engine);
+    }
+}
+#endif
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 1e94e64c3..77fc84ceb 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -21,6 +21,7 @@
 #include "io/file_manager.hpp"
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
+#include "scriptengine/script_audio.hpp"
 #include "scriptengine/script_challenges.hpp"
 #include "scriptengine/script_kart.hpp"
 #include "scriptengine/script_engine.hpp"
@@ -336,7 +337,8 @@ namespace Scripting
         Scripting::Utils::registerScriptFunctions(m_engine);
         Scripting::GUI::registerScriptFunctions(m_engine);
         Scripting::GUI::registerScriptEnums(m_engine);
-    
+        Scripting::Audio::registerScriptFunctions(m_engine);
+
         // It is possible to register the functions, properties, and types in 
         // configuration groups as well. When compiling the scripts it can then
         // be defined which configuration groups should be available for that

From 9119f5f29182b1f4d1573ad778c8ef64068e53c6 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 21 Jun 2015 18:43:31 -0400
Subject: [PATCH 301/331] Fixes for scripting documentation

---
 src/scriptengine/script_audio.cpp      | 6 +++++-
 src/scriptengine/script_challenges.cpp | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/scriptengine/script_audio.cpp b/src/scriptengine/script_audio.cpp
index 4d712aceb..673ef8ab0 100644
--- a/src/scriptengine/script_audio.cpp
+++ b/src/scriptengine/script_audio.cpp
@@ -32,13 +32,17 @@ namespace Scripting
         /** \addtogroup Scripting
         * @{
         */
-        /** \addtogroup Audio
+        /** \addtogroup Scripting_Audio Audio
         * @{
         */
+
+        /** Plays a sound by name */
+
         void playSound(const std::string* sound_name)
         {
             SFXManager::get()->quickSound(*sound_name);
         }
+
         /** @}*/
         /** @}*/
 
diff --git a/src/scriptengine/script_challenges.cpp b/src/scriptengine/script_challenges.cpp
index 3c619a318..10d7b0bf1 100644
--- a/src/scriptengine/script_challenges.cpp
+++ b/src/scriptengine/script_challenges.cpp
@@ -44,12 +44,14 @@ namespace Scripting
         * @{
         */
 
+        /** Get number of challenges that were completed at any difficulty */
         int getCompletedChallengesCount()
         {
             ::Track* track = World::getWorld()->getTrack();
             return track->getNumOfCompletedChallenges();
         }
 
+        /** Get total number of challenges */
         int getChallengeCount()
         {
             ::Track* track = World::getWorld()->getTrack();
@@ -69,8 +71,9 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("int getChallengeCount()", asFUNCTION(getChallengeCount), asCALL_CDECL); assert(r >= 0);
         }
 
-/** \cond DOXYGEN_IGNORE */
     }
+
+    /** \cond DOXYGEN_IGNORE */
 }
 /** \endcond */
 

From b73469caf1a2e48bc25bfcb0bc5001fb6239b98c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 21 Jun 2015 19:44:22 -0400
Subject: [PATCH 302/331] Extend scripting API with random and timeout
 functions

---
 src/modes/world.cpp                |  1 +
 src/scriptengine/script_engine.cpp | 23 +++++++++++++++++++++++
 src/scriptengine/script_engine.hpp | 17 +++++++++++++++++
 src/scriptengine/script_utils.cpp  | 23 +++++++++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/src/modes/world.cpp b/src/modes/world.cpp
index 5310bdf80..8c88faced 100644
--- a/src/modes/world.cpp
+++ b/src/modes/world.cpp
@@ -933,6 +933,7 @@ void World::update(float dt)
     if(ReplayPlay::get()) ReplayPlay::get()->update(dt);
     if(history->replayHistory()) dt=history->getNextDelta();
     WorldStatus::update(dt);
+    if (m_script_engine) m_script_engine->update(dt);
     PROFILER_POP_CPU_MARKER();
 
     if (!history->dontDoPhysics())
diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index 77fc84ceb..a520c667e 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -407,4 +407,27 @@ namespace Scripting
 
         return true;
     }
+
+    //-----------------------------------------------------------------------------
+
+    void ScriptEngine::addPendingTimeout(double time, const std::string& callback_name)
+    {
+        m_pending_timeouts.push_back(PendingTimeout(time, callback_name));
+    }
+
+    //-----------------------------------------------------------------------------
+
+    void ScriptEngine::update(double dt)
+    {
+        for (int i = m_pending_timeouts.size() - 1; i >= 0; i--)
+        {
+            PendingTimeout& curr = m_pending_timeouts[i];
+            curr.m_time -= dt;
+            if (curr.m_time <= 0.0)
+            {
+                runFunction("void " + curr.m_callback_name + "()");
+                m_pending_timeouts.erase(m_pending_timeouts.begin() + i);
+            }
+        }
+    }
 }
diff --git a/src/scriptengine/script_engine.hpp b/src/scriptengine/script_engine.hpp
index 1d6aa956d..ab0bd8fd1 100644
--- a/src/scriptengine/script_engine.hpp
+++ b/src/scriptengine/script_engine.hpp
@@ -27,6 +27,19 @@ class TrackObjectPresentation;
 
 namespace Scripting
 {
+    /** Represents a scripting function to execute after a given time */
+    struct PendingTimeout
+    {
+        double m_time;
+        std::string m_callback_name;
+
+        PendingTimeout(double time, const std::string& callback_name)
+        {
+            m_time = time;
+            m_callback_name = callback_name;
+        }
+    };
+
     class ScriptEngine
     {
     public:
@@ -46,9 +59,13 @@ namespace Scripting
         bool loadScript(std::string script_path, bool clear_previous);
         bool compileLoadedScripts();
 
+        void addPendingTimeout(double time, const std::string& callback_name);
+        void update(double dt);
+
     private:
         asIScriptEngine *m_engine;
         std::map<std::string, asIScriptFunction*> m_functions_cache;
+        std::vector<PendingTimeout> m_pending_timeouts;
 
         void configureEngine(asIScriptEngine *engine);
     };   // class ScriptEngine
diff --git a/src/scriptengine/script_utils.cpp b/src/scriptengine/script_utils.cpp
index 5ab527efa..dc925b0f6 100644
--- a/src/scriptengine/script_utils.cpp
+++ b/src/scriptengine/script_utils.cpp
@@ -108,6 +108,25 @@ namespace Scripting
             script_engine->runFunction(*str);
         }
 
+        /** Generate a random integer value */
+        int randomInt(int min, int maxExclusive)
+        {
+            return min + (rand() % (maxExclusive - min));
+        }
+
+        /** Generate a random floating-point value */
+        float randomFloat(int min, int maxExclusive)
+        {
+            int val = min * 100 + (rand() % ((maxExclusive - min) * 100));
+            return val / 100.0f;
+        }
+
+        /** Call a function after the specified delay */
+        void setTimeout(const std::string* callback_name, float delay)
+        {
+            World::getWorld()->getScriptEngine()->addPendingTimeout(delay, *callback_name);
+        }
+
         /** Log to the console */
         void logInfo(std::string* log)
         {
@@ -163,6 +182,10 @@ namespace Scripting
             
             r = engine->RegisterGlobalFunction("void runScript(string &in)", asFUNCTION(runScript), asCALL_CDECL); assert(r >= 0);
 
+            r = engine->RegisterGlobalFunction("int randomInt(int, int)", asFUNCTION(randomInt), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("float randomFloat(int, int)", asFUNCTION(randomFloat), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("void setTimeout(const string &in, float)", asFUNCTION(setTimeout), asCALL_CDECL); assert(r >= 0);
+
             r = engine->RegisterGlobalFunction("void logInfo(const string &in)", asFUNCTION(logInfo), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void logWarning(const string &in)", asFUNCTION(logWarning), asCALL_CDECL); assert(r >= 0);
             r = engine->RegisterGlobalFunction("void logError(const string &in)", asFUNCTION(logError), asCALL_CDECL); assert(r >= 0);

From ae18901bb26fe7933829d933de4110b8485f20dd Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 21 Jun 2015 19:57:06 -0400
Subject: [PATCH 303/331] Try fixing travis build

---
 src/tracks/track_object.cpp | 2 ++
 src/tracks/track_object.hpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 92e5985db..6d2674d7f 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -72,6 +72,7 @@ TrackObject::TrackObject(const core::vector3df& xyz, const core::vector3df& hpr,
     m_is_driveable    = false;
     m_soccer_ball     = false;
     m_garage          = false;
+    m_initially_visible = false;
     m_distance        = 0;
     m_type            = "";
 
@@ -100,6 +101,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
     m_init_hpr   = core::vector3df(0,0,0);
     m_init_scale = core::vector3df(1,1,1);
     m_enabled    = true;
+    m_initially_visible = false;
     m_presentation = NULL;
     m_animator = NULL;
     m_parent_library = parent_library;
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index a463e01c2..1d6ba88c1 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -94,7 +94,7 @@ protected:
     
     std::vector<TrackObject*>      m_movable_children;
 
-    bool                           m_initially_visible = true;
+    bool                           m_initially_visible;
 
     void init(const XMLNode &xml_node, scene::ISceneNode* parent,
         ModelDefinitionLoader& model_def_loader,

From 0fdc7a2d98b6226ab962f5d0cca6a13fe4ac116d Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 22 Jun 2015 19:26:20 -0400
Subject: [PATCH 304/331] Use plural form for resolution change message, fixes
 #2219. ALso fix crash in tinygettext code handling plural forms

---
 src/states_screens/dialogs/confirm_resolution_dialog.cpp | 6 ++++--
 src/tinygettext/dictionary.cpp                           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.cpp b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
index a418b577e..2acdc4031 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.cpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
@@ -78,8 +78,10 @@ bool ConfirmResolutionDialog::onEscapePressed()
 void ConfirmResolutionDialog::updateMessage()
 {
     //I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-    stringw msg = _("Confirm resolution within %i seconds", (int)m_remaining_time);
-    //Log::info("ConfirmResolutionDialog", "stringc(msg.c_str()).c_str());
+
+    stringw msg = _P("Confirm resolution within %i second",
+        "Confirm resolution within %i seconds",
+        (int)m_remaining_time);
 
     LabelWidget* countdown_message = getWidget<LabelWidget>("title");
     countdown_message->setText( msg.c_str(), false );
diff --git a/src/tinygettext/dictionary.cpp b/src/tinygettext/dictionary.cpp
index e500c4fe2..9e6f8cbca 100644
--- a/src/tinygettext/dictionary.cpp
+++ b/src/tinygettext/dictionary.cpp
@@ -63,10 +63,10 @@ std::string
 Dictionary::translate_plural(const Entries& dict, const std::string& msgid, const std::string& msgid_plural, int count)
 {
   Entries::const_iterator i = dict.find(msgid);
-  const std::vector<std::string>& msgstrs = i->second;
 
   if (i != dict.end())
   {
+    const std::vector<std::string>& msgstrs = i->second;
     unsigned int n = 0;
     n = plural_forms.get_plural(count);
     assert(/*n >= 0 &&*/ n < msgstrs.size());

From 74f19f0cbc9e89234de4836ee88d81318f7647e0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Mon, 22 Jun 2015 19:36:30 -0400
Subject: [PATCH 305/331] Start working on scripting API to move objects

---
 src/scriptengine/script_track.cpp |  3 ++-
 src/scriptengine/scriptvec3.hpp   |  6 +++---
 src/tracks/track_object.hpp       | 10 ++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index a2c475167..8c748c86d 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -243,7 +243,8 @@ namespace Scripting
             r = engine->RegisterObjectMethod("TrackObject", "Mesh@ getMesh()", asMETHOD(TrackObject, getMesh), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "ParticleEmitter@ getParticleEmitter()", asMETHOD(TrackObject, getParticleEmitter), asCALL_THISCALL); assert(r >= 0);
             r = engine->RegisterObjectMethod("TrackObject", "Animator@ getIPOAnimator()", asMETHOD(TrackObject, getIPOAnimator), asCALL_THISCALL); assert(r >= 0);
-            // TODO: add move method
+            r = engine->RegisterObjectMethod("TrackObject", "void moveTo(const Vec3 &in, bool)", asMETHOD(TrackObject, moveTo), asCALL_THISCALL); assert(r >= 0);
+
 
             // PhysicalObject
             r = engine->RegisterObjectMethod("PhysicalObject", "bool isFlattenKartObject()", asMETHOD(PhysicalObject, isFlattenKartObject), asCALL_THISCALL); assert(r >= 0);
diff --git a/src/scriptengine/scriptvec3.hpp b/src/scriptengine/scriptvec3.hpp
index 5de506dd3..25a8cdbf0 100644
--- a/src/scriptengine/scriptvec3.hpp
+++ b/src/scriptengine/scriptvec3.hpp
@@ -31,9 +31,9 @@ namespace Scripting
         float y;
         float z;
 
-        float getX() { return x; }
-        float getY() { return y; }
-        float getZ() { return z; }
+        float getX() const { return x; }
+        float getY() const { return y; }
+        float getZ() const { return z; }
 
         SimpleVec3() : x(0), y(0), z(0) { }
         SimpleVec3(float p_x, float p_y, float p_z) : x(p_x), y(p_y), z(p_z) { }
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 1d6ba88c1..70e9b8328 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -23,6 +23,7 @@
 
 #include "items/item.hpp"
 #include "physics/physical_object.hpp"
+#include "scriptengine/scriptvec3.hpp"
 #include "tracks/track_object_presentation.hpp"
 #include "utils/cpp2011.hpp"
 #include "utils/no_copy.hpp"
@@ -212,6 +213,15 @@ public:
     PhysicalObject* getPhysics() { return m_physical_object; }
     /** Hide or show the object */
     void setEnabled(bool mode);
+
+    void moveTo(const Scripting::SimpleVec3* pos, bool isAbsoluteCoord)
+    {
+        move(core::vector3df(pos->getX(), pos->getY(), pos->getZ()),
+            core::vector3df(0.0f, 0.0f, 0.0f), // TODO: preserve rotation
+            core::vector3df(1.0f, 1.0f, 1.0f), // TODO: preserve scale
+            true, // updateRigidBody
+            isAbsoluteCoord);
+    }
     /* @} */
     /* @} */
     /* @} */

From 64adbb4238e7cd4aa170d4acbce610ed119287a0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 23 Jun 2015 18:32:38 -0400
Subject: [PATCH 306/331] Remove anchor as weapon from help menu, fixes #2173

---
 data/gui/help2.stkgui | Bin 9388 -> 8682 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/gui/help2.stkgui b/data/gui/help2.stkgui
index 0e27dd413963cdcfcd6de31db87434ec5cfefcd6..c3fb7f71244bbb95ffa6dd2e8926d49eed1aca33 100644
GIT binary patch
delta 12
TcmZ4E`O0}in&f5;nHCNJB_RaW

delta 104
zcmaFmyvB1wnj~i;LmopiLk2_s<XnNT@{TYbLlJ`lgDw!K16ipIi3}wSISiGP4~k1_
nmH<_!0%fv+qD4S)1%^zZE(IV9BAy217cmqwlx${}c+Lp`Vn-Ne


From be81a7fd116cc68a453deff4fc230d1972cb1724 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 23 Jun 2015 18:46:36 -0400
Subject: [PATCH 307/331] Increase size of popup, text was truncated at least
 in french

---
 src/main.cpp                                  | 2 +-
 src/states_screens/dialogs/message_dialog.cpp | 5 +++--
 src/states_screens/dialogs/message_dialog.hpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 19b4937c9..6bcc579f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1228,7 +1228,7 @@ void askForInternetPermission()
         "'User Interface', and edit \"Connect to the "
         "Internet\" and \"Send anonymous HW statistics\")."),
         MessageDialog::MESSAGE_DIALOG_YESNO,
-        new ConfirmServer(), true, true);
+        new ConfirmServer(), true, true, 0.7f, 0.7f);
     GUIEngine::DialogQueue::get()->pushDialog(dialog, false);
 }   // askForInternetPermission
 
diff --git a/src/states_screens/dialogs/message_dialog.cpp b/src/states_screens/dialogs/message_dialog.cpp
index f3fa7a2b3..998788635 100644
--- a/src/states_screens/dialogs/message_dialog.cpp
+++ b/src/states_screens/dialogs/message_dialog.cpp
@@ -40,8 +40,9 @@ using namespace GUIEngine;
 MessageDialog::MessageDialog(const irr::core::stringw &msg,
                              MessageDialogType type,
                              IConfirmDialogListener* listener,
-                             bool own_listener, bool from_queue)
-             : ModalDialog(0.6f, 0.6f)
+                             bool own_listener, bool from_queue,
+                             float width, float height)
+             : ModalDialog(width, height)
 {
     m_msg          = msg;
     m_type         = type;
diff --git a/src/states_screens/dialogs/message_dialog.hpp b/src/states_screens/dialogs/message_dialog.hpp
index 5164d4bee..7f4627124 100644
--- a/src/states_screens/dialogs/message_dialog.hpp
+++ b/src/states_screens/dialogs/message_dialog.hpp
@@ -83,7 +83,7 @@ public:
       */
     MessageDialog(const irr::core::stringw &msg, MessageDialogType type,
                   IConfirmDialogListener* listener, bool delete_listener,
-                  bool from_queue=false);
+                  bool from_queue = false, float width = 0.6f, float height = 0.6f);
     
     /**
       * Variant of MessageDialog where cancelling is not possible (i.e. just shows a message box with OK)

From f992b864e1a2145ad5022110ae57d722d1c35390 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Thu, 25 Jun 2015 19:33:28 -0400
Subject: [PATCH 308/331] More work on moving track objects via scripting

---
 src/tracks/track_object.cpp              | 80 ++++++++++++++++++------
 src/tracks/track_object.hpp              | 19 +++---
 src/tracks/track_object_presentation.cpp | 18 ++++++
 src/tracks/track_object_presentation.hpp |  3 +
 4 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index 6d2674d7f..acac4e6eb 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -261,9 +261,12 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
                                                    this);
         }
 
-        if (is_movable && parent_library != NULL)
+        if (parent_library != NULL)
         {
-            parent_library->addMovableChild(this);
+            if (is_movable)
+                parent_library->addMovableChild(this);
+            else
+                parent_library->addChild(this);
         }
 
         video::SColor glow;
@@ -430,25 +433,32 @@ void TrackObject::move(const core::vector3df& xyz, const core::vector3df& hpr,
 
     if (update_rigid_body && m_physical_object != NULL)
     {
-        // If we set a bullet position from an irrlicht position, we need to
-        // get the absolute transform from the presentation object (as set in
-        // the line before), since xyz etc here are only relative to a
-        // potential parent scene node.
-        TrackObjectPresentationSceneNode *tops =
-            dynamic_cast<TrackObjectPresentationSceneNode*>(m_presentation);
-        if(tops)
-        {
-            const core::matrix4 &m = tops->getNode()
-                                   ->getAbsoluteTransformation();
-            m_physical_object->move(m.getTranslation(),m.getRotationDegrees());
-        }
-        else
-        {
-            m_physical_object->move(xyz, hpr);
-        }
+        movePhysicalBodyToGraphicalNode(xyz, hpr);
     }
 }   // move
 
+// ----------------------------------------------------------------------------
+
+void TrackObject::movePhysicalBodyToGraphicalNode(const core::vector3df& xyz, const core::vector3df& hpr)
+{
+    // If we set a bullet position from an irrlicht position, we need to
+    // get the absolute transform from the presentation object (as set in
+    // the line before), since xyz etc here are only relative to a
+    // potential parent scene node.
+    TrackObjectPresentationSceneNode *tops =
+        dynamic_cast<TrackObjectPresentationSceneNode*>(m_presentation);
+    if (tops)
+    {
+        const core::matrix4 &m = tops->getNode()
+            ->getAbsoluteTransformation();
+        m_physical_object->move(m.getTranslation(), m.getRotationDegrees());
+    }
+    else
+    {
+        m_physical_object->move(xyz, hpr);
+    }
+}
+
 // ----------------------------------------------------------------------------
 const core::vector3df& TrackObject::getPosition() const
 {
@@ -496,3 +506,37 @@ void TrackObject::addMovableChild(TrackObject* child)
         child->setEnabled(false);
     m_movable_children.push_back(child);
 }
+
+// ----------------------------------------------------------------------------
+
+void TrackObject::addChild(TrackObject* child)
+{
+    if (!m_enabled)
+        child->setEnabled(false);
+    m_children.push_back(child);
+}
+
+// ----------------------------------------------------------------------------
+
+// scripting function
+void TrackObject::moveTo(const Scripting::SimpleVec3* pos, bool isAbsoluteCoord)
+{
+    TrackObjectPresentationLibraryNode *libnode =
+        dynamic_cast<TrackObjectPresentationLibraryNode*>(m_presentation);
+    if (libnode != NULL)
+    {
+        libnode->move(core::vector3df(pos->getX(), pos->getY(), pos->getZ()),
+            core::vector3df(0.0f, 0.0f, 0.0f), // TODO: preserve rotation
+            core::vector3df(1.0f, 1.0f, 1.0f), // TODO: preserve scale
+            isAbsoluteCoord,
+            true /* moveChildrenPhysicalBodies */);
+    }
+    else
+    {
+        move(core::vector3df(pos->getX(), pos->getY(), pos->getZ()),
+            core::vector3df(0.0f, 0.0f, 0.0f), // TODO: preserve rotation
+            core::vector3df(1.0f, 1.0f, 1.0f), // TODO: preserve scale
+            true, // updateRigidBody
+            isAbsoluteCoord);
+    }
+}
diff --git a/src/tracks/track_object.hpp b/src/tracks/track_object.hpp
index 70e9b8328..26cd2092d 100644
--- a/src/tracks/track_object.hpp
+++ b/src/tracks/track_object.hpp
@@ -94,6 +94,7 @@ protected:
     TrackObject*                   m_parent_library;
     
     std::vector<TrackObject*>      m_movable_children;
+    std::vector<TrackObject*>      m_children;
 
     bool                           m_initially_visible;
 
@@ -214,14 +215,7 @@ public:
     /** Hide or show the object */
     void setEnabled(bool mode);
 
-    void moveTo(const Scripting::SimpleVec3* pos, bool isAbsoluteCoord)
-    {
-        move(core::vector3df(pos->getX(), pos->getY(), pos->getZ()),
-            core::vector3df(0.0f, 0.0f, 0.0f), // TODO: preserve rotation
-            core::vector3df(1.0f, 1.0f, 1.0f), // TODO: preserve scale
-            true, // updateRigidBody
-            isAbsoluteCoord);
-    }
+    void moveTo(const Scripting::SimpleVec3* pos, bool isAbsoluteCoord);
     /* @} */
     /* @} */
     /* @} */
@@ -241,7 +235,14 @@ public:
       * to still preserve the parent-child relationship
       */
     void addMovableChild(TrackObject* child);
-
+    // ------------------------------------------------------------------------
+    void addChild(TrackObject* child);
+    // ------------------------------------------------------------------------
+    std::vector<TrackObject*>& getMovableChildren() { return m_movable_children; }
+    // ------------------------------------------------------------------------
+    std::vector<TrackObject*>& getChildren() { return m_children; }
+    // ------------------------------------------------------------------------
+    void movePhysicalBodyToGraphicalNode(const core::vector3df& xyz, const core::vector3df& hpr);
     LEAK_CHECK()
 };   // TrackObject
 
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index 8259045c4..f24f6b837 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -254,6 +254,7 @@ TrackObjectPresentationLibraryNode::TrackObjectPresentationLibraryNode(
     assert(libroot != NULL);
     World::getWorld()->getTrack()->loadObjects(libroot, lib_path, model_def_loader,
         create_lod_definitions, m_node, parent);
+    m_parent = parent;
 }   // TrackObjectPresentationLibraryNode
 
 // ----------------------------------------------------------------------------
@@ -261,7 +262,24 @@ TrackObjectPresentationLibraryNode::~TrackObjectPresentationLibraryNode()
 {
     irr_driver->removeNode(m_node);
 }   // TrackObjectPresentationLibraryNode
+// ----------------------------------------------------------------------------
+void TrackObjectPresentationLibraryNode::move(const core::vector3df& xyz, const core::vector3df& hpr,
+    const core::vector3df& scale, bool isAbsoluteCoord, bool moveChildrenPhysicalBodies)
+{
+    TrackObjectPresentationSceneNode::move(xyz, hpr, scale, isAbsoluteCoord);
 
+    if (moveChildrenPhysicalBodies)
+    {
+        for (TrackObject* obj : m_parent->getChildren())
+        {
+            obj->reset();
+            if (obj->getPhysicalObject() != NULL)
+            {
+                obj->movePhysicalBodyToGraphicalNode(obj->getAbsolutePosition(), obj->getRotation());
+            }
+        }
+    }
+}
 // ----------------------------------------------------------------------------
 TrackObjectPresentationLOD::TrackObjectPresentationLOD(const XMLNode& xml_node,
                                        scene::ISceneNode* parent,
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index 8f2e7f80d..ad2a40ca2 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -174,11 +174,14 @@ public:
  */
 class TrackObjectPresentationLibraryNode : public TrackObjectPresentationSceneNode
 {
+    TrackObject* m_parent;
 public:
     TrackObjectPresentationLibraryNode(TrackObject* parent,
         const XMLNode& xml_node,
         ModelDefinitionLoader& model_def_loader);
     virtual ~TrackObjectPresentationLibraryNode();
+    void move(const core::vector3df& xyz, const core::vector3df& hpr,
+        const core::vector3df& scale, bool isAbsoluteCoord, bool moveChildrenPhysicalBodies);
 };   // TrackObjectPresentationLibraryNode
 
 // ============================================================================

From 11a213fa8de0cbd39df8e7b469029c9a6e8fabf8 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 29 Jun 2015 08:09:42 +1000
Subject: [PATCH 309/331] Significantly reduced number of audio sfx commands:
 instead of sending 7 commands for each kart (when only engine is actually
 playing), now there is only one command being sent: positions of sfx that are
 not playing are not sent anymore, a duplication engine position was removed,
 and speed and position are combined into one event.

---
 src/audio/dummy_sfx.hpp   |  6 +++++
 src/audio/sfx_base.hpp    |  6 +++++
 src/audio/sfx_manager.cpp | 32 +++++++++++++++++++----
 src/audio/sfx_manager.hpp | 17 +++++++++++-
 src/audio/sfx_openal.cpp  | 54 +++++++++++++++++++++++++++++++++++++--
 src/audio/sfx_openal.hpp  |  4 +++
 src/graphics/hit_sfx.cpp  |  3 +--
 src/karts/kart.cpp        | 20 ++++++++-------
 8 files changed, 123 insertions(+), 19 deletions(-)

diff --git a/src/audio/dummy_sfx.hpp b/src/audio/dummy_sfx.hpp
index 0b3c4ab46..63f9893e9 100644
--- a/src/audio/dummy_sfx.hpp
+++ b/src/audio/dummy_sfx.hpp
@@ -42,8 +42,14 @@ public:
     virtual void       reallySetLoop(bool status)       {}
     virtual void       setPosition(const Vec3 &p)       {}
     virtual void       reallySetPosition(const Vec3 &p) {}
+    virtual void       setSpeedPosition(float factor,
+                                        const Vec3 &p)  {}
+    virtual void       reallySetSpeedPosition(float f,
+                                         const Vec3 &p) {}
     virtual void       play()                           {}
     virtual void       reallyPlayNow()                  {}
+    virtual void       play(const Vec3 &xyz)            {}
+    virtual void       reallyPlayNow(const Vec3 &xyz)   {}
     virtual void       stop()                           {}
     virtual void       reallyStopNow()                  {}
     virtual void       pause()                          {}
diff --git a/src/audio/sfx_base.hpp b/src/audio/sfx_base.hpp
index c95511bb6..f01479346 100644
--- a/src/audio/sfx_base.hpp
+++ b/src/audio/sfx_base.hpp
@@ -57,10 +57,16 @@ public:
     virtual void       updatePlayingSFX(float dt)           = 0;
     virtual void       setPosition(const Vec3 &p)           = 0;
     virtual void       reallySetPosition(const Vec3 &p)     = 0;
+    virtual void       setSpeedPosition(float factor, 
+                                        const Vec3 &p)      = 0;
+    virtual void       reallySetSpeedPosition(float f, 
+                                              const Vec3 &p)= 0;
     virtual void       setLoop(bool status)                 = 0;
     virtual void       reallySetLoop(bool status)           = 0;
     virtual void       play()                               = 0;
     virtual void       reallyPlayNow()                      = 0;
+    virtual void       play(const Vec3 &xyz)                = 0;
+    virtual void       reallyPlayNow(const Vec3 &xyz)       = 0;
     virtual void       stop()                               = 0;
     virtual void       reallyStopNow()                      = 0;
     virtual void       pause()                              = 0;
diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp
index aebe6ac2c..8d9b69b86 100644
--- a/src/audio/sfx_manager.cpp
+++ b/src/audio/sfx_manager.cpp
@@ -207,6 +207,22 @@ void SFXManager::queue(SFXCommands command, SFXBase *sfx, const Vec3 &p)
    queueCommand(sfx_command);
 }   // queue (Vec3)
 
+//----------------------------------------------------------------------------
+/** Adds a sound effect command with a float and a Vec3 parameter to the queue
+ *  of the sfx manager. Openal commands can sometimes cause a 5ms delay, so it
+ *   is done in a separate thread.
+ *  \param command The command to execute.
+ *  \param sfx The sound effect to be started.
+ *  \param f A float parameter for the command.
+ *  \param p A Vec3 parameter for the command.
+ */
+void SFXManager::queue(SFXCommands command, SFXBase *sfx, float f,
+                       const Vec3 &p)
+{
+    SFXCommand *sfx_command = new SFXCommand(command, sfx, f, p);
+    queueCommand(sfx_command);
+}   // queue(float, Vec3)
+
 //----------------------------------------------------------------------------
 /** Queues a command for the music manager.
  *  \param mi The music for which the command is.
@@ -310,20 +326,26 @@ void* SFXManager::mainLoop(void *obj)
         switch (current->m_command)
         {
         case SFX_PLAY:     current->m_sfx->reallyPlayNow();       break;
+        case SFX_PLAY_POSITION:
+            current->m_sfx->reallyPlayNow(current->m_parameter);  break;
         case SFX_STOP:     current->m_sfx->reallyStopNow();       break;
         case SFX_PAUSE:    current->m_sfx->reallyPauseNow();      break;
         case SFX_RESUME:   current->m_sfx->reallyResumeNow();     break;
         case SFX_SPEED:    current->m_sfx->reallySetSpeed(
-            current->m_parameter.getX());   break;
+                                  current->m_parameter.getX());   break;
         case SFX_POSITION: current->m_sfx->reallySetPosition(
-            current->m_parameter);   break;
+                                         current->m_parameter);   break;
+        case SFX_SPEED_POSITION: current->m_sfx->reallySetSpeedPosition(
+                                         // Extract float from W component
+                                         current->m_parameter.getW(),
+                                         current->m_parameter);   break;
         case SFX_VOLUME:   current->m_sfx->reallySetVolume(
-            current->m_parameter.getX());   break;
+                                  current->m_parameter.getX());   break;
         case SFX_MASTER_VOLUME:
             current->m_sfx->reallySetMasterVolumeNow(
-                current->m_parameter.getX());   break;
+                                  current->m_parameter.getX());   break;
         case SFX_LOOP:     current->m_sfx->reallySetLoop(
-            current->m_parameter.getX() != 0);   break;
+                             current->m_parameter.getX() != 0);   break;
         case SFX_DELETE:     me->deleteSFX(current->m_sfx);       break;
         case SFX_PAUSE_ALL:  me->reallyPauseAllNow();             break;
         case SFX_RESUME_ALL: me->reallyResumeAllNow();            break;
diff --git a/src/audio/sfx_manager.hpp b/src/audio/sfx_manager.hpp
index 31447f546..299d5a31a 100644
--- a/src/audio/sfx_manager.hpp
+++ b/src/audio/sfx_manager.hpp
@@ -64,6 +64,7 @@ public:
     enum SFXCommands
     {
         SFX_PLAY = 1,
+        SFX_PLAY_POSITION,
         SFX_STOP,
         SFX_PAUSE,
         SFX_PAUSE_ALL,
@@ -72,6 +73,7 @@ public:
         SFX_DELETE,
         SFX_SPEED,
         SFX_POSITION,
+        SFX_SPEED_POSITION,
         SFX_VOLUME,
         SFX_MASTER_VOLUME,
         SFX_LOOP,
@@ -163,6 +165,18 @@ private:
             m_sfx       = base;
             m_parameter = parameter;
         }   // SFXCommand(Vec3)
+        // --------------------------------------------------------------------
+        /** Store a float and vec3 parameter. The float is stored as W
+         *  component of the vector. A bit hacky, but this class is used
+         *  very frequently, so should remain as small as possible). */
+        SFXCommand(SFXCommands command, SFXBase *base, float f,
+                   const Vec3 &parameter)
+        {
+            m_command   = command;
+            m_sfx       = base;
+            m_parameter = parameter;
+            m_parameter.setW(f);
+        }   // SFXCommand(Vec3)
     };   // SFXCommand
     // ========================================================================
 
@@ -220,8 +234,9 @@ public:
     void queue(SFXCommands command,  SFXBase *sfx=NULL);
     void queue(SFXCommands command,  SFXBase *sfx, float f);
     void queue(SFXCommands command,  SFXBase *sfx, const Vec3 &p);
+    void queue(SFXCommands command,  SFXBase *sfx, float f, const Vec3 &p);
     void queue(SFXCommands command,  MusicInformation *mi);
-    void queue(SFXCommands command, MusicInformation *mi, float f);
+    void queue(SFXCommands command,  MusicInformation *mi, float f);
     // ------------------------------------------------------------------------
     /** Static function to get the singleton sfx manager. */
     static SFXManager *get()
diff --git a/src/audio/sfx_openal.cpp b/src/audio/sfx_openal.cpp
index 3395b2333..1357a3965 100644
--- a/src/audio/sfx_openal.cpp
+++ b/src/audio/sfx_openal.cpp
@@ -146,7 +146,7 @@ void SFXOpenAL::updatePlayingSFX(float dt)
  */
 void SFXOpenAL::setSpeed(float factor)
 {
-    if(m_status==SFX_UNKNOWN || !SFXManager::get()->sfxAllowed()) return;
+    //if(m_status!=SFX_PLAYING || !SFXManager::get()->sfxAllowed()) return;
     assert(!isnan(factor));
     SFXManager::get()->queue(SFXManager::SFX_SPEED, this, factor);
 }   // setSpeed
@@ -377,13 +377,44 @@ void SFXOpenAL::reallyPlayNow()
     SFXManager::checkError("playing");
 }   // reallyPlayNow
 
+//-----------------------------------------------------------------------------
+/** This actually queues up the sfx in the sfx manager. It will be started
+ *  from a separate thread later (in this frame).
+ */
+void SFXOpenAL::play(const Vec3 &position)
+{
+    if (m_status == SFX_UNKNOWN || !SFXManager::get()->sfxAllowed()) return;
+
+    if(m_status==SFX_STOPPED)
+        m_play_time = 0.0f;
+
+    // Technically the sfx is only playing after the sfx thread starts it,
+    // but it is important to set this here since stk might decide to
+    // delete a sfx if it has finished playing (i.e. is in stopped state)
+    // - which can happen if the sfx thread had no time to actually start
+    // it yet.
+    m_status = SFX_PLAYING;
+    SFXManager::get()->queue(SFXManager::SFX_PLAY_POSITION, this, position);
+}   // play(Vec3)
+
+//-----------------------------------------------------------------------------
+/** Plays this sound effect.
+ */
+void SFXOpenAL::reallyPlayNow(const Vec3 &position)
+{
+    reallySetPosition(position);
+    reallyPlayNow();
+}   // reallyPlayNow(Vec3)
+
 //-----------------------------------------------------------------------------
 /** Sets the position where this sound effects is played.
  *  \param position Position of the sound effect.
  */
 void SFXOpenAL::setPosition(const Vec3 &position)
 {
-    if (m_status == SFX_UNKNOWN || !SFXManager::get()->sfxAllowed()) return;
+    // Don't send a position command to the thread if the sound is not playing
+    // (or sfx disabled or the sound was not initialised correctly)
+//    if (m_status != SFX_PLAYING|| !SFXManager::get()->sfxAllowed()) return;
     SFXManager::get()->queue(SFXManager::SFX_POSITION, this, position);
 
 }   // setPosition
@@ -430,6 +461,25 @@ void SFXOpenAL::reallySetPosition(const Vec3 &position)
     SFXManager::checkError("positioning");
 }   // reallySetPosition
 
+// ----------------------------------------------------------------------------
+/** Shortcut that plays at a specified position. */
+void SFXOpenAL::setSpeedPosition(float factor, const Vec3 &position)
+{
+    if (m_status != SFX_PLAYING || !SFXManager::get()->sfxAllowed()) return;
+
+    SFXManager::get()->queue(SFXManager::SFX_SPEED_POSITION, this,
+                             factor, position);
+}   // play(vec3)
+//-----------------------------------------------------------------------------
+/** Set speed and position of a sound effect.
+ *  \param f Speed.
+ *  \param position Position of the sfx.
+ */
+void SFXOpenAL::reallySetSpeedPosition(float f, const Vec3 &position)
+{
+    reallySetSpeed(f);
+    reallySetPosition(position);
+}   // reallySetSpeedPosition
 //-----------------------------------------------------------------------------
 /** Queues up a delete request for this object. This is necessary to avoid
  *  a crash if the sfx manager thread might be delayed and access this object
diff --git a/src/audio/sfx_openal.hpp b/src/audio/sfx_openal.hpp
index 19d3adabb..10b1c0717 100644
--- a/src/audio/sfx_openal.hpp
+++ b/src/audio/sfx_openal.hpp
@@ -84,6 +84,8 @@ public:
     virtual bool      init();
     virtual void      play();
     virtual void      reallyPlayNow();
+    virtual void      play(const Vec3 &xyz);
+    virtual void      reallyPlayNow(const Vec3 &xyz);
     virtual void      setLoop(bool status);
     virtual void      reallySetLoop(bool status);
     virtual void      stop();
@@ -97,6 +99,8 @@ public:
     virtual void      reallySetSpeed(float factor);
     virtual void      setPosition(const Vec3 &position);
     virtual void      reallySetPosition(const Vec3 &p);
+    virtual void      setSpeedPosition(float factor, const Vec3 &p);
+    virtual void      reallySetSpeedPosition(float f,const Vec3 &p);
     virtual void      setVolume(float volume);
     virtual void      reallySetVolume(float volume);
     virtual void      setMasterVolume(float volume);
diff --git a/src/graphics/hit_sfx.cpp b/src/graphics/hit_sfx.cpp
index 5fe15a6e1..c187b58ae 100644
--- a/src/graphics/hit_sfx.cpp
+++ b/src/graphics/hit_sfx.cpp
@@ -27,14 +27,13 @@ HitSFX::HitSFX(const Vec3& coord, const char* explosion_sound)
              : HitEffect()
 {
     m_sfx = SFXManager::get()->createSoundSource( explosion_sound );
-    m_sfx->setPosition(coord);
 
     // in multiplayer mode, sounds are NOT positional (because we have
     // multiple listeners) so the sounds of all AIs are constantly heard.
     // Therefore reduce volume of sounds.
     float vol = race_manager->getNumLocalPlayers() > 1 ? 0.5f : 1.0f;
     m_sfx->setVolume(vol);
-    m_sfx->play();
+    m_sfx->play(coord);
 }   // HitSFX
 
 //-----------------------------------------------------------------------------
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 7ec9b2645..4b8bb9a19 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1218,7 +1218,6 @@ void Kart::update(float dt)
      */
 
     m_beep_sound->setPosition   ( getXYZ() );
-    m_engine_sound->setPosition ( getXYZ() );
     m_crash_sound->setPosition  ( getXYZ() );
     m_skid_sound->setPosition   ( getXYZ() );
     m_boing_sound->setPosition  ( getXYZ() );
@@ -1961,12 +1960,14 @@ void Kart::playCrashSFX(const Material* m, AbstractKart *k)
             if (isShielded() || (k != NULL && k->isShielded()))
             {
                 if (m_boing_sound->getStatus() != SFXBase::SFX_PLAYING)
-                    m_boing_sound->play();
+                    m_boing_sound->play(getXYZ());
             }
             else
             {
-                if(m_crash_sound->getStatus() != SFXBase::SFX_PLAYING)
-                    m_crash_sound->play();
+                if (m_crash_sound->getStatus() != SFXBase::SFX_PLAYING)
+                {
+                    m_crash_sound->play(getXYZ());
+                }
             }
         }    // if lin_vel > 0.555
     }   // if m_bounce_back_time <= 0
@@ -1979,7 +1980,9 @@ void Kart::beep()
 {
     // If the custom horn can't play (isn't defined) then play the default one
     if (!playCustomSFX(SFXManager::CUSTOM_HORN))
-        m_beep_sound->play();
+    {
+        m_beep_sound->play(getXYZ());
+    }
 
 } // beep
 
@@ -2085,7 +2088,7 @@ void Kart::updatePhysics(float dt)
         m_skidding->getGraphicalJumpOffset()==0)
     {
         if(m_skid_sound->getStatus()!=SFXBase::SFX_PLAYING && !isWheeless())
-            m_skid_sound->play();
+            m_skid_sound->play(getXYZ());
     }
     else if(m_skid_sound->getStatus()==SFXBase::SFX_PLAYING)
     {
@@ -2192,15 +2195,14 @@ void Kart::updateEngineSFX()
 
         float gears = 3.0f * fmod(f, 0.333334f);
         assert(!isnan(f));
-        m_engine_sound->setSpeed(0.6f + (f + gears) * 0.35f);
+        m_engine_sound->setSpeedPosition(0.6f + (f + gears) * 0.35f, getXYZ());
     }
     else
     {
         // When flying, fixed value but not too high pitch
         // This gives some variation (vs previous "on wheels" one)
-        m_engine_sound->setSpeed(0.9f);
+        m_engine_sound->setSpeedPosition(0.9f, getXYZ());
     }
-    m_engine_sound->setPosition(getXYZ());
 }   // updateEngineSFX
 
 //-----------------------------------------------------------------------------

From 0dc2e66039962298dadb4bf3699199f74cd4fc47 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 29 Jun 2015 08:24:31 +1000
Subject: [PATCH 310/331] Fixed compiler warnings.

---
 src/tracks/track_object.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracks/track_object.cpp b/src/tracks/track_object.cpp
index acac4e6eb..01a29017e 100644
--- a/src/tracks/track_object.cpp
+++ b/src/tracks/track_object.cpp
@@ -350,7 +350,7 @@ void TrackObject::setEnabled(bool enabled)
         }
     }
 
-    for (int i = 0; i < m_movable_children.size(); i++)
+    for (unsigned int i = 0; i < m_movable_children.size(); i++)
     {
         m_movable_children[i]->setEnabled(enabled);
     }
@@ -376,7 +376,7 @@ void TrackObject::resetEnabled()
         }
     }
 
-    for (int i = 0; i < m_movable_children.size(); i++)
+    for (unsigned int i = 0; i < m_movable_children.size(); i++)
     {
         m_movable_children[i]->resetEnabled();
     }

From a9958a60a8db52bd7494a50754ce738ea3a9ee3d Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 29 Jun 2015 08:41:20 +1000
Subject: [PATCH 311/331] Minor cosmetical changes.

---
 src/graphics/mesh_tools.cpp | 57 +++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/graphics/mesh_tools.cpp b/src/graphics/mesh_tools.cpp
index 3addc0e32..c1df6f588 100644
--- a/src/graphics/mesh_tools.cpp
+++ b/src/graphics/mesh_tools.cpp
@@ -148,7 +148,7 @@ static inline core::vector3df getAngleWeight(const core::vector3df& v1,
 
 // Copied from irrlicht
 template <typename T>
-void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, bool smooth, bool angleWeighted)
+void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculate_normals, bool smooth, bool angle_weighted)
 {
     if (!buffer || (buffer->getVertexType() != video::EVT_TANGENTS))
         return;
@@ -166,7 +166,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
 
         for (i = 0; i != vtxCnt; ++i)
         {
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[i].Normal.set(0.f, 0.f, 0.f);
             v[i].Tangent.set(0.f, 0.f, 0.f);
             v[i].Binormal.set(0.f, 0.f, 0.f);
@@ -188,7 +188,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
 
             //Angle-weighted normals look better, but are slightly more CPU intensive to calculate
             core::vector3df weight(1.f, 1.f, 1.f);
-            if (angleWeighted)
+            if (angle_weighted)
                 weight = getAngleWeight(v[i + 0].Pos, v[i + 1].Pos, v[i + 2].Pos);
             core::vector3df localNormal;
             core::vector3df localTangent;
@@ -205,7 +205,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 1]].TCoords,
                 v[idx[i + 2]].TCoords);
 
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 0]].Normal += localNormal * weight.X;
             v[idx[i + 0]].Tangent += localTangent * weight.X;
             v[idx[i + 0]].Binormal += localBinormal * weight.X;
@@ -221,7 +221,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 2]].TCoords,
                 v[idx[i + 0]].TCoords);
 
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 1]].Normal += localNormal * weight.Y;
             v[idx[i + 1]].Tangent += localTangent * weight.Y;
             v[idx[i + 1]].Binormal += localBinormal * weight.Y;
@@ -237,14 +237,14 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 0]].TCoords,
                 v[idx[i + 1]].TCoords);
 
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 2]].Normal += localNormal * weight.Z;
             v[idx[i + 2]].Tangent += localTangent * weight.Z;
             v[idx[i + 2]].Binormal += localBinormal * weight.Z;
         }
 
         // Normalize the tangents and binormals
-        if (recalculateNormals)
+        if (recalculate_normals)
         {
             for (i = 0; i != vtxCnt; ++i)
                 v[i].Normal.normalize();
@@ -270,7 +270,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 0]].TCoords,
                 v[idx[i + 1]].TCoords,
                 v[idx[i + 2]].TCoords);
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 0]].Normal = localNormal;
 
             calculateTangents(
@@ -283,7 +283,7 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 1]].TCoords,
                 v[idx[i + 2]].TCoords,
                 v[idx[i + 0]].TCoords);
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 1]].Normal = localNormal;
 
             calculateTangents(
@@ -296,34 +296,34 @@ void recalculateTangentsT(scene::IMeshBuffer* buffer, bool recalculateNormals, b
                 v[idx[i + 2]].TCoords,
                 v[idx[i + 0]].TCoords,
                 v[idx[i + 1]].TCoords);
-            if (recalculateNormals)
+            if (recalculate_normals)
                 v[idx[i + 2]].Normal = localNormal;
         }
     }
 }
 
 // Copied from irrlicht
-void recalculateTangents(scene::IMeshBuffer* buffer, bool recalculateNormals, bool smooth, bool angleWeighted)
+void recalculateTangents(scene::IMeshBuffer* buffer, bool recalculate_normals, bool smooth, bool angle_weighted)
 {
     if (buffer && (buffer->getVertexType() == video::EVT_TANGENTS))
     {
         if (buffer->getIndexType() == video::EIT_16BIT)
-            recalculateTangentsT<u16>(buffer, recalculateNormals, smooth, angleWeighted);
+            recalculateTangentsT<u16>(buffer, recalculate_normals, smooth, angle_weighted);
         else
-            recalculateTangentsT<u32>(buffer, recalculateNormals, smooth, angleWeighted);
+            recalculateTangentsT<u32>(buffer, recalculate_normals, smooth, angle_weighted);
     }
 }
 
 // Copied from irrlicht
-void recalculateTangents(scene::IMesh* mesh, bool recalculateNormals, bool smooth, bool angleWeighted)
+void recalculateTangents(scene::IMesh* mesh, bool recalculate_normals, bool smooth, bool angle_weighted)
 {
     if (!mesh)
         return;
 
-    const u32 meshBufferCount = mesh->getMeshBufferCount();
-    for (u32 b = 0; b<meshBufferCount; ++b)
+    const u32 mesh_buffer_count = mesh->getMeshBufferCount();
+    for (u32 b = 0; b<mesh_buffer_count; ++b)
     {
-        recalculateTangents(mesh->getMeshBuffer(b), recalculateNormals, smooth, angleWeighted);
+        recalculateTangents(mesh->getMeshBuffer(b), recalculate_normals, smooth, angle_weighted);
     }
 }
 
@@ -336,8 +336,11 @@ bool MeshTools::isNormalMap(scene::IMeshBuffer* mb)
 }
 
 // Copied from irrlicht
-scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh, bool(*predicate)(scene::IMeshBuffer*),
-    bool recalculateNormals, bool smooth, bool angleWeighted, bool calculateTangents)
+scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh,
+                                                bool(*predicate)(scene::IMeshBuffer*),
+                                                bool recalculate_normals, bool smooth,
+                                                bool angle_weighted,
+                                                bool calculate_tangents)
 {
     if (!mesh)
         return 0;
@@ -345,25 +348,25 @@ scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh, bool(*predic
     // copy mesh and fill data into SMeshBufferTangents
 
     scene::SMesh* clone = new scene::SMesh();
-    const u32 meshBufferCount = mesh->getMeshBufferCount();
+    const u32 mesh_buffer_count = mesh->getMeshBufferCount();
 
-    bool needsNormalMap = false;
-    for (u32 b = 0; b < meshBufferCount; ++b)
+    bool needs_normal_map = false;
+    for (u32 b = 0; b < mesh_buffer_count; ++b)
     {
         scene::IMeshBuffer* original = mesh->getMeshBuffer(b);
         if (predicate(original))
         {
-            needsNormalMap = true;
+            needs_normal_map = true;
             break;
         }
     }
 
-    if (!needsNormalMap)
+    if (!needs_normal_map)
     {
         return mesh;
     }
 
-    for (u32 b = 0; b<meshBufferCount; ++b)
+    for (u32 b = 0; b<mesh_buffer_count; ++b)
     {
         scene::IMeshBuffer* original = mesh->getMeshBuffer(b);
         const u32 idxCnt = original->getIndexCount();
@@ -439,8 +442,8 @@ scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh, bool(*predic
     }
 
     clone->recalculateBoundingBox();
-    if (calculateTangents)
-        recalculateTangents(clone, recalculateNormals, smooth, angleWeighted);
+    if (calculate_tangents)
+        recalculateTangents(clone, recalculate_normals, smooth, angle_weighted);
     
     int mbcount = clone->getMeshBufferCount();
     for (int i = 0; i < mbcount; i++)

From 08529e167fc6001cd2d4c47b1ddc872667a26269 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 29 Jun 2015 08:41:46 +1000
Subject: [PATCH 312/331] Fixed memory leak.

---
 src/graphics/mesh_tools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/mesh_tools.cpp b/src/graphics/mesh_tools.cpp
index c1df6f588..f9698acc6 100644
--- a/src/graphics/mesh_tools.cpp
+++ b/src/graphics/mesh_tools.cpp
@@ -347,7 +347,6 @@ scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh,
 
     // copy mesh and fill data into SMeshBufferTangents
 
-    scene::SMesh* clone = new scene::SMesh();
     const u32 mesh_buffer_count = mesh->getMeshBufferCount();
 
     bool needs_normal_map = false;
@@ -365,6 +364,7 @@ scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh,
     {
         return mesh;
     }
+    scene::SMesh* clone = new scene::SMesh();
 
     for (u32 b = 0; b<mesh_buffer_count; ++b)
     {

From 68eb4eb3598f81ffcc7062cefd183db1261244a0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 28 Jun 2015 19:00:25 -0400
Subject: [PATCH 313/331] Start work to control particle emitters from scripts,
 and allow getting kart velocity from script

---
 src/scriptengine/script_kart.cpp         | 11 ++++++++++-
 src/tracks/track_object_presentation.cpp |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/scriptengine/script_kart.cpp b/src/scriptengine/script_kart.cpp
index 9e827c65a..f16462c12 100644
--- a/src/scriptengine/script_kart.cpp
+++ b/src/scriptengine/script_kart.cpp
@@ -100,7 +100,7 @@ namespace Scripting
         }
 
         /** Sets the kart's velocity to the specified value. */
-        void setVelocity(int idKart, Vec3* position)
+        void setVelocity(int idKart, SimpleVec3* position)
         {
             float x = position->getX();
             float y = position->getY();
@@ -110,6 +110,14 @@ namespace Scripting
             kart->setVelocity(btVector3(x, y, z));
         }
 
+        /** Gets the kart's velocity */
+        SimpleVec3 getVelocity(int idKart)
+        {
+            AbstractKart* kart = World::getWorld()->getKart(idKart);
+            btVector3 velocity = kart->getVelocity();
+            return SimpleVec3(velocity.getX(), velocity.getY(), velocity.getZ());
+        }
+
         /** @}*/
         /** @}*/
 
@@ -122,6 +130,7 @@ namespace Scripting
             r = engine->RegisterGlobalFunction("void setVelocity(int id, const Vec3 &in)", asFUNCTION(setVelocity), asCALL_CDECL); assert(r >= 0);
             //r = engine->RegisterGlobalFunction("void jumpTo(int id, float x, float y)", asFUNCTION(jumpTo), asCALL_GENERIC); assert(r >= 0);
             r = engine->RegisterGlobalFunction("Vec3 getLocation(int id)", asFUNCTION(getLocation), asCALL_CDECL); assert(r >= 0);
+            r = engine->RegisterGlobalFunction("Vec3 getVelocity(int id)", asFUNCTION(getVelocity), asCALL_CDECL); assert(r >= 0);
         }
 
         void registerScriptEnums(asIScriptEngine *engine)
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index f24f6b837..cf6dd3547 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -784,6 +784,9 @@ TrackObjectPresentationParticles::TrackObjectPresentationParticles(
     xml_node.get("clip_distance", &clip_distance);
     xml_node.get("conditions",    &m_trigger_condition);
 
+    bool auto_emit = true;
+    xml_node.get("auto_emit", &auto_emit);
+
     try
     {
         ParticleKind* kind = ParticleKindManager::get()->getParticles(path);
@@ -810,7 +813,7 @@ TrackObjectPresentationParticles::TrackObjectPresentationParticles(
             m_emitter = emitter;
         }
 
-        if (m_trigger_condition.size() > 0)
+        if (m_trigger_condition.size() > 0 || !auto_emit)
         {
             m_emitter->setCreationRateAbsolute(0.0f);
         }

From eda00e12f95a7980359a140dd2049c2982526ca0 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 28 Jun 2015 19:03:09 -0400
Subject: [PATCH 314/331] Expose length method in scripting vector3

---
 src/scriptengine/scriptvec3.cpp | 2 ++
 src/scriptengine/scriptvec3.hpp | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/scriptengine/scriptvec3.cpp b/src/scriptengine/scriptvec3.cpp
index 29e4d1818..b2eab94eb 100644
--- a/src/scriptengine/scriptvec3.cpp
+++ b/src/scriptengine/scriptvec3.cpp
@@ -57,6 +57,7 @@ namespace Scripting
     float getX(SimpleVec3* v) { return v->getX(); }
     float getY(SimpleVec3* v) { return v->getY(); }
     float getZ(SimpleVec3* v) { return v->getZ(); }
+    float getLength(SimpleVec3* v) { return v->getLength(); }
 
     void RegisterVec3(asIScriptEngine *engine)
     {
@@ -71,5 +72,6 @@ namespace Scripting
         r = engine->RegisterObjectMethod("Vec3", "float getX()", asFUNCTION(getX), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectMethod("Vec3", "float getY()", asFUNCTION(getY), asCALL_CDECL_OBJLAST); assert(r >= 0);
         r = engine->RegisterObjectMethod("Vec3", "float getZ()", asFUNCTION(getZ), asCALL_CDECL_OBJLAST); assert(r >= 0);
+        r = engine->RegisterObjectMethod("Vec3", "float getLength()", asFUNCTION(getLength), asCALL_CDECL_OBJLAST); assert(r >= 0);
     }
 }
diff --git a/src/scriptengine/scriptvec3.hpp b/src/scriptengine/scriptvec3.hpp
index 25a8cdbf0..db3f00f83 100644
--- a/src/scriptengine/scriptvec3.hpp
+++ b/src/scriptengine/scriptvec3.hpp
@@ -35,6 +35,11 @@ namespace Scripting
         float getY() const { return y; }
         float getZ() const { return z; }
 
+        float getLength() const
+        {
+            return sqrt(x*x + y*y + z*z);
+        }
+
         SimpleVec3() : x(0), y(0), z(0) { }
         SimpleVec3(float p_x, float p_y, float p_z) : x(p_x), y(p_y), z(p_z) { }
         SimpleVec3(const SimpleVec3& other) : x(other.x), y(other.y), z(other.z) { }

From 1ceb05c2cb1afceeaf7f5e2e2ddaf89b3c97f862 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 28 Jun 2015 19:10:43 -0400
Subject: [PATCH 315/331] More scripting functions to control particles

---
 src/scriptengine/script_track.cpp        |  8 +++++++-
 src/tracks/track_object_presentation.cpp | 19 +++++++++++++++++++
 src/tracks/track_object_presentation.hpp |  3 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/scriptengine/script_track.cpp b/src/scriptengine/script_track.cpp
index 8c748c86d..055389275 100644
--- a/src/scriptengine/script_track.cpp
+++ b/src/scriptengine/script_track.cpp
@@ -195,13 +195,18 @@ namespace Scripting
             * @{
             */
 
-            // TODO: adjust all signatures to type "void*" parameters if possible
             /** Stop particle emission */
             void stop(/** \cond DOXYGEN_IGNORE */ void *memory /** \endcond */)
             {
                 ((TrackObjectPresentationParticles*)memory)->stop();
             }
 
+            /** Stop particle emission */
+            void stopIn(float delay, /** \cond DOXYGEN_IGNORE */ void *memory /** \endcond */)
+            {
+                ((TrackObjectPresentationParticles*)memory)->stopIn(delay);
+            }
+
             /** Play the specified sound once */
             void setEmissionRate(float rate /** \cond DOXYGEN_IGNORE */, void *memory /** \endcond */)
             {
@@ -259,6 +264,7 @@ namespace Scripting
 
             // Particle Emitter
             r = engine->RegisterObjectMethod("ParticleEmitter", "void stop()", asFUNCTION(ParticleEmitter::stop), asCALL_CDECL_OBJLAST); assert(r >= 0);
+            r = engine->RegisterObjectMethod("ParticleEmitter", "void stopIn(float)", asFUNCTION(ParticleEmitter::stopIn), asCALL_CDECL_OBJLAST); assert(r >= 0);
             r = engine->RegisterObjectMethod("ParticleEmitter", "void setEmissionRate(float)", asFUNCTION(ParticleEmitter::setEmissionRate), asCALL_CDECL_OBJLAST); assert(r >= 0);
 
             // Sound Effect
diff --git a/src/tracks/track_object_presentation.cpp b/src/tracks/track_object_presentation.cpp
index cf6dd3547..0f0871ddf 100644
--- a/src/tracks/track_object_presentation.cpp
+++ b/src/tracks/track_object_presentation.cpp
@@ -787,6 +787,9 @@ TrackObjectPresentationParticles::TrackObjectPresentationParticles(
     bool auto_emit = true;
     xml_node.get("auto_emit", &auto_emit);
 
+    m_delayed_stop = false;
+    m_delayed_stop_time = 0.0;
+
     try
     {
         ParticleKind* kind = ParticleKindManager::get()->getParticles(path);
@@ -846,6 +849,16 @@ void TrackObjectPresentationParticles::update(float dt)
     {
         m_emitter->update(dt);
     }
+
+    if (m_delayed_stop)
+    {
+        if (m_delayed_stop_time < 0.0f)
+        {
+            m_delayed_stop = false;
+            stop();
+        }
+        m_delayed_stop_time -= dt;
+    }
 }   // update
 
 // ----------------------------------------------------------------------------
@@ -867,6 +880,12 @@ void TrackObjectPresentationParticles::stop()
     }
 }
 // ----------------------------------------------------------------------------
+void TrackObjectPresentationParticles::stopIn(double delay)
+{
+    m_delayed_stop = true;
+    m_delayed_stop_time = delay;
+}
+// ----------------------------------------------------------------------------
 void TrackObjectPresentationParticles::setRate(float rate)
 {
     if (m_emitter != NULL)
diff --git a/src/tracks/track_object_presentation.hpp b/src/tracks/track_object_presentation.hpp
index ad2a40ca2..d6275e96b 100644
--- a/src/tracks/track_object_presentation.hpp
+++ b/src/tracks/track_object_presentation.hpp
@@ -313,6 +313,8 @@ private:
     ParticleEmitter* m_emitter;
     LODNode* m_lod_emitter_node;
     std::string m_trigger_condition;
+    bool m_delayed_stop;
+    double m_delayed_stop_time;
 
 public:
     TrackObjectPresentationParticles(const XMLNode& xml_node,
@@ -322,6 +324,7 @@ public:
     virtual void update(float dt) OVERRIDE;
     void triggerParticles();
     void stop();
+    void stopIn(double delay);
     void setRate(float rate);
     // ------------------------------------------------------------------------
     /** Returns the trigger condition for this object. */

From 1bafdf528f2093d3a840a3f1e2def91089053e25 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Mon, 29 Jun 2015 16:17:14 +1000
Subject: [PATCH 316/331] Fix wheel-view camera.

---
 src/graphics/camera.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 058469486..e7e2c8336 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -67,10 +67,7 @@ Camera::Camera(int camera_index, AbstractKart* kart) : m_kart(NULL)
     setupCamera();
     if (kart != NULL)
     {
-        if(UserConfigParams::m_camera_debug==2)
-            m_distance = kart->getKartModel()->getLength();
-        else
-            m_distance = kart->getKartProperties()->getCameraDistance();
+        m_distance = kart->getKartProperties()->getCameraDistance();
         setKart(kart);
     }
     else
@@ -466,11 +463,13 @@ void Camera::getCameraSettings(float *above_kart, float *cam_angle,
             {
                 *above_kart = 0;
                 *cam_angle  = 0;
+                *distance   = -m_kart->getKartModel()->getLength();
             }
             else
             {
                 *above_kart    = 0.75f;
                 *cam_angle     = kp->getCameraForwardUpAngle();
+                *distance      = -m_distance;
             }
             float steering = m_kart->getSteerPercent()
                            * (1.0f + (m_kart->getSkidding()->getSkidFactor()
@@ -478,7 +477,6 @@ void Camera::getCameraSettings(float *above_kart, float *cam_angle,
             // quadratically to dampen small variations (but keep sign)
             float dampened_steer = fabsf(steering) * steering;
             *sideway             = -m_rotation_range*dampened_steer*0.5f;
-            *distance            = -m_distance;
             *smoothing           = true;
             break;
         }   // CM_FALLING
@@ -723,7 +721,14 @@ void Camera::positionCamera(float dt, float above_kart, float cam_angle,
         btQuaternion q(m_kart->getSkidding()->getVisualSkidRotation(), 0, 0);
         t.setBasis(t.getBasis() * btMatrix3x3(q));
     }
-    wanted_position = t(relative_position);
+    if (UserConfigParams::m_camera_debug == 2)
+    {
+        wanted_position = t(relative_position);
+        // Make sure that the Y position is a the same height as the wheel.
+        wanted_position.setY(wanted_target.getY());
+    }
+    else
+        wanted_position = t(relative_position);
 
     if (smoothing && UserConfigParams::m_camera_debug==0)
     {

From 42114c163cb12ce9f3e40c20c731deee5d05238b Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 30 Jun 2015 16:59:48 +1000
Subject: [PATCH 317/331] Minor refactoring to move more code into KartGFX.

---
 src/karts/kart.cpp     | 23 ++++++----------------
 src/karts/kart_gfx.cpp | 44 ++++++++++++++++++++++++++++++++++++------
 src/karts/kart_gfx.hpp |  3 ++-
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 4b8bb9a19..f110409d6 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2538,36 +2538,25 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
     // Upate particle effects (creation rate, and emitter size
     // depending on speed)
     // --------------------------------------------------------
+    float nitro_frac = 0;
     if ( (m_controls.m_nitro || m_min_nitro_time > 0.0f) &&
          isOnGround() &&  m_collected_energy > 0            )
     {
         // fabs(speed) is important, otherwise the negative number will
         // become a huge unsigned number in the particle scene node!
-        float f = fabsf(getSpeed())/(m_kart_properties->getMaxSpeed() *
-                  m_difficulty->getMaxSpeed());
+        nitro_frac = fabsf(getSpeed())/(m_kart_properties->getMaxSpeed() *
+                                        m_difficulty->getMaxSpeed()       );
         // The speed of the kart can be higher (due to powerups) than
         // the normal maximum speed of the kart.
-        if(f>1.0f) f = 1.0f;
-        m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITRO1, f);
-        m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITRO2, f);
-        m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITROSMOKE1, f);
-        m_kart_gfx->setCreationRateRelative(KartGFX::KGFX_NITROSMOKE2, f);
+        if(nitro_frac>1.0f) nitro_frac = 1.0f;
         m_nitro_light->setVisible(true);
     }
     else
     {
-        m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITRO1, 0);
-        m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITRO2, 0);
-        m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE1, 0);
-        m_kart_gfx->setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE2, 0);
         m_nitro_light->setVisible(false);
     }
-    m_kart_gfx->resizeBox(KartGFX::KGFX_NITRO1, getSpeed(), dt);
-    m_kart_gfx->resizeBox(KartGFX::KGFX_NITRO2, getSpeed(), dt);
-    m_kart_gfx->resizeBox(KartGFX::KGFX_NITROSMOKE1, getSpeed(), dt);
-    m_kart_gfx->resizeBox(KartGFX::KGFX_NITROSMOKE2, getSpeed(), dt);
-
-    m_kart_gfx->resizeBox(KartGFX::KGFX_ZIPPER, getSpeed(), dt);
+    // speed * dt is the new size of the box in which particles start
+    m_kart_gfx->updateNitroGraphics(nitro_frac, getSpeed()*dt);
 
     // Handle leaning of karts
     // -----------------------
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 3cc52a6e1..84347f733 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -243,13 +243,12 @@ void KartGFX::setCreationRateRelative(KartGFXType type, float f)
  *  we want the particles to be emitted in a smooth, continuous flame and not
  *  in blobs.
  *  \param type The particle effect for which to resize the emitting box.
- *  \param speed Current speed of the kart.
- *  \param dt Time step size.
+ *  \param new_size New size of the box, typically speed*dt.
  */
-void KartGFX::resizeBox(KartGFXType type, float speed, float dt)
+void KartGFX::resizeBox(KartGFXType type, float new_size)
 {
     if(m_all_emitters[type])
-        m_all_emitters[type]->resizeBox(std::max(0.25f, speed*dt));
+        m_all_emitters[type]->resizeBox(std::max(0.25f, new_size));
 }   // resizeBox
 
 // ----------------------------------------------------------------------------
@@ -304,11 +303,44 @@ void KartGFX::update(float dt)
 {
     m_wheel_toggle = 1 - m_wheel_toggle;
 
-    for(unsigned int i=0; i<m_all_emitters.size(); i++)
+    for (unsigned int i = 0; i < m_all_emitters.size(); i++)
     {
-        if(m_all_emitters[i])
+        if (m_all_emitters[i])
             m_all_emitters[i]->update(dt);
     }
 
 }  // update
 
+// ----------------------------------------------------------------------------
+/** Updates nitro dependent particle effects (and box sizes).
+ *  \param nitro_frac Nitro fraction/
+ *  \param new_size New size of the box in which new particles are emitted.
+ */
+void KartGFX::updateNitroGraphics(float nitro_frac, float new_size)
+{
+    // Upate particle effects (creation rate, and emitter size
+    // depending on speed)
+    // --------------------------------------------------------
+    if (nitro_frac > 0)
+    {
+        setCreationRateRelative(KartGFX::KGFX_NITRO1, nitro_frac);
+        setCreationRateRelative(KartGFX::KGFX_NITRO2, nitro_frac);
+        setCreationRateRelative(KartGFX::KGFX_NITROSMOKE1, nitro_frac);
+        setCreationRateRelative(KartGFX::KGFX_NITROSMOKE2, nitro_frac);
+    }
+    else
+    {
+        setCreationRateAbsolute(KartGFX::KGFX_NITRO1,      0);
+        setCreationRateAbsolute(KartGFX::KGFX_NITRO2,      0);
+        setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE1, 0);
+        setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE2, 0);
+
+    }
+    resizeBox(KartGFX::KGFX_NITRO1,      new_size);
+    resizeBox(KartGFX::KGFX_NITRO2,      new_size);
+    resizeBox(KartGFX::KGFX_NITROSMOKE1, new_size);
+    resizeBox(KartGFX::KGFX_NITROSMOKE2, new_size);
+    resizeBox(KartGFX::KGFX_ZIPPER,      new_size);
+
+}  // updateGraphics
+
diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp
index 2eda04d45..b17b91129 100644
--- a/src/karts/kart_gfx.hpp
+++ b/src/karts/kart_gfx.hpp
@@ -71,6 +71,7 @@ private:
 
     void addEffect(KartGFXType type, const std::string &file_name,
                    const Vec3 &position, bool important);
+    void resizeBox(const KartGFXType type, float new_size);
 
 public:
          KartGFX(const AbstractKart *kart);
@@ -81,8 +82,8 @@ public:
     void setXYZ(const KartGFXType type, const Vec3 &xyz);
     void setCreationRateAbsolute(const KartGFXType type, float f);
     void setCreationRateRelative(const KartGFXType type, float f);
-    void resizeBox(const KartGFXType type, float speed, float dt);
     void updateTerrain(const ParticleKind *pk);
     void update(float dt);
+    void updateNitroGraphics(float f, float new_size);
 };   // KartWGFX
 #endif

From b41035a008fd9258eff8c1ea54f3763cfe6a46d5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Tue, 30 Jun 2015 21:49:20 +1000
Subject: [PATCH 318/331] Moved nitro_light from Kart into KartGFX.

---
 src/karts/kart.cpp     | 12 ------------
 src/karts/kart.hpp     |  3 ---
 src/karts/kart_gfx.cpp | 15 ++++++++++++++-
 src/karts/kart_gfx.hpp | 10 ++++++++++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index f110409d6..1126acfa3 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -129,7 +129,6 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     m_min_nitro_time       = 0.0f;
     m_fire_clicked         = 0;
     m_wrongway_counter     = 0;
-    m_nitro_light          = NULL;
     m_skidding_light_1     = NULL;
     m_skidding_light_2     = NULL;
     m_type                 = RaceManager::KT_AI;
@@ -2408,12 +2407,6 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
     bool always_animated = (type == RaceManager::KT_PLAYER && race_manager->getNumPlayers() == 1);
     m_node = m_kart_model->attachModel(is_animated_model, always_animated);
 
-    // Create nitro light
-    m_nitro_light = irr_driver->addLight(core::vector3df(0.0f, 0.5f, m_kart_model->getLength()*-0.5f - 0.05f),
-        0.4f /* force */, 5.0f /* radius */, 0.0f, 0.4f, 1.0f, false, m_node);
-    m_nitro_light->setVisible(false);
-    m_nitro_light->setName( ("nitro emitter (" + getIdent() + ")").c_str() );
-
     // Create skidding lights
     // For the first skidding level
     m_skidding_light_1 = irr_driver->addLight(core::vector3df(0.0f, 0.1f, m_kart_model->getLength()*-0.5f - 0.05f),
@@ -2549,11 +2542,6 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
         // The speed of the kart can be higher (due to powerups) than
         // the normal maximum speed of the kart.
         if(nitro_frac>1.0f) nitro_frac = 1.0f;
-        m_nitro_light->setVisible(true);
-    }
-    else
-    {
-        m_nitro_light->setVisible(false);
     }
     // speed * dt is the new size of the box in which particles start
     m_kart_gfx->updateNitroGraphics(nitro_frac, getSpeed()*dt);
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 30a5dcb34..52f883163 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -219,9 +219,6 @@ private:
     /** To prevent using nitro in too short bursts */
     float         m_min_nitro_time;
 
-    /** A light that's shown when the kart uses nitro. */
-    scene::ISceneNode* m_nitro_light;
-
     /** Lights that are shown when the kart is skidding. */
     scene::ISceneNode* m_skidding_light_1;
     /** A light that's shown on the second skid-level with another color. */
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 84347f733..50d149df8 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -20,6 +20,7 @@
 
 #include "config/user_config.hpp"
 #include "io/file_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/particle_emitter.hpp"
 #include "graphics/particle_kind.hpp"
 #include "graphics/particle_kind_manager.hpp"
@@ -44,6 +45,17 @@ KartGFX::KartGFX(const AbstractKart *kart)
 
     m_kart = kart;
 
+    // Create nitro light
+    core::vector3df location(0.0f, 0.5f,
+                             m_kart->getKartModel()->getLength()*-0.5f - 0.05f);
+    m_nitro_light = irr_driver->addLight(location, /*force*/ 0.4f,
+                                         /*radius*/5.0f, 0.0f, 0.4f, 1.0f,
+                                         false, m_kart->getNode());
+    m_nitro_light->setVisible(false);
+#ifdef DEBUG
+    m_nitro_light->setName( ("nitro emitter (" + m_kart->getIdent() + ")").c_str() );
+#endif
+
     Vec3 rear_left(kart->getWheelGraphicsPosition(3).getX(), 0.05f,
                    kart->getWheelGraphicsPosition(3).getZ()-0.1f    );
     Vec3 rear_right(kart->getWheelGraphicsPosition(2).getX(), 0.05f,
@@ -327,6 +339,7 @@ void KartGFX::updateNitroGraphics(float nitro_frac, float new_size)
         setCreationRateRelative(KartGFX::KGFX_NITRO2, nitro_frac);
         setCreationRateRelative(KartGFX::KGFX_NITROSMOKE1, nitro_frac);
         setCreationRateRelative(KartGFX::KGFX_NITROSMOKE2, nitro_frac);
+        m_nitro_light->setVisible(true);
     }
     else
     {
@@ -334,7 +347,7 @@ void KartGFX::updateNitroGraphics(float nitro_frac, float new_size)
         setCreationRateAbsolute(KartGFX::KGFX_NITRO2,      0);
         setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE1, 0);
         setCreationRateAbsolute(KartGFX::KGFX_NITROSMOKE2, 0);
-
+        m_nitro_light->setVisible(false);
     }
     resizeBox(KartGFX::KGFX_NITRO1,      new_size);
     resizeBox(KartGFX::KGFX_NITRO2,      new_size);
diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp
index b17b91129..eddc8f71b 100644
--- a/src/karts/kart_gfx.hpp
+++ b/src/karts/kart_gfx.hpp
@@ -30,6 +30,12 @@ class ParticleEmitter;
 class ParticleKind;
 class Vec3;
 
+namespace irr {
+    namespace scene {
+        class ISceneNode;
+    }
+}
+
 class KartGFX
 {
 public:
@@ -69,6 +75,10 @@ private:
     /** Used to alternate particle effects from the rear wheels. */
     int         m_wheel_toggle;
 
+    /** A light that's shown when the kart uses nitro. */
+    irr::scene::ISceneNode* m_nitro_light;
+
+
     void addEffect(KartGFXType type, const std::string &file_name,
                    const Vec3 &position, bool important);
     void resizeBox(const KartGFXType type, float new_size);

From f82bb996ea94f86ef336d0ad3cb883de1d862f73 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Jul 2015 08:04:10 +1000
Subject: [PATCH 319/331] Fixed memory leaks of lights.

---
 src/karts/kart.cpp     | 2 ++
 src/karts/kart_gfx.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 1126acfa3..f0f5f44ff 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -256,6 +256,8 @@ Kart::~Kart()
     m_goo_sound   ->deleteSFX();
     m_beep_sound  ->deleteSFX();
     m_boing_sound ->deleteSFX();
+    m_skidding_light_1->drop();
+    m_skidding_light_2->drop();
     delete m_kart_gfx;
     if(m_terrain_sound)          m_terrain_sound->deleteSFX();
     if(m_previous_terrain_sound) m_previous_terrain_sound->deleteSFX();
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 50d149df8..44b03fdc6 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -100,7 +100,7 @@ KartGFX::~KartGFX()
         if(m_all_emitters[i])
             delete m_all_emitters[i];
     }   // for i < KGFX_COUNT
-
+    m_nitro_light->drop();
 }   // ~KartGFX
 
 // ----------------------------------------------------------------------------

From 4ec423ff352feadbfa31163d222a7b7c8126fa42 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Jul 2015 08:22:43 +1000
Subject: [PATCH 320/331] Coding style improvements.

---
 src/graphics/irr_driver.cpp | 87 +++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 537f097fc..1e8850f90 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -75,7 +75,8 @@
 #if IRRLICHT_VERSION_MAJOR < 1 || IRRLICHT_VERSION_MINOR < 7 || \
     _IRR_MATERIAL_MAX_TEXTURES_ < 8 || !defined(_IRR_COMPILE_WITH_OPENGL_) || \
     !defined(_IRR_COMPILE_WITH_B3D_LOADER_)
-#error "Building against an incompatible Irrlicht. Distros, please use the included version."
+#error "Building against an incompatible Irrlicht. Distros, \
+please use the included version."
 #endif
 
 using namespace irr;
@@ -120,8 +121,9 @@ IrrDriver::IrrDriver()
     m_rtts                = NULL;
     m_post_processing     = NULL;
     m_wind                = new Wind();
-    m_mipviz = m_wireframe = m_normals = m_ssaoviz = \
-        m_lightviz = m_shadowviz = m_distortviz = m_rsm = m_rh = m_gi = m_boundingboxesviz = false;
+    m_mipviz = m_wireframe = m_normals = m_ssaoviz = false;
+    m_lightviz = m_shadowviz = m_distortviz = m_rsm = m_rh = m_gi = false;
+    m_boundingboxesviz = false;
     SkyboxCubeMap = m_last_light_bucket_distance = 0;
     memset(object_count, 0, sizeof(object_count));
 }   // IrrDriver
@@ -507,7 +509,8 @@ void IrrDriver::initDevice()
         (UserConfigParams::m_shadows_resolution < 512 ||
          UserConfigParams::m_shadows_resolution > 2048))
     {
-        Log::warn("IrrDriver", "Invalid value for UserConfigParams::m_shadows_resolution : %i",
+        Log::warn("IrrDriver", 
+               "Invalid value for UserConfigParams::m_shadows_resolution : %i",
             (int)UserConfigParams::m_shadows_resolution);
         UserConfigParams::m_shadows_resolution = 0;
     }
@@ -542,7 +545,8 @@ void IrrDriver::initDevice()
     }
     else
     {
-        Log::warn("irr_driver", "Using the fixed pipeline (old GPU, or shaders disabled in options)");
+        Log::warn("irr_driver", "Using the fixed pipeline (old GPU, or "
+                                "shaders disabled in options)");
     }
 
     // Only change video driver settings if we are showing graphics
@@ -627,16 +631,21 @@ void IrrDriver::cleanSunInterposer()
 // ----------------------------------------------------------------------------
 void IrrDriver::createSunInterposer()
 {
-    scene::IMesh * sphere = m_scene_manager->getGeometryCreator()->createSphereMesh(1, 16, 16);
+    scene::IMesh * sphere = m_scene_manager->getGeometryCreator()
+                                           ->createSphereMesh(1, 16, 16);
     for (unsigned i = 0; i < sphere->getMeshBufferCount(); ++i)
     {
         scene::IMeshBuffer *mb = sphere->getMeshBuffer(i);
         if (!mb)
             continue;
-        mb->getMaterial().setTexture(0, getUnicolorTexture(video::SColor(255, 255, 255, 255)));
-        mb->getMaterial().setTexture(1, getUnicolorTexture(video::SColor(0, 0, 0, 0)));
+        mb->getMaterial().setTexture(0, 
+                        getUnicolorTexture(video::SColor(255, 255, 255, 255)));
+        mb->getMaterial().setTexture(1,
+                                getUnicolorTexture(video::SColor(0, 0, 0, 0)));
     }
-    m_sun_interposer = new STKMeshSceneNode(sphere, m_scene_manager->getRootSceneNode(), NULL, -1, "sun_interposer");
+    m_sun_interposer = new STKMeshSceneNode(sphere, 
+                                            m_scene_manager->getRootSceneNode(),
+                                            NULL, -1, "sun_interposer");
 
     m_sun_interposer->grab();
     m_sun_interposer->setParent(NULL);
@@ -819,7 +828,8 @@ void IrrDriver::applyResolutionSettings()
     input_manager->setMode(InputManager::MENU);
 
     GUIEngine::addLoadingIcon(
-        irr_driver->getTexture(file_manager->getAsset(FileManager::GUI,"options_video.png"))
+        irr_driver->getTexture(file_manager
+                               ->getAsset(FileManager::GUI,"options_video.png"))
                              );
 
     file_manager->pushTextureSearchPath(file_manager->getAsset(FileManager::MODEL,""));
@@ -1109,7 +1119,9 @@ scene::IMeshSceneNode *IrrDriver::addMesh(scene::IMesh *mesh,
     if (!parent)
       parent = m_scene_manager->getRootSceneNode();
 
-    scene::IMeshSceneNode* node = new STKMeshSceneNode(mesh, parent, m_scene_manager, -1, debug_name);
+    scene::IMeshSceneNode* node = new STKMeshSceneNode(mesh, parent, 
+                                                       m_scene_manager, -1,
+                                                       debug_name);
     node->drop();
 
     return node;
@@ -1132,7 +1144,8 @@ PerCameraNode *IrrDriver::addPerCameraNode(scene::ISceneNode* node,
  */
 scene::ISceneNode *IrrDriver::addBillboard(const core::dimension2d< f32 > size,
                                            video::ITexture *texture,
-                                           scene::ISceneNode* parent, bool alphaTesting)
+                                           scene::ISceneNode* parent,
+                                           bool alphaTesting)
 {
     scene::IBillboardSceneNode* node;
     if (CVS->isGLSL())
@@ -1140,7 +1153,8 @@ scene::ISceneNode *IrrDriver::addBillboard(const core::dimension2d< f32 > size,
         if (!parent)
             parent = m_scene_manager->getRootSceneNode();
 
-        node = new STKBillboard(parent, m_scene_manager, -1, vector3df(0., 0., 0.), size);
+        node = new STKBillboard(parent, m_scene_manager, -1, 
+                                vector3df(0., 0., 0.), size);
         node->drop();
     }
     else
@@ -1821,8 +1835,10 @@ void IrrDriver::displayFPS()
 
     if (UserConfigParams::m_artist_debug_mode)
     {
-        fpsString = _("FPS: %d/%d/%d  - PolyCount: %d Solid, %d Shadows - LightDist : %d",
-            min, fps, max, poly_count[SOLID_NORMAL_AND_DEPTH_PASS], poly_count[SHADOW_PASS], m_last_light_bucket_distance);
+        fpsString = _("FPS: %d/%d/%d  - PolyCount: %d Solid, "
+                      "%d Shadows - LightDist : %d",
+                    min, fps, max, poly_count[SOLID_NORMAL_AND_DEPTH_PASS],
+                    poly_count[SHADOW_PASS], m_last_light_bucket_distance);
         poly_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
         poly_count[SHADOW_PASS] = 0;
         object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
@@ -2046,7 +2062,8 @@ void IrrDriver::doScreenShot()
 
     std::string track_name = race_manager->getTrackName();
     if (World::getWorld() == NULL) track_name = "menu";
-    std::string path = file_manager->getScreenshotDir()+track_name+"-"+time_buffer+".png";
+    std::string path = file_manager->getScreenshotDir()+track_name+"-"
+                     + time_buffer+".png";
 
     if (irr_driver->getVideoDriver()->writeImageToFile(image, path.c_str(), 0))
     {
@@ -2444,10 +2461,10 @@ void IrrDriver::applyObjectPassShader(scene::ISceneNode * const node, bool rimli
 
     const u32 mcount = node->getMaterialCount();
     u32 i;
-    const video::E_MATERIAL_TYPE ref = Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT
-                                                                 : ES_OBJECTPASS_REF);
-    const video::E_MATERIAL_TYPE pass = Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT 
-                                                                  : ES_OBJECTPASS);
+    const video::E_MATERIAL_TYPE ref = 
+        Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT : ES_OBJECTPASS_REF);
+    const video::E_MATERIAL_TYPE pass = 
+        Shaders::getShader(rimlit ? ES_OBJECTPASS_RIMLIT : ES_OBJECTPASS);
 
     const video::E_MATERIAL_TYPE origref = Shaders::getShader(ES_OBJECTPASS_REF);
     const video::E_MATERIAL_TYPE origpass = Shaders::getShader(ES_OBJECTPASS);
@@ -2473,7 +2490,8 @@ void IrrDriver::applyObjectPassShader(scene::ISceneNode * const node, bool rimli
     for (i = 0; i < mcount; i++)
     {
         video::SMaterial &nodemat = node->getMaterial(i);
-        video::SMaterial &mbmat = mesh ? mesh->getMeshBuffer(i)->getMaterial() : nodemat;
+        video::SMaterial &mbmat = mesh ? mesh->getMeshBuffer(i)->getMaterial() 
+                                       : nodemat;
         video::SMaterial *mat = &nodemat;
 
         if (viamb)
@@ -2510,8 +2528,10 @@ void IrrDriver::applyObjectPassShader()
 
 // ----------------------------------------------------------------------------
 
-scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy, float radius,
-    float r, float g, float b, bool sun, scene::ISceneNode* parent)
+scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos,
+                                       float energy, float radius,
+                                       float r, float g, float b,
+                                       bool sun, scene::ISceneNode* parent)
 {
     if (CVS->isGLSL())
     {
@@ -2519,7 +2539,8 @@ scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy,
         LightNode *light = NULL;
 
         if (!sun)
-            light = new LightNode(m_scene_manager, parent, energy, radius, r, g, b);
+            light = new LightNode(m_scene_manager, parent, energy, radius,
+                                  r, g, b);
         else
             light = new SunNode(m_scene_manager, parent, r, g, b);
 
@@ -2536,17 +2557,19 @@ scene::ISceneNode *IrrDriver::addLight(const core::vector3df &pos, float energy,
             //m_sun_interposer->updateAbsolutePosition();
             m_shadow_matrices->addLight(pos);
 
-            ((WaterShaderProvider *) Shaders::getCallback(ES_WATER) )->setSunPosition(pos);
+            ((WaterShaderProvider *) Shaders::getCallback(ES_WATER) )
+                                                         ->setSunPosition(pos);
         }
 
         return light;
     }
     else
     {
-        return m_scene_manager->addLightSceneNode(m_scene_manager->getRootSceneNode(),
-                                                  pos, video::SColorf(1.0f, r, g, b));
+        return m_scene_manager
+               ->addLightSceneNode(m_scene_manager->getRootSceneNode(),
+                                   pos, video::SColorf(1.0f, r, g, b));
     }
-}
+}   // addLight
 
 // ----------------------------------------------------------------------------
 
@@ -2560,26 +2583,26 @@ void IrrDriver::clearLights()
     }
 
     m_lights.clear();
-}
+}   // clearLights
 
 // ----------------------------------------------------------------------------
 
 GLuint IrrDriver::getRenderTargetTexture(TypeRTT which)
 {
     return m_rtts->getRenderTarget(which);
-}
+}   // getRenderTargetTexture
 
 // ----------------------------------------------------------------------------
 
 FrameBuffer& IrrDriver::getFBO(TypeFBO which)
 {
     return m_rtts->getFBO(which);
-}
+}   // getFBO
 
 // ----------------------------------------------------------------------------
 
 GLuint IrrDriver::getDepthStencilTexture()
 {
     return m_rtts->getDepthStencilTexture();
-}
+}   // getDepthStencilTexture
 

From 576270bb173c4c972e9cc7b32aa1b89b65a7f0d7 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Jul 2015 08:57:40 +1000
Subject: [PATCH 321/331] Coding style changes, removed dead code and unused
 variables.

---
 src/graphics/sun.cpp | 82 +++++---------------------------------------
 src/graphics/sun.hpp | 10 +++---
 2 files changed, 14 insertions(+), 78 deletions(-)

diff --git a/src/graphics/sun.cpp b/src/graphics/sun.cpp
index 300316dac..e18400fb2 100644
--- a/src/graphics/sun.cpp
+++ b/src/graphics/sun.cpp
@@ -34,88 +34,24 @@ using namespace video;
 using namespace scene;
 using namespace core;
 
-SunNode::SunNode(scene::ISceneManager* mgr, scene::ISceneNode* parent, float r, float g, float b):
-                     LightNode(mgr, parent, 0., 0., r, g, b)
+SunNode::SunNode(scene::ISceneManager* mgr, scene::ISceneNode* parent,
+                 float r, float g, float b)
+       : LightNode(mgr, parent, 0., 0., r, g, b)
 {
     m_color[0] = r;
     m_color[1] = g;
     m_color[2] = b;
-}
+}   // SunNode
 
+// ----------------------------------------------------------------------------
 SunNode::~SunNode()
 {
-    delete sq;
-}
+}   // ~SunNode
 
+// ----------------------------------------------------------------------------
 void SunNode::render()
 {
     irr_driver->setSunColor(video::SColorf(m_color[0], m_color[1], m_color[2]));
+    irr_driver->setSunDirection(getPosition());
 
-    vector3df pos = getPosition();
-    irr_driver->setSunDirection(pos);
-    return;
-
-/*    array<IRenderTarget> mrt;
-    mrt.reallocate(2);
-    mrt.push_back(irr_driver->getRTT(RTT_TMP2));
-    mrt.push_back(irr_driver->getRTT(RTT_TMP3));
-    irr_driver->getVideoDriver()->setRenderTarget(mrt, true, false);
-
-    // Render the sun lighting to tmp2, shadow map to tmp3
-    sq->render(false);
-
-    // Filter the shadow map for soft shadows
-    // Note that quarter1 is reserved for glow during this time.
-    // Having a separate RTT for glow would work, but be wasted VRAM due to less reuse.
-    ScreenQuad tmpsq(irr_driver->getVideoDriver());
-    GaussianBlurProvider * const gcb = (GaussianBlurProvider *) irr_driver->getCallback(ES_GAUSSIAN3H);
-
-    gcb->setResolution(UserConfigParams::m_width / 2, UserConfigParams::m_height / 2);
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAH));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_TMP3));
-    tmpsq.render(irr_driver->getRTT(RTT_HALF1));
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAV));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_HALF1));
-    tmpsq.render(irr_driver->getRTT(RTT_HALF2));
-
-    gcb->setResolution(UserConfigParams::m_width / 4, UserConfigParams::m_height / 4);
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAH));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_HALF2));
-    tmpsq.render(irr_driver->getRTT(RTT_QUARTER2));
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAV));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_QUARTER2));
-    tmpsq.render(irr_driver->getRTT(RTT_QUARTER3));
-
-    gcb->setResolution(UserConfigParams::m_width / 8, UserConfigParams::m_height / 8);
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAH));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_QUARTER3));
-    tmpsq.render(irr_driver->getRTT(RTT_EIGHTH1));
-    tmpsq.setMaterialType(irr_driver->getShader(ES_PENUMBRAV));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_EIGHTH1));
-    tmpsq.render(irr_driver->getRTT(RTT_EIGHTH2));
-
-    // Use these to generate a new soft shadow map
-    tmpsq.setMaterialType(irr_driver->getShader(ES_SHADOWGEN));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_HALF2), 0);
-    tmpsq.setTexture(irr_driver->getRTT(RTT_QUARTER3), 1);
-    tmpsq.setTexture(irr_driver->getRTT(RTT_EIGHTH2), 2);
-
-    irr_driver->getVideoDriver()->setRenderTarget(irr_driver->getRTT(RTT_HALF_SOFT), true, false);
-    tmpsq.render(false);
-
-    tmpsq.setTexture(0, 0);
-    tmpsq.setTexture(0, 1);
-    tmpsq.setTexture(0, 2);
-    tmpsq.setTexture(0, 3);
-
-    // Combine them back to the lighting RTT
-    tmpsq.setMaterialType(irr_driver->getShader(ES_MULTIPLY_ADD));
-    tmpsq.setTexture(irr_driver->getRTT(RTT_TMP2), 0);
-    tmpsq.setTexture(irr_driver->getRTT(RTT_HALF_SOFT), 1);
-
-    tmpsq.getMaterial().MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE);
-    tmpsq.getMaterial().BlendOperation = EBO_ADD;
-
-    irr_driver->getVideoDriver()->setRenderTarget(irr_driver->getRTT(RTT_TMP1), false, false);
-    tmpsq.render(false);*/
-}
+}   // render
diff --git a/src/graphics/sun.hpp b/src/graphics/sun.hpp
index 245450e46..14f67e4fa 100644
--- a/src/graphics/sun.hpp
+++ b/src/graphics/sun.hpp
@@ -24,18 +24,18 @@
 
 class ScreenQuad;
 
-// The actual rain node
+// The actual sun node
 class SunNode: public LightNode
 {
+
 public:
-    SunNode(scene::ISceneManager* mgr, scene::ISceneNode* parent, float r, float g, float b);
+    SunNode(scene::ISceneManager* mgr, scene::ISceneNode* parent, 
+            float r, float g, float b);
     virtual ~SunNode();
 
     virtual void render() OVERRIDE;
     virtual bool isPointLight() OVERRIDE { return false; }
 
-private:
-    ScreenQuad *sq;
-};
+};   // SunNode
 
 #endif

From 8aabb30687d9d8357460205f91ea4a8556a424aa Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Jul 2015 08:58:15 +1000
Subject: [PATCH 322/331] Fixed memory leak.

---
 src/tracks/track.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 3390959c3..8f04de77b 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -309,7 +309,7 @@ void Track::cleanup()
     m_object_physics_only_nodes.clear();
 
     irr_driver->removeNode(m_sun);
-
+    m_sun->drop();
     delete m_track_mesh;
     m_track_mesh = NULL;
 

From 92974fc4b396687b63724935e8e163ac50e405be Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 30 Jun 2015 21:35:17 -0400
Subject: [PATCH 323/331] Fix scripting crash

---
 src/scriptengine/script_engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scriptengine/script_engine.cpp b/src/scriptengine/script_engine.cpp
index a520c667e..c9cdadf68 100644
--- a/src/scriptengine/script_engine.cpp
+++ b/src/scriptengine/script_engine.cpp
@@ -366,7 +366,7 @@ namespace Scripting
         // the script engine will treat them all as if they were one. The script
         // section name, will allow us to localize any errors in the script code.
         asIScriptModule *mod = m_engine->GetModule(MODULE_ID_MAIN_SCRIPT_FILE,
-            clear_previous ? asGM_ALWAYS_CREATE : asGM_ONLY_IF_EXISTS);
+            clear_previous ? asGM_ALWAYS_CREATE : asGM_CREATE_IF_NOT_EXISTS);
         r = mod->AddScriptSection("script", &script[0], script.size());
         if (r < 0)
         {

From 04c84fd23d7587a9144476b2172f50fa87dd8c7c Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Wed, 1 Jul 2015 18:57:44 +1000
Subject: [PATCH 324/331] Moved skidding lights from Kart into KartGFX.

---
 src/karts/kart.cpp     | 28 ++------------
 src/karts/kart.hpp     |  7 +---
 src/karts/kart_gfx.cpp | 86 ++++++++++++++++++++++++++++++------------
 src/karts/kart_gfx.hpp |  7 ++++
 src/karts/skidding.cpp |  6 +--
 5 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index f0f5f44ff..cee329c63 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -129,8 +129,6 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     m_min_nitro_time       = 0.0f;
     m_fire_clicked         = 0;
     m_wrongway_counter     = 0;
-    m_skidding_light_1     = NULL;
-    m_skidding_light_2     = NULL;
     m_type                 = RaceManager::KT_AI;
 
     m_view_blocked_by_plunger = 0;
@@ -256,8 +254,6 @@ Kart::~Kart()
     m_goo_sound   ->deleteSFX();
     m_beep_sound  ->deleteSFX();
     m_boing_sound ->deleteSFX();
-    m_skidding_light_1->drop();
-    m_skidding_light_2->drop();
     delete m_kart_gfx;
     if(m_terrain_sound)          m_terrain_sound->deleteSFX();
     if(m_previous_terrain_sound) m_previous_terrain_sound->deleteSFX();
@@ -2409,18 +2405,6 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
     bool always_animated = (type == RaceManager::KT_PLAYER && race_manager->getNumPlayers() == 1);
     m_node = m_kart_model->attachModel(is_animated_model, always_animated);
 
-    // Create skidding lights
-    // For the first skidding level
-    m_skidding_light_1 = irr_driver->addLight(core::vector3df(0.0f, 0.1f, m_kart_model->getLength()*-0.5f - 0.05f),
-        0.3f /* force */, 3.0f /* radius */, 1.0f, 0.6f, 0.0f, false, m_node);
-    m_skidding_light_1->setVisible(false);
-    m_skidding_light_1->setName( ("skidding emitter 1 (" + getIdent() + ")").c_str() );
-    // For the second skidding level
-    m_skidding_light_2 = irr_driver->addLight(core::vector3df(0.0f, 0.1f, m_kart_model->getLength()*-0.5f - 0.05f),
-        0.4f /* force */, 4.0f /* radius */, 1.0f, 0.0f, 0.0f, false, m_node);
-    m_skidding_light_2->setVisible(false);
-    m_skidding_light_2->setName( ("skidding emitter 2 (" + getIdent() + ")").c_str() );
-
 #ifdef DEBUG
     m_node->setName( (getIdent()+"(lod-node)").c_str() );
 #endif
@@ -2711,7 +2695,8 @@ void Kart::setOnScreenText(const wchar_t *text)
 
     if (CVS->isGLSL())
     {
-        gui::ScalableFont* font = GUIEngine::getFont() ? GUIEngine::getFont() : GUIEngine::getTitleFont();
+        gui::ScalableFont* font = GUIEngine::getFont() ? GUIEngine::getFont() 
+                                                       : GUIEngine::getTitleFont();
         new STKTextBillboard(text, font,
             video::SColor(255, 255, 225, 0),
             video::SColor(255, 255, 89, 0),
@@ -2723,7 +2708,7 @@ void Kart::setOnScreenText(const wchar_t *text)
     {
         scene::ISceneManager* sm = irr_driver->getSceneManager();
         sm->addBillboardTextSceneNode(GUIEngine::getFont() ? GUIEngine::getFont()
-            : GUIEngine::getTitleFont(),
+                                                           : GUIEngine::getTitleFont(),
             text,
             getNode(),
             core::dimension2df(textsize.Width/55.0f,
@@ -2739,11 +2724,4 @@ void Kart::setOnScreenText(const wchar_t *text)
     // when the parent is deleted.
 }   // setOnScreenText
 
-// ----------------------------------------------------------------------------
-void Kart::activateSkidLight(unsigned int level)
-{
-    m_skidding_light_1->setVisible(level == 1);
-    m_skidding_light_2->setVisible(level > 1);
-}   // activateSkidLight
-
 /* EOF */
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index 52f883163..db0b71432 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -219,11 +219,6 @@ private:
     /** To prevent using nitro in too short bursts */
     float         m_min_nitro_time;
 
-    /** Lights that are shown when the kart is skidding. */
-    scene::ISceneNode* m_skidding_light_1;
-    /** A light that's shown on the second skid-level with another color. */
-    scene::ISceneNode* m_skidding_light_2;
-
     void          updatePhysics(float dt);
     void          handleMaterialSFX(const Material *material);
     void          handleMaterialGFX();
@@ -447,9 +442,9 @@ public:
     // ------------------------------------------------------------------------
     /** Counter which is used for displaying wrong way message after a delay */
     float getWrongwayCounter() { return m_wrongway_counter; }
+    // ------------------------------------------------------------------------
     void setWrongwayCounter(float counter) { m_wrongway_counter = counter; }
 
-    void activateSkidLight(unsigned int level);
 };   // Kart
 
 
diff --git a/src/karts/kart_gfx.cpp b/src/karts/kart_gfx.cpp
index 44b03fdc6..ae62b1073 100644
--- a/src/karts/kart_gfx.cpp
+++ b/src/karts/kart_gfx.cpp
@@ -45,49 +45,69 @@ KartGFX::KartGFX(const AbstractKart *kart)
 
     m_kart = kart;
 
+    const KartModel *km = m_kart->getKartModel();
+    const float length = km->getLength();
+
+    scene::ISceneNode *node = m_kart->getNode();
     // Create nitro light
-    core::vector3df location(0.0f, 0.5f,
-                             m_kart->getKartModel()->getLength()*-0.5f - 0.05f);
+    core::vector3df location(0.0f, 0.5f, -0.5f*length - 0.05f);
     m_nitro_light = irr_driver->addLight(location, /*force*/ 0.4f,
                                          /*radius*/5.0f, 0.0f, 0.4f, 1.0f,
-                                         false, m_kart->getNode());
+                                         false, node);
     m_nitro_light->setVisible(false);
 #ifdef DEBUG
-    m_nitro_light->setName( ("nitro emitter (" + m_kart->getIdent() + ")").c_str() );
+    m_nitro_light->setName( ("nitro emitter (" + m_kart->getIdent()
+                                               + ")").c_str() );
 #endif
 
+    // Create skidding lights
+    // For the first skidding level
+    m_skidding_light_1 = 
+        irr_driver->addLight(core::vector3df(0.0f, 0.1f, -0.5f*length - 0.05f),
+                             /* force */ 0.3f,  /* radius */ 3.0f,
+                             1.0f, 0.6f, 0.0f, false, node);
+    m_skidding_light_1->setVisible(false);
+    m_skidding_light_1->setName( ("skidding emitter 1 (" + m_kart->getIdent() 
+                                                         + ")").c_str() );
+
+    // For the second skidding level
+    m_skidding_light_2 =
+        irr_driver->addLight(core::vector3df(0.0f, 0.1f, -0.5f*length - 0.05f),
+                             /* force */0.4f, /*radius*/ 4.0f,
+                             1.0f, 0.0f, 0.0f, false, node);
+    m_skidding_light_2->setVisible(false);
+    m_skidding_light_2->setName( ("skidding emitter 2 (" + m_kart->getIdent() 
+                                                         + ")").c_str() );
+
+    // Create particle effects
     Vec3 rear_left(kart->getWheelGraphicsPosition(3).getX(), 0.05f,
                    kart->getWheelGraphicsPosition(3).getZ()-0.1f    );
     Vec3 rear_right(kart->getWheelGraphicsPosition(2).getX(), 0.05f,
                     kart->getWheelGraphicsPosition(2).getZ()-0.1f   );
 
-    Vec3 rear_center(0, kart->getKartHeight()*0.35f,
-                       -kart->getKartLength()*0.35f);
+    Vec3 rear_center(0, kart->getKartHeight()*0.35f, -0.35f*length);
 
-    Vec3 rear_nitro_center(0, kart->getKartHeight()*0.2f,
-                       -kart->getKartLength()*0.1f);
+    Vec3 rear_nitro_center(0, kart->getKartHeight()*0.2f, -0.1f*length);
 
     // FIXME Used to match the emitter as seen in blender
     const Vec3 delta(0, 0, 0.6f);
-    Vec3 rear_nitro_right = kart->getKartModel()->getNitroEmittersPositon(0)
-                          + delta;
-    Vec3 rear_nitro_left  = kart->getKartModel()->getNitroEmittersPositon(1)
-                          + delta;
-    if (!kart->getKartModel()->hasNitroEmitters())
+    Vec3 rear_nitro_right = km->getNitroEmittersPositon(0) + delta;
+    Vec3 rear_nitro_left  = km->getNitroEmittersPositon(1) + delta;
+    if (!km->hasNitroEmitters())
         rear_nitro_right = rear_nitro_left = rear_nitro_center;
 
     // Create all effects. Note that they must be created
     // in the order of KartGFXType.
-    addEffect(KGFX_NITRO1, "nitro.xml", rear_nitro_right, true);
-    addEffect(KGFX_NITRO2, "nitro.xml", rear_nitro_left, true);
-    addEffect(KGFX_NITROSMOKE1, "nitro-smoke.xml", rear_nitro_left, false);
+    addEffect(KGFX_NITRO1,      "nitro.xml",       rear_nitro_right, true );
+    addEffect(KGFX_NITRO2,      "nitro.xml",       rear_nitro_left,  true );
+    addEffect(KGFX_NITROSMOKE1, "nitro-smoke.xml", rear_nitro_left,  false);
     addEffect(KGFX_NITROSMOKE2, "nitro-smoke.xml", rear_nitro_right, false);
-    addEffect(KGFX_ZIPPER, "zipper_fire.xml", rear_center, true);
-    addEffect(KGFX_TERRAIN, "smoke.xml", Vec3(0, 0, 0), false);
-    addEffect(KGFX_SKID1L, "skid1.xml", rear_left, true);
-    addEffect(KGFX_SKID1R, "skid1.xml", rear_right, true);
-    addEffect(KGFX_SKID2L, "skid2.xml", rear_left, true);
-    addEffect(KGFX_SKID2R, "skid2.xml", rear_right, true);
+    addEffect(KGFX_ZIPPER,      "zipper_fire.xml", rear_center,      true );
+    addEffect(KGFX_TERRAIN,     "smoke.xml",       Vec3(0, 0, 0),    false);
+    addEffect(KGFX_SKID1L,      "skid1.xml",       rear_left,        true );
+    addEffect(KGFX_SKID1R,      "skid1.xml",       rear_right,       true );
+    addEffect(KGFX_SKID2L,      "skid2.xml",       rear_left,        true );
+    addEffect(KGFX_SKID2R,      "skid2.xml",       rear_right,       true );
 }   // KartGFX
 
 // ----------------------------------------------------------------------------
@@ -101,6 +121,9 @@ KartGFX::~KartGFX()
             delete m_all_emitters[i];
     }   // for i < KGFX_COUNT
     m_nitro_light->drop();
+    m_skidding_light_1->drop();
+    m_skidding_light_2->drop();
+
 }   // ~KartGFX
 
 // ----------------------------------------------------------------------------
@@ -129,14 +152,17 @@ void KartGFX::addEffect(KartGFXType type, const std::string &file_name,
         //kind    = new ParticleKind(file_manager->getGfxFile(file_name));
         // Skid2 is only used to store the emitter type, and a wheeless
         // kart has no terrain effects.
-        if(type==KGFX_SKID2L || type==KGFX_SKID2R || (type==KGFX_TERRAIN && m_kart->isWheeless()) )
+        if(type==KGFX_SKID2L || type==KGFX_SKID2R ||
+            (type==KGFX_TERRAIN && m_kart->isWheeless()) )
             emitter = NULL;
         else if(type==KGFX_TERRAIN)
             // Terrain is NOT a child of the kart, since bullet returns the
             // raycast info in world coordinates
-            emitter = new ParticleEmitter(kind, position, NULL, false, important);
+            emitter = new ParticleEmitter(kind, position, NULL, false,
+                                          important);
         else
-            emitter = new ParticleEmitter(kind, position, m_kart->getNode(), false, important);
+            emitter = new ParticleEmitter(kind, position, m_kart->getNode(),
+                                          false, important);
     }
     catch (std::runtime_error& e)
     {
@@ -357,3 +383,13 @@ void KartGFX::updateNitroGraphics(float nitro_frac, float new_size)
 
 }  // updateGraphics
 
+// ----------------------------------------------------------------------------
+/** Updates the skiddng light (including disabling it).
+ *  \param level Which level of light to display: 0 no light at all,
+ *         1: level 1, 2 level 2.
+ */
+void KartGFX::updateSkidLight(unsigned int level)
+{
+    m_skidding_light_1->setVisible(level == 1);
+    m_skidding_light_2->setVisible(level > 1);
+}   // updateSkidLight
diff --git a/src/karts/kart_gfx.hpp b/src/karts/kart_gfx.hpp
index eddc8f71b..5ac31df26 100644
--- a/src/karts/kart_gfx.hpp
+++ b/src/karts/kart_gfx.hpp
@@ -78,6 +78,11 @@ private:
     /** A light that's shown when the kart uses nitro. */
     irr::scene::ISceneNode* m_nitro_light;
 
+    /** Light that is shown when the kart is skidding. */
+    irr::scene::ISceneNode* m_skidding_light_1;
+
+    /** A light that's shown on the second skid-level with another color. */
+    irr::scene::ISceneNode* m_skidding_light_2;
 
     void addEffect(KartGFXType type, const std::string &file_name,
                    const Vec3 &position, bool important);
@@ -95,5 +100,7 @@ public:
     void updateTerrain(const ParticleKind *pk);
     void update(float dt);
     void updateNitroGraphics(float f, float new_size);
+    void updateSkidLight(unsigned int level);
+
 };   // KartWGFX
 #endif
diff --git a/src/karts/skidding.cpp b/src/karts/skidding.cpp
index 261087abc..d7fbacf1d 100644
--- a/src/karts/skidding.cpp
+++ b/src/karts/skidding.cpp
@@ -77,7 +77,7 @@ void Skidding::reset()
     m_jump_speed          = 0.0f;
     m_kart->getKartGFX()->setCreationRateAbsolute(KartGFX::KGFX_SKIDL, 0);
     m_kart->getKartGFX()->setCreationRateAbsolute(KartGFX::KGFX_SKIDR, 0);
-    m_kart->activateSkidLight(0);
+    m_kart->getKartGFX()->updateSkidLight(0);
     m_kart->getControls().m_skid = KartControl::SC_NONE;
     
     btVector3 rot(0, 0, 0);
@@ -399,7 +399,7 @@ void Skidding::update(float dt, bool is_on_ground,
             {
                 m_skid_bonus_ready = true;
                 m_kart->getKartGFX()->setSkidLevel(level);
-                m_kart->activateSkidLight(level);
+                m_kart->getKartGFX()->updateSkidLight(level);
             }
             // If player stops skidding, trigger bonus, and change state to
             // SKID_SHOW_GFX_*
@@ -453,7 +453,7 @@ void Skidding::update(float dt, bool is_on_ground,
                   ->setCreationRateAbsolute(KartGFX::KGFX_SKIDL, 0);
             m_kart->getKartGFX()
                   ->setCreationRateAbsolute(KartGFX::KGFX_SKIDR, 0);
-            m_kart->activateSkidLight(0);
+            m_kart->getKartGFX()->updateSkidLight(0);
             m_skid_state = SKID_NONE;
         }
     }   // switch

From 799b4cdf7e6797a456931832cb59b63fa2d4771e Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 2 Jul 2015 08:04:37 +1000
Subject: [PATCH 325/331] Minor code cleanup.

---
 src/karts/kart.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index cee329c63..8ce358863 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -583,7 +583,6 @@ void Kart::createPhysics()
         kart_height = kart_length*0.6f;
     }
 
-    btCollisionShape *shape;
     const Vec3 &bevel = m_kart_properties->getBevelFactor();
     Vec3 wheel_pos[4];
     assert(bevel.getX() || bevel.getY() || bevel.getZ());
@@ -641,14 +640,13 @@ void Kart::createPhysics()
 
     // This especially enables proper drawing of the point cloud
     hull->initializePolyhedralFeatures();
-    shape = hull;
 
     btTransform shiftCenterOfGravity;
     shiftCenterOfGravity.setIdentity();
     // Shift center of gravity downwards, so that the kart
     // won't topple over too easy.
     shiftCenterOfGravity.setOrigin(m_kart_properties->getGravityCenterShift());
-    m_kart_chassis.addChildShape(shiftCenterOfGravity, shape);
+    m_kart_chassis.addChildShape(shiftCenterOfGravity, hull);
 
     // Set mass and inertia
     // --------------------

From 34d22a32c7e30a4c79b6d6172e16d4ec1dc6a4a5 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 2 Jul 2015 16:35:51 +1000
Subject: [PATCH 326/331] Improved distance calculation (so that the same
 distance to the rear of each kart is reached).

---
 src/graphics/camera.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index e7e2c8336..88253d630 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -465,6 +465,13 @@ void Camera::getCameraSettings(float *above_kart, float *cam_angle,
                 *cam_angle  = 0;
                 *distance   = -m_kart->getKartModel()->getLength();
             }
+            else if(UserConfigParams::m_camera_debug==4)
+            {
+                *above_kart = 0;
+                *cam_angle  = 0;
+                *distance   = -0.5f*m_kart->getKartModel()->getLength()-1.0f;
+                *smoothing  = false;
+            }
             else
             {
                 *above_kart    = 0.75f;

From 369ed86380a6e50bad14a05abef7253517765669 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Thu, 2 Jul 2015 16:39:13 +1000
Subject: [PATCH 327/331] Added 'behind kart' camera which helps debugging
 graphical vs physical chassis position issues.

---
 src/config/user_config.hpp | 3 ++-
 src/main.cpp               | 2 ++
 src/utils/debug.cpp        | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 4ea5da5b7..fff731fa4 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -513,7 +513,8 @@ namespace UserConfigParams
     PARAM_PREFIX bool m_check_debug PARAM_DEFAULT( false );
 
     /** Special debug camera: 0: normal camera;   1: being high over the kart;
-                              2: on ground level; 3: free first person camera; */
+                              2: on ground level; 3: free first person camera; 
+                              4: straight behind kart */
     PARAM_PREFIX int m_camera_debug PARAM_DEFAULT( false );
 
     /** True if physics debugging should be enabled. */
diff --git a/src/main.cpp b/src/main.cpp
index 6bcc579f2..1eff57a3c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -766,6 +766,8 @@ int handleCmdLine()
            UserConfigParams::m_camera_debug=2;
         if(CommandLine::has("--camera-debug"))
             UserConfigParams::m_camera_debug=1;
+        if(CommandLine::has("--camera-kart-debug"))
+            UserConfigParams::m_camera_debug=4;
         if(CommandLine::has("--physics-debug"))
             UserConfigParams::m_physics_debug=1;
         if(CommandLine::has("--check-debug"))
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 9d7f21b01..a6430a74d 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -97,6 +97,7 @@ enum DebugMenuCommand
     DEBUG_GUI_CAM_FREE,
     DEBUG_GUI_CAM_TOP,
     DEBUG_GUI_CAM_WHEEL,
+    DEBUG_GUI_CAM_BEHIND_KART,
     DEBUG_GUI_CAM_NORMAL,
     DEBUG_GUI_CAM_SMOOTH,
     DEBUG_GUI_CAM_ATTACH,
@@ -251,6 +252,7 @@ bool onEvent(const SEvent &event)
             sub->addItem(L"Hide karts", DEBUG_GUI_HIDE_KARTS);
             sub->addItem(L"Top view", DEBUG_GUI_CAM_TOP);
             sub->addItem(L"Wheel view", DEBUG_GUI_CAM_WHEEL);
+            sub->addItem(L"Behind kart view", DEBUG_GUI_CAM_BEHIND_KART);
             sub->addItem(L"First person view", DEBUG_GUI_CAM_FREE);
             sub->addItem(L"Normal view", DEBUG_GUI_CAM_NORMAL);
             sub->addItem(L"Toggle smooth camera", DEBUG_GUI_CAM_SMOOTH);
@@ -520,6 +522,11 @@ bool onEvent(const SEvent &event)
                     UserConfigParams::m_camera_debug = 2;
                     irr_driver->getDevice()->getCursorControl()->setVisible(true);
                 }
+                else if (cmdID == DEBUG_GUI_CAM_BEHIND_KART)
+                {
+                    UserConfigParams::m_camera_debug = 4;
+                    irr_driver->getDevice()->getCursorControl()->setVisible(true);
+                }
                 else if (cmdID == DEBUG_GUI_CAM_FREE)
                 {
                     UserConfigParams::m_camera_debug = 3;

From 97499759ecfd173ad8cd448f53796f9230643d74 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 3 Jul 2015 07:55:50 +1000
Subject: [PATCH 328/331] Revert "Remove shadow blob"

This reverts commit 33c0dfe7c2b049570dafa68676c79d2c9b6829f1.
---
 src/graphics/shadow.cpp | 87 +++++++++++++++++++++++++++++++++++++++++
 src/graphics/shadow.hpp | 59 ++++++++++++++++++++++++++++
 src/karts/kart.cpp      | 12 ++++++
 src/karts/kart.hpp      |  3 ++
 4 files changed, 161 insertions(+)
 create mode 100644 src/graphics/shadow.cpp
 create mode 100644 src/graphics/shadow.hpp

diff --git a/src/graphics/shadow.cpp b/src/graphics/shadow.cpp
new file mode 100644
index 000000000..07948219e
--- /dev/null
+++ b/src/graphics/shadow.cpp
@@ -0,0 +1,87 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2013  Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "graphics/shadow.hpp"
+#include "graphics/irr_driver.hpp"
+
+#include <IMesh.h>
+#include <IMeshSceneNode.h>
+#include <ISceneNode.h>
+
+Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node,
+               float scale = 1.0, float x_offset = 0.0, float y_offset = 0.0,
+               float z_offset = 0.0)
+{
+    video::SMaterial m;
+    m.setTexture(0, texture);
+    m.BackfaceCulling = false;
+    m.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+    m.setFlag(video::EMF_ZWRITE_ENABLE , false);
+    m_mesh   = irr_driver->createQuadMesh(&m, /*create_one_quad*/true);
+    scene::IMeshBuffer *buffer = m_mesh->getMeshBuffer(0);
+    irr::video::S3DVertex* v=(video::S3DVertex*)buffer->getVertices();
+    v[0].Pos.X = -scale+x_offset; v[0].Pos.Z =  scale+z_offset; v[0].Pos.Y = 0.01f-y_offset;
+    v[1].Pos.X =  scale+x_offset; v[1].Pos.Z =  scale+z_offset; v[1].Pos.Y = 0.01f-y_offset;
+    v[2].Pos.X =  scale+x_offset; v[2].Pos.Z = -scale+z_offset; v[2].Pos.Y = 0.01f-y_offset;
+    v[3].Pos.X = -scale+x_offset; v[3].Pos.Z = -scale+z_offset; v[3].Pos.Y = 0.01f-y_offset;
+    v[0].TCoords = core::vector2df(0,0);
+    v[1].TCoords = core::vector2df(1,0);
+    v[2].TCoords = core::vector2df(1,1);
+    v[3].TCoords = core::vector2df(0,1);
+    core::vector3df normal(0, 0, 1.0f);
+    v[0].Normal  = normal;
+    v[1].Normal  = normal;
+    v[2].Normal  = normal;
+    v[3].Normal  = normal;
+    buffer->recalculateBoundingBox();
+
+    m_node   = irr_driver->addMesh(m_mesh, "shadow");
+#ifdef DEBUG
+    m_node->setName("shadow");
+#endif
+
+    m_mesh->drop();   // the node grabs the mesh, so we can drop this reference
+    m_node->setAutomaticCulling(scene::EAC_OFF);
+    m_parent_kart_node = node;
+    m_parent_kart_node->addChild(m_node);
+}   // Shadow
+
+// ----------------------------------------------------------------------------
+Shadow::~Shadow()
+{
+    // Note: the mesh was not loaded from disk, so it is not cached,
+    // and does not need to be removed. It's clean up when removing the node
+    m_parent_kart_node->removeChild(m_node);
+}   // ~Shadow
+
+// ----------------------------------------------------------------------------
+/** Removes the shadow, used for the simplified shadow when the kart is in
+ *  the air.
+ */
+void Shadow::disableShadow()
+{
+    m_node->setVisible(false);
+}
+// ----------------------------------------------------------------------------
+/** Enables the shadow again, after it was disabled with disableShadow().
+ */
+void Shadow::enableShadow()
+{
+    m_node->setVisible(true);
+}
+// ----------------------------------------------------------------------------
diff --git a/src/graphics/shadow.hpp b/src/graphics/shadow.hpp
new file mode 100644
index 000000000..e234e716b
--- /dev/null
+++ b/src/graphics/shadow.hpp
@@ -0,0 +1,59 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2009-2013  Joerg Henrichs
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 3
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SHADOW_HPP
+#define HEADER_SHADOW_HPP
+
+#include "utils/no_copy.hpp"
+
+#include <string>
+
+namespace irr
+{
+    namespace scene { class ISceneNode; class IMesh; }
+    namespace video { class ITexture; }
+}
+using namespace irr;
+
+/**
+ * \brief This class is used to enable a shadow for a kart.
+ * For now it uses a simple texture to simulate the shadow, real time shadows might
+ * be added later.
+ * \ingroup graphics
+ */
+class Shadow : public NoCopy
+{
+private:
+    /** The scene node for the shadow. */
+    scene::ISceneNode  *m_node;
+    /** The mesh of the shadow. */
+    scene::IMesh       *m_mesh;
+    /** The scene node of the kart to which this shadow belongs. */
+    scene::ISceneNode  *m_parent_kart_node;
+public:
+         Shadow(video::ITexture *texture, scene::ISceneNode *node,
+                float scale, float x_offset, float y_offset,float z_offset);
+        ~Shadow();
+    void enableShadow();
+    void disableShadow();
+};   // Shadow
+#endif
+
+/* EOF */
+
+
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 8ce358863..582a385a5 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -32,6 +32,7 @@
 #include "graphics/particle_emitter.hpp"
 #include "graphics/particle_kind.hpp"
 #include "graphics/particle_kind_manager.hpp"
+#include "graphics/shadow.hpp"
 #include "graphics/skid_marks.hpp"
 #include "graphics/slip_stream.hpp"
 #include "graphics/stk_text_billboard.hpp"
@@ -116,6 +117,7 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     m_squash_time          = 0.0f;
     m_shadow_enabled       = false;
 
+    m_shadow               = NULL;
     m_wheel_box            = NULL;
     m_collision_particles  = NULL;
     m_slipstream           = NULL;
@@ -263,6 +265,7 @@ Kart::~Kart()
     if(m_attachment)             delete m_attachment;
     if(m_stars_effect)          delete m_stars_effect;
 
+    delete m_shadow;
     if (m_wheel_box) m_wheel_box->remove();
     if(m_skidmarks) delete m_skidmarks ;
 
@@ -1398,9 +1401,11 @@ void Kart::update(float dt)
     if((!isOnGround() || emergency) && m_shadow_enabled)
     {
         m_shadow_enabled = false;
+        m_shadow->disableShadow();
     }
     if(!m_shadow_enabled && isOnGround() && !emergency)
     {
+        m_shadow->enableShadow();
         m_shadow_enabled = true;
     }
 }   // update
@@ -2446,6 +2451,13 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
                          ->isFogEnabled() );
     }
 
+    m_shadow = new Shadow(m_kart_properties->getShadowTexture(),
+                          m_node,
+                          m_kart_properties->getShadowScale(),
+                          m_kart_properties->getShadowXOffset(),
+                          m_kart_properties->getGraphicalYOffset(),
+                          m_kart_properties->getShadowZOffset());
+
     World::getWorld()->kartAdded(this, m_node);
 }   // loadData
 
diff --git a/src/karts/kart.hpp b/src/karts/kart.hpp
index db0b71432..4411e618e 100644
--- a/src/karts/kart.hpp
+++ b/src/karts/kart.hpp
@@ -170,6 +170,9 @@ private:
     /** Is time flying activated */
     bool             m_is_jumping;
 
+    /** The shadow of a kart. */
+    Shadow          *m_shadow;
+
     /** If a kart is flying, the shadow is disabled (since it is
      *  stuck to the kart, i.e. the shadow would be flying, too). */
     bool             m_shadow_enabled;

From 747aa39bdf212d33e7f63083d847956939f82802 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 3 Jul 2015 08:12:55 +1000
Subject: [PATCH 329/331] Disable artificial shadow if shader-based shadows are
 available.

---
 sources.cmake      |  2 +-
 src/karts/kart.cpp | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sources.cmake b/sources.cmake
index c16c9c60c..117eebbea 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,5 +1,5 @@
 # Modify this file to change the last-modified date when you add/remove a file. 
-# This will then trigger a new cmake run automatically.      
+# This will then trigger a new cmake run automatically.       
 file(GLOB_RECURSE STK_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.hpp")
 file(GLOB_RECURSE STK_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*.cpp")
 file(GLOB_RECURSE STK_SHADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "data/shaders/*")
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 582a385a5..4cbd8e394 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2451,13 +2451,15 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
                          ->isFogEnabled() );
     }
 
-    m_shadow = new Shadow(m_kart_properties->getShadowTexture(),
-                          m_node,
-                          m_kart_properties->getShadowScale(),
-                          m_kart_properties->getShadowXOffset(),
-                          m_kart_properties->getGraphicalYOffset(),
-                          m_kart_properties->getShadowZOffset());
-
+    if (!CVS->supportsShadows())
+    {
+        m_shadow = new Shadow(m_kart_properties->getShadowTexture(),
+                              m_node,
+                              m_kart_properties->getShadowScale(),
+                              m_kart_properties->getShadowXOffset(),
+                              m_kart_properties->getGraphicalYOffset(),
+                              m_kart_properties->getShadowZOffset());
+    }
     World::getWorld()->kartAdded(this, m_node);
 }   // loadData
 

From 8059544b21ca867a1b0fdd8d2103ce83a579fd90 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 3 Jul 2015 08:22:39 +1000
Subject: [PATCH 330/331] Try to fix advanced pipeline.

---
 src/karts/kart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 4cbd8e394..4919af563 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1398,12 +1398,12 @@ void Kart::update(float dt)
     //                         irr_driver->isGLSL();
 
     // Disable the fake shadow if we're flying
-    if((!isOnGround() || emergency) && m_shadow_enabled)
+    if(m_shadow && (!isOnGround() || emergency) && m_shadow_enabled)
     {
         m_shadow_enabled = false;
         m_shadow->disableShadow();
     }
-    if(!m_shadow_enabled && isOnGround() && !emergency)
+    if(m_shadow && !m_shadow_enabled && isOnGround() && !emergency)
     {
         m_shadow->enableShadow();
         m_shadow_enabled = true;

From 9b562d31f4e63e3411155fee01aa8ca5baa6a3fb Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@gmail.com>
Date: Fri, 3 Jul 2015 16:19:28 +1000
Subject: [PATCH 331/331] Replaced Widget's set(De)Activated functions with one
 setActive(bool) function, which simplifies code for various screen a lot.

---
 src/guiengine/widget.cpp                      | 20 ++------
 src/guiengine/widget.hpp                      | 13 +++--
 src/guiengine/widgets/spinner_widget.cpp      | 40 ++++++++--------
 src/guiengine/widgets/spinner_widget.hpp      |  5 +-
 src/guiengine/widgets/text_box_widget.cpp     | 22 ++-------
 src/guiengine/widgets/text_box_widget.hpp     |  5 +-
 src/states_screens/addons_screen.cpp          | 10 ++--
 src/states_screens/create_server_screen.cpp   |  2 +-
 .../dialogs/change_password_dialog.cpp        |  6 +--
 .../dialogs/custom_video_settings.cpp         | 47 +++++++------------
 .../dialogs/recovery_dialog.cpp               |  4 +-
 .../dialogs/user_info_dialog.cpp              | 12 ++---
 src/states_screens/dialogs/vote_dialog.cpp    | 20 ++++----
 src/states_screens/edit_gp_screen.cpp         | 32 +++----------
 src/states_screens/edit_track_screen.cpp      |  6 +--
 src/states_screens/gp_info_screen.cpp         |  2 +-
 .../grand_prix_editor_screen.cpp              | 22 +++------
 src/states_screens/help_screen_1.cpp          | 10 +---
 src/states_screens/kart_selection.cpp         |  4 +-
 src/states_screens/main_menu_screen.cpp       | 16 +++----
 src/states_screens/network_kart_selection.cpp |  2 +-
 src/states_screens/online_screen.cpp          | 10 ++--
 src/states_screens/online_user_search.cpp     | 12 ++---
 src/states_screens/options_screen_input.cpp   | 10 +---
 src/states_screens/options_screen_input2.cpp  | 22 ++-------
 src/states_screens/options_screen_ui.cpp      | 11 +----
 src/states_screens/options_screen_video.cpp   | 31 ++++--------
 src/states_screens/race_setup_screen.cpp      |  2 +-
 src/states_screens/register_screen.cpp        |  4 +-
 src/states_screens/server_selection.cpp       |  6 +--
 src/states_screens/soccer_setup_screen.cpp    | 17 ++-----
 src/states_screens/track_info_screen.cpp      |  2 +-
 src/states_screens/user_screen.cpp            | 41 ++++++----------
 33 files changed, 161 insertions(+), 307 deletions(-)

diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index 58b7cb324..db1956f56 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -148,29 +148,15 @@ void Widget::elementRemoved()
 
 // -----------------------------------------------------------------------------
 
-void Widget::setActivated()
+void Widget::setActive(bool active)
 {
     // even if this one is already active, do it anyway on purpose, maybe the
     // children widgets need to be updated
-    m_deactivated = false;
+    m_deactivated = !active;
     const int count = m_children.size();
     for (int n=0; n<count; n++)
     {
-        m_children[n].setActivated();
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-void Widget::setDeactivated()
-{
-    // even if this one is already inactive, do it anyway on purpose, maybe the
-    // children widgets need to be updated
-    m_deactivated = true;
-    const int count = m_children.size();
-    for (int n=0; n<count; n++)
-    {
-        m_children[n].setDeactivated();
+        m_children[n].setActive(active);
     }
 }
 
diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp
index e7fb8aa50..4e9118112 100644
--- a/src/guiengine/widget.hpp
+++ b/src/guiengine/widget.hpp
@@ -322,7 +322,7 @@ namespace GUIEngine
         /**
          * \brief Sets the widget (and its children, if any) visible or not.
          * Note that setting a widget invisible implicitely calls setDeactivated(), and setting
-         * it visible implicitely calls setActivated(). If you mix visiblity and (de)activated calls,
+         * it visible implicitely calls setActive(true). If you mix visiblity and (de)activated calls,
          * undefined behavior may ensue (like invisible but clickable buttons).
          */
         void setVisible(bool visible);
@@ -352,12 +352,11 @@ namespace GUIEngine
          * \{
          */
 
-        /** \brief undos setDeactivated() */
-        virtual void setActivated();
-
-        /** \brief greys out the widget, making it not clickable for the user */
-        virtual void setDeactivated();
-
+        /** \brief Sets an widget to be either activated or deactivated 
+         *  (i.e. greyed out)
+         *  \param active Active (true) or deactive (false). Defaults to 
+         *         true. */
+        virtual void setActive(bool active=true);
 
         /**
           * \}
diff --git a/src/guiengine/widgets/spinner_widget.cpp b/src/guiengine/widgets/spinner_widget.cpp
index 034bc6c29..348ed7d4e 100644
--- a/src/guiengine/widgets/spinner_widget.cpp
+++ b/src/guiengine/widgets/spinner_widget.cpp
@@ -395,36 +395,34 @@ void SpinnerWidget::setValue(irr::core::stringw new_value)
 
 // -----------------------------------------------------------------------------
 
-void SpinnerWidget::setActivated()
+void SpinnerWidget::setActive(bool active)
 {
-    Widget::setActivated();
+    Widget::setActive(active);
 
-    setText(L"");
-    if (m_customText.empty())
+    if (active)
     {
-        setValue( getValue() ); // Update the display
+        setText(L"");
+        if (m_customText.empty())
+        {
+            setValue(getValue()); // Update the display
+        }
+        else
+        {
+            setCustomText(m_customText);
+        }
     }
     else
     {
-        setCustomText(m_customText);
+        // Save it temporary because setValue(which is uses for update in
+        // this case) overwrites it
+        core::stringw customText = m_customText;
+        setText(L"-");
+        setValue(getValue()); // Update the display
+        m_customText = customText;
     }
-}
+}   // setActive
 
 // -----------------------------------------------------------------------------
-
-void SpinnerWidget::setDeactivated()
-{
-    Widget::setDeactivated();
-
-    // Save it temporary because setValue(which is uses for update in this case) overwrites it
-    core::stringw customText = m_customText; 
-    setText(L"-");
-    setValue( getValue() ); // Update the display
-    m_customText = customText;
-}
-
-// -----------------------------------------------------------------------------
-
 void SpinnerWidget::setCustomText(const core::stringw& text)
 {
     m_customText = text;
diff --git a/src/guiengine/widgets/spinner_widget.hpp b/src/guiengine/widgets/spinner_widget.hpp
index 4f1c4a841..d295fde8f 100644
--- a/src/guiengine/widgets/spinner_widget.hpp
+++ b/src/guiengine/widgets/spinner_widget.hpp
@@ -193,10 +193,7 @@ namespace GUIEngine
         
         // --------------------------------------------------------------------
         /** Override method from base class Widget */
-        virtual void setActivated();
-
-        /** Override method from base class Widget */
-        virtual void setDeactivated();
+        virtual void setActive(bool active = true);
 
         /** Display custom text in spinner */
         void setCustomText(const core::stringw& text);
diff --git a/src/guiengine/widgets/text_box_widget.cpp b/src/guiengine/widgets/text_box_widget.cpp
index 0a55d4aac..9b5684488 100644
--- a/src/guiengine/widgets/text_box_widget.cpp
+++ b/src/guiengine/widgets/text_box_widget.cpp
@@ -174,30 +174,16 @@ void TextBoxWidget::elementRemoved()
 
 // -----------------------------------------------------------------------------
 
-void TextBoxWidget::setActivated()
+void TextBoxWidget::setActive(bool active)
 {
-    Widget::setActivated();
+    Widget::setActive(active);
 
     if (m_element != NULL)
     {
         IGUIEditBox* textCtrl = Widget::getIrrlichtElement<IGUIEditBox>();
         assert(textCtrl != NULL);
-        textCtrl->setEnabled(true);
+        textCtrl->setEnabled(active);
     }
-}
-
-// -----------------------------------------------------------------------------
-
-void TextBoxWidget::setDeactivated()
-{
-    Widget::setDeactivated();
-
-    if (m_element != NULL)
-    {
-        IGUIEditBox* textCtrl = Widget::getIrrlichtElement<IGUIEditBox>();
-        assert(textCtrl != NULL);
-        textCtrl->setEnabled(false);
-    }
-}
+}   // setActive
 
 // -----------------------------------------------------------------------------
diff --git a/src/guiengine/widgets/text_box_widget.hpp b/src/guiengine/widgets/text_box_widget.hpp
index 97a61971c..977aaec82 100644
--- a/src/guiengine/widgets/text_box_widget.hpp
+++ b/src/guiengine/widgets/text_box_widget.hpp
@@ -73,10 +73,7 @@ namespace GUIEngine
         virtual void elementRemoved();
 
         /** Override method from base class Widget */
-        virtual void setActivated();
-
-        /** Override method from base class Widget */
-        virtual void setDeactivated();
+        virtual void setActive(bool active=true);
     };
 }
 
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index aa87e1866..9e9db77b2 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -143,7 +143,7 @@ void AddonsScreen::init()
     m_sort_default = true;
     m_sort_col = 0;
 
-    getWidget<GUIEngine::RibbonWidget>("category")->setDeactivated();
+    getWidget<GUIEngine::RibbonWidget>("category")->setActive(false);
 
     if(UserConfigParams::logAddons())
         Log::info("addons", "Using directory <%s>", file_manager->getAddonsDir().c_str());
@@ -157,10 +157,8 @@ void AddonsScreen::init()
     w_list->setIcons(m_icon_bank, (int)(m_icon_height));
 
     m_type = "kart";
-    if (UserConfigParams::m_internet_status != RequestManager::IPERM_ALLOWED)
-        getWidget<GUIEngine::IconButtonWidget>("reload")->setDeactivated();
-    else
-        getWidget<GUIEngine::IconButtonWidget>("reload")->setActivated();
+    bool ip = UserConfigParams::m_internet_status == RequestManager::IPERM_ALLOWED;
+    getWidget<GUIEngine::IconButtonWidget>("reload")->setActive(ip);
 
     // Reset filter.
     GUIEngine::TextBoxWidget* w_filter_name =
@@ -371,7 +369,7 @@ void AddonsScreen::loadList()
         }
     }
 
-    getWidget<GUIEngine::RibbonWidget>("category")->setActivated();
+    getWidget<GUIEngine::RibbonWidget>("category")->setActive(true);
     if(m_type == "kart")
         getWidget<GUIEngine::RibbonWidget>("category")->select("tab_kart",
                                                         PLAYER_ID_GAME_MASTER);
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
index 283857fb8..dc98b7019 100644
--- a/src/states_screens/create_server_screen.cpp
+++ b/src/states_screens/create_server_screen.cpp
@@ -109,7 +109,7 @@ void CreateServerScreen::onUpdate(float delta)
             }
             delete m_server_creation_request;
             m_server_creation_request = NULL;
-            //m_options_widget->setActivated();
+            //m_options_widget->setActive(true);
         }
         else
         {
diff --git a/src/states_screens/dialogs/change_password_dialog.cpp b/src/states_screens/dialogs/change_password_dialog.cpp
index e4aa34a11..90c4c3e19 100644
--- a/src/states_screens/dialogs/change_password_dialog.cpp
+++ b/src/states_screens/dialogs/change_password_dialog.cpp
@@ -148,7 +148,7 @@ void ChangePasswordDialog::submit()
     }
     else
     {
-        m_options_widget->setDeactivated();
+        m_options_widget->setActive(false);
         m_info_widget->setDefaultColor();
 
         // We don't need to use password 2 anymore, it was already confirmed
@@ -208,7 +208,7 @@ void ChangePasswordDialog::success()
 {
     m_info_widget->setDefaultColor();
     m_info_widget->setText(_("Password successfully changed."), false);
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
     m_current_password_widget->setText("");
     m_new_password1_widget->setText("");
     m_new_password2_widget->setText("");
@@ -220,7 +220,7 @@ void ChangePasswordDialog::error(const irr::core::stringw & error)
     SFXManager::get()->quickSound("anvil");
     m_info_widget->setErrorColor();
     m_info_widget->setText(error, false);
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
     m_current_password_widget->setText("");
     m_new_password1_widget->setText("");
     m_new_password2_widget->setText("");
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index cbbab6121..8ea27e58b 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -107,13 +107,13 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
     {
         CheckBoxWidget* cb_tex_cmp = getWidget<CheckBoxWidget>("texture_compression");
         cb_tex_cmp->setState(false);
-        cb_tex_cmp->setDeactivated();
+        cb_tex_cmp->setActive(false);
     }
 
     if (!CVS->supportsGlobalIllumination())
     {
-        shadows->setDeactivated();
-        getWidget<CheckBoxWidget>("global_illumination")->setDeactivated();
+        shadows->setActive(false);
+        getWidget<CheckBoxWidget>("global_illumination")->setActive(false);
     }
 }
 
@@ -227,37 +227,22 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
 
 void CustomVideoSettingsDialog::updateActivation()
 {
-    if(getWidget<CheckBoxWidget>("dynamiclight")->getState())
-    {
-        getWidget<CheckBoxWidget>("motionblur")->setActivated();
-        getWidget<CheckBoxWidget>("dof")->setActivated();
-        getWidget<SpinnerWidget>("shadows")->setActivated();
-        getWidget<CheckBoxWidget>("mlaa")->setActivated();
-        getWidget<CheckBoxWidget>("ssao")->setActivated();
-        getWidget<CheckBoxWidget>("lightshaft")->setActivated();
-        getWidget<CheckBoxWidget>("ibl")->setActivated();
-        getWidget<CheckBoxWidget>("global_illumination")->setActivated();
-        getWidget<CheckBoxWidget>("glow")->setActivated();
-        getWidget<CheckBoxWidget>("bloom")->setActivated();
-    }
-    else
-    {
-        getWidget<CheckBoxWidget>("motionblur")->setDeactivated();
-        getWidget<CheckBoxWidget>("dof")->setDeactivated();
-        getWidget<SpinnerWidget>("shadows")->setDeactivated();
-        getWidget<CheckBoxWidget>("mlaa")->setDeactivated();
-        getWidget<CheckBoxWidget>("ssao")->setDeactivated();
-        getWidget<CheckBoxWidget>("lightshaft")->setDeactivated();
-        getWidget<CheckBoxWidget>("ibl")->setDeactivated();
-        getWidget<CheckBoxWidget>("global_illumination")->setDeactivated();
-        getWidget<CheckBoxWidget>("glow")->setDeactivated();
-        getWidget<CheckBoxWidget>("bloom")->setDeactivated();
-    }
+    bool light = getWidget<CheckBoxWidget>("dynamiclight")->getState();
+    getWidget<CheckBoxWidget>("motionblur")->setActive(light);
+    getWidget<CheckBoxWidget>("dof")->setActive(true);
+    getWidget<SpinnerWidget>("shadows")->setActive(light);
+    getWidget<CheckBoxWidget>("mlaa")->setActive(light);
+    getWidget<CheckBoxWidget>("ssao")->setActive(light);
+    getWidget<CheckBoxWidget>("lightshaft")->setActive(light);
+    getWidget<CheckBoxWidget>("ibl")->setActive(light);
+    getWidget<CheckBoxWidget>("global_illumination")->setActive(light);
+    getWidget<CheckBoxWidget>("glow")->setActive(light);
+    getWidget<CheckBoxWidget>("bloom")->setActive(light);
 
     if (!CVS->supportsShadows() && !CVS->supportsGlobalIllumination())
     {
-        getWidget<SpinnerWidget>("shadows")->setDeactivated();
-        getWidget<CheckBoxWidget>("global_illumination")->setDeactivated();
+        getWidget<SpinnerWidget>("shadows")->setActive(false);
+        getWidget<CheckBoxWidget>("global_illumination")->setActive(false);
     }
 }   // updateActivation
 
diff --git a/src/states_screens/dialogs/recovery_dialog.cpp b/src/states_screens/dialogs/recovery_dialog.cpp
index 0298dc353..ead80ea28 100644
--- a/src/states_screens/dialogs/recovery_dialog.cpp
+++ b/src/states_screens/dialogs/recovery_dialog.cpp
@@ -124,7 +124,7 @@ void RecoveryDialog::processInput()
     else
     {
         m_info_widget->setDefaultColor();
-        m_options_widget->setDeactivated();
+        m_options_widget->setActive(false);
 
         m_recovery_request = new XMLRequest();
 
@@ -197,7 +197,7 @@ void RecoveryDialog::onUpdate(float dt)
                 SFXManager::get()->quickSound( "anvil" );
                 m_info_widget->setErrorColor();
                 m_info_widget->setText(m_recovery_request->getInfo(), false);
-                m_options_widget->setActivated();
+                m_options_widget->setActive(true);
             }
 
             delete m_recovery_request;
diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp
index e43d4c21b..7b02727be 100644
--- a/src/states_screens/dialogs/user_info_dialog.cpp
+++ b/src/states_screens/dialogs/user_info_dialog.cpp
@@ -179,7 +179,7 @@ void UserInfoDialog::sendFriendRequest()
     request->queue();
 
     m_processing = true;
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
 
 }   // sendFriendRequest
 
@@ -234,7 +234,7 @@ void UserInfoDialog::acceptFriendRequest()
     request->queue();
 
     m_processing = true;
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
 }   // acceptFriendRequest
 
 // -----------------------------------------------------------------------------
@@ -285,7 +285,7 @@ void UserInfoDialog::declineFriendRequest()
     request->queue();
 
     m_processing = true;
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
 
 }   // declineFriendRequest
 
@@ -398,7 +398,7 @@ GUIEngine::EventPropagation UserInfoDialog::processEvent(const std::string& even
         {
             ProfileManager::get()->setVisiting(m_online_profile->getID());
             m_enter_profile = true;
-            m_options_widget->setDeactivated();
+            m_options_widget->setActive(false);
             return GUIEngine::EVENT_BLOCK;
         }
         else if(selection == m_friend_widget->m_properties[PROP_ID])
@@ -415,7 +415,7 @@ GUIEngine::EventPropagation UserInfoDialog::processEvent(const std::string& even
                 removeExistingFriend();
 
             m_processing = true;
-            m_options_widget->setDeactivated();
+            m_options_widget->setActive(false);
             return GUIEngine::EVENT_BLOCK;
         }
         else if(selection == m_accept_widget->m_properties[PROP_ID])
@@ -435,7 +435,7 @@ GUIEngine::EventPropagation UserInfoDialog::processEvent(const std::string& even
 // -----------------------------------------------------------------------------
 void UserInfoDialog::deactivate()
 {
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
 }   // deactivate
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/dialogs/vote_dialog.cpp b/src/states_screens/dialogs/vote_dialog.cpp
index 5433f3bb7..923f65120 100644
--- a/src/states_screens/dialogs/vote_dialog.cpp
+++ b/src/states_screens/dialogs/vote_dialog.cpp
@@ -64,8 +64,8 @@ VoteDialog::VoteDialog(const std::string & addon_id)
     m_fetch_vote_request->addParameter("addonid", addon_id.substr(6));
     m_fetch_vote_request->queue();
 
-    m_rating_widget->setDeactivated();
-    m_cancel_widget->setDeactivated();
+    m_rating_widget->setActive(false);
+    m_cancel_widget->setActive(false);
 }    // VoteDialog
 
 // -----------------------------------------------------------------------------
@@ -123,8 +123,8 @@ void VoteDialog::sendVote()
     m_perform_vote_request->addParameter("rating", m_rating_widget->getRating());
     m_perform_vote_request->queue();
 
-    m_rating_widget->setDeactivated();
-    m_cancel_widget->setDeactivated();
+    m_rating_widget->setActive(false);
+    m_cancel_widget->setActive(false);
 
 }   // sendVote
 
@@ -196,15 +196,15 @@ void VoteDialog::updateFetchVote()
                                      "Select your desired rating by clicking "
                                      "the stars beneath"),              false);
         }
-        m_cancel_widget->setActivated();
-        m_rating_widget->setActivated();
+        m_cancel_widget->setActive(true);
+        m_rating_widget->setActive(true);
     }   // isSuccess
     else
     {
         SFXManager::get()->quickSound("anvil");
         m_info_widget->setErrorColor();
         m_info_widget->setText(m_fetch_vote_request->getInfo(), false);
-        m_cancel_widget->setActivated();
+        m_cancel_widget->setActive(true);
     }   // !isSuccess
 
     delete m_fetch_vote_request;
@@ -229,15 +229,15 @@ void VoteDialog::onUpdate(float dt)
                 m_info_widget->setDefaultColor();
                 m_info_widget->setText(_("Vote successful! You can now close "
                                          "the window."),                false);
-                m_cancel_widget->setActivated();
+                m_cancel_widget->setActive(true);
             }   // isSuccess
             else
             {
                 SFXManager::get()->quickSound( "anvil" );
                 m_info_widget->setErrorColor();
                 m_info_widget->setText(m_perform_vote_request->getInfo(), false);
-                m_cancel_widget->setActivated();
-                m_rating_widget->setActivated();
+                m_cancel_widget->setActive(true);
+                m_rating_widget->setActive(true);
             }   // !isSuccess
             delete m_perform_vote_request;
             m_perform_vote_request = NULL;
diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp
index 243553de0..8cd5e00f1 100644
--- a/src/states_screens/edit_gp_screen.cpp
+++ b/src/states_screens/edit_gp_screen.cpp
@@ -159,7 +159,7 @@ void EditGPScreen::init()
 
         IconButtonWidget* button = getWidget<IconButtonWidget>("save");
         assert(button != NULL);
-        button->setDeactivated();
+        button->setActive(false);
 
         loadList(0);
         setModified(false);
@@ -274,10 +274,7 @@ void EditGPScreen::setModified(const bool modified)
 
     IconButtonWidget* save_button = getWidget<IconButtonWidget>("save");
     assert(save_button != NULL);
-    if (modified)
-        save_button->setActivated();
-    else
-        save_button->setDeactivated();
+    save_button->setActive(modified);
 
     LabelWidget* header = getWidget<LabelWidget>("title");
     assert(header != NULL);
@@ -359,25 +356,10 @@ void EditGPScreen::enableButtons()
     assert(edit_button != NULL);
     assert(remove_button != NULL);
 
-    if (m_selected >= 0 && m_list->getItemCount() > 1)
-    {
-        up_button->setActivated();
-        down_button->setActivated();
-    }
-    else
-    {
-        up_button->setDeactivated();
-        down_button->setDeactivated();
-    }
+    bool b = m_selected >= 0 && m_list->getItemCount() > 1;
+    up_button->setActive(b);
+    down_button->setActive(b);
 
-    if (m_selected >= 0)
-    {
-        edit_button->setActivated();
-        remove_button->setActivated();
-    }
-    else
-    {
-        edit_button->setDeactivated();
-        remove_button->setDeactivated();
-    }
+    edit_button->setActive(m_selected >= 0);
+    remove_button->setActive(m_selected >= 0);
 }
diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index b5a5f8db3..1b9863767 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -220,7 +220,8 @@ void EditTrackScreen::selectTrack(const std::string& id)
     assert(ok_button != NULL);
 
     m_track = track_manager->getTrack(id);
-    if (m_track != NULL)
+    ok_button->setActive(m_track!=NULL);
+    if (m_track)
     {
         tracks->setSelection(m_track->getIdent(), PLAYER_ID_GAME_MASTER, true);
         selected_track->setText(translations->fribidize(m_track->getName()), true);
@@ -229,8 +230,6 @@ void EditTrackScreen::selectTrack(const std::string& id)
 
         reverse->setVisible(m_track->reverseAvailable());
         label_reverse->setVisible(m_track->reverseAvailable());
-
-        ok_button->setActivated();
     }
     else
     {
@@ -244,6 +243,5 @@ void EditTrackScreen::selectTrack(const std::string& id)
         reverse->setVisible(true);
         reverse->setState(false);
 
-        ok_button->setDeactivated();
     }
 }
diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp
index 12c9f07f0..48d9f9c34 100644
--- a/src/states_screens/gp_info_screen.cpp
+++ b/src/states_screens/gp_info_screen.cpp
@@ -230,7 +230,7 @@ void GPInfoScreen::init()
     getWidget<LabelWidget>("ai-text")->setVisible(has_AI);
     if (has_AI)
     {
-        m_ai_kart_spinner->setActivated();
+        m_ai_kart_spinner->setActive(true);
 
         // Avoid negative numbers (which can happen if e.g. the number of karts
         // in a previous race was lower than the number of players now.
diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp
index 8a666a11b..5d0184304 100644
--- a/src/states_screens/grand_prix_editor_screen.cpp
+++ b/src/states_screens/grand_prix_editor_screen.cpp
@@ -271,23 +271,13 @@ void GrandPrixEditorScreen::enableButtons()
     assert(remove_button != NULL);
     assert(rename_button != NULL);
 
-    if (m_selection != NULL && m_selection->getNumberOfTracks() > 0)
-        copy_button->setActivated();
-    else
-        copy_button->setDeactivated();
+    bool b = m_selection && m_selection->getNumberOfTracks() > 0;
+    copy_button->setActive(b);
 
-    if (m_selection != NULL && m_selection->isEditable())
-    {
-        edit_button->setActivated();
-        remove_button->setActivated();
-        rename_button->setActivated();
-    }
-    else
-    {
-        edit_button->setDeactivated();
-        remove_button->setDeactivated();
-        rename_button->setDeactivated();
-    }
+    b = m_selection && m_selection->isEditable();
+    edit_button->setActive(b);
+    remove_button->setActive(b);
+    rename_button->setActive(b);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/help_screen_1.cpp b/src/states_screens/help_screen_1.cpp
index 83dcdeeb0..d377bfd5b 100644
--- a/src/states_screens/help_screen_1.cpp
+++ b/src/states_screens/help_screen_1.cpp
@@ -118,14 +118,8 @@ void HelpScreen1::init()
     RibbonWidget* w = this->getWidget<RibbonWidget>("category");
     ButtonWidget* tutorial = getWidget<ButtonWidget>("startTutorial");
 
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        tutorial->setDeactivated();
-    }
-    else
-    {
-        tutorial->setActivated();
-    }
+    tutorial->setActive(StateManager::get()->getGameState() != 
+                                                       GUIEngine::INGAME_MENU);
 
     if (w != NULL)  w->select( "page1", PLAYER_ID_GAME_MASTER );
 }   //init
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 5dc89cdf0..42076802d 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -332,7 +332,7 @@ void KartSelectionScreen::init()
 
     m_game_master_confirmed = false;
 
-    tabs->setActivated();
+    tabs->setActive(true);
 
     m_kart_widgets.clearAndDeleteAll();
     StateManager::get()->resetActivePlayers();
@@ -775,7 +775,7 @@ void KartSelectionScreen::playerConfirm(const int player_id)
         m_game_master_confirmed = true;
         RibbonWidget* tabs = getWidget<RibbonWidget>("kartgroups");
         assert( tabs != NULL );
-        tabs->setDeactivated();
+        tabs->setActive(false);
     }
 
     // validate choices to notify player of duplicates
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 914af70d6..4d27f3be1 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -125,7 +125,7 @@ void MainMenuScreen::init()
     if (addons_manager->isLoading())
     {
         IconButtonWidget* w = getWidget<IconButtonWidget>("addons");
-        w->setDeactivated();
+        w->setActive(false);
         w->resetAllBadges();
         w->setBadge(LOADING_BADGE);
     }
@@ -133,7 +133,7 @@ void MainMenuScreen::init()
     m_online = getWidget<IconButtonWidget>("online");
 
     if(!m_enable_online)
-        m_online->setDeactivated();
+        m_online->setActive(false);
 
     LabelWidget* w = getWidget<LabelWidget>("info_addons");
     const core::stringw &news_text = NewsManager::get()->getNextNewsMessage();
@@ -166,19 +166,19 @@ void MainMenuScreen::onUpdate(float delta)
        PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_SIGNED_IN)
     {
         m_user_id->setText(player->getLastOnlineName() + "@stk");
-        m_online->setActivated();
+        m_online->setActive(true);
         m_online->setLabel( _("Online"));
     }
     else if (PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_SIGNED_OUT)
     {
-        m_online->setActivated();
+        m_online->setActive(true);
         m_online->setLabel( _("Login" ));
         m_user_id->setText(player->getName());
     }
     else 
     {
         // now must be either logging in or logging out
-        m_online->setDeactivated();
+        m_online->setActive(false);
         m_user_id->setText(player->getName());
     }
 
@@ -189,7 +189,7 @@ void MainMenuScreen::onUpdate(float delta)
     {
         if (addons_manager->wasError())
         {
-            addons_icon->setActivated();
+            addons_icon->setActive(true);
             addons_icon->resetAllBadges();
             addons_icon->setBadge(BAD_BADGE);
         }
@@ -197,13 +197,13 @@ void MainMenuScreen::onUpdate(float delta)
             == Online::RequestManager::IPERM_ALLOWED)
         {
             // Addons manager is still initialising/downloading.
-            addons_icon->setDeactivated();
+            addons_icon->setActive(false);
             addons_icon->resetAllBadges();
             addons_icon->setBadge(LOADING_BADGE);
         }
         else
         {
-            addons_icon->setActivated();
+            addons_icon->setActive(true);
             addons_icon->resetAllBadges();
         }
         // maybe add a new badge when not allowed to access the net
diff --git a/src/states_screens/network_kart_selection.cpp b/src/states_screens/network_kart_selection.cpp
index 23e82ff6a..12076dc24 100644
--- a/src/states_screens/network_kart_selection.cpp
+++ b/src/states_screens/network_kart_selection.cpp
@@ -55,7 +55,7 @@ void NetworkKartSelectionScreen::init()
     RibbonWidget* tabs = getWidget<RibbonWidget>("kartgroups");
     assert( tabs != NULL );
     tabs->select( "standard", PLAYER_ID_GAME_MASTER); // select standard kart group
-    tabs->setDeactivated();
+    tabs->setActive(false);
     tabs->setVisible(false);
 
     // change the back button image (because it makes the game quit)
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 6f1d26624..239d57bb7 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -115,16 +115,16 @@ void OnlineScreen::beforeAddingWidget()
         m_recorded_state == PlayerProfile::OS_SIGNING_IN ||
         m_recorded_state == PlayerProfile::OS_SIGNING_OUT)
     {
-        m_quick_play_widget->setDeactivated();
-        m_find_server_widget->setDeactivated();
-        m_create_server_widget->setDeactivated();
+        m_quick_play_widget->setActive(false);
+        m_find_server_widget->setActive(false);
+        m_create_server_widget->setActive(false);
         m_sign_out_widget->setVisible(false);
         m_profile_widget->setVisible(false);
     }
     else if (m_recorded_state == PlayerProfile::OS_GUEST)
     {
-        m_find_server_widget->setDeactivated();
-        m_create_server_widget->setDeactivated();
+        m_find_server_widget->setActive(false);
+        m_create_server_widget->setActive(false);
         m_profile_widget->setVisible(false);
     }
 
diff --git a/src/states_screens/online_user_search.cpp b/src/states_screens/online_user_search.cpp
index 5c9953471..cb1285b00 100644
--- a/src/states_screens/online_user_search.cpp
+++ b/src/states_screens/online_user_search.cpp
@@ -206,9 +206,9 @@ void OnlineUserSearch::search()
         m_user_list_widget->clear();
         m_user_list_widget->addItem("spacer", L"");
         m_user_list_widget->addItem("loading", StringUtils::loadingDots(_("Searching")));
-        m_back_widget->setDeactivated();
-        m_search_box_widget->setDeactivated();
-        m_search_button_widget->setDeactivated();
+        m_back_widget->setActive(false);
+        m_search_box_widget->setActive(false);
+        m_search_button_widget->setActive(false);
     }
 }   // search
 
@@ -278,9 +278,9 @@ void OnlineUserSearch::onUpdate(float dt)
 
             delete m_search_request;
             m_search_request = NULL;
-            m_back_widget->setActivated();
-            m_search_box_widget->setActivated();
-            m_search_button_widget->setActivated();
+            m_back_widget->setActive(true);
+            m_search_box_widget->setActive(true);
+            m_search_button_widget->setActive(true);
         }
         else
         {
diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options_screen_input.cpp
index b92880471..4630d02a5 100644
--- a/src/states_screens/options_screen_input.cpp
+++ b/src/states_screens/options_screen_input.cpp
@@ -156,14 +156,8 @@ void OptionsScreenInput::init()
     eventCallback(devices, name2, PLAYER_ID_GAME_MASTER);
      */
     // Disable adding keyboard configurations
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        getWidget<ButtonWidget>("add_device")->setDeactivated();
-    }
-    else
-    {
-        getWidget<ButtonWidget>("add_device")->setActivated();
-    }
+    bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
+    getWidget<ButtonWidget>("add_device")->setActive(!in_game);
 }   // init
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/options_screen_input2.cpp b/src/states_screens/options_screen_input2.cpp
index 527b05c79..55a7c535c 100644
--- a/src/states_screens/options_screen_input2.cpp
+++ b/src/states_screens/options_screen_input2.cpp
@@ -109,16 +109,9 @@ void OptionsScreenInput2::init()
     else
     {
         delete_button->setLabel(_("Delete Configuration"));
-
-        if (input_manager->getDeviceManager()->getKeyboardAmount() < 2)
-        {
-            // don't allow deleting the last config
-            delete_button->setDeactivated();
-        }
-        else
-        {
-            delete_button->setActivated();
-        }
+        // Don't allow deleting the last config
+        delete_button->setActive(
+                   input_manager->getDeviceManager()->getKeyboardAmount() > 1);
     }
 
     // Make the two buttons the same length, not strictly needed but will
@@ -166,13 +159,8 @@ void OptionsScreenInput2::init()
     updateInputButtons();
 
     // Disable deletion keyboard configurations
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        getWidget<ButtonWidget>("delete")->setDeactivated();
-    } else
-    {
-        getWidget<ButtonWidget>("delete")->setActivated();
-    }
+    bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
+    getWidget<ButtonWidget>("delete")->setActive(!in_game);
 }   // init
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options_screen_ui.cpp
index fe089e73c..2358035d4 100644
--- a/src/states_screens/options_screen_ui.cpp
+++ b/src/states_screens/options_screen_ui.cpp
@@ -89,7 +89,7 @@ void OptionsScreenUI::loadedFromFile()
     {
         Log::warn("OptionsScreenUI", "Could not find a single skin, make sure that "
                                      "the data files are correctly installed");
-        skinSelector->setDeactivated();
+        skinSelector->setActive(false);
         return;
     }
 
@@ -211,14 +211,7 @@ void OptionsScreenUI::init()
 
     // Forbid changing language while in-game, since this crashes (changing the language involves
     // tearing down and rebuilding the menu stack. not good when in-game)
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        list_widget->setDeactivated();
-    }
-    else
-    {
-        list_widget->setActivated();
-    }
+    list_widget->setActive(StateManager::get()->getGameState() != GUIEngine::INGAME_MENU);
 
 }   // init
 
diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp
index 054ca8ec2..5981a9cce 100644
--- a/src/states_screens/options_screen_video.cpp
+++ b/src/states_screens/options_screen_video.cpp
@@ -192,9 +192,7 @@ void OptionsScreenVideo::init()
     CheckBoxWidget* rememberWinpos = getWidget<CheckBoxWidget>("rememberWinpos");
     rememberWinpos->setState(UserConfigParams::m_remember_window_location);
 
-    if (UserConfigParams::m_fullscreen) rememberWinpos->setDeactivated();
-    else rememberWinpos->setActivated();
-
+    rememberWinpos->setActive(UserConfigParams::m_fullscreen);
 
     // --- get resolution list from irrlicht the first time
     if (!m_inited)
@@ -353,23 +351,13 @@ void OptionsScreenVideo::init()
     // ---- forbid changing resolution or animation settings from in-game
     // (we need to disable them last because some items can't be edited when
     // disabled)
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        res->setDeactivated();
-        full->setDeactivated();
-        applyBtn->setDeactivated();
-        gfx->setDeactivated();
-        getWidget<ButtonWidget>("custom")->setDeactivated();
-    }
-    else
-    {
-        // Enable back widgets if they were visited in-game previously
-        res->setActivated();
-        full->setActivated();
-        applyBtn->setActivated();
-        gfx->setActivated();
-        getWidget<ButtonWidget>("custom")->setActivated();
-    }
+    bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
+
+    res->setActive(!in_game);
+    full->setActive(!in_game);
+    applyBtn->setActive(!in_game);
+    gfx->setActive(!in_game);
+    getWidget<ButtonWidget>("custom")->setActive(!in_game);
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -597,8 +585,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
         CheckBoxWidget* fullscreen = getWidget<CheckBoxWidget>("fullscreen");
         CheckBoxWidget* rememberWinpos = getWidget<CheckBoxWidget>("rememberWinpos");
 
-        if (fullscreen->getState()) rememberWinpos->setDeactivated();
-        else rememberWinpos->setActivated();
+        rememberWinpos->setActive(!fullscreen->getState());
     }
 }   // eventCallback
 
diff --git a/src/states_screens/race_setup_screen.cpp b/src/states_screens/race_setup_screen.cpp
index ffaf02721..60f784555 100644
--- a/src/states_screens/race_setup_screen.cpp
+++ b/src/states_screens/race_setup_screen.cpp
@@ -289,7 +289,7 @@ void RaceSetupScreen::init()
         int index = w->findItemNamed("best");
         Widget* hardestWidget = &w->getChildren()[index];
         hardestWidget->setBadge(LOCKED_BADGE);
-        hardestWidget->setDeactivated();
+        hardestWidget->setActive(false);
     }
 }   // init
 
diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp
index 19623be8b..9c4df5195 100644
--- a/src/states_screens/register_screen.cpp
+++ b/src/states_screens/register_screen.cpp
@@ -326,7 +326,7 @@ void RegisterScreen::doRegister()
  */
 void RegisterScreen::acceptTerms()
 {
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
 
     core::stringw username = getWidget<TextBoxWidget>("username")->getText().trim();
     core::stringw password = m_password_widget->getText().trim();
@@ -374,7 +374,7 @@ void RegisterScreen::onUpdate(float dt)
             }
             delete m_signup_request;
             m_signup_request = NULL;
-            m_options_widget->setActivated();
+            m_options_widget->setActive(true);
         }
     }
     else if(m_info_message_shown && !ModalDialog::isADialogActive())
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 2689b22fc..f70e6a2d1 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -65,7 +65,7 @@ void ServerSelection::refresh()
     m_server_list_widget->addItem("spacer", L"");
     m_server_list_widget->addItem("loading",
                               StringUtils::loadingDots(_("Fetching servers")));
-    m_reload_widget->setDeactivated();
+    m_reload_widget->setActive(false);
 }
 
 
@@ -202,7 +202,7 @@ void ServerSelection::onUpdate(float dt)
             }
             delete m_refresh_request;
             m_refresh_request = NULL;
-            m_reload_widget->setActivated();
+            m_reload_widget->setActive(true);
         }
         else
         {
@@ -214,6 +214,6 @@ void ServerSelection::onUpdate(float dt)
     {
         loadList();
         m_fake_refresh = false;
-        m_reload_widget->setActivated();
+        m_reload_widget->setActive(true);
     }
 }   // onUpdate
diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index dd2c13edd..7349bd81b 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -111,16 +111,9 @@ void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name,
     else if(name == "time_enabled")
     {
         CheckBoxWidget* timeEnabled = dynamic_cast<CheckBoxWidget*>(widget);
-        if(timeEnabled->getState())
-        {
-            getWidget<SpinnerWidget>("goalamount")->setDeactivated();
-            getWidget<SpinnerWidget>("timeamount")->setActivated();
-        }
-        else
-        {
-            getWidget<SpinnerWidget>("timeamount")->setDeactivated();
-            getWidget<SpinnerWidget>("goalamount")->setActivated();
-        }
+        bool timed = timeEnabled->getState();
+        getWidget<SpinnerWidget>("goalamount")->setActive(!timed);
+        getWidget<SpinnerWidget>("timeamount")->setActive(timed);
     }
 }   // eventCallback
 
@@ -208,11 +201,11 @@ void SoccerSetupScreen::init()
 
     SpinnerWidget*  goalamount = getWidget<SpinnerWidget>("goalamount");
     goalamount->setValue(UserConfigParams::m_num_goals);
-    goalamount->setActivated();
+    goalamount->setActive(true);
 
     SpinnerWidget* timeAmount = getWidget<SpinnerWidget>("timeamount");
     timeAmount->setValue(UserConfigParams::m_soccer_time_limit);
-    timeAmount->setDeactivated();
+    timeAmount->setActive(false);
 
     CheckBoxWidget* timeEnabled = getWidget<CheckBoxWidget>("time_enabled");
     timeEnabled->setState(false);
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index ff6887ed7..f822fd6a3 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -148,7 +148,7 @@ void TrackInfoScreen::init()
     getWidget<LabelWidget>("ai-text")->setVisible(has_AI);
     if (has_AI)
     {
-        m_ai_kart_spinner->setActivated();
+        m_ai_kart_spinner->setActive(true);
 
         // Avoid negative numbers (which can happen if e.g. the number of karts
         // in a previous race was lower than the number of players now.
diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/user_screen.cpp
index 3c4658c70..7c7e7d3c0 100644
--- a/src/states_screens/user_screen.cpp
+++ b/src/states_screens/user_screen.cpp
@@ -115,7 +115,7 @@ void BaseUserScreen::init()
     m_sign_in_name  = "";
 
     // It should always be activated ... but just in case
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
     // Clean any error message still shown
     m_info_widget->setText("", true);
     m_info_widget->setErrorColor();
@@ -148,20 +148,12 @@ void BaseUserScreen::init()
         selectUser(0);
 
     // Disable changing the user while in game
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        getWidget<IconButtonWidget>("ok")->setDeactivated();
-        getWidget<IconButtonWidget>("new_user")->setDeactivated();
-        getWidget<IconButtonWidget>("rename")->setDeactivated();
-        getWidget<IconButtonWidget>("delete")->setDeactivated();
-    }
-    else
-    {
-        getWidget<IconButtonWidget>("ok")->setActivated();
-        getWidget<IconButtonWidget>("new_user")->setActivated();
-        getWidget<IconButtonWidget>("rename")->setActivated();
-        getWidget<IconButtonWidget>("delete")->setActivated();
-    }
+    bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
+    getWidget<IconButtonWidget>("ok")->setActive(!in_game);
+    getWidget<IconButtonWidget>("new_user")->setActive(!in_game);
+    getWidget<IconButtonWidget>("rename")->setActive(!in_game);
+    getWidget<IconButtonWidget>("delete")->setActive(!in_game);
+
     m_new_registered_data = false;
     if (m_auto_login)
     {
@@ -229,10 +221,7 @@ void BaseUserScreen::selectUser(int index)
     makeEntryFieldsVisible();
     getWidget<CheckBoxWidget>("remember-user")->setState(
         profile->rememberPassword());
-    if(profile->getLastOnlineName().size() > 0)
-        m_username_tb->setDeactivated();
-    else
-        m_username_tb->setActivated();
+    m_username_tb->setActive(profile->getLastOnlineName().size() == 0);
 
     // And make the password invisible if the session is saved (i.e
     // the user does not need to enter a password).
@@ -282,7 +271,7 @@ void BaseUserScreen::makeEntryFieldsVisible()
         m_password_tb->setVisible(online);
         // Is user has no online name, make sure the user can enter one
         if (player->getLastOnlineName().empty())
-            m_username_tb->setActivated();
+            m_username_tb->setActive(true);
 
     }
 }   // makeEntryFieldsVisible
@@ -348,7 +337,7 @@ void BaseUserScreen::eventCallback(Widget* widget,
             // Make sure the new user will have an empty online name field
             // that can also be edited.
             m_username_tb->setText("");
-            m_username_tb->setActivated();
+            m_username_tb->setActive(true);
         }
         else if (button == "cancel")
         {
@@ -403,7 +392,7 @@ void BaseUserScreen::login()
 {
     // If an error occurs, the callback informing this screen about the
     // problem will activate the widget again.
-    m_options_widget->setDeactivated();
+    m_options_widget->setActive(false);
     m_state = STATE_NONE;
 
     PlayerProfile *player = getSelectedPlayer();
@@ -471,7 +460,7 @@ void BaseUserScreen::login()
         {
             m_info_widget->setText(_("You need to enter a password."), true);
             SFXManager::get()->quickSound("anvil");
-            m_options_widget->setActivated();
+            m_options_widget->setActive(true);
             return;
         }
         m_sign_in_name = m_username_tb->getText();
@@ -504,7 +493,7 @@ void BaseUserScreen::loginSuccessful()
 {
     PlayerProfile *player  = getSelectedPlayer();
     player->setWasOnlineLastTime(true);
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
     // Clean any error message still shown
     m_info_widget->setText("", true);
     m_info_widget->setErrorColor();
@@ -530,7 +519,7 @@ void BaseUserScreen::loginError(const irr::core::stringw & error_message)
     SFXManager::get()->quickSound("anvil");
     m_info_widget->setErrorColor();
     m_info_widget->setText(error_message, false);
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
 }   // loginError
 
 // ----------------------------------------------------------------------------
@@ -560,7 +549,7 @@ void BaseUserScreen::logoutError(const irr::core::stringw & error_message)
     SFXManager::get()->quickSound("anvil");
     m_info_widget->setErrorColor();
     m_info_widget->setText(error_message, false);
-    m_options_widget->setActivated();
+    m_options_widget->setActive(true);
 }   // logoutError
 
 // ----------------------------------------------------------------------------